diff options
| author | Toomas Soome <tsoome@me.com> | 2018-11-22 18:39:05 +0200 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2018-12-05 01:59:04 +0000 |
| commit | a50e8766452bf989ab5da8c51bb857190e7a18c9 (patch) | |
| tree | bce626c827ab58269f971b75e3262ba298896e4f | |
| parent | fa79a855d371dfcb29461ad6ebaf48a458bf9f14 (diff) | |
| download | illumos-gate-a50e8766452bf989ab5da8c51bb857190e7a18c9.tar.gz | |
10018 libkmf: macro expands to multiple statements
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c | 3 | ||||
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c | 3 |
2 files changed, 4 insertions, 2 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 1faa4bea34..f014d5b2be 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 @@ -1033,8 +1033,9 @@ openssl_load_key(KMF_HANDLE_T handle, const char *file) } end: - if (pkey == NULL) + if (pkey == NULL) { SET_ERROR(kmfh, ERR_get_error()); + } if (keyfile != NULL) (void) BIO_free(keyfile); diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c b/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c index e36085ad03..bab6957c45 100644 --- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c @@ -3245,8 +3245,9 @@ store_raw_key(KMF_HANDLE_T handle, SETATTR(templ, i, CKA_KEY_TYPE, &keytype, sizeof (keytype)); i++; SETATTR(templ, i, CKA_TOKEN, &cktrue, sizeof (cktrue)); i++; SETATTR(templ, i, CKA_PRIVATE, &cktrue, sizeof (cktrue)); i++; - if (keytype != CKK_EC) + if (keytype != CKK_EC) { SETATTR(templ, i, CKA_DECRYPT, &cktrue, sizeof (cktrue)); i++; + } cert = kmf_get_attr_ptr(KMF_CERT_DATA_ATTR, attrlist, numattr); if (cert != NULL) { |