From 21960bd1002dc56d4cd75e2a9ffb3f710f92240a Mon Sep 17 00:00:00 2001
From: jey <jey@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Sun, 23 Dec 2001 15:48:02 +0000
Subject: [PATCH] - updated to support latest version of OpenSC

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@103 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/signer/dialog.c         | 2 +-
 src/signer/opensc-crypto.c  | 4 ++--
 src/signer/opensc-support.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/signer/dialog.c b/src/signer/dialog.c
index 0502f553..687d8c28 100644
--- a/src/signer/dialog.c
+++ b/src/signer/dialog.c
@@ -40,7 +40,7 @@ int ask_and_verify_pin_code(struct sc_pkcs15_card *p15card,
 	argv[0] = pgmname;
 	argv[1] = NULL;
 	
-	r = assuan_pipe_connect(&ctx, pgmname, (char **) argv);
+	r = assuan_pipe_connect(&ctx, pgmname, (char **) argv, 0);
 	if (r) {
 		printf("Can't connect to the PIN entry module: %s\n",
 		       assuan_strerror(r));
diff --git a/src/signer/opensc-crypto.c b/src/signer/opensc-crypto.c
index 233fb1d4..079a906c 100644
--- a/src/signer/opensc-crypto.c
+++ b/src/signer/opensc-crypto.c
@@ -11,7 +11,7 @@ void
 sc_close(struct sc_priv_data *priv)
 {
 	if (priv->p15card) {
-		sc_pkcs15_destroy(priv->p15card);
+		sc_pkcs15_unbind(priv->p15card);
 		priv->p15card = NULL;
 	}
 	if (priv->card) {
@@ -35,7 +35,7 @@ sc_init(struct sc_priv_data *priv)
 	r = sc_connect_card(priv->ctx, priv->reader_id, &priv->card);
 	if (r)
 		goto err;
-	r = sc_pkcs15_init(priv->card, &priv->p15card);
+	r = sc_pkcs15_bind(priv->card, &priv->p15card);
 	if (r)
 		goto err;
 	return 0;
diff --git a/src/signer/opensc-support.c b/src/signer/opensc-support.c
index d24c4c73..80259a48 100644
--- a/src/signer/opensc-support.c
+++ b/src/signer/opensc-support.c
@@ -59,7 +59,7 @@ static int init_pkcs15(PluginInstance *inst)
         r = sc_connect_card(inst->ctx, 0, &inst->card);
         if (r)
                 return r;
-        r = sc_pkcs15_init(inst->card, &inst->p15card);
+        r = sc_pkcs15_bind(inst->card, &inst->p15card);
         if (r)
                 return r;
         return 0;
@@ -69,7 +69,7 @@ static int init_pkcs15(PluginInstance *inst)
 static void close_pkcs15(PluginInstance *inst)
 {
         if (inst->p15card) {
-                sc_pkcs15_destroy(inst->p15card);
+                sc_pkcs15_unbind(inst->p15card);
                 inst->p15card = NULL;
         }
         if (inst->card) {