diff options
| author | relyea%netscape.com <devnull@localhost> | 2001-11-30 23:24:35 +0000 |
|---|---|---|
| committer | relyea%netscape.com <devnull@localhost> | 2001-11-30 23:24:35 +0000 |
| commit | 2a2a8afaab1f97046e8b870f0e9652dff83cdffe (patch) | |
| tree | b1ba2e0e9193e1c82a8670d69fb10f4a5ea0dd1d /security/nss/lib/softoken/pkcs11c.c | |
| parent | 2486f202852f9c939bed65c2b77f5f1a2a4f09d9 (diff) | |
| download | nss-hg-2a2a8afaab1f97046e8b870f0e9652dff83cdffe.tar.gz | |
Fix several memory leaks.
Adjust the default hash sizes down for mozilla client.
Merge the NSS 3.3 key check and signature check stuff.
Diffstat (limited to 'security/nss/lib/softoken/pkcs11c.c')
| -rw-r--r-- | security/nss/lib/softoken/pkcs11c.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c index b4e769d06..997002c71 100644 --- a/security/nss/lib/softoken/pkcs11c.c +++ b/security/nss/lib/softoken/pkcs11c.c @@ -923,8 +923,11 @@ CK_RV NSC_DecryptFinal(CK_SESSION_HANDLE hSession, if (rv == SECSuccess) { unsigned int padSize = (unsigned int) pLastPart[context->blockSize-1]; - - *pulLastPartLen = outlen - padSize; + if ((padSize > context->blockSize) || (padSize == 0)) { + rv = SECFailure; + } else { + *pulLastPartLen = outlen - padSize; + } } } } @@ -3881,7 +3884,7 @@ pk11_DeriveSensitiveCheck(PK11Object *baseKey,PK11Object *destKey) { hasSensitive = PR_FALSE; att = pk11_FindAttribute(destKey,CKA_SENSITIVE); if (att) { - hasSensitive = PR_FALSE; + hasSensitive = PR_TRUE; sensitive = (PRBool) *(CK_BBOOL *)att->attrib.pValue; pk11_FreeAttribute(att); } @@ -3889,7 +3892,7 @@ pk11_DeriveSensitiveCheck(PK11Object *baseKey,PK11Object *destKey) { hasExtractable = PR_FALSE; att = pk11_FindAttribute(destKey,CKA_EXTRACTABLE); if (att) { - hasExtractable = PR_FALSE; + hasExtractable = PR_TRUE; extractable = (PRBool) *(CK_BBOOL *)att->attrib.pValue; pk11_FreeAttribute(att); } |