summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 72492a3332..9aa72a9c4e 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -151,9 +151,7 @@
151#include <stdio.h> 151#include <stdio.h>
152#include <openssl/objects.h> 152#include <openssl/objects.h>
153#include "ssl_locl.h" 153#include "ssl_locl.h"
154#ifndef OPENSSL_NO_EC
155#include "../crypto/ec/ec_lcl.h" 154#include "../crypto/ec/ec_lcl.h"
156#endif /* OPENSSL_NO_EC */
157#include <openssl/md5.h> 155#include <openssl/md5.h>
158#include <openssl/dh.h> 156#include <openssl/dh.h>
159 157
@@ -2381,9 +2379,7 @@ ssl3_clear(SSL *s)
2381 EC_KEY_free(s->s3->tmp.ecdh); 2379 EC_KEY_free(s->s3->tmp.ecdh);
2382 s->s3->tmp.ecdh = NULL; 2380 s->s3->tmp.ecdh = NULL;
2383 } 2381 }
2384#ifndef OPENSSL_NO_EC
2385 s->s3->is_probably_safari = 0; 2382 s->s3->is_probably_safari = 0;
2386#endif /* !OPENSSL_NO_EC */
2387 2383
2388 rp = s->s3->rbuf.buf; 2384 rp = s->s3->rbuf.buf;
2389 wp = s->s3->wbuf.buf; 2385 wp = s->s3->wbuf.buf;
@@ -3031,7 +3027,6 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
3031 ok = (alg_k & mask_k) && (alg_a & mask_a); 3027 ok = (alg_k & mask_k) && (alg_a & mask_a);
3032 } 3028 }
3033 3029
3034#ifndef OPENSSL_NO_EC
3035 if ( 3030 if (
3036 /* 3031 /*
3037 * if we are considering an ECC cipher suite that uses our 3032 * if we are considering an ECC cipher suite that uses our
@@ -3167,7 +3162,6 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
3167 } 3162 }
3168 ok = ok && ec_ok; 3163 ok = ok && ec_ok;
3169 } 3164 }
3170#endif /* OPENSSL_NO_EC */
3171 3165
3172 if (!ok) 3166 if (!ok)
3173 continue; 3167 continue;