Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 590515 - Implement SHA-224/256/384/512 key derivation in Softoken, cleanup, contributed by David Cooper, r=rrelyea

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@264035 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kaie%kuix.de 2012-07-17 14:40:48 +00:00
parent f3f4f05abb
commit 0ffb2fb48b
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mozilla/security/nss/lib/softoken/pkcs11c.c
View File

@ -5268,6 +5268,10 @@ CK_RV NSC_DeriveKey( CK_SESSION_HANDLE hSession,
SFTKAttribute * att2 = NULL; SFTKAttribute * att2 = NULL;
unsigned char * buf; unsigned char * buf;
SHA1Context * sha; SHA1Context * sha;
SHA224Context * sha224;
SHA256Context * sha256;
SHA384Context * sha384;
SHA512Context * sha512;
MD5Context * md5; MD5Context * md5;
MD2Context * md2; MD2Context * md2;
CK_ULONG macSize; CK_ULONG macSize;
@ -6105,16 +6109,16 @@ key_and_mac_derive_fail:
break; break;
} }
/* now allocate the hash contexts */ /* now allocate the hash contexts */
sha = SHA224_NewContext(); sha224 = SHA224_NewContext();
if (sha == NULL) { if (sha224 == NULL) {
crv = CKR_HOST_MEMORY; crv = CKR_HOST_MEMORY;
break; break;
} }
SHA224_Begin(sha); SHA224_Begin(sha224);
SHA224_Update(sha,(const unsigned char*)att->attrib.pValue, SHA224_Update(sha224,(const unsigned char*)att->attrib.pValue,
att->attrib.ulValueLen); att->attrib.ulValueLen);
SHA224_End(sha,key_block,&outLen,SHA224_LENGTH); SHA224_End(sha224,key_block,&outLen,SHA224_LENGTH);
SHA224_DestroyContext(sha, PR_TRUE); SHA224_DestroyContext(sha224, PR_TRUE);
crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize); crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize);
break; break;
@ -6126,16 +6130,16 @@ key_and_mac_derive_fail:
break; break;
} }
/* now allocate the hash contexts */ /* now allocate the hash contexts */
sha = SHA256_NewContext(); sha256 = SHA256_NewContext();
if (sha == NULL) { if (sha256 == NULL) {
crv = CKR_HOST_MEMORY; crv = CKR_HOST_MEMORY;
break; break;
} }
SHA256_Begin(sha); SHA256_Begin(sha256);
SHA256_Update(sha,(const unsigned char*)att->attrib.pValue, SHA256_Update(sha256,(const unsigned char*)att->attrib.pValue,
att->attrib.ulValueLen); att->attrib.ulValueLen);
SHA256_End(sha,key_block,&outLen,SHA256_LENGTH); SHA256_End(sha256,key_block,&outLen,SHA256_LENGTH);
SHA256_DestroyContext(sha, PR_TRUE); SHA256_DestroyContext(sha256, PR_TRUE);
crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize); crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize);
break; break;
@ -6147,16 +6151,16 @@ key_and_mac_derive_fail:
break; break;
} }
/* now allocate the hash contexts */ /* now allocate the hash contexts */
sha = SHA384_NewContext(); sha384 = SHA384_NewContext();
if (sha == NULL) { if (sha384 == NULL) {
crv = CKR_HOST_MEMORY; crv = CKR_HOST_MEMORY;
break; break;
} }
SHA384_Begin(sha); SHA384_Begin(sha384);
SHA384_Update(sha,(const unsigned char*)att->attrib.pValue, SHA384_Update(sha384,(const unsigned char*)att->attrib.pValue,
att->attrib.ulValueLen); att->attrib.ulValueLen);
SHA384_End(sha,key_block,&outLen,SHA384_LENGTH); SHA384_End(sha384,key_block,&outLen,SHA384_LENGTH);
SHA384_DestroyContext(sha, PR_TRUE); SHA384_DestroyContext(sha384, PR_TRUE);
crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize); crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize);
break; break;
@ -6168,16 +6172,16 @@ key_and_mac_derive_fail:
break; break;
} }
/* now allocate the hash contexts */ /* now allocate the hash contexts */
sha = SHA512_NewContext(); sha512 = SHA512_NewContext();
if (sha == NULL) { if (sha512 == NULL) {
crv = CKR_HOST_MEMORY; crv = CKR_HOST_MEMORY;
break; break;
} }
SHA512_Begin(sha); SHA512_Begin(sha512);
SHA512_Update(sha,(const unsigned char*)att->attrib.pValue, SHA512_Update(sha512,(const unsigned char*)att->attrib.pValue,
att->attrib.ulValueLen); att->attrib.ulValueLen);
SHA512_End(sha,key_block,&outLen,SHA512_LENGTH); SHA512_End(sha512,key_block,&outLen,SHA512_LENGTH);
SHA512_DestroyContext(sha, PR_TRUE); SHA512_DestroyContext(sha512, PR_TRUE);
crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize); crv = sftk_forceAttribute(key,CKA_VALUE,key_block,keySize);
break; break;