From 3c24fc75d3c35ae5222a8cd0b5e1917c3a4dbd59 Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Mon, 20 Apr 2015 14:04:07 -0700 Subject: Bugzilla 1186896 - NIST SP800-108 KDF (cfu for community member) - remove harmful bit of sanity checking, not needed. --- base/symkey/src/com/netscape/symkey/SymKey.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'base/symkey') 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. // -- cgit