[exim-cvs] Future-proof OpenSSL version string. Bug 1421

Gitweb: http://git.exim.org/exim.git/commitdiff/d9784128d573baed950d9b0c6aef1c864c33b4b4

Commit:     d9784128d573baed950d9b0c6aef1c864c33b4b4
Parent:     24c83d149054570a727c6229adc611c9e9cf1064
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Mar 20 20:09:08 2014 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Mar 20 20:09:08 2014 +0000

    Future-proof OpenSSL version string.  Bug 1421
---
 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 a9adb61..a64f85d 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);