Mercurial > hg > octave-nkf > gnulib-hg
changeset 8109:38b4f50a2b13
lib/gc.h, lib/gc-libgcrypt.c: Support SHA-256/384/512.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Mon, 05 Feb 2007 11:17:30 +0000 |
parents | e22e004d89dd |
children | 8428e492271f |
files | ChangeLog lib/gc-libgcrypt.c lib/gc.h |
diffstat | 3 files changed, 54 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-02-05 Simon Josefsson <simon@josefsson.org> + + * lib/gc.h, lib/gc-libgcrypt.c: Support SHA-256/384/512. + 2007-02-04 Paul Eggert <eggert@cs.ucla.edu> * lib/getsubopt.c [!_LIBC]: Include config.h and getsubopt.h.
--- a/lib/gc-libgcrypt.c +++ b/lib/gc-libgcrypt.c @@ -269,6 +269,18 @@ gcryalg = GCRY_MD_SHA1; break; + case GC_SHA256: + gcryalg = GCRY_MD_SHA256; + break; + + case GC_SHA384: + gcryalg = GCRY_MD_SHA384; + break; + + case GC_SHA512: + gcryalg = GCRY_MD_SHA512; + break; + case GC_RMD160: gcryalg = GCRY_MD_RMD160; break; @@ -356,6 +368,18 @@ len = GC_SHA1_DIGEST_SIZE; break; + case GC_SHA256: + len = GC_SHA256_DIGEST_SIZE; + break; + + case GC_SHA384: + len = GC_SHA384_DIGEST_SIZE; + break; + + case GC_SHA512: + len = GC_SHA512_DIGEST_SIZE; + break; + default: return 0; } @@ -453,6 +477,24 @@ break; #endif +#ifdef GNULIB_GC_SHA256 + case GC_SHA256: + gcryalg = GCRY_MD_SHA256; + break; +#endif + +#ifdef GNULIB_GC_SHA384 + case GC_SHA384: + gcryalg = GCRY_MD_SHA384; + break; +#endif + +#ifdef GNULIB_GC_SHA512 + case GC_SHA512: + gcryalg = GCRY_MD_SHA512; + break; +#endif + #ifdef GNULIB_GC_RMD160 case GC_RMD160: gcryalg = GCRY_MD_RMD160;
--- a/lib/gc.h +++ b/lib/gc.h @@ -1,5 +1,5 @@ /* gc.h --- Header file for implementation agnostic crypto wrapper API. - * Copyright (C) 2002, 2003, 2004, 2005 Simon Josefsson + * Copyright (C) 2002, 2003, 2004, 2005, 2007 Simon Josefsson * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -45,7 +45,10 @@ GC_MD5, GC_SHA1, GC_MD2, - GC_RMD160 + GC_RMD160, + GC_SHA256, + GC_SHA384, + GC_SHA512 }; typedef enum Gc_hash Gc_hash; @@ -62,6 +65,9 @@ #define GC_MD5_DIGEST_SIZE 16 #define GC_RMD160_DIGEST_SIZE 20 #define GC_SHA1_DIGEST_SIZE 20 +#define GC_SHA256_DIGEST_SIZE 32 +#define GC_SHA384_DIGEST_SIZE 48 +#define GC_SHA512_DIGEST_SIZE 64 /* Cipher types. */ enum Gc_cipher