From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 10 Nov 2013 09:07:19 +0000 (+0100)
Subject: use GNUTLS_PIN instead of GNUTLS_PKCS11_PIN.
X-Git-Tag: gnutls_3_2_7~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2651af970271a8572d5221eee4fd89565642d034;p=thirdparty%2Fgnutls.git

use GNUTLS_PIN instead of GNUTLS_PKCS11_PIN.
---

diff --git a/NEWS b/NEWS
index 9cb6f323b3..99bc1205c7 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ looking in unrelated to the object tokens.
 ** certtool: When exporting an encrypted PEM private key do not output the key
 parameters.
 
-** tools: The environment variable GNUTLS_PKCS11_PIN can be used to read the PIN.
+** tools: The environment variable GNUTLS_PIN can be used to read the PIN.
 
 ** API and ABI modifications:
 gnutls_pkcs11_obj_export3: Added
diff --git a/src/common.c b/src/common.c
index d5a0c33a76..5882dd0615 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1008,7 +1008,7 @@ pin_callback(void *user, int attempt, const char *token_url,
 	printf("Token '%s' with URL '%s' ", token_label, token_url);
 	printf("requires %s PIN\n", desc);
 	
-	password = getenv("GNUTLS_PKCS11_PIN");
+	password = getenv("GNUTLS_PIN");
 
 	if (password == NULL)
 		password = getpass("Enter PIN: ");
diff --git a/tests/suite/testpkcs11 b/tests/suite/testpkcs11
index 480d0b8540..c73ce18b25 100755
--- a/tests/suite/testpkcs11
+++ b/tests/suite/testpkcs11
@@ -63,7 +63,7 @@ if test x"$TOKEN" = x;then
 	exit 1
 fi
 
-export GNUTLS_PKCS11_PIN=1234
+export GNUTLS_PIN=1234
 
 echo -n "* Writing a client private key... "
 $P11TOOL --login --write --label gnutls-client2 --load-privkey $srcdir/pkcs11-certs/client.key "$TOKEN" >/dev/null 2>&1