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

support storing private and symmetric keys (now that NSS bug 128172 is fixed).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@131169 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nicolson%netscape.com 2002-10-04 21:02:50 +00:00
parent b381b31548
commit b903ab2d58
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/security/jss/org/mozilla/jss/provider/java/security/JSSKeyStoreSpi.c
View File

@ -830,12 +830,6 @@ Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineSetKeyEntryNati
goto finish;
}
#if 1
JSS_throwMsg(env, KEYSTORE_EXCEPTION,
"Operation is not supported. "
"http://bugzilla.mozilla.org/show_bug.cgi?id=128172");
goto finish;
#else
if( (*env)->IsInstanceOf(env, keyObj, privkClass) ) {
SECKEYPrivateKey *privk;
@ -845,9 +839,9 @@ Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineSetKeyEntryNati
goto finish;
}
tokenPrivk = PK11_ConvertSessionPrivKeyToTokenPrivKey(privk);
tokenPrivk = PK11_ConvertSessionPrivKeyToTokenPrivKey(privk, NULL);
if( tokenPrivk == NULL ) {
JSS_throwMsg(env, KEYSTORE_EXCEPTION,
JSS_throwMsgPrErr(env, KEYSTORE_EXCEPTION,
"Failed to copy private key to permanent token object");
goto finish;
}
@ -870,9 +864,9 @@ Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineSetKeyEntryNati
"Failed to set alias of symmetric key");
goto finish;
}
tokenSymk = PK11_ConvertSessionSymKeyToTokenSymKey(symk);
tokenSymk = PK11_ConvertSessionSymKeyToTokenSymKey(symk, NULL);
if( tokenSymk == NULL ) {
JSS_throwMsg(env, KEYSTORE_EXCEPTION,
JSS_throwMsgPrErr(env, KEYSTORE_EXCEPTION,
"Failed to copy symmetric key to permanent token object");
goto finish;
}
@ -882,7 +876,6 @@ Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineSetKeyEntryNati
" JSS symmetric key (PK11SymKey)");
goto finish;
}
#endif
finish:
if( nickname != NULL ) {