[git] GnuPG - branch, master, updated. gnupg-2.1.0-63-gc50c11d

[by NIIBE Yutaka]

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  c50c11d5751f46ddb38244a5a07d8274e1e10922 (commit)
      from  f4ed04fca8885301b567ec004ffff0d6e24f4611 (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 c50c11d5751f46ddb38244a5a07d8274e1e10922
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Dec 8 10:21:55 2014 +0900

    scd: Fix for EdDSA.
    
    * scd/app-openpgp.c (get_algo_byte): It catches 22.
    (store_fpr): It's MPI usually, but it's opaque bytes for EdDSA.

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index e27a2cb..663b7d3 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -752,7 +752,7 @@ get_algo_byte (key_type_t key_type)
   else if (key_type == KEY_TYPE_ECDH)
     return 18;
   else if (key_type == KEY_TYPE_EDDSA)
-    return 105;                 /* (experimental) */
+    return 22;
   else
     return 1;  /* RSA */
 }
@@ -790,8 +790,10 @@ store_fpr (app_t app, int keynumber, u32 timestamp,
     {
       m[i] = va_arg (ap, const unsigned char *);
       mlen[i] = va_arg (ap, size_t);
-      for (; mlen[i] && !*m[i]; mlen[i]--, m[i]++) /* strip leading zeroes */
-        ;
+      if (key_type != KEY_TYPE_EDDSA)
+        /* strip off leading zeroes */
+        for (; mlen[i] && !*m[i]; mlen[i]--, m[i]++)
+          ;
       if (key_type == KEY_TYPE_RSA || i == 1)
         n += 2;
       n += mlen[i];

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

Summary of changes:
 scd/app-openpgp.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


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