| Index: mozilla/security/nss/lib/freebl/rawhash.c
|
| ===================================================================
|
| --- mozilla/security/nss/lib/freebl/rawhash.c (revision 180595)
|
| +++ mozilla/security/nss/lib/freebl/rawhash.c (working copy)
|
| @@ -58,7 +58,9 @@
|
| (void (*)(void *, unsigned char *, unsigned int *,
|
| unsigned int)) null_hash_end,
|
| 0,
|
| - HASH_AlgNULL
|
| + HASH_AlgNULL,
|
| + (void (*)(void *, unsigned char *, unsigned int *,
|
| + unsigned int)) null_hash_end
|
| },
|
| { MD2_LENGTH,
|
| (void * (*)(void)) MD2_NewContext,
|
| @@ -68,7 +70,8 @@
|
| (void (*)(void *, const unsigned char *, unsigned int)) MD2_Update,
|
| (void (*)(void *, unsigned char *, unsigned int *, unsigned int)) MD2_End,
|
| MD2_BLOCK_LENGTH,
|
| - HASH_AlgMD2
|
| + HASH_AlgMD2,
|
| + NULL /* end_raw */
|
| },
|
| { MD5_LENGTH,
|
| (void * (*)(void)) MD5_NewContext,
|
| @@ -78,7 +81,8 @@
|
| (void (*)(void *, const unsigned char *, unsigned int)) MD5_Update,
|
| (void (*)(void *, unsigned char *, unsigned int *, unsigned int)) MD5_End,
|
| MD5_BLOCK_LENGTH,
|
| - HASH_AlgMD5
|
| + HASH_AlgMD5,
|
| + (void (*)(void *, unsigned char *, unsigned int *, unsigned int)) MD5_EndRaw
|
| },
|
| { SHA1_LENGTH,
|
| (void * (*)(void)) SHA1_NewContext,
|
| @@ -88,7 +92,9 @@
|
| (void (*)(void *, const unsigned char *, unsigned int)) SHA1_Update,
|
| (void (*)(void *, unsigned char *, unsigned int *, unsigned int)) SHA1_End,
|
| SHA1_BLOCK_LENGTH,
|
| - HASH_AlgSHA1
|
| + HASH_AlgSHA1,
|
| + (void (*)(void *, unsigned char *, unsigned int *, unsigned int))
|
| + SHA1_EndRaw
|
| },
|
| { SHA256_LENGTH,
|
| (void * (*)(void)) SHA256_NewContext,
|
| @@ -99,7 +105,9 @@
|
| (void (*)(void *, unsigned char *, unsigned int *,
|
| unsigned int)) SHA256_End,
|
| SHA256_BLOCK_LENGTH,
|
| - HASH_AlgSHA256
|
| + HASH_AlgSHA256,
|
| + (void (*)(void *, unsigned char *, unsigned int *,
|
| + unsigned int)) SHA256_EndRaw
|
| },
|
| { SHA384_LENGTH,
|
| (void * (*)(void)) SHA384_NewContext,
|
| @@ -110,7 +118,9 @@
|
| (void (*)(void *, unsigned char *, unsigned int *,
|
| unsigned int)) SHA384_End,
|
| SHA384_BLOCK_LENGTH,
|
| - HASH_AlgSHA384
|
| + HASH_AlgSHA384,
|
| + (void (*)(void *, unsigned char *, unsigned int *,
|
| + unsigned int)) SHA384_EndRaw
|
| },
|
| { SHA512_LENGTH,
|
| (void * (*)(void)) SHA512_NewContext,
|
| @@ -121,7 +131,9 @@
|
| (void (*)(void *, unsigned char *, unsigned int *,
|
| unsigned int)) SHA512_End,
|
| SHA512_BLOCK_LENGTH,
|
| - HASH_AlgSHA512
|
| + HASH_AlgSHA512,
|
| + (void (*)(void *, unsigned char *, unsigned int *,
|
| + unsigned int)) SHA512_EndRaw
|
| },
|
| { SHA224_LENGTH,
|
| (void * (*)(void)) SHA224_NewContext,
|
| @@ -132,7 +144,9 @@
|
| (void (*)(void *, unsigned char *, unsigned int *,
|
| unsigned int)) SHA224_End,
|
| SHA224_BLOCK_LENGTH,
|
| - HASH_AlgSHA224
|
| + HASH_AlgSHA224,
|
| + (void (*)(void *, unsigned char *, unsigned int *,
|
| + unsigned int)) SHA224_EndRaw
|
| },
|
| };
|
|
|
|
|