diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-07-30 22:59:13 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-07-30 22:59:13 +0000 |
| commit | c3120aef2eb9a0eafdcae0a19c0c02958cc4fd7d (patch) | |
| tree | d05b7c92c6c43df99f5c3dd9f54fd6d4861a5e75 | |
| parent | 9f99564e8b22e9178ae49ce160599bdbf1285d28 (diff) | |
| download | nss-hg-c3120aef2eb9a0eafdcae0a19c0c02958cc4fd7d.tar.gz | |
Bug 148220: enforce FIPS 198's requirement on the secret key's length.
Added an assertion. Set the error code on error return.
| -rw-r--r-- | security/nss/lib/softoken/alghmac.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/security/nss/lib/softoken/alghmac.c b/security/nss/lib/softoken/alghmac.c index 60abd73d0..e6b2fd66f 100644 --- a/security/nss/lib/softoken/alghmac.c +++ b/security/nss/lib/softoken/alghmac.c @@ -64,6 +64,11 @@ HMAC_Create(const SECHashObject *hash_obj, const unsigned char *secret, int i; unsigned char hashed_secret[SHA1_LENGTH]; + /* required by FIPS 198 */ + if (secret_len < hash_obj->length/2) { + PORT_SetError(SEC_ERROR_INVALID_ARGS); + return NULL; + } cx = (HMACContext*)PORT_ZAlloc(sizeof(HMACContext)); if (cx == NULL) return NULL; @@ -76,6 +81,7 @@ HMAC_Create(const SECHashObject *hash_obj, const unsigned char *secret, if (secret_len > HMAC_PAD_SIZE) { cx->hashobj->begin( cx->hash); cx->hashobj->update(cx->hash, secret, secret_len); + PORT_Assert(cx->hashobj->length <= sizeof hashed_secret); cx->hashobj->end( cx->hash, hashed_secret, &secret_len, sizeof hashed_secret); if (secret_len != cx->hashobj->length) @@ -118,8 +124,10 @@ SECStatus HMAC_Finish(HMACContext *cx, unsigned char *result, unsigned int *result_len, unsigned int max_result_len) { - if (max_result_len < cx->hashobj->length) + if (max_result_len < cx->hashobj->length) { + PORT_SetError(SEC_ERROR_INVALID_ARGS); return SECFailure; + } cx->hashobj->end(cx->hash, result, result_len, max_result_len); if (*result_len != cx->hashobj->length) |