diff options
| -rw-r--r-- | src/lib/libssl/s23_clnt.c | 17 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/s23_clnt.c | 17 |
2 files changed, 2 insertions, 32 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index a7b262229f..196ef1dfad 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c | |||
| @@ -250,21 +250,6 @@ end: | |||
| 250 | return (ret); | 250 | return (ret); |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | static int | ||
| 254 | ssl23_no_ssl2_ciphers(SSL *s) | ||
| 255 | { | ||
| 256 | SSL_CIPHER *cipher; | ||
| 257 | STACK_OF(SSL_CIPHER) *ciphers; | ||
| 258 | int i; | ||
| 259 | ciphers = SSL_get_ciphers(s); | ||
| 260 | for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { | ||
| 261 | cipher = sk_SSL_CIPHER_value(ciphers, i); | ||
| 262 | if (cipher->algorithm_ssl == SSL_SSLV2) | ||
| 263 | return 0; | ||
| 264 | } | ||
| 265 | return 1; | ||
| 266 | } | ||
| 267 | |||
| 268 | /* | 253 | /* |
| 269 | * Fill a ClientRandom or ServerRandom field of length len. Returns <= 0 | 254 | * Fill a ClientRandom or ServerRandom field of length len. Returns <= 0 |
| 270 | * on failure, 1 on success. | 255 | * on failure, 1 on success. |
| @@ -294,7 +279,7 @@ ssl23_client_hello(SSL *s) | |||
| 294 | { | 279 | { |
| 295 | unsigned char *buf; | 280 | unsigned char *buf; |
| 296 | unsigned char *p, *d; | 281 | unsigned char *p, *d; |
| 297 | int i, ch_len; | 282 | int i; |
| 298 | unsigned long l; | 283 | unsigned long l; |
| 299 | int version = 0, version_major, version_minor; | 284 | int version = 0, version_major, version_minor; |
| 300 | #ifndef OPENSSL_NO_COMP | 285 | #ifndef OPENSSL_NO_COMP |
diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c index a7b262229f..196ef1dfad 100644 --- a/src/lib/libssl/src/ssl/s23_clnt.c +++ b/src/lib/libssl/src/ssl/s23_clnt.c | |||
| @@ -250,21 +250,6 @@ end: | |||
| 250 | return (ret); | 250 | return (ret); |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | static int | ||
| 254 | ssl23_no_ssl2_ciphers(SSL *s) | ||
| 255 | { | ||
| 256 | SSL_CIPHER *cipher; | ||
| 257 | STACK_OF(SSL_CIPHER) *ciphers; | ||
| 258 | int i; | ||
| 259 | ciphers = SSL_get_ciphers(s); | ||
| 260 | for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { | ||
| 261 | cipher = sk_SSL_CIPHER_value(ciphers, i); | ||
| 262 | if (cipher->algorithm_ssl == SSL_SSLV2) | ||
| 263 | return 0; | ||
| 264 | } | ||
| 265 | return 1; | ||
| 266 | } | ||
| 267 | |||
| 268 | /* | 253 | /* |
| 269 | * Fill a ClientRandom or ServerRandom field of length len. Returns <= 0 | 254 | * Fill a ClientRandom or ServerRandom field of length len. Returns <= 0 |
| 270 | * on failure, 1 on success. | 255 | * on failure, 1 on success. |
| @@ -294,7 +279,7 @@ ssl23_client_hello(SSL *s) | |||
| 294 | { | 279 | { |
| 295 | unsigned char *buf; | 280 | unsigned char *buf; |
| 296 | unsigned char *p, *d; | 281 | unsigned char *p, *d; |
| 297 | int i, ch_len; | 282 | int i; |
| 298 | unsigned long l; | 283 | unsigned long l; |
| 299 | int version = 0, version_major, version_minor; | 284 | int version = 0, version_major, version_minor; |
| 300 | #ifndef OPENSSL_NO_COMP | 285 | #ifndef OPENSSL_NO_COMP |
