summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Magne <jmagne@dhcp-32-224.sjc.redhat.com>2012-08-29 16:58:06 -0700
committerJack Magne <jmagne@dhcp-32-224.sjc.redhat.com>2012-08-29 17:02:07 -0700
commit4bdacf737cabb39888d894a90a455a0848abb587 (patch)
tree9df0898c33f485b480ff13dbf61d34d01f3bd151
parent48e68f928f72a782afa6ab165a026901efd53b22 (diff)
downloadpki-4bdacf737cabb39888d894a90a455a0848abb587.tar.gz
pki-4bdacf737cabb39888d894a90a455a0848abb587.tar.xz
pki-4bdacf737cabb39888d894a90a455a0848abb587.zip
Bugzilla Bug #849027 - rhcs81 tks failed start in selftest sharedsessionkey - symkey PK11_Derive.
-rw-r--r--base/symkey/src/com/netscape/symkey/SessionKey.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/base/symkey/src/com/netscape/symkey/SessionKey.cpp b/base/symkey/src/com/netscape/symkey/SessionKey.cpp
index eb412f01a..0878e26dd 100644
--- a/base/symkey/src/com/netscape/symkey/SessionKey.cpp
+++ b/base/symkey/src/com/netscape/symkey/SessionKey.cpp
@@ -389,8 +389,10 @@ PK11SymKey *DeriveKey(PK11SymKey *cardKey, const Buffer& hostChallenge, const Bu
param.data = (unsigned char*)&string;
param.len = sizeof(string);
- invalid_mechanism = PR_FALSE;
+ invalid_mechanism = PR_TRUE;
+ /* When NSS gets full ability to perform this mechanism in soft token, revisit this code to make sure it works. */
+ /*
tmp1 = PK11_Derive( master , CKM_DES_ECB_ENCRYPT_DATA , &param , CKM_CONCATENATE_BASE_AND_KEY , CKA_DERIVE, 0);
if ( tmp1 == NULL) {
@@ -401,7 +403,7 @@ PK11SymKey *DeriveKey(PK11SymKey *cardKey, const Buffer& hostChallenge, const Bu
} else {
PR_fprintf(PR_STDOUT,"DeriveKey: Successfully created key using encrypt and derive method! \n");
}
-
+ */
if ( invalid_mechanism == PR_FALSE) {
string.pData = &derivationData[EIGHT_BYTES];