From 1915b95ffd1294bb64f8c4d127cccb863147061f Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 18 Jun 2021 18:02:08 +0200
Subject: [PATCH] scd:p15: Add pre-check for ascii-numeric PINs.

* scd/app-p15.c (verify_pin): ascii-numeric is different than BCD.

(cherry picked from commit 029924a46e08ffcda038d89f06abfb41c980a9ad)
Added a few typo fixes.
---
 scd/app-p15.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scd/app-p15.c b/scd/app-p15.c
index c5f7f5b9d..aef3d3c32 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -326,7 +326,7 @@ struct prkdf_object_s
   char *serial_number;
 
   /* KDF/KEK parameter for OpenPGP's ECDH.  First byte is zero if not
-   * availabale. .*/
+   * available.  */
   unsigned char ecdh_kdf[4];
 
   /* Length and allocated buffer with the Id of this object. */
@@ -4515,7 +4515,7 @@ send_key_fpr_line (ctrl_t ctrl, int number, const unsigned char *fpr)
 }
 
 
-/* If possible Emit a FPR-KEY status line for the private key object
+/* If possible emit a FPR-KEY status line for the private key object
  * PRKDF using NUMBER as index.  */
 static void
 send_key_fpr (app_t app, ctrl_t ctrl, prkdf_object_t prkdf, int number)
@@ -5302,7 +5302,6 @@ verify_pin (app_t app,
   switch (aodf->pintype)
     {
     case PIN_TYPE_BCD:
-    case PIN_TYPE_ASCII_NUMERIC:
       for (s=pinvalue; digitp (s); s++)
         ;
       if (*s)
@@ -5311,6 +5310,15 @@ verify_pin (app_t app,
           err = gpg_error (GPG_ERR_BAD_PIN);
         }
       break;
+    case PIN_TYPE_ASCII_NUMERIC:
+      for (s=pinvalue; *s && !(*s & 0x80); s++)
+        ;
+      if (*s)
+        {
+          errstr = "Non-ascii characters found in PIN";
+          err = gpg_error (GPG_ERR_BAD_PIN);
+        }
+      break;
     case PIN_TYPE_UTF8:
       break;
     case PIN_TYPE_HALF_NIBBLE_BCD: