[pkg-opensc-commit] [engine-pkcs11] 91/152: new engine_pkcs11 release 0.1.8.

[Eric Dorland]

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

eric pushed a commit to branch master
in repository engine-pkcs11.

commit bb775c32dba8cc4b4381a53da7ab5d7b22b7921d
Author: Andreas Jellinghaus <andreas at ionisiert.de>
Date:   Thu Jan 7 10:07:49 2010 +0000

    new engine_pkcs11 release 0.1.8.
---
 NEWS                | 6 +++++-
 configure.ac        | 2 +-
 src/engine_pkcs11.c | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 052f521..d31f6f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 NEWS for Engine PKCS#11 -- History of user visible changes
 
-New in 0.1.8; 200X-XX-XX; Name
+New in 0.1.8; 2010-01-07; Andreas Jellinghaus
+* Fix problem causing slot_n parsing returning not certs or keys 
+  by Camille Moncelier
+* Fix missing declaration of set_init_args symbol
+  by Arfrever Frehtes Taifersar Arahesis
 
 New in 0.1.7; 2009-10-20; Andreas Jellinghaus
 * Buffer overrun fixed by David Smith
diff --git a/configure.ac b/configure.ac
index a4003b3..35b7b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.60)
 define([PACKAGE_VERSION_MAJOR], [0])
 define([PACKAGE_VERSION_MINOR], [1])
 define([PACKAGE_VERSION_FIX], [8])
-define([PACKAGE_SUFFIX], [-svn])
+define([PACKAGE_SUFFIX], [])
 
 AC_INIT([engine_pkcs11],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX])
 AC_CONFIG_AUX_DIR([.])
diff --git a/src/engine_pkcs11.c b/src/engine_pkcs11.c
index 6715022..98f68d7 100644
--- a/src/engine_pkcs11.c
+++ b/src/engine_pkcs11.c
@@ -495,7 +495,7 @@ static X509 *pkcs11_load_cert(ENGINE * e, const char *s_slot_cert_id)
 		fprintf(stderr, "Found %u cert%s:\n", cert_count,
 			(cert_count <= 1) ? "" : "s");
 	}
-	if ((s_slot_cert_id && *s_slot_cert_id) || (cert_id_len == 0)) {
+	if ((s_slot_cert_id && *s_slot_cert_id) && (cert_id_len != 0)) {
 		for (n = 0; n < cert_count; n++) {
 			PKCS11_CERT *k = certs + n;
 
@@ -751,7 +751,7 @@ static EVP_PKEY *pkcs11_load_key(ENGINE * e, const char *s_slot_key_id,
 		fprintf(stderr, "Found %u key%s:\n", key_count,
 			(key_count <= 1) ? "" : "s");
 	}
-	if (s_slot_key_id && *s_slot_key_id) {
+	if (s_slot_key_id && *s_slot_key_id && (key_id_len != 0 || key_label != NULL)) {
 		for (n = 0; n < key_count; n++) {
 			PKCS11_KEY *k = keys + n;
 

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