me/guix
Archived
1
0
Fork 0
Code Activity

daemon: Map directly to gcrypt hash functions.

Browse source 
* nix/libutil/hash.hh (HashType): Map directly to GCRY_MD_ values.
(md5HashSize, sha1HashSize, sha256HashSize, sha512HashSize): Remove.
* nix/libutil/hash.cc (Hash::Hash): Use 'gcry_md_get_algo_dlen'.
This commit is contained in:
Ludovic Courtès 2020-06-23 11:46:05 +02:00
parent 4b4f890cb0
commit 3fb6b8f304
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nix/libutil/hash.cc
View file

@ -38,11 +38,9 @@ Hash::Hash()
Hash::Hash(HashType type) Hash::Hash(HashType type)
{ {
this->type = type; this->type = type;
if (type == htMD5) hashSize = md5HashSize; hashSize = gcry_md_get_algo_dlen(type);
else if (type == htSHA1) hashSize = sha1HashSize;
else if (type == htSHA256) hashSize = sha256HashSize; if (hashSize == 0) throw Error("unknown hash type");
else if (type == htSHA512) hashSize = sha512HashSize;
else throw Error("unknown hash type");
assert(hashSize <= maxHashSize); assert(hashSize <= maxHashSize);
memset(hash, 0, maxHashSize); memset(hash, 0, maxHashSize);
} }

17
nix/libutil/hash.hh
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <gcrypt.h>
#include "types.hh" #include "types.hh"
#include "serialise.hh" #include "serialise.hh"
@ -7,16 +9,15 @@
namespace nix { namespace nix {
typedef enum { htUnknown, htMD5, htSHA1, htSHA256, htSHA512 } HashType;
const int md5HashSize = 16;
const int sha1HashSize = 20;
const int sha256HashSize = 32;
const int sha512HashSize = 64;
extern const string base32Chars; extern const string base32Chars;
typedef enum {
htUnknown = 0,
htMD5 = GCRY_MD_MD5,
htSHA1 = GCRY_MD_SHA1,
htSHA256 = GCRY_MD_SHA256,
htSHA512 = GCRY_MD_SHA512
} HashType;
struct Hash struct Hash
{ {