From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 6 Apr 2011 22:18:01 +0000 (+0200)
Subject: check PIN size.
X-Git-Tag: gnutls_2_99_0~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f623bca3f822eec97a638c1e6bb5626ec72f130e;p=thirdparty%2Fgnutls.git

check PIN size.
---

diff --git a/src/common.c b/src/common.c
index 7971c7b535..286b9564c4 100644
--- a/src/common.c
+++ b/src/common.c
@@ -748,6 +748,12 @@ pin_callback (void *user, int attempt, const char *token_url,
     {
       if (strcmp (cached_url, token_url) == 0)
         {
+          if (strlen(pin) >= sizeof(cached_pin))
+            {
+              fprintf (stderr, "Too long PIN given\n");
+              exit (1);
+            }
+
           strcpy (pin, cached_pin);
           return 0;
         }
diff --git a/src/pkcs11.c b/src/pkcs11.c
index 62446374d1..cab837a994 100644
--- a/src/pkcs11.c
+++ b/src/pkcs11.c
@@ -60,10 +60,10 @@ pin_callback (void *user, int attempt, const char *token_url,
         }
     }
 
-  password = getpass ("Enter pin: ");
+  password = getpass ("Enter PIN: ");
   if (password == NULL || password[0] == 0)
     {
-      fprintf (stderr, "No password given\n");
+      fprintf (stderr, "No PIN given\n");
       exit (1);
     }
 
@@ -72,6 +72,12 @@ pin_callback (void *user, int attempt, const char *token_url,
   pin[len] = 0;
 
   /* cache */
+  if (strlen(pin) >= sizeof(cached_pin))
+    {
+      fprintf (stderr, "Too long PIN given\n");
+      exit (1);
+    }
+
   strcpy (cached_pin, pin);
   free (cached_url);
   cached_url = strdup (token_url);
@@ -609,13 +615,16 @@ pkcs11_init (FILE * outfile, const char *url, const char *label,
 
   pin = getpass ("Enter Security Officer's PIN: ");
   if (pin == NULL)
-    exit (0);
+    exit (1);
+
+  if (strlen(pin) >= sizeof(so_pin))
+    exit (1);
 
   strcpy (so_pin, pin);
 
   pin = getpass ("Enter new User's PIN: ");
   if (pin == NULL)
-    exit (0);
+    exit (1);
 
   ret = gnutls_pkcs11_token_init (url, so_pin, label);
   if (ret < 0)