[pkg-opensc-commit] [libp11] 21/33: Revert "Do not set private to C_Initialize unless actually have one"

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit 37e0dfbd9162bfef698913d8c076ae3f53e83c9d
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Wed Aug 10 06:36:00 2016 +0200

    Revert "Do not set private to C_Initialize unless actually have one"
    
    This reverts commit 9c837e4b1eb5eaf9b9c4a373ff5f9de1dfc4d63d.
    
    closes #91
---
 src/p11_load.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/p11_load.c b/src/p11_load.c
index 58d51a8..a914588 100644
--- a/src/p11_load.c
+++ b/src/p11_load.c
@@ -68,8 +68,7 @@ void pkcs11_CTX_init_args(PKCS11_CTX * ctx, const char *init_args)
 int pkcs11_CTX_load(PKCS11_CTX * ctx, const char *name)
 {
 	PKCS11_CTX_private *cpriv = PRIVCTX(ctx);
-	CK_C_INITIALIZE_ARGS _args;
-	CK_C_INITIALIZE_ARGS *args = NULL;
+	CK_C_INITIALIZE_ARGS args;
 	CK_INFO ck_info;
 	int rv;
 
@@ -80,14 +79,11 @@ int pkcs11_CTX_load(PKCS11_CTX * ctx, const char *name)
 	}
 
 	/* Tell the PKCS11 to initialize itself */
-	if (cpriv->init_args != NULL) {
-		memset(&_args, 0, sizeof(_args));
-		args = &_args;
-		/* Unconditionally say using OS locking primitives is OK */
-		args->flags |= CKF_OS_LOCKING_OK;
-		args->pReserved = cpriv->init_args;
-	}
-	rv = cpriv->method->C_Initialize(args);
+	memset(&args, 0, sizeof(args));
+	/* Unconditionally say using OS locking primitives is OK */
+	args.flags |= CKF_OS_LOCKING_OK;
+	args.pReserved = cpriv->init_args;
+	rv = cpriv->method->C_Initialize(&args);
 	if (rv && rv != CKR_CRYPTOKI_ALREADY_INITIALIZED) {
 		PKCS11err(PKCS11_F_PKCS11_CTX_LOAD, rv);
 		return -1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git