security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: New command "openpgp" for --card-edit.

Browse Source 
* g10/card-util.c (current_card_status): Print a hint for fishy
outputs.
(enum cmdids): Add cmdOPENPGP.
(cmds): Add "openpgp".
(card_edit): Implement that command.
--

If a Yubikey has been used in PIV mode the initial listing does not
look correct.  Although we explicitly switch to the OpenPGP app when
needed, we don't want to do this in listing mode.  Instead we offer a
new command "openpgp" to force the openpgp mode.  The ultimate goal
will be to enhance the gpg-card tool to completely take over the
--card-edit features.  But we are not yet there.

GnuPG-bug-id: 6462
This commit is contained in:
Werner Koch 2023-04-20 12:10:54 +02:00
parent 80d4ae1215
commit e1663c0450
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/gpg.texi
View File

@ -399,10 +399,13 @@ this command may change with new releases.
@opindex edit-card @opindex edit-card
@itemx --card-edit @itemx --card-edit
@opindex card-edit @opindex card-edit
Present a menu to work with a smartcard. The subcommand "help" provides Present a menu to work with a smartcard. The subcommand "help"
an overview on available commands. For a detailed description, please provides an overview on available commands. For a detailed
see the Card HOWTO at description, please see the Card HOWTO at
https://gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO . https://gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO . Please
note that the command "openpgp" can be used to switch to the OpenPGP
application of cards which by default are presenting another
application (e.g. PIV).
@item --card-status @item --card-status
@opindex card-status @opindex card-status

16
g10/card-util.c
View File

@ -705,6 +705,14 @@ current_card_status (ctrl_t ctrl, estream_t fp,
} }
else else
tty_fprintf (fp, "[none]\n"); tty_fprintf (fp, "[none]\n");
if (!info.manufacturer_name)
{
tty_fprintf (fp, "\n");
tty_fprintf (fp, _("Please try command \"%s\""
" if the listing does not look correct\n"),
"openpgp");
}
} }
release_kbnode (keyblock); release_kbnode (keyblock);
@ -2243,7 +2251,7 @@ enum cmdids
cmdNAME, cmdURL, cmdFETCH, cmdLOGIN, cmdLANG, cmdSEX, cmdCAFPR, cmdNAME, cmdURL, cmdFETCH, cmdLOGIN, cmdLANG, cmdSEX, cmdCAFPR,
cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO, cmdWRITECERT, cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO, cmdWRITECERT,
cmdREADCERT, cmdUNBLOCK, cmdFACTORYRESET, cmdKDFSETUP, cmdREADCERT, cmdUNBLOCK, cmdFACTORYRESET, cmdKDFSETUP,
cmdKEYATTR, cmdUIF, cmdKEYATTR, cmdUIF, cmdOPENPGP,
cmdINVCMD cmdINVCMD
}; };
@ -2281,6 +2289,7 @@ static struct
N_("setup KDF for PIN authentication (on/single/off)")}, N_("setup KDF for PIN authentication (on/single/off)")},
{ "key-attr", cmdKEYATTR, 1, N_("change the key attribute")}, { "key-attr", cmdKEYATTR, 1, N_("change the key attribute")},
{ "uif", cmdUIF, 1, N_("change the User Interaction Flag")}, { "uif", cmdUIF, 1, N_("change the User Interaction Flag")},
{ "openpgp", cmdOPENPGP, 0, N_("switch to the OpenPGP app")},
/* Note, that we do not announce these command yet. */ /* Note, that we do not announce these command yet. */
{ "privatedo", cmdPRIVATEDO, 0, NULL }, { "privatedo", cmdPRIVATEDO, 0, NULL },
{ "readcert", cmdREADCERT, 0, NULL }, { "readcert", cmdREADCERT, 0, NULL },
@ -2580,6 +2589,11 @@ card_edit (ctrl_t ctrl, strlist_t commands)
uif (arg_number, arg_rest); uif (arg_number, arg_rest);
break; break;
case cmdOPENPGP:
agent_scd_switchapp ("openpgp");
redisplay = 1;
break;
case cmdQUIT: case cmdQUIT:
goto leave; goto leave;