diff options
| author | Werner Koch <wk@gnupg.org> | 2003-09-06 15:23:48 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2003-09-06 15:23:48 +0200 |
| commit | be034cf34c3c5bc7787d9b2f8d4c7b6b948d4e2f (patch) | |
| tree | a35573c9fe82e0b9e5ce804b344a984f901e17ea /g10/misc.c | |
| parent | * ccid-driver.c: More work, data can now actually be retrieved. (diff) | |
| download | gnupg2-be034cf34c3c5bc7787d9b2f8d4c7b6b948d4e2f.tar.xz gnupg2-be034cf34c3c5bc7787d9b2f8d4c7b6b948d4e2f.zip | |
* configure.ac: Required newer versions of some libraries.V1-9-1
* misc.c (openpgp_pk_algo_usage): Allow AUTH where SIGN is allowed.
* keygen.c (ask_passphrase): No need to allocated S2K in secure
memory.
* scdaemon.c (main): --pcsc-driver again defaults to pcsclite.
David Corcoran was so kind to remove the GPL incompatible
advertisng clause from pcsclite.
* apdu.c (apdu_open_reader): Actually make pcsc-driver option work.
Diffstat (limited to 'g10/misc.c')
| -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 ad04ce76f..4abe75661 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -260,7 +260,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; @@ -272,10 +272,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; |