diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-12-15 16:22:58 +0100 |
| commit | 18fef7c99aa36b3e5622b3865f36d78d0879e92d (patch) | |
| tree | 7a04fc87318d5008bbc1f1ac145ebb505bb5238c /app/openssl/ssl/s23_lib.c | |
| parent | 56fe0400b8983ce57112ed5a0f993985a87741c0 (diff) | |
| parent | 33c5958a18599267820f73b151d8161d83f93d88 (diff) | |
Merge branch 'research/Test-on-Android-5-#6543' into develop
Diffstat (limited to 'app/openssl/ssl/s23_lib.c')
| -rw-r--r-- | app/openssl/ssl/s23_lib.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/openssl/ssl/s23_lib.c b/app/openssl/ssl/s23_lib.c index 3bf72831..f3c29d1d 100644 --- a/app/openssl/ssl/s23_lib.c +++ b/app/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; |