Merge branch 'nix-integration'

Conflicts:
	tests/guix-package.sh

6 files changed, 196 insertions, 0 deletions

diff --git a/nix/libutil/.gitignore b/nix/libutil/.gitignore
new file mode 100644
index 0000000000..e539428b1b
--- /dev/null
+++ b/nix/libutil/.gitignore
@@ -0,0 +1,2 @@
+*.cc
+*.hh
diff --git a/nix/libutil/gcrypt-hash.cc b/nix/libutil/gcrypt-hash.cc
new file mode 100644
index 0000000000..de7e5afc1a
--- /dev/null
+++ b/nix/libutil/gcrypt-hash.cc
@@ -0,0 +1,50 @@
+/* Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
+   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
+
+   This file is part of Guix.
+
+   Guix is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
+
+   Guix is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Guix.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include <gcrypt-hash.hh>
+#include <assert.h>
+
+extern "C" {
+
+void
+guix_hash_init (struct guix_hash_context *ctx, gcry_md_algo_t algo)
+{
+  gcry_error_t err;
+
+  err = gcry_md_open (&ctx->md_handle, algo, 0);
+  assert (err == GPG_ERR_NO_ERROR);
+}
+
+void
+guix_hash_update (struct guix_hash_context *ctx, const void *buffer, size_t len)
+{
+  gcry_md_write (ctx->md_handle, buffer, len);
+}
+
+void
+guix_hash_final (void *resbuf, struct guix_hash_context *ctx,
+		 gcry_md_algo_t algo)
+{
+  memcpy (resbuf, gcry_md_read (ctx->md_handle, algo),
+	  gcry_md_get_algo_dlen (algo));
+  gcry_md_close (ctx->md_handle);
+}
+
+}
diff --git a/nix/libutil/gcrypt-hash.hh b/nix/libutil/gcrypt-hash.hh
new file mode 100644
index 0000000000..1e26398540
--- /dev/null
+++ b/nix/libutil/gcrypt-hash.hh
@@ -0,0 +1,39 @@
+/* Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
+   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
+
+   This file is part of Guix.
+
+   Guix is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
+
+   Guix is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Guix.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* An OpenSSL-like interface to GNU libgcrypt cryptographic hash
+   functions.  */
+
+#pragma once
+#include <gcrypt.h>
+#include <unistd.h>
+
+extern "C" {
+
+struct guix_hash_context
+{
+  gcry_md_hd_t md_handle;
+};
+
+extern void guix_hash_init (struct guix_hash_context *ctx, gcry_md_algo_t algo);
+extern void guix_hash_update (struct guix_hash_context *ctx, const void *buffer,
+			      size_t len);
+extern void guix_hash_final (void *resbuf, struct guix_hash_context *ctx,
+			     gcry_md_algo_t algo);
+
+}
diff --git a/nix/libutil/md5.h b/nix/libutil/md5.h
new file mode 100644
index 0000000000..7fa29087d7
--- /dev/null
+++ b/nix/libutil/md5.h
@@ -0,0 +1,35 @@
+/* Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
+   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
+
+   This file is part of Guix.
+
+   Guix is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
+
+   Guix is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Guix.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <gcrypt-hash.hh>
+
+#define MD5_CTX guix_hash_context
+
+static inline void
+MD5_Init (struct MD5_CTX *ctx)
+{
+  guix_hash_init (ctx, GCRY_MD_MD5);
+}
+
+#define MD5_Update guix_hash_update
+
+static inline void
+MD5_Final (void *resbuf, struct MD5_CTX *ctx)
+{
+  guix_hash_final (resbuf, ctx, GCRY_MD_MD5);
+}
diff --git a/nix/libutil/sha1.h b/nix/libutil/sha1.h
new file mode 100644
index 0000000000..0eca8e310d
--- /dev/null
+++ b/nix/libutil/sha1.h
@@ -0,0 +1,35 @@
+/* Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
+   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
+
+   This file is part of Guix.
+
+   Guix is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
+
+   Guix is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Guix.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <gcrypt-hash.hh>
+
+#define SHA_CTX guix_hash_context
+
+static inline void
+SHA1_Init (struct SHA_CTX *ctx)
+{
+  guix_hash_init (ctx, GCRY_MD_SHA1);
+}
+
+#define SHA1_Update guix_hash_update
+
+static inline void
+SHA1_Final (void *resbuf, struct SHA_CTX *ctx)
+{
+  guix_hash_final (resbuf, ctx, GCRY_MD_SHA1);
+}
diff --git a/nix/libutil/sha256.h b/nix/libutil/sha256.h
new file mode 100644
index 0000000000..a91f18f689
--- /dev/null
+++ b/nix/libutil/sha256.h
@@ -0,0 +1,35 @@
+/* Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
+   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
+
+   This file is part of Guix.
+
+   Guix is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or (at
+   your option) any later version.
+
+   Guix is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Guix.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <gcrypt-hash.hh>
+
+#define SHA256_CTX guix_hash_context
+
+static inline void
+SHA256_Init (struct SHA256_CTX *ctx)
+{
+  guix_hash_init (ctx, GCRY_MD_SHA256);
+}
+
+#define SHA256_Update guix_hash_update
+
+static inline void
+SHA256_Final (void *resbuf, struct SHA256_CTX *ctx)
+{
+  guix_hash_final (resbuf, ctx, GCRY_MD_SHA256);
+}