diff options
| author | NIIBE Yutaka <[email protected]> | 2015-05-19 01:32:07 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2015-05-19 01:43:33 +0000 |
| commit | 80b6d614b7b53058da11ae239e8f1c69f167a200 (patch) | |
| tree | 34d72549dab74c8eb2fa3643c0bcaeb0aa1cdb36 | |
| parent | g10: Improve handling of no corresponding public key. (diff) | |
| download | gnupg-80b6d614b7b53058da11ae239e8f1c69f167a200.tar.gz gnupg-80b6d614b7b53058da11ae239e8f1c69f167a200.zip | |
g10: detects public key encryption packet error properly.
g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
encryption.
--
(backport from 2.1 commit c771963140cad7c1c25349bcde27e427effc0058)
| -rw-r--r-- | g10/mainproc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index be4c73dac..17d40def9 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -387,9 +387,9 @@ proc_pubkey_enc( CTX c, PACKET *pkt ) xfree(c->dek); c->dek = NULL; } } - else if( is_ELGAMAL(enc->pubkey_algo) - || enc->pubkey_algo == PUBKEY_ALGO_DSA - || is_RSA(enc->pubkey_algo) + else if( enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E + || enc->pubkey_algo == PUBKEY_ALGO_RSA + || enc->pubkey_algo == PUBKEY_ALGO_RSA_E || enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL) { /* Note that we also allow type 20 Elgamal keys for decryption. There are still a couple of those keys in active use as a |