mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* certlist.c (gpgsm_add_to_certlist): Fixed locating of a
certificate with the required key usage. * gpgsm.c (main): Fixed a segv when using --outfile without an argument. * keylist.c (print_capabilities): Also check for non-repudiation and data encipherment. * certlist.c (cert_usage_p): Test for signing and encryption was swapped. Add a case for certification usage, handle non-repudiation and data encipherment. (gpgsm_cert_use_cert_p): New. (gpgsm_add_to_certlist): Added a CTRL argument and changed all callers to pass it. * certpath.c (gpgsm_validate_path): Use it here to print a status message. Added a CTRL argument and changed all callers to pass it. * decrypt.c (gpgsm_decrypt): Print a status message for wrong key usage. * verify.c (gpgsm_verify): Ditto. * keydb.c (classify_user_id): Allow a colon delimited fingerprint.
This commit is contained in:
parent
52146943d1
commit
42cf865350
12 changed files with 176 additions and 36 deletions
|
@ -84,15 +84,15 @@ print_capabilities (KsbaCert cert, FILE *fp)
|
|||
return;
|
||||
}
|
||||
|
||||
if ((use & KSBA_KEYUSAGE_KEY_ENCIPHERMENT))
|
||||
if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
|
||||
putc ('e', fp);
|
||||
if ((use & KSBA_KEYUSAGE_DIGITAL_SIGNATURE))
|
||||
if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
|
||||
putc ('s', fp);
|
||||
if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
|
||||
putc ('c', fp);
|
||||
if ((use & KSBA_KEYUSAGE_KEY_ENCIPHERMENT))
|
||||
if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
|
||||
putc ('E', fp);
|
||||
if ((use & KSBA_KEYUSAGE_DIGITAL_SIGNATURE))
|
||||
if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
|
||||
putc ('S', fp);
|
||||
if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
|
||||
putc ('C', fp);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue