diff options
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | g10/card-util.c | 2 | ||||
| -rw-r--r-- | g10/keyedit.c | 6 |
4 files changed, 17 insertions, 6 deletions
@@ -1,4 +1,11 @@ -Noteworthy changes in version 2.5.9 (unreleased) +Noteworthy changes in version 2.5.10 (unreleased) +------------------------------------------------- + + + Release-info: https://dev.gnupg.org/T7719 + + +Noteworthy changes in version 2.5.9 (2025-07-10) ------------------------------------------------ * gpg: Add the revocation reason to the sigclass of a "rev" line. @@ -6,10 +13,14 @@ Noteworthy changes in version 2.5.9 (unreleased) * gpg: Do not show the non-standard secp256k1 curve in the menu to select the curve. It can however be specified using its name. + [rG49a9171f63] + + * gpg: Fix regression in using the secp256k1 curve. [T7698] * dirmngr: New option --user-agent and send a default User-Agent of "GnuPG/2.6" for all HTTP requests. [T7715] + Release-info: https://dev.gnupg.org/T7695 diff --git a/configure.ac b/configure.ac index b5a1766a8..8eeb98204 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ min_automake_version="1.16.3" m4_define([mym4_package],[gnupg]) m4_define([mym4_major], [2]) m4_define([mym4_minor], [5]) -m4_define([mym4_micro], [9]) +m4_define([mym4_micro], [10]) # 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/g10/card-util.c b/g10/card-util.c index ab1ce159c..53584ce08 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -1614,7 +1614,7 @@ do_change_keyattr (int keyno, const struct key_attr *key_attr) else { log_error (_("public key algorithm %d (%s) is not supported\n"), - key_attr->algo, gcry_pk_algo_name (key_attr->algo)); + key_attr->algo, openpgp_pk_algo_name (key_attr->algo)); return gpg_error (GPG_ERR_PUBKEY_ALGO); } diff --git a/g10/keyedit.c b/g10/keyedit.c index eebeecfcd..b0f8ea5ed 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -4106,7 +4106,7 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp, _("The following key was revoked on" " %s by %s key %s\n"), revokestr_from_pk (pk), - gcry_pk_algo_name (pk->revoked.algo), user); + openpgp_pk_algo_name (pk->revoked.algo), user); xfree (user); } @@ -4121,14 +4121,14 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp, char *user; const char *algo; - algo = gcry_pk_algo_name (pk->revkey[i].algid); + algo = openpgp_pk_algo_name (pk->revkey[i].algid); keyid_from_fingerprint (ctrl, pk->revkey[i].fpr, pk->revkey[i].fprlen, r_keyid); user = get_user_id_string_native (ctrl, r_keyid); tty_fprintf (fp, _("This key may be revoked by %s key %s"), - algo ? algo : "?", user); + algo, user); if (pk->revkey[i].class & 0x40) { |