summaryrefslogtreecommitdiff
path: root/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-01-22 13:21:26 +0200
committerToomas Soome <tsoome@me.com>2019-06-25 08:36:39 +0300
commit07eb1aef88b873c5c1036d9cf69820c1ef6a32fb (patch)
tree24d93067a9e749baf75f3c83602563bc57e131af /usr/src/lib/pkcs11/libpkcs11/common/metaObject.c
parentc0e21d6af8bfe88f1c49c7c12d4537b663fe9db9 (diff)
downloadillumos-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/metaObject.c')
-rw-r--r--usr/src/lib/pkcs11/libpkcs11/common/metaObject.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c b/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c
index b5c86496dd..100f0f7cba 100644
--- a/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c
+++ b/usr/src/lib/pkcs11/libpkcs11/common/metaObject.c
@@ -55,15 +55,15 @@ static int num_stop_rv = sizeof (stop_rv) / sizeof (CK_RV);
* it doesn't need to be used by the code at this point.
*
* static CK_RV try_again_rv[] = {
- * CKR_DEVICE_ERROR,
- * CKR_DEVICE_MEMORY,
- * CKR_DEVICE_REMOVED,
- * CKR_FUNCTION_FAILED,
- * CKR_GENERAL_ERROR,
- * CKR_HOST_MEMORY,
- * CKR_TEMPLATE_INCONSISTENT,
- * CKR_ATTRIBUTE_READ_ONLY,
- * CKR_ATTRIBUTE_VALUE_INVALID
+ * CKR_DEVICE_ERROR,
+ * CKR_DEVICE_MEMORY,
+ * CKR_DEVICE_REMOVED,
+ * CKR_FUNCTION_FAILED,
+ * CKR_GENERAL_ERROR,
+ * CKR_HOST_MEMORY,
+ * CKR_TEMPLATE_INCONSISTENT,
+ * CKR_ATTRIBUTE_READ_ONLY,
+ * CKR_ATTRIBUTE_VALUE_INVALID
* };
* static int num_try_again_rv = sizeof (try_again_rv) / sizeof (CK_RV);
*/
@@ -180,7 +180,7 @@ meta_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
*/
if (meta_freeobject_check(session, object, NULL, pTemplate, ulCount,
- NULL)) {
+ 0)) {
/*
* Make sure we are logged into the keystore if this is a
* private freetoken object.