diff options
| author | wyllys <none@none> | 2007-03-15 09:49:26 -0700 |
|---|---|---|
| committer | wyllys <none@none> | 2007-03-15 09:49:26 -0700 |
| commit | 9b37d29632d2cb262ba42f1d804f85fcb0aa3709 (patch) | |
| tree | 431f6d718226469b9b831703c75935175783beb9 /usr/src/lib/libkmf/plugins/kmf_openssl | |
| parent | 23259b79afff8cc5e183c5be57e05120f378fa72 (diff) | |
| download | illumos-gate-9b37d29632d2cb262ba42f1d804f85fcb0aa3709.tar.gz | |
6531818 libkmf has too many dependencies on libpkcs11
6534811 KMF openssl verify routine should test for NULL hash method.
6534827 KMF_ReadInputFile should not require a handle
Diffstat (limited to 'usr/src/lib/libkmf/plugins/kmf_openssl')
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c index 7edbcc58dd..01ee7d7909 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c @@ -4379,6 +4379,7 @@ OpenSSL_CreateSymKey(KMF_HANDLE_T handle, KMF_CREATESYMKEY_PARAMS *params, rkey->keydata.val = (uchar_t *)des3key; rkey->keydata.len = DES3_KEY_SIZE; symkey->keyalg = KMF_DES3; + } else if (params->keytype == KMF_AES || params->keytype == KMF_RC4 || params->keytype == KMF_GENERIC_SECRET) { int bytes; @@ -4845,7 +4846,8 @@ OpenSSL_VerifyDataWithCert(KMF_HANDLE_T handle, goto cleanup; } } - switch (EVP_MD_type(md)) { + if (md != NULL) { + switch (EVP_MD_type(md)) { case NID_md2: case NID_md2WithRSAEncryption: pfxlen = ASN1_MD2_OID_PREFIX_LEN; @@ -4865,6 +4867,7 @@ OpenSSL_VerifyDataWithCert(KMF_HANDLE_T handle, pfxlen = 0; pfx = NULL; break; + } } /* RSA with no hash is a special case */ |