diff options
Diffstat (limited to 'src/lib/libssl/s23_lib.c')
-rw-r--r-- | src/lib/libssl/s23_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c index ad2d8dadf7..b70002a647 100644 --- a/src/lib/libssl/s23_lib.c +++ b/src/lib/libssl/s23_lib.c | |||
@@ -111,7 +111,7 @@ SSL_METHOD *sslv23_base_method(void) | |||
111 | static int ssl23_num_ciphers(void) | 111 | static int ssl23_num_ciphers(void) |
112 | { | 112 | { |
113 | return(ssl3_num_ciphers() | 113 | return(ssl3_num_ciphers() |
114 | #ifndef NO_SSL2 | 114 | #ifndef OPENSSL_NO_SSL2 |
115 | + ssl2_num_ciphers() | 115 | + ssl2_num_ciphers() |
116 | #endif | 116 | #endif |
117 | ); | 117 | ); |
@@ -124,7 +124,7 @@ static SSL_CIPHER *ssl23_get_cipher(unsigned int u) | |||
124 | if (u < uu) | 124 | if (u < uu) |
125 | return(ssl3_get_cipher(u)); | 125 | return(ssl3_get_cipher(u)); |
126 | else | 126 | else |
127 | #ifndef NO_SSL2 | 127 | #ifndef OPENSSL_NO_SSL2 |
128 | return(ssl2_get_cipher(u-uu)); | 128 | return(ssl2_get_cipher(u-uu)); |
129 | #else | 129 | #else |
130 | return(NULL); | 130 | return(NULL); |
@@ -144,7 +144,7 @@ static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p) | |||
144 | ((unsigned long)p[1]<<8L)|(unsigned long)p[2]; | 144 | ((unsigned long)p[1]<<8L)|(unsigned long)p[2]; |
145 | c.id=id; | 145 | c.id=id; |
146 | cp=ssl3_get_cipher_by_char(p); | 146 | cp=ssl3_get_cipher_by_char(p); |
147 | #ifndef NO_SSL2 | 147 | #ifndef OPENSSL_NO_SSL2 |
148 | if (cp == NULL) | 148 | if (cp == NULL) |
149 | cp=ssl2_get_cipher_by_char(p); | 149 | cp=ssl2_get_cipher_by_char(p); |
150 | #endif | 150 | #endif |