use GNUTLS_PIN instead of GNUTLS_PKCS11_PIN.

diff --git a/NEWS b/NEWS
index 9cb6f323b369b4dfadfe91b476f150025a820bdf..99bc1205c7daa453b198f16b827d676275367a0b 100644 (file)
--- 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 d5a0c33a768ab9b9a23c8ba940370468237d0dd5..5882dd061525ba0b6c655a66c094e204aef1f49a 100644 (file)
--- 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 480d0b8540c433b2525b61b2845ed919aacbb8a6..c73ce18b25cb7c934603d8f602e8b113aca21975 100755 (executable)
--- 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