[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-51-gb817ae7

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b817ae7df947093384a25797999a9aa187e20f9c (commit)
      from  12ea5c904c0008a2adec2e8bbe45dac629548e7d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b817ae7df947093384a25797999a9aa187e20f9c
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Feb 7 14:17:33 2012 +0100

    agent: Add pin length field to the shadowed private key format.
    
    This is not yet fully implemented.  It will eventually allow to
    support pinpad equipped readers which do not support variable length
    pin lengths.
    * agent/protect.c (parse_shadow_info): Add optional arg R_PINLEN and
    parse pinlen info.  Change all callers to pass NULL for it.

diff --git a/agent/agent.h b/agent/agent.h
index d345c66..45bc507 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -394,7 +394,7 @@ int agent_shadow_key (const unsigned char *pubkey,
 int agent_get_shadow_info (const unsigned char *shadowkey,
                            unsigned char const **shadow_info);
 gpg_error_t parse_shadow_info (const unsigned char *shadow_info,
-                               char **r_hexsn, char **r_idstr);
+                               char **r_hexsn, char **r_idstr, int *r_pinlen);
 gpg_error_t s2k_hash_passphrase (const char *passphrase, int hashalgo,
                                  int s2kmode,
                                  const unsigned char *s2ksalt,
diff --git a/agent/command.c b/agent/command.c
index 9de3e47..88cd62c 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1090,7 +1090,7 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
 
   if (shadow_info)
     {
-      err = parse_shadow_info (shadow_info, &serialno, &idstr);
+      err = parse_shadow_info (shadow_info, &serialno, &idstr, NULL);
       if (err)
         goto leave;
     }
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 5926424..22cdf8e 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -44,7 +44,7 @@ ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info, char **r_kid)
 
   *r_kid = NULL;
 
-  rc = parse_shadow_info (shadow_info, &want_sn, &want_kid);
+  rc = parse_shadow_info (shadow_info, &want_sn, &want_kid, NULL);
   if (rc)
     return rc;
 
diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index 3ebba6e..7ba6af2 100644
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -155,7 +155,12 @@ to keys stored on a token:
 The currently used protocol is "ti-v1" (token info version 1).  The
 second list with the information has this layout:
 
-(card_serial_number id_string_of_key)
+(card_serial_number id_string_of_key fixed_pin_length)
+
+FIXED_PIN_LENGTH is optional.  It can be used to store the length of
+the PIN; a value of 0 indicates that this information is not
+available.  The rationale for this field is that some pinpad equipped
+readers don't allow passing a variable length PIN.
 
 More items may be added to the list.
 
diff --git a/agent/protect.c b/agent/protect.c
index 64af4ed..68e1a04 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -1272,7 +1272,7 @@ agent_get_shadow_info (const unsigned char *shadowkey,
    required, NULL may be passed for them.  */
 gpg_error_t
 parse_shadow_info (const unsigned char *shadow_info,
-                   char **r_hexsn, char **r_idstr)
+                   char **r_hexsn, char **r_idstr, int *r_pinlen)
 {
   const unsigned char *s;
   size_t n;
@@ -1281,6 +1281,8 @@ parse_shadow_info (const unsigned char *shadow_info,
     *r_hexsn = NULL;
   if (r_idstr)
     *r_idstr = NULL;
+  if (r_pinlen)
+    *r_pinlen = 0;
 
   s = shadow_info;
   if (*s != '(')
@@ -1325,5 +1327,34 @@ parse_shadow_info (const unsigned char *shadow_info,
       (*r_idstr)[n] = 0;
     }
 
+  /* Parse the optional PINLEN.  */
+  n = snext (&s);
+  if (!n)
+    return 0;
+
+  if (r_pinlen)
+    {
+      char *tmpstr = xtrymalloc (n+1);
+      if (!tmpstr)
+        {
+          if (r_hexsn)
+            {
+              xfree (*r_hexsn);
+              *r_hexsn = NULL;
+            }
+          if (r_idstr)
+            {
+              xfree (*r_idstr);
+              *r_idstr = NULL;
+            }
+          return gpg_error_from_syserror ();
+        }
+      memcpy (tmpstr, s, n);
+      tmpstr[n] = 0;
+
+      *r_pinlen = (int)strtol (tmpstr, NULL, 10);
+      xfree (tmpstr);
+    }
+
   return 0;
 }

-----------------------------------------------------------------------

Summary of changes:
 agent/agent.h       |    2 +-
 agent/command.c     |    2 +-
 agent/divert-scd.c  |    2 +-
 agent/keyformat.txt |    7 ++++++-
 agent/protect.c     |   33 ++++++++++++++++++++++++++++++++-
 5 files changed, 41 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org