[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.4-17-gf98e193

[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, STABLE-BRANCH-2-2 has been updated
       via  f98e193c84250bbc49d5d1c625f54f2c14501ae3 (commit)
      from  64aa98c8a05513d9c00f53a2b880d80f9035333e (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 f98e193c84250bbc49d5d1c625f54f2c14501ae3
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Feb 1 12:05:19 2018 +0100

    gpg: Update list of card vendors from master
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/card-util.c b/g10/card-util.c
index a396b7d..759dde8 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -212,9 +212,11 @@ get_manufacturer (unsigned int no)
     case 0x000A: return "Dangerous Things";
 
     case 0x002A: return "Magrathea";
+    case 0x0042: return "GnuPG e.V.";
 
     case 0x1337: return "Warsaw Hackerspace";
     case 0x2342: return "warpzone"; /* hackerspace Muenster.  */
+    case 0xBD0E: return "Paranoidlabs";
     case 0xF517: return "FSIJ";
 
       /* 0x0000 and 0xFFFF are defined as test cards per spec,

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

Summary of changes:
 g10/card-util.c | 2 ++
 1 file changed, 2 insertions(+)


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