Merge branch 'master' into staging

[jackhill/guix/guix.git] / nix / libutil / gcrypt-hash.cc

diff --git a/nix/libutil/gcrypt-hash.cc b/nix/libutil/gcrypt-hash.cc
index de7e5af..c4ae7bf 100644 (file)
--- a/nix/libutil/gcrypt-hash.cc
+++ b/nix/libutil/gcrypt-hash.cc
@@ -1,20 +1,20 @@
-/* Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
-   Copyright (C) 2012  Ludovic Courtès <ludo@gnu.org>
+/* GNU Guix --- Functional package management for GNU
+   Copyright (C) 2012, 2013  Ludovic Courtès <ludo@gnu.org>
 
-   This file is part of Guix.
+   This file is part of GNU Guix.
 
-   Guix is free software; you can redistribute it and/or modify it
+   GNU 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
+   GNU 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/>.  */
+   along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -24,7 +24,7 @@
 extern "C" {
 
 void
-guix_hash_init (struct guix_hash_context *ctx, gcry_md_algo_t algo)
+guix_hash_init (struct guix_hash_context *ctx, int algo)
 {
   gcry_error_t err;
 
@@ -40,11 +40,12 @@ guix_hash_update (struct guix_hash_context *ctx, const void *buffer, size_t len)
 
 void
 guix_hash_final (void *resbuf, struct guix_hash_context *ctx,
-                gcry_md_algo_t algo)
+                int algo)
 {
   memcpy (resbuf, gcry_md_read (ctx->md_handle, algo),
          gcry_md_get_algo_dlen (algo));
   gcry_md_close (ctx->md_handle);
+  ctx->md_handle = NULL;
 }
 
 }