diff options
Diffstat (limited to 'cpan/Digest-SHA/src')
| -rw-r--r-- | cpan/Digest-SHA/src/hmac.c | 4 | ||||
| -rw-r--r-- | cpan/Digest-SHA/src/hmac.h | 4 | ||||
| -rw-r--r-- | cpan/Digest-SHA/src/sha.c | 10 | ||||
| -rw-r--r-- | cpan/Digest-SHA/src/sha.h | 5 | ||||
| -rw-r--r-- | cpan/Digest-SHA/src/sha64bit.c | 4 | ||||
| -rw-r--r-- | cpan/Digest-SHA/src/sha64bit.h | 2 |
6 files changed, 20 insertions, 9 deletions
diff --git a/cpan/Digest-SHA/src/hmac.c b/cpan/Digest-SHA/src/hmac.c index 7c8dea7324..12ca2a80ae 100644 --- a/cpan/Digest-SHA/src/hmac.c +++ b/cpan/Digest-SHA/src/hmac.c @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.60 - * Thu Mar 3 05:26:42 MST 2011 + * Version: 5.61 + * Wed Mar 9 05:26:36 MST 2011 * */ diff --git a/cpan/Digest-SHA/src/hmac.h b/cpan/Digest-SHA/src/hmac.h index 9a52d875f9..9a29419cb7 100644 --- a/cpan/Digest-SHA/src/hmac.h +++ b/cpan/Digest-SHA/src/hmac.h @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.60 - * Thu Mar 3 05:26:42 MST 2011 + * Version: 5.61 + * Wed Mar 9 05:26:36 MST 2011 * */ diff --git a/cpan/Digest-SHA/src/sha.c b/cpan/Digest-SHA/src/sha.c index e77ff3f373..20f2d7157e 100644 --- a/cpan/Digest-SHA/src/sha.c +++ b/cpan/Digest-SHA/src/sha.c @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.60 - * Thu Mar 3 05:26:42 MST 2011 + * Version: 5.61 + * Wed Mar 9 05:26:36 MST 2011 * */ @@ -473,6 +473,12 @@ int shadsize(SHA *s) return(s->digestlen); } +/* shaalg: returns which SHA algorithm is being used */ +int shaalg(SHA *s) +{ + return(s->alg); +} + /* shadup: duplicates current digest object */ SHA *shadup(SHA *s) { diff --git a/cpan/Digest-SHA/src/sha.h b/cpan/Digest-SHA/src/sha.h index 82efe48373..cb7610ff43 100644 --- a/cpan/Digest-SHA/src/sha.h +++ b/cpan/Digest-SHA/src/sha.h @@ -5,8 +5,8 @@ * * Copyright (C) 2003-2011 Mark Shelor, All Rights Reserved * - * Version: 5.60 - * Thu Mar 3 05:26:42 MST 2011 + * Version: 5.61 + * Wed Mar 9 05:26:36 MST 2011 * */ @@ -211,6 +211,7 @@ unsigned char *shadigest (_SHA_STATE); char *shahex (_SHA_STATE); char *shabase64 (_SHA_STATE); int shadsize (_SHA_STATE); +int shaalg (_SHA_STATE); SHA *shadup (_SHA_STATE); int shadump (_SHA_FNAME, _SHA_STATE); SHA *shaload (_SHA_FNAME); diff --git a/cpan/Digest-SHA/src/sha64bit.c b/cpan/Digest-SHA/src/sha64bit.c index aaf87f83fc..b37d6f3c09 100644 --- a/cpan/Digest-SHA/src/sha64bit.c +++ b/cpan/Digest-SHA/src/sha64bit.c @@ -6,6 +6,8 @@ #undef sha512 #undef H0384 #undef H0512 +#undef H0512224 +#undef H0512256 #define sha_384_512 1 @@ -70,8 +72,8 @@ static W64 H0512224[8] = /* SHA-512/224 initial hash value */ C64(0x8c3d37c819544da2), C64(0x73e1996689dcd4d6), C64(0x1dfab7ae32ff9c82), C64(0x679dd514582f9fcf), C64(0x0f6d2b697bd44da8), C64(0x77e36f7304c48942), C64(0x3f9d85a86a1d36c8), C64(0x1112e6ad91d692a1) - }; + static W64 H0512256[8] = /* SHA-512/256 initial hash value */ { C64(0x22312194fc2bf72c), C64(0x9f555fa3c84c64c2), C64(0x2393b86b6f53b151), diff --git a/cpan/Digest-SHA/src/sha64bit.h b/cpan/Digest-SHA/src/sha64bit.h index 5a02c92ddd..c4fe7666bd 100644 --- a/cpan/Digest-SHA/src/sha64bit.h +++ b/cpan/Digest-SHA/src/sha64bit.h @@ -13,3 +13,5 @@ #define sha512 NULL #define H0384 H01 #define H0512 H01 +#define H0512224 H01 +#define H0512256 H01 |