diff options
| author | Werner Koch <[email protected]> | 2003-10-21 18:22:21 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-10-21 18:22:21 +0000 |
| commit | 441aeb85f21436b1ae2ecd1de420138016baba57 (patch) | |
| tree | fc1c2ed359f38e7700ef53c0872117f571712d4b /g10/misc.c | |
| parent | * configure.ac: Include -ldl when card support is used. (diff) | |
| download | gnupg-441aeb85f21436b1ae2ecd1de420138016baba57.tar.gz gnupg-441aeb85f21436b1ae2ecd1de420138016baba57.zip | |
* passphrase.c (ask_passphrase): Add optional promptid arg.
Changed all callers.
* cardglue.c (pin_cb): Use it here, so the machine interface can
tell whether the Admin PIN is requested.
* cardglue.c (agent_scd_checkpin): New.
* misc.c (openpgp_pk_algo_usage): Added AUTH usage.
* app-openpgp.c (check_against_given_fingerprint): New. Factored
out that code elsewhere.
(do_check_pin): New.
* card-util.c (card_edit): New command "passwd". Add logic to
check the PIN in advance.
(card_status): Add new args to return the serial number. Changed
all callers.
Diffstat (limited to '')
| -rw-r--r-- | g10/misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/misc.c b/g10/misc.c index 01a38a4f3..727c49920 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -258,7 +258,7 @@ openpgp_pk_algo_usage ( int algo ) /* they are hardwired in gpg 1.0 */ switch ( algo ) { case PUBKEY_ALGO_RSA: - use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC; + use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC | PUBKEY_USAGE_AUTH; break; case PUBKEY_ALGO_RSA_E: use = PUBKEY_USAGE_ENC; @@ -270,10 +270,10 @@ openpgp_pk_algo_usage ( int algo ) use = PUBKEY_USAGE_ENC; break; case PUBKEY_ALGO_DSA: - use = PUBKEY_USAGE_SIG; + use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH; break; case PUBKEY_ALGO_ELGAMAL: - use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC; + use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC | PUBKEY_USAGE_AUTH; break; default: break; |