diff options
| author | Jack Magne <jmagne@localhost.localdomain> | 2015-04-20 14:04:07 -0700 |
|---|---|---|
| committer | Jack Magne <jmagne@localhost.localdomain> | 2015-04-20 14:05:07 -0700 |
| commit | 3c24fc75d3c35ae5222a8cd0b5e1917c3a4dbd59 (patch) | |
| tree | d88306dadf9e2adb367fedb7aca055e3056725cf /base/symkey | |
| parent | 35a946e1b1a8f8c7e27891f5c4a3845212f49251 (diff) | |
| download | pki-3c24fc75d3c35ae5222a8cd0b5e1917c3a4dbd59.tar.gz pki-3c24fc75d3c35ae5222a8cd0b5e1917c3a4dbd59.tar.xz pki-3c24fc75d3c35ae5222a8cd0b5e1917c3a4dbd59.zip | |
Bugzilla 1186896 - NIST SP800-108 KDF (cfu for community member) - remove harmful bit of sanity checking, not needed.
Diffstat (limited to 'base/symkey')
| -rw-r--r-- | base/symkey/src/com/netscape/symkey/SymKey.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/base/symkey/src/com/netscape/symkey/SymKey.cpp b/base/symkey/src/com/netscape/symkey/SymKey.cpp index 512da4efe..bda4bd866 100644 --- a/base/symkey/src/com/netscape/symkey/SymKey.cpp +++ b/base/symkey/src/com/netscape/symkey/SymKey.cpp @@ -1280,9 +1280,8 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_com_netscape_symkey_SessionKey_Dive (env)->ReleaseStringUTFChars(newMasterKeyName, (const char *)newMasterKeyNameChars); } - if(masterKey == NULL) { - goto done; - } + // masterKey is null in key changeover from version 2 to 1. + // Thus sanity checking is not needed here. // AC: BUGFIX for key versions higher than 09: Since "jstring keyInfo" is now passed in as "jbyteArray newKeyInfo", we no longer need this code. // |