[pkg-opensc-commit] [pkcs11-helper] 32/53: Fixed pin_cache_priod for certificate, thank to Leo Pohl for reporting

[Eric Dorland]

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

eric pushed a commit to tag pkcs11-helper-1.03
in repository pkcs11-helper.

commit 3cc36bc245bfdde9955c916967342c875270948e
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date:   Thu Feb 22 15:13:41 2007 +0000

    Fixed pin_cache_priod for certificate, thank to Leo Pohl for reporting
---
 lib/pkcs11h-certificate.c | 5 ++++-
 lib/pkcs11h-session.c     | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/pkcs11h-certificate.c b/lib/pkcs11h-certificate.c
index d12190e..38e1e59 100644
--- a/lib/pkcs11h-certificate.c
+++ b/lib/pkcs11h-certificate.c
@@ -1838,7 +1838,10 @@ pkcs11h_certificate_create (
 #endif
 
 	if (certificate->pin_cache_period != PKCS11H_PIN_CACHE_INFINITE) {
-		if (certificate->session->pin_cache_period != PKCS11H_PIN_CACHE_INFINITE) {
+		if (certificate->session->pin_cache_period == PKCS11H_PIN_CACHE_INFINITE) {
+			certificate->session->pin_cache_period = certificate->pin_cache_period;
+		}
+		else {
 			if (certificate->session->pin_cache_period > certificate->pin_cache_period) {
 				certificate->session->pin_expire_time = (
 					certificate->session->pin_expire_time -
diff --git a/lib/pkcs11h-session.c b/lib/pkcs11h-session.c
index d9de3a0..90e73e3 100644
--- a/lib/pkcs11h-session.c
+++ b/lib/pkcs11h-session.c
@@ -862,6 +862,13 @@ _pkcs11h_session_validate (
 		goto cleanup;
 	}
 
+	_PKCS11H_DEBUG (
+		PKCS11H_LOG_DEBUG2,
+		"PKCS#11: _pkcs11h_session_validate session->pin_expire_time=%u, time=%u",
+		(unsigned int)session->pin_expire_time,
+		(unsigned int)_g_pkcs11h_sys_engine.time ()
+	);
+
 	if (
 		session->pin_expire_time != (time_t)0 &&
 		session->pin_expire_time < _g_pkcs11h_sys_engine.time ()

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