mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Add dummu option --passwd for gpg.
Collected changes.
This commit is contained in:
parent
5f4595a529
commit
be45bf3d54
26 changed files with 248 additions and 71 deletions
|
@ -2909,7 +2909,7 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
|
|||
if (aodf->pinflags.integrity_protected
|
||||
|| aodf->pinflags.confidentiality_protected)
|
||||
{
|
||||
log_error ("PIN verification requires unsupported protecion method\n");
|
||||
log_error ("PIN verification requires unsupported protection method\n");
|
||||
return gpg_error (GPG_ERR_BAD_PIN_METHOD);
|
||||
}
|
||||
if (!aodf->stored_length && aodf->pinflags.needs_padding)
|
||||
|
|
|
@ -845,11 +845,11 @@ parse_ccid_descriptor (ccid_driver_t handle,
|
|||
if ((us & 0x0020))
|
||||
DEBUGOUT (" Auto baud rate change\n");
|
||||
if ((us & 0x0040))
|
||||
DEBUGOUT (" Auto parameter negotation made by CCID\n");
|
||||
DEBUGOUT (" Auto parameter negotiation made by CCID\n");
|
||||
else if ((us & 0x0080))
|
||||
DEBUGOUT (" Auto PPS made by CCID\n");
|
||||
else if ((us & (0x0040 | 0x0080)))
|
||||
DEBUGOUT (" WARNING: conflicting negotation features\n");
|
||||
DEBUGOUT (" WARNING: conflicting negotiation features\n");
|
||||
|
||||
if ((us & 0x0100))
|
||||
DEBUGOUT (" CCID can set ICC in clock stop mode\n");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue