From 30fb7bf49ce0f4c726f937b3984a4e27abb39959 Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Tue, 6 Jun 2017 16:16:32 -0700 Subject: Minor fix to already fixed issue: The problem was that a tiny piece of the original patch didn't get checked in. This resolves this issue. --- base/native-tools/src/tkstool/key.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'base/native-tools') diff --git a/base/native-tools/src/tkstool/key.c b/base/native-tools/src/tkstool/key.c index e63da93aa..f208cbdaf 100644 --- a/base/native-tools/src/tkstool/key.c +++ b/base/native-tools/src/tkstool/key.c @@ -1219,13 +1219,14 @@ TKS_StoreSymmetricKeyAndNameIt( char *symmetricKeyName, rvExtractSymmetricKey = PK11_ExtractKeyValue( /* symmetric key */ symKey ); if( rvExtractSymmetricKey != SECSuccess ) { PR_fprintf( PR_STDERR, - "ERROR: Failed to extract the %s key!\n\n", + "ERROR: Failed to extract the %s key for final display, OK if in FIPs mode!\n\n", symmetricKeyName ); - goto destroyHexSymmetricKey; - } + symmetricKey = NULL; + } else { - /* If present, retrieve the raw key data */ - symmetricKey = PK11_GetKeyData( /* symmetric key */ symKey ); + /* If present, retrieve the raw key data */ + symmetricKey = PK11_GetKeyData( /* symmetric key */ symKey ); + } #if defined(DEBUG) /* For convenience, display the final symmetric key and */ -- cgit