diff options
| author | Tomas Mraz <tmraz@redhat.com> | 2014-06-27 16:49:22 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 16:52:00 +0100 |
| commit | f4623ab996b06307995e851924ff6004d7bb8baa (patch) | |
| tree | 87cfe8db4b197c1c30aff1bf26ae8848d1925657 /ssl | |
| parent | 6ef350952ce99ed8877fe47606f2fa067ba30786 (diff) | |
Don't advertise ECC ciphersuits in SSLv2 compatible client hello.
PR#3374
(cherry picked from commit 0436369fccd128cb7f6a8538d5fed1c876c437af)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s23_lib.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index 3bf728318a..f3c29d1dde 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c @@ -107,6 +107,13 @@ int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p) long l; /* We can write SSLv2 and SSLv3 ciphers */ + /* but no ECC ciphers */ + if (c->algorithm_mkey == SSL_kECDHr || + c->algorithm_mkey == SSL_kECDHe || + c->algorithm_mkey == SSL_kEECDH || + c->algorithm_auth == SSL_aECDH || + c->algorithm_auth == SSL_aECDSA) + return 0; if (p != NULL) { l=c->id; |