diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-22 13:21:26 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-06-25 08:36:39 +0300 |
| commit | 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb (patch) | |
| tree | 24d93067a9e749baf75f3c83602563bc57e131af /usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c | |
| parent | c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9 (diff) | |
| download | illumos-joyent-07eb1aef88b873c5c1036d9cf69820c1ef6a32fb.tar.gz | |
11151 libpkcs11: NULL pointer errors
Reviewed by: Jason Lippert <jason@glasspelican.ca>
Reviewed by: Jason King <jbk@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c')
| -rw-r--r-- | usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c index 68f997e103..882ca9f8bd 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c @@ -289,7 +289,7 @@ SUNW_C_KeyToObject(CK_SESSION_HANDLE hSession, CK_MECHANISM_TYPE mech, /* template for creating generic secret key object */ CK_ATTRIBUTE template[NUM_SECRETKEY_ATTRS]; - if ((hSession == NULL) || (obj == NULL) || + if ((hSession == CK_INVALID_HANDLE) || (obj == NULL) || (rawkey == NULL) || (rawkey_len == 0)) { return (CKR_ARGUMENTS_BAD); } @@ -386,7 +386,7 @@ pkcs11_PasswdToPBKD2Object(CK_SESSION_HANDLE hSession, char *passphrase, CK_ULONG i, j, num_asym_mechs, num_fixed_secs, num_mapping; CK_ATTRIBUTE template[NUM_SECRETKEY_ATTRS]; - if (hSession == NULL || obj == NULL || + if (hSession == CK_INVALID_HANDLE || obj == NULL || passphrase == NULL || passphrase_len == 0 || iterations == 0UL) { return (CKR_ARGUMENTS_BAD); @@ -510,9 +510,9 @@ pkcs11_ObjectToKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE obj, CK_RV rv; CK_ATTRIBUTE template; - if (hSession == NULL) + if (hSession == CK_INVALID_HANDLE) return (CKR_SESSION_HANDLE_INVALID); - if (obj == NULL) + if (obj == 0) return (CKR_OBJECT_HANDLE_INVALID); if (rawkey == NULL || rawkey_len == NULL) return (CKR_ARGUMENTS_BAD); |