[pkg-opensc-commit] [libp11] 146/239: add new function to export slot id.

[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 6c135dd30fe911d03cf16d173b1729302513e6b9
Author: Andreas Jellinghaus <andreas at ionisiert.de>
Date:   Mon Jun 15 19:51:23 2009 +0000

    add new function to export slot id.
---
 NEWS           |  4 ++++
 configure.ac   |  6 +++---
 src/libp11.h   |  8 ++++++++
 src/p11_slot.c | 11 +++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 635d942..049f4cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 NEWS for Libp11 -- History of user visible changes
 
+New in 0.2.5; 2009-06-15; Andreas Jellinghaus
+* Add function to export the slot id (Douglas E. Engert).
+* Increase library version because of the new function.
+
 New in 0.2.4; 2008-07-31; Andreas Jellinghaus
 * Build system rewritten (NOTICE: configure options was modified). 
   The build system can produce outputs for *NIX, cygwin and native
diff --git a/configure.ac b/configure.ac
index ad1eab9..ae848d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ AC_PREREQ(2.60)
 
 define([PACKAGE_VERSION_MAJOR], [0])
 define([PACKAGE_VERSION_MINOR], [2])
-define([PACKAGE_VERSION_FIX], [4])
-define([PACKAGE_SUFFIX], [-svn])
+define([PACKAGE_VERSION_FIX], [5])
+define([PACKAGE_SUFFIX], [])
 
 AC_INIT([libp11],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX])
 AC_CONFIG_AUX_DIR([.])
@@ -21,7 +21,7 @@ LIBP11_VERSION_FIX="PACKAGE_VERSION_FIX"
 #   (Code changed:                      REVISION++)
 #   (Oldest interface removed:          OLDEST++)
 #   (Interfaces added:                  CURRENT++, REVISION=0)
-LIBP11_LT_CURRENT="2"
+LIBP11_LT_CURRENT="3"
 LIBP11_LT_OLDEST="1"
 LIBP11_LT_REVISION="0"
 LIBP11_LT_AGE="$((${LIBP11_LT_CURRENT}-${LIBP11_LT_OLDEST}))"
diff --git a/src/libp11.h b/src/libp11.h
index 5a60e25..763532f 100644
--- a/src/libp11.h
+++ b/src/libp11.h
@@ -160,6 +160,14 @@ extern int PKCS11_enumerate_slots(PKCS11_CTX * ctx,
 			PKCS11_SLOT **slotsp, unsigned int *nslotsp);
 
 /**
+ * Get the slot_id from a slot as it is stored in private
+ *
+ * @param slotp pointer on a slot
+ * @retval the slotid 
+ */
+extern unsigned long PKCS11_get_slotid_from_slot(PKCS11_SLOT *slotp);
+
+/**
  * Free the list of slots allocated by PKCS11_enumerate_slots()
  *
  * @param ctx context allocated by PKCS11_CTX_new()
diff --git a/src/p11_slot.c b/src/p11_slot.c
index e0c36da..35a8cd1 100644
--- a/src/p11_slot.c
+++ b/src/p11_slot.c
@@ -26,6 +26,17 @@ static int pkcs11_check_token(PKCS11_CTX *, PKCS11_SLOT *);
 static void pkcs11_destroy_token(PKCS11_TOKEN *);
 
 /*
+ * Get slotid from private
+ */
+unsigned long
+PKCS11_get_slotid_from_slot(PKCS11_SLOT *slot)
+{
+	PKCS11_SLOT_private *priv = PRIVSLOT(slot);
+
+		return priv->id;
+}
+
+/*
  * Enumerate slots
  */
 int

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