Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-07 07:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added/removed blank lines to eliminate the diffs between the trunk and the

Browse Source 
NSS_3_11_BRANCH.
Modified files: pkcs11.c pkcs11c.c
This commit is contained in:
wtchang%redhat.com 2006-05-05 20:31:30 +00:00
parent 01891a9574
commit 798e8d1bc1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/nss/lib/softoken/pkcs11.c
View File

@ -71,7 +71,6 @@
#include "cdbhdl.h"
#endif
/*
* ******************** Static data *******************************
*/
@ -2998,6 +2997,7 @@ CK_RV nsc_CommonInitialize(CK_VOID_PTR pReserved, PRBool isFIPS)
loginWaitTime = PR_SecondsToInterval(1);
}
rv = secoid_Init();
if (rv != SECSuccess) {
crv = CKR_DEVICE_ERROR;

4
security/nss/lib/softoken/pkcs11c.c
View File

@ -5262,7 +5262,6 @@ key_and_mac_derive_fail:
}
case CKM_CONCATENATE_BASE_AND_DATA:
crv = sftk_DeriveSensitiveCheck(sourceKey,key);
if (crv != CKR_OK) break;
@ -5287,7 +5286,6 @@ key_and_mac_derive_fail:
PORT_ZFree(buf,tmpKeySize);
break;
case CKM_CONCATENATE_DATA_AND_BASE:
crv = sftk_DeriveSensitiveCheck(sourceKey,key);
if (crv != CKR_OK) break;
@ -5312,7 +5310,6 @@ key_and_mac_derive_fail:
PORT_ZFree(buf,tmpKeySize);
break;
case CKM_XOR_BASE_AND_DATA:
crv = sftk_DeriveSensitiveCheck(sourceKey,key);
if (crv != CKR_OK) break;
@ -5559,6 +5556,7 @@ key_and_mac_derive_fail:
secret = secret_hash;
secretlen = 20;
}
/*
* if keySize is supplied, then we are generating a key of a specific
* length. This is done by taking the least significant 'keySize'