diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-03-20 20:09:08 +0000 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-03-20 20:09:08 +0000 |
commit | d9784128d573baed950d9b0c6aef1c864c33b4b4 (patch) | |
tree | b23302aae523021bff7ae34c845fd74f0298ec86 | |
parent | 24c83d149054570a727c6229adc611c9e9cf1064 (diff) |
Future-proof OpenSSL version string. Bug 1421
-rw-r--r-- | src/src/tls-openssl.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index a9adb6134..a64f85dea 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -1137,37 +1137,9 @@ construct_cipher_name(SSL *ssl, uschar *cipherbuf, int bsize, int *bits) yet reflect that. It should be a safe change anyway, even 0.9.8 versions have the accessor functions use const in the prototype. */ const SSL_CIPHER *c; -uschar *ver; +const uschar *ver; -switch (ssl->session->ssl_version) - { - case SSL2_VERSION: - ver = US"SSLv2"; - break; - - case SSL3_VERSION: - ver = US"SSLv3"; - break; - - case TLS1_VERSION: - ver = US"TLSv1"; - break; - -#ifdef TLS1_1_VERSION - case TLS1_1_VERSION: - ver = US"TLSv1.1"; - break; -#endif - -#ifdef TLS1_2_VERSION - case TLS1_2_VERSION: - ver = US"TLSv1.2"; - break; -#endif - - default: - ver = US"UNKNOWN"; - } +ver = (const uschar *)SSL_get_version(ssl); c = (const SSL_CIPHER *) SSL_get_current_cipher(ssl); SSL_CIPHER_get_bits(c, bits); |