diff options
Diffstat (limited to 'src/lib/libssl/s23_lib.c')
| -rw-r--r-- | src/lib/libssl/s23_lib.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c index 3a4d5a6ecb..74afe01d94 100644 --- a/src/lib/libssl/s23_lib.c +++ b/src/lib/libssl/s23_lib.c | |||
| @@ -69,11 +69,7 @@ ssl23_default_timeout(void) | |||
| 69 | int | 69 | int |
| 70 | ssl23_num_ciphers(void) | 70 | ssl23_num_ciphers(void) |
| 71 | { | 71 | { |
| 72 | return(ssl3_num_ciphers() | 72 | return(ssl3_num_ciphers()); |
| 73 | #ifndef OPENSSL_NO_SSL2 | ||
| 74 | + ssl2_num_ciphers() | ||
| 75 | #endif | ||
| 76 | ); | ||
| 77 | } | 73 | } |
| 78 | 74 | ||
| 79 | const SSL_CIPHER | 75 | const SSL_CIPHER |
| @@ -84,11 +80,7 @@ const SSL_CIPHER | |||
| 84 | if (u < uu) | 80 | if (u < uu) |
| 85 | return (ssl3_get_cipher(u)); | 81 | return (ssl3_get_cipher(u)); |
| 86 | else | 82 | else |
| 87 | #ifndef OPENSSL_NO_SSL2 | 83 | return (NULL); |
| 88 | return (ssl2_get_cipher(u - uu)); | ||
| 89 | #else | ||
| 90 | return (NULL); | ||
| 91 | #endif | ||
| 92 | } | 84 | } |
| 93 | 85 | ||
| 94 | /* This function needs to check if the ciphers required are actually | 86 | /* This function needs to check if the ciphers required are actually |
| @@ -99,10 +91,6 @@ const SSL_CIPHER | |||
| 99 | const SSL_CIPHER *cp; | 91 | const SSL_CIPHER *cp; |
| 100 | 92 | ||
| 101 | cp = ssl3_get_cipher_by_char(p); | 93 | cp = ssl3_get_cipher_by_char(p); |
| 102 | #ifndef OPENSSL_NO_SSL2 | ||
| 103 | if (cp == NULL) | ||
| 104 | cp = ssl2_get_cipher_by_char(p); | ||
| 105 | #endif | ||
| 106 | return (cp); | 94 | return (cp); |
| 107 | } | 95 | } |
| 108 | 96 | ||
