Imported Upstream version 2.2.25

diff --git a/NEWS b/NEWS
index 5ddfec5..b37c2e5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Noteworthy changes in version 2.2.25 (2020-11-23)
+-------------------------------------------------
+
+  * scd: Fix regression in 2.2.24 requiring gpg --card-status before
+    signing or decrypting.  [#5065]
+
+  * gpgsm: Using Libksba 1.5.0 signatures with a rarely used
+    combination of attributes can now be verified.  [#5146]
+
+  Release-info: https://dev.gnupg.org/T5140
+  See-also: gnupg-announce/2020q4/000450.html
+
+
 Noteworthy changes in version 2.2.24 (2020-11-17)
 -------------------------------------------------
 

diff --git a/agent/keyformat.txt b/agent/keyformat.txt
index c15e4f8..24d7420 100644 (file)
--- a/agent/keyformat.txt
+++ b/agent/keyformat.txt
@@ -245,7 +245,7 @@ The currently defined protection modes are:
   they can easily be stripped by looking for the end of the list.
 
   The associated data required for this protection mode is the list
-  formiing the public key parameters.  For the above example this is
+  forming the public key parameters.  For the above example this is
   is this canonical encoded S-expression:
 
   (rsa

diff --git a/configure.ac b/configure.ac
index 2e5c284..9642ab2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ min_automake_version="1.14"
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [2])
-m4_define([mym4_micro], [24])
+m4_define([mym4_micro], [25])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index e497183..509cb9e 100644 (file)
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -2368,7 +2368,7 @@ get_revision_from_blurb (const char *blurb, int *r_len)
   for (; *s; s++)
     if (*s == '\n' && s[1] == '(')
       break;
-  if (s)
+  if (*s)
     {
       s += 2;
       for (n=0; s[n] && s[n] != ' '; n++)
@@ -2400,8 +2400,9 @@ gpgconf_versions (void)
   es_fprintf (es_stdout, "* Libassuan %s (%.*s)\n\n",
               assuan_check_version (NULL), n, s);
 
-  es_fprintf (es_stdout, "* KSBA %s \n\n",
-              ksba_check_version (NULL));
+  s = get_revision_from_blurb (ksba_check_version ("\x01\x01"), &n);
+  es_fprintf (es_stdout, "* KSBA %s (%.*s)\n\n",
+              ksba_check_version (NULL), n, s);
 
 #ifdef HTTP_USE_NTBTLS
   s = get_revision_from_blurb (ntbtls_check_version ("\x01\x01"), &n);

diff --git a/doc/gpg.texi b/doc/gpg.texi
index f611813..fc8539c 100644 (file)
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -421,7 +421,7 @@ fingerprint of the primary key the entire public key is deleted.
 @opindex delete-secret-keys
 Remove key from the secret keyring. In batch mode the key must be
 specified by fingerprint.  The option @option{--yes} can be used to
-advice gpg-agent not to request a confirmation.  This extra
+advise gpg-agent not to request a confirmation.  This extra
 pre-caution is done because @command{@gpgname} can't be sure that the
 secret key (as controlled by gpg-agent) is only used for the given
 OpenPGP public key.  If the exclamation mark syntax is used with the
@@ -434,7 +434,7 @@ primary key only the secret part of the primary key is deleted.
 @opindex delete-secret-and-public-key
 Same as @option{--delete-key}, but if a secret key exists, it will be
 removed first. In batch mode the key must be specified by fingerprint.
-The option @option{--yes} can be used to advice gpg-agent not to
+The option @option{--yes} can be used to advise gpg-agent not to
 request a confirmation.
 
 @item --export

diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 1c329a7..0900e87 100644 (file)
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -1237,9 +1237,9 @@ last file descriptor passed to the application.
 @xref{fun-assuan_sendfd, ,the assuan_sendfd function,assuan,the Libassuan
 manual}, on how to do descriptor passing.
 
-The @code{--armor} option may be used to advice the server that the
-input data is in @acronym{PEM} format, @code{--base64} advices that a
-raw base-64 encoding is used, @code{--binary} advices of raw binary
+The @code{--armor} option may be used to advise the server that the
+input data is in @acronym{PEM} format, @code{--base64} advises that a
+raw base-64 encoding is used, @code{--binary} advises of raw binary
 input (@acronym{BER}).  If none of these options is used, the server
 tries to figure out the used encoding, but this may not always be
 correct.

diff --git a/po/pl.po b/po/pl.po
index b43e72f..8706f1a 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-2.2.21\n"
+"Project-Id-Version: gnupg-2.2.24\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"PO-Revision-Date: 2020-08-16 07:45+0200\n"
+"PO-Revision-Date: 2020-11-18 17:35+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -1946,10 +1946,8 @@ msgstr "szybkie złożenie podpisu na kluczu"
 msgid "quickly sign a key locally"
 msgstr "szybkie złożenie prywatnego podpisu na kluczu"
 
-#, fuzzy
-#| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
-msgstr "szybkie unieważnienie identyfikatora użytkownika"
+msgstr "szybkie unieważnienie podpisu klucza"
 
 msgid "sign a key"
 msgstr "złożenie podpisu na kluczu"
@@ -2973,35 +2971,28 @@ msgstr "klucz %s: dodano bezpośredni podpis\n"
 msgid "error allocating memory: %s\n"
 msgstr "błąd przydzielania pamięci: %s\n"
 
-#, fuzzy, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
+#, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
+msgstr "nie można sprawdzić podpisu z nieobsługiwanym algorytmem klucza publicznego (%d): %s.\n"
 
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
+#, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "karta nie obsługuje algorytmu skrótu %s\n"
+msgstr "nie można sprawdzić podpisu z nieobsługiwanym algorytmem skrótu %d: %s.\n"
 
-#, fuzzy
-#| msgid "Good signature from"
 msgid " (reordered signatures follow)"
-msgstr "Poprawny podpis złożony przez"
+msgstr " (poniżej uporządkowane podpisy)"
 
-#, fuzzy, c-format
-#| msgid "key %s: %s\n"
+#, c-format
 msgid "key %s:\n"
-msgstr "klucz %s: %s\n"
+msgstr "klucz %s:\n"
 
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
-#| msgid_plural "User ID \"%s\": %d signatures removed\n"
+#, c-format
 msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
-msgstr[0] "Identyfikator użytkownika ,,%s'': %d podpis usunięty\n"
-msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpisy usunięte\n"
-msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpisów usuniętych\n"
+msgstr[0] "%d powtórzony podpis usunięty\n"
+msgstr[1] "%d powtórzone podpisy usunięte\n"
+msgstr[2] "%d powtórzonych podpisów usuniętych\n"
 
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
@@ -3017,19 +3008,19 @@ msgstr[0] "%d niepoprawny podpis\n"
 msgstr[1] "%d niepoprawne podpisy\n"
 msgstr[2] "%d niepoprawnych podpisów\n"
 
-#, fuzzy, c-format
-#| msgid "Good signature from"
+#, c-format
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
-msgstr[0] "Poprawny podpis złożony przez"
-msgstr[1] "Poprawny podpis złożony przez"
-msgstr[2] "Poprawny podpis złożony przez"
+msgstr[0] "%d podpis uporządkowany\n"
+msgstr[1] "%d podpisy uporządkowane\n"
+msgstr[2] "%d podpisów uporządkowanych\n"
 
 #, c-format
 msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
+"Uwaga: znaleziono błędy, a sprawdzono tylko podpisy własne; uruchomienie '%s' sprawdzi wszystkie podpisy.\n"
 
 #, c-format
 msgid "error creating keybox '%s': %s\n"
@@ -3552,10 +3543,9 @@ msgstr "Nie ma nic do podpisania.\n"
 msgid "Not signed by you.\n"
 msgstr "Nie podpisane przez ciebie.\n"
 
-#, fuzzy, c-format
-#| msgid "checking created signature failed: %s\n"
+#, c-format
 msgid "revoking the key signature failed: %s\n"
-msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
+msgstr "unieważnienie podpisu klucza nie powiodło się: %s\n"
 
 #, c-format
 msgid "'%s' is not a valid expiration time\n"

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 6245a53..7480f50 100644 (file)
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -3340,7 +3340,7 @@ build_ecc_privkey_template (app_t app, int keyno,
 }
 
 
-/* Helper for do_writekley to change the size of a key.  Not ethat
+/* Helper for do_writekey to change the size of a key.  Note that
    this deletes the entire key without asking.  */
 static gpg_error_t
 change_keyattr (app_t app, int keyno, const unsigned char *buf, size_t buflen,
@@ -4392,10 +4392,15 @@ check_keyidstr (app_t app, const char *keyidstr, int keyno, int *r_use_auth)
   const char *s;
   int n;
   const char *fpr = NULL;
+  int i;
 
   if (r_use_auth)
     *r_use_auth = 0;
 
+  /* Make sure we have load the public keys.  */
+  for (i = 0; i < 3; i++)
+    get_public_key (app, i);
+
   if (strlen (keyidstr) < 32)
     return gpg_error (GPG_ERR_INV_ID);
   else