diff options
| author | Phil Pennock <pdp@exim.org> | 2010-07-11 00:19:56 -0700 |
|---|---|---|
| committer | Phil Pennock <pdp@spodhuis.org> | 2010-09-05 18:49:34 -0400 |
| commit | 57b3a7f5217369edd800f6d57abbd67ea12e9bbe (patch) | |
| tree | a53ca2fc221095313af980e7ce1ea9f66e3fc844 | |
| parent | 2daddfb8bf41421c78cbc9bf5cf5a24acc4b0ff8 (diff) | |
OpenSSL 1.0.0 const fix for SSL_get_current_cipher
OpenSSL 1.0.0 changes SSL_get_current_cipher()'s return value to include
const. It looks like a safe change for older OpenSSL, so treat it
appropriately and cast as needed.
| -rw-r--r-- | src/src/tls-openssl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index 3ea55f238..b6a8dcb8c 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -438,7 +438,10 @@ static void construct_cipher_name(SSL *ssl) { static uschar cipherbuf[256]; -SSL_CIPHER *c; +/* With OpenSSL 1.0.0a, this needs to be const but the documentation doesn't +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; int bits; @@ -460,7 +463,7 @@ switch (ssl->session->ssl_version) ver = US"UNKNOWN"; } -c = SSL_get_current_cipher(ssl); +c = (const SSL_CIPHER *) SSL_get_current_cipher(ssl); SSL_CIPHER_get_bits(c, &bits); string_format(cipherbuf, sizeof(cipherbuf), "%s:%s:%u", ver, |