[pkg-opensc-commit] [libp11] 48/67: Error queue cleared after requesting a new rwlock

Eric Dorland eric at moszumanska.debian.org
Sat Jan 30 05:34:16 UTC 2016


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

eric pushed a commit to branch master
in repository libp11.

commit d8769e4de3909c060fb9412b5c756732a1b8df7e
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Fri Jan 8 16:38:48 2016 +0100

    Error queue cleared after requesting a new rwlock
---
 src/p11_load.c | 1 +
 src/p11_slot.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/p11_load.c b/src/p11_load.c
index 522737d..60c3981 100644
--- a/src/p11_load.c
+++ b/src/p11_load.c
@@ -44,6 +44,7 @@ PKCS11_CTX *PKCS11_CTX_new(void)
 	ctx->_private = priv;
 	priv->forkid = _P11_get_forkid();
 	priv->lockid = CRYPTO_get_new_dynlockid();
+	ERR_clear_error(); /* Dynamic locks are optional */
 
 	return ctx;
  fail:
diff --git a/src/p11_slot.c b/src/p11_slot.c
index 37c38fa..34fb930 100644
--- a/src/p11_slot.c
+++ b/src/p11_slot.c
@@ -448,6 +448,7 @@ static int pkcs11_init_slot(PKCS11_CTX * ctx, PKCS11_SLOT * slot, CK_SLOT_ID id)
 	priv->prev_pin = NULL;
 	priv->prev_so = 0;
 	priv->lockid = CRYPTO_get_new_dynlockid();
+	ERR_clear_error(); /* Dynamic locks are optional */
 
 	slot->description = PKCS11_DUP(info.slotDescription);
 	slot->manufacturer = PKCS11_DUP(info.manufacturerID);

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



More information about the pkg-opensc-commit mailing list