Normalize capitalization from "Public Key Id" to "Public Key ID"

The GnuTLS codebase produced the string "Public Key Id" in some places
(e.g. in the output of "certtool -i"), and "Public Key ID" in other
places (e.g. in the output of "certtool -k").

This changeset standardizes on "Public Key ID", making the output
consistent across uses.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/lib/x509/output.c b/lib/x509/output.c
index 530984c12f2651e5194c9d6e6162c592b3c53ee1..22cf6b02c1fa562984aa2795c4fee889a8899f0b 100644 (file)
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -1608,7 +1608,7 @@ print_keyid (gnutls_buffer_st * str, gnutls_x509_crt_t cert)
       return;
     }
 
-  adds (str, _("\tPublic Key Id:\n\t\t"));
+  adds (str, _("\tPublic Key ID:\n\t\t"));
   _gnutls_buffer_hexprint (str, buffer, size);
   adds (str, "\n");
 
@@ -2447,7 +2447,7 @@ print_crq_other (gnutls_buffer_st * str, gnutls_x509_crq_t crq)
       return;
     }
 
-  adds (str, _("\tPublic Key Id:\n\t\t"));
+  adds (str, _("\tPublic Key ID:\n\t\t"));
   _gnutls_buffer_hexprint (str, buffer, size);
   adds (str, "\n");
 

diff --git a/po/cs.po.in b/po/cs.po.in
index bcf1de40aa1739dff8ab2f9b702ef80aa7fc226a..1337bd5199d5ae0a763cafe0adff58cf00e534a2 100644 (file)
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -1365,7 +1365,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tID veřejného klíče:\n"

diff --git a/po/de.po.in b/po/de.po.in
index 7604d95b8385a1523f72780f47996cfdc344a58f..efdbc9de6aed7e0ebcca322d0d98571405c7d9f1 100644 (file)
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -1358,7 +1358,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tKennung des öffentlichen Schlüssels:\n"

diff --git a/po/eo.po.in b/po/eo.po.in
index 5a38df96b2a6a477ff6b81d2c252ad3b56c09726..7082177ebcb47c1ca8472bb30bb096392da17d0d 100644 (file)
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -1351,7 +1351,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tPublik-ŝlosila Id:\n"

diff --git a/po/fi.po.in b/po/fi.po.in
index 944a6a4a8bdb1266de2889d9509c71d8f84de928..152391e0e4729f4608f3cd7c4716cd8cc02b2e77 100644 (file)
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -1352,7 +1352,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tJulkisen avaimen tunniste:\n"

diff --git a/po/fr.po.in b/po/fr.po.in
index 7fa9ccac2ad59005b84784fcbdf4cbda2ebe511d..7b51f8235d1792f50c7bc20b8401e97c77d04eb8 100644 (file)
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -866,7 +866,7 @@ msgstr ""
 
 #: x509/output.c:1188 x509/output.c:1956
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tId de clef publique:\n"

diff --git a/po/it.po.in b/po/it.po.in
index 4914a443b95b72994ed372638ce50b4b9efec368..1091c3d0017ca85b483112d51eb902b4f47cb2d4 100644 (file)
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -1354,7 +1354,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tId della chiave pubblica:\n"

diff --git a/po/ms.po.in b/po/ms.po.in
index 4260eb4927496f0a9f23e530a0beae68c1e6e5b5..08aea54b8ccd05ae2c6b2100c8a0b97425eba747 100644 (file)
--- a/po/ms.po.in
+++ b/po/ms.po.in
@@ -824,7 +824,7 @@ msgstr ""
 
 #: lib/x509/output.c:985
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tId Kekunci Awam:\n"

diff --git a/po/nl.po.in b/po/nl.po.in
index 5d0d1e1f37c9ce9812fbe3700a0713ad0b0df1f0..5ab868d77b767b09ae17b913d516e974802ab641 100644 (file)
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -1356,7 +1356,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tID van publieke sleutel:\n"

diff --git a/po/pl.po.in b/po/pl.po.in
index ec5fb5eae03171fb5ea69cf70b3bd2f53ddb1159..2c3540d5d39d3bbb545684384f6761c9af157af2 100644 (file)
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -1351,7 +1351,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tIdentyfikator klucza publicznego:\n"

diff --git a/po/sv.po.in b/po/sv.po.in
index 27858f9f145a5fb58d07fa4bb49800e446bdad4e..767242df79d165f0d29e154e9b3cf2ee305eb959 100644 (file)
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -1241,7 +1241,7 @@ msgstr ""
 
 #: lib/x509/output.c:1385 lib/x509/output.c:2248
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tPublik nyckel-identitet:\n"

diff --git a/po/uk.po.in b/po/uk.po.in
index 5310bf4d5454ac7cd014b41fcba0f48393d24b2b..a5e9a66bd2a863635cddf611f1be25192fc77cc4 100644 (file)
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -1354,7 +1354,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tІдент. відкритого ключа:\n"

diff --git a/po/vi.po.in b/po/vi.po.in
index e36885619baef0b2df44560d57b666d27f53d47e..2286184c8c1251af982cc118101759cbb31cd2c6 100644 (file)
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -1355,7 +1355,7 @@ msgstr ""
 
 #: lib/x509/output.c:1611 lib/x509/output.c:2450
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\tMã số Khoá Công:\n"

diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index 6505039dc80d5166e7ca0a910ea8a10c075b4bcf..85d54dd85f430d822e754d413f9c82a08492252f 100644 (file)
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -857,7 +857,7 @@ msgstr ""
 
 #: x509/output.c:1156 x509/output.c:1924
 msgid ""
-"\tPublic Key Id:\n"
+"\tPublic Key ID:\n"
 "\t\t"
 msgstr ""
 "\t公钥 Id：\n"

diff --git a/tests/cert-tests/aki-cert.pem b/tests/cert-tests/aki-cert.pem
index c12d0bed3e401ef841a87f7f531bb3a32e6ee923..69f7c27bb8768f3b81cad2671547536e086e508e 100644 (file)
--- a/tests/cert-tests/aki-cert.pem
+++ b/tests/cert-tests/aki-cert.pem
@@ -67,7 +67,7 @@ X.509 Certificate Information:
 Other Information:
        SHA-1 fingerprint:
                62f3c89771da4ce01a91fc13e02b6057b4547a1d
-       Public Key Id:
+       Public Key ID:
                df622ed0fe6a65a8df5b62840c826ac5b372235f
        Public key's random art:
                +--[ RSA 2048]----+

diff --git a/tests/cert-tests/bmpstring.pem b/tests/cert-tests/bmpstring.pem
index 0bd2548edf8aac13a175c6bfac08058c7c5e8b90..e44db84f0930e851a835195184f282aa91f333da 100644 (file)
--- a/tests/cert-tests/bmpstring.pem
+++ b/tests/cert-tests/bmpstring.pem
@@ -101,7 +101,7 @@ X.509 Certificate Information:
 Other Information:
        SHA-1 fingerprint:
                8b730ffbd11677aaaf8600b893927d9e402c3f2d
-       Public Key Id:
+       Public Key ID:
                3c7fd9a47b17ed6f81ce80c326d147fd3b991444
        Public key's random art:
                +--[ RSA 4096]----+

diff --git a/tests/cert-tests/ca-no-pathlen.pem b/tests/cert-tests/ca-no-pathlen.pem
index 66b1c4a146102387d5254d6f1878469cd59684b6..e3cfbb379264a05078bb07351d5122866d59ed31 100644 (file)
--- a/tests/cert-tests/ca-no-pathlen.pem
+++ b/tests/cert-tests/ca-no-pathlen.pem
@@ -30,7 +30,7 @@ X.509 Certificate Information:
 Other Information:
        SHA-1 fingerprint:
                f3ddd5478b80b142200b50c9eb2ee37061b09ed6
-       Public Key Id:
+       Public Key ID:
                f268df0e814c0302ed338e146f57421dba44f06c
        Public key's random art:
                +--[ RSA  512]----+

diff --git a/tests/cert-tests/complex-cert.pem b/tests/cert-tests/complex-cert.pem
index abac197715551c6490f0a5b4d7a972855cf04e2d..0c537a6bc73cddb5f2a8688eb4826cbd85a51348 100644 (file)
--- a/tests/cert-tests/complex-cert.pem
+++ b/tests/cert-tests/complex-cert.pem
@@ -62,7 +62,7 @@ X.509 Certificate Information:
 Other Information:
        SHA-1 fingerprint:
                5bf859ec9395b73f5ed5adfdfaa9c1add2ec23ff
-       Public Key Id:
+       Public Key ID:
                1f1df37c58ffae0157ffccd8aae234092017a090
        Public key's random art:
                +--[ RSA 2432]----+

diff --git a/tests/cert-tests/no-ca-or-pathlen.pem b/tests/cert-tests/no-ca-or-pathlen.pem
index a255e077ad6f52b20a1ed24817db12708aec16e2..312e3d7df8a3f234d4fac76e9442777acccf3294 100644 (file)
--- a/tests/cert-tests/no-ca-or-pathlen.pem
+++ b/tests/cert-tests/no-ca-or-pathlen.pem
@@ -48,7 +48,7 @@ warning: signed using a broken signature algorithm that can be forged.
 Other Information:
        SHA-1 fingerprint:
                8f735c5ddefd723f59b6a3bb2ac0522470c0182f
-       Public Key Id:
+       Public Key ID:
                1e09d707d4e3651b84dcb6c68a828d2affef7ec3
        Public key's random art:
                +--[ RSA 1024]----+

diff --git a/tests/hostname-check.c b/tests/hostname-check.c
index a9c421b85524f2774d814a9bc7a70ffe49777f6a..2dd31da3f0f6d61f1be14535f84ea96841b69306 100644 (file)
--- a/tests/hostname-check.c
+++ b/tests/hostname-check.c
@@ -81,7 +81,7 @@ char pem1[] =
   "                fd845ded8c28ba5e78d6c1844ceafd24\n"
   "        SHA-1 fingerprint:\n"
   "                0bae431dda3cae76012b82276e4cd92ad7961798\n"
-  "        Public Key Id:\n"
+  "        Public Key ID:\n"
   "                e93c1cfbad926ee606a4562ca2e1c05327c8f295\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -139,7 +139,7 @@ char pem2[] =
   "                30cda7de4f0360892547974f45111ac1\n"
   "        SHA-1 fingerprint:\n"
   "                39e3f8fec6a8d842390b6536998a957c1a6b7322\n"
-  "        Public Key Id:\n"
+  "        Public Key ID:\n"
   "                e93c1cfbad926ee606a4562ca2e1c05327c8f295\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -201,7 +201,7 @@ char pem3[] =
   "                df3f57d00c8149bd826b177d6ea4f369\n"
   "        SHA-1 fingerprint:\n"
   "                e95e56e2acac305f72ea6f698c11624663a595bd\n"
-  "        Public Key Id:\n"
+  "        Public Key ID:\n"
   "                e93c1cfbad926ee606a4562ca2e1c05327c8f295\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -264,7 +264,7 @@ char pem4[] =
   "                a411da7b0fa064d214116d5f94e06c24\n"
   "        SHA-1 fingerprint:\n"
   "                3596e796c73ed096d762ab3d440a9ab55a386b3b\n"
-  "        Public Key Id:\n"
+  "        Public Key ID:\n"
   "                e93c1cfbad926ee606a4562ca2e1c05327c8f295\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -311,7 +311,7 @@ char pem6[] =
   "                Subject Key Identifier (not critical):\n"
   "                        5493e6599b283b4529378818aef9a4abbf4d9918\n"
   "Other Information:\n"
-  "        Public Key Id:\n"
+  "        Public Key ID:\n"
   "                5493e6599b283b4529378818aef9a4abbf4d9918\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -359,7 +359,7 @@ char pem7[] =
   "                Subject Key Identifier (not critical):\n"
   "                        5493e6599b283b4529378818aef9a4abbf4d9918\n"
   "Other Information:\n"
-  "        Public Key Id:\n"
+  "        Public Key ID:\n"
   "                5493e6599b283b4529378818aef9a4abbf4d9918\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -407,7 +407,7 @@ char pem8[] =
   "                Subject Key Identifier (not critical):\n"
   "                        5493e6599b283b4529378818aef9a4abbf4d9918\n"
   "Other Information:\n"
-  "        Public Key Id:\n"
+  "        Public Key ID:\n"
   "                5493e6599b283b4529378818aef9a4abbf4d9918\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -470,7 +470,7 @@ char pem9[] =
   "            f27b18092c7497f206e70f504eee0f8e\n"
   "    SHA-1 fingerprint:\n"
   "            bebdac9d0dd54e8f044642e0f065fae5d75ca6e5\n"
-  "    Public Key Id:\n"
+  "    Public Key ID:\n"
   "            4cb90a9bfa1d34e37edecbd20715fea1dacb6891\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"
@@ -549,7 +549,7 @@ char pem10[] =
   "            0b4d6d944200cdd1639008b24dc0fe0a\n"
   "    SHA-1 fingerprint:\n"
   "            ce85660f5451b0cc12f525577f0eb9411a20c76b\n"
-  "    Public Key Id:\n"
+  "    Public Key ID:\n"
   "            a1d18c15e65c7c4935512eeea7ca5d3e6baad4e1\n"
   "\n"
   "-----BEGIN CERTIFICATE-----\n"