[git] GnuPG - branch, master, updated. gnupg-2.2.1-66-g922bae8
by Werner Koch
cvs at cvs.gnupg.org
Thu Nov 2 17:24:32 CET 2017
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, master has been updated
via 922bae8082f2f8d696ea0e7d7e9e4d986789bdfc (commit)
via ea09b6cded9d31a8ebd91878553c3eaa2b76e817 (commit)
from 16513102036a91aa46741260b3af0d42a25941e0 (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 922bae8082f2f8d696ea0e7d7e9e4d986789bdfc
Author: Werner Koch <wk at gnupg.org>
Date: Thu Nov 2 17:20:13 2017 +0100
gpg: Unifiy the message for re-configuring cards.
* g10/card-util.c (ask_card_keyattr): Print "rsaNNNN".
--
This is a separate patch from the previous to avoid string changes
when backporting the other patch to 2.2.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/card-util.c b/g10/card-util.c
index 2294df1..8a03a26 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1381,8 +1381,12 @@ ask_card_keyattr (int keyno, unsigned int nbits)
}
else
{
+ char name[30];
+
+ snprintf (name, sizeof name, "rsa%u", req_nbits);
tty_printf (_("The card will now be re-configured"
- " to generate a key of %u bits\n"), req_nbits);
+ " to generate a key of type: %s\n"),
+ name);
show_keysize_warning ();
return req_nbits;
}
commit ea09b6cded9d31a8ebd91878553c3eaa2b76e817
Author: Werner Koch <wk at gnupg.org>
Date: Thu Nov 2 17:11:03 2017 +0100
gpg: Introduce magic value 25519 to switch a card to ECC.
* g10/card-util.c (show_keysize_warning): Slightly change the text.
(ask_card_keyattr): Handle special value 25519.
(do_change_keyattr): Allow changing to cv25519/ed25519.
(generate_card_keys): Ditto.
(card_generate_subkey): Ditto.
--
This is kludge to make it easier for gnuk to be switched into ECC
mode.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/card-util.c b/g10/card-util.c
index 9495038..2294df1 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1317,12 +1317,11 @@ show_keysize_warning (void)
return;
shown = 1;
tty_printf
- (_("Note: There is no guarantee that the card "
- "supports the requested size.\n"
- " If the key generation does not succeed, "
- "please check the\n"
- " documentation of your card to see what "
- "sizes are allowed.\n"));
+ (_("Note: There is no guarantee that the card supports the requested\n"
+ " key type or size. If the key generation does not succeed,\n"
+ " please check the documentation of your card to see which\n"
+ " key types and sizes are supported.\n")
+ );
}
@@ -1353,40 +1352,61 @@ ask_card_keyattr (int keyno, unsigned int nbits)
xfree (prompt);
xfree (answer);
- if (req_nbits != nbits && (req_nbits % 32) )
+ if (req_nbits == 25519)
{
- req_nbits = ((req_nbits + 31) / 32) * 32;
- tty_printf (_("rounded up to %u bits\n"), req_nbits);
- }
-
- if (req_nbits == nbits)
- return 0; /* Use default. */
+ if (req_nbits == nbits)
+ return 0; /* Use default. */
- if (req_nbits < min_nbits || req_nbits > max_nbits)
- {
- tty_printf (_("%s keysizes must be in the range %u-%u\n"),
- "RSA", min_nbits, max_nbits);
+ tty_printf (_("The card will now be re-configured"
+ " to generate a key of type: %s\n"),
+ keyno==1? "cv25519":"ed25519");
+ show_keysize_warning ();
+ return req_nbits;
}
else
{
- tty_printf (_("The card will now be re-configured "
- "to generate a key of %u bits\n"), req_nbits);
- show_keysize_warning ();
- return req_nbits;
+ if (req_nbits != nbits && (req_nbits % 32) )
+ {
+ req_nbits = ((req_nbits + 31) / 32) * 32;
+ tty_printf (_("rounded up to %u bits\n"), req_nbits);
+ }
+
+ if (req_nbits == nbits)
+ return 0; /* Use default. */
+
+ if (req_nbits < min_nbits || req_nbits > max_nbits)
+ {
+ tty_printf (_("%s keysizes must be in the range %u-%u\n"),
+ "RSA", min_nbits, max_nbits);
+ }
+ else
+ {
+ tty_printf (_("The card will now be re-configured"
+ " to generate a key of %u bits\n"), req_nbits);
+ show_keysize_warning ();
+ return req_nbits;
+ }
}
}
}
/* Change the size of key KEYNO (0..2) to NBITS and show an error
- message if that fails. */
+ * message if that fails. Using the magic value 25519 for NBITS
+ * switches to ed25519 or cv25519 depending on the KEYNO. */
static gpg_error_t
do_change_keyattr (int keyno, unsigned int nbits)
{
gpg_error_t err;
char args[100];
- snprintf (args, sizeof args, "--force %d 1 rsa%u", keyno+1, nbits);
+ if (nbits == 25519)
+ snprintf (args, sizeof args, "--force %d %d %s",
+ keyno+1,
+ keyno == 1? PUBKEY_ALGO_ECDH : PUBKEY_ALGO_EDDSA,
+ keyno == 1? "cv25519" : "ed25519");
+ else
+ snprintf (args, sizeof args, "--force %d 1 rsa%u", keyno+1, nbits);
err = agent_scd_setattr ("KEY-ATTR", args, strlen (args), NULL);
if (err)
log_error (_("error changing size of key %d to %u bits: %s\n"),
@@ -1460,9 +1480,15 @@ generate_card_keys (ctrl_t ctrl)
for (keyno = 0; keyno < DIM (info.key_attr); keyno++)
{
- if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
+ if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA
+ || info.key_attr[keyno].algo == PUBKEY_ALGO_ECDH
+ || info.key_attr[keyno].algo == PUBKEY_ALGO_EDDSA)
{
- nbits = ask_card_keyattr (keyno, info.key_attr[keyno].nbits);
+ if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
+ nbits = ask_card_keyattr (keyno, info.key_attr[keyno].nbits);
+ else
+ nbits = ask_card_keyattr (keyno, 25519 /* magic */);
+
if (nbits && do_change_keyattr (keyno, nbits))
{
/* Error: Better read the default key size again. */
@@ -1540,12 +1566,18 @@ card_generate_subkey (ctrl_t ctrl, kbnode_t pub_keyblock)
key size. */
if (info.is_v2 && info.extcap.aac)
{
- if (info.key_attr[keyno-1].algo == PUBKEY_ALGO_RSA)
+ if (info.key_attr[keyno-1].algo == PUBKEY_ALGO_RSA
+ || info.key_attr[keyno].algo == PUBKEY_ALGO_ECDH
+ || info.key_attr[keyno].algo == PUBKEY_ALGO_EDDSA)
{
unsigned int nbits;
ask_again:
- nbits = ask_card_keyattr (keyno-1, info.key_attr[keyno-1].nbits);
+ if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
+ nbits = ask_card_keyattr (keyno-1, info.key_attr[keyno-1].nbits);
+ else
+ nbits = ask_card_keyattr (keyno-1, 25519);
+
if (nbits && do_change_keyattr (keyno-1, nbits))
{
/* Error: Better read the default key size again. */
-----------------------------------------------------------------------
Summary of changes:
g10/card-util.c | 90 ++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 63 insertions(+), 27 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list