diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-23 00:35:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-23 00:35:17 +0200 |
| commit | 5608847c6f4131e8f30321fdf25289efd73f8689 (patch) | |
| tree | 5a5910165d29455b249fd4d6612078ff5cf6ced5 /nix/libutil/gcrypt-hash.cc | |
| parent | 0c456db45bf03df61cdb71db7742a44f4328fb3d (diff) | |
| parent | f59e9eaac87b4365c646a475d44b431e43949649 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libutil/gcrypt-hash.cc')
| -rw-r--r-- | nix/libutil/gcrypt-hash.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nix/libutil/gcrypt-hash.cc b/nix/libutil/gcrypt-hash.cc index b364a5747a..553f633b93 100644 --- a/nix/libutil/gcrypt-hash.cc +++ b/nix/libutil/gcrypt-hash.cc @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org> + Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org> This file is part of GNU Guix. @@ -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,7 +40,7 @@ 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)); |