OpenPGP: add 3 more OpenPGP card vendors

* taken from GnuPG's git
albertico-gov · Feb 9, 2020 · 8e466ad · 8e466ad
1 parent 2f7d0cf
commit 8e466ad
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/src/libopensc/pkcs15-openpgp.c b/src/libopensc/pkcs15-openpgp.c
@@ -105,25 +105,28 @@ typedef struct _pgp_manuf_map {
 } pgp_manuf_map_t;
 
 static const pgp_manuf_map_t manuf_map[] = {
- { 0x0001, "PPC Card Systems" },
- { 0x0002, "Prism" },
- { 0x0003, "OpenFortress" },
- { 0x0004, "Wewid AB" },
- { 0x0005, "ZeitControl" },
- { 0x0006, "Yubico" },
- { 0x0007, "OpenKMS" },
- { 0x0008, "LogoEmail" },
- { 0x0009, "Fidesmo" },
- { 0x000A, "Dangerous Things" },
- { 0x002A, "Magrathea" },
- { 0x0042, "GnuPG e.V." },
- { 0x1337, "Warsaw Hackerspace" },
- { 0x2342, "warpzone" },
- { 0x63AF, "Trustica" },
- { 0xBD0E, "Paranoidlabs" },
- { 0xF517, "FSIJ" },
- { 0x0000, "test card" },
- { 0xffff, "test card" },
+ { 0x0001, "PPC Card Systems" },
+ { 0x0002, "Prism" },
+ { 0x0003, "OpenFortress" },
+ { 0x0004, "Wewid AB" },
+ { 0x0005, "ZeitControl" },
+ { 0x0006, "Yubico" },
+ { 0x0007, "OpenKMS" },
+ { 0x0008, "LogoEmail" },
+ { 0x0009, "Fidesmo" },
+ { 0x000A, "Dangerous Things" },
+ { 0x000B, "Feitian Technologies" },
+ { 0x002A, "Magrathea" },
+ { 0x0042, "GnuPG e.V." },
+ { 0x1337, "Warsaw Hackerspace" },
+ { 0x2342, "warpzone" },
+ { 0x4354, "Confidential Technologies" },
+ { 0x5443, "TIF-IT e.V." },
+ { 0x63AF, "Trustica" },
+ { 0xBD0E, "Paranoidlabs" },
+ { 0xF517, "FSIJ" },
+ { 0x0000, "test card" },
+ { 0xffff, "test card" },
  { 0, NULL }
 };
 

diff --git a/src/tools/openpgp-tool.c b/src/tools/openpgp-tool.c
@@ -293,12 +293,15 @@ static char *prettify_manufacturer(u8 *data, size_t length)
  case 0x0008: return "LogoEmail";
  case 0x0009: return "Fidesmo";
  case 0x000A: return "Dangerous Things";
+ case 0x000B: return "Feitian Technologies";
 
  case 0x002A: return "Magrathea";
  case 0x0042: return "GnuPG e.V.";
 
  case 0x1337: return "Warsaw Hackerspace";
  case 0x2342: return "warpzone"; /* hackerspace Muenster. */
+ case 0x4354: return "Confidential Technologies"; /* cotech.de */
+ case 0x5443: return "TIF-IT e.V.";
  case 0x63AF: return "Trustica";
  case 0xBD0E: return "Paranoidlabs";
  case 0xF517: return "FSIJ";