diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-11-14 09:52:32 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-11-14 09:52:32 +0100 |
commit | b28828796ad6d65ac463b41bba153f74e4531a6b (patch) | |
tree | 154b9f7436ae575e324f3374a5145e451bf649a8 /main/openssl/ssl/s23_lib.c | |
parent | e7a6c1a987ebee1ddb2f908ca028d613a5c52490 (diff) |
Update OpenSSL version
Diffstat (limited to 'main/openssl/ssl/s23_lib.c')
-rw-r--r-- | main/openssl/ssl/s23_lib.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/openssl/ssl/s23_lib.c b/main/openssl/ssl/s23_lib.c index 3bf72831..f3c29d1d 100644 --- a/main/openssl/ssl/s23_lib.c +++ b/main/openssl/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; |