summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorJack Magne <jmagne@dhcp-16-206.sjc.redhat.com>2017-06-06 16:16:32 -0700
committerJack Magne <jmagne@dhcp-16-206.sjc.redhat.com>2017-06-06 16:18:45 -0700
commit30fb7bf49ce0f4c726f937b3984a4e27abb39959 (patch)
tree1821d37e9f57f972876fbddddfb5429baccd3d15 /base
parent7af36652d58db983a1063125271003f06e9b3fb4 (diff)
downloadpki-30fb7bf49ce0f4c726f937b3984a4e27abb39959.tar.gz
pki-30fb7bf49ce0f4c726f937b3984a4e27abb39959.tar.xz
pki-30fb7bf49ce0f4c726f937b3984a4e27abb39959.zip
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.
Diffstat (limited to 'base')
-rw-r--r--base/native-tools/src/tkstool/key.c11
1 files changed, 6 insertions, 5 deletions
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 */