diff options
| author | Christian Heimes <christian@python.org> | 2018-01-21 10:37:59 +0100 |
|---|---|---|
| committer | Benjamin Kaduk <kaduk@mit.edu> | 2018-01-24 12:59:39 -0600 |
| commit | 1f82eba718f758757a439e717ea7a5aa8be55f8d (patch) | |
| tree | c837befe62b19bca9a0baa99918f1f8fc8d8e6c6 /include | |
| parent | 78d0afaa69c2ec662f6c97b47473c2c6a69d636c (diff) | |
Fix signature of min/max proto getter
The getters for min and max proto version wrongly passed NULL instead of
0 as third argument to SSL_ctrl() and SSL_CTX_ctrl(). The third argument
is not used, but the error results in a compiler warning:
warning: passing argument 3 of ‘SSL_CTX_ctrl’ makes integer from pointer without a cast [-Wint-conversion]
int v = SSL_CTX_get_max_proto_version(self->ctx);
See https://github.com/openssl/openssl/pull/4364
Signed-off-by: Christian Heimes <christian@python.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/5128)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index b044015977..97d2e46248 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1414,9 +1414,9 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #define SSL_set_max_proto_version(s, version) \ SSL_ctrl(s, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) #define SSL_get_min_proto_version(s) \ - SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, NULL, NULL) + SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL) #define SSL_get_max_proto_version(s) \ - SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, NULL, NULL) + SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL) #if OPENSSL_API_COMPAT < 0x10100000L /* Provide some compatibility macros for removed functionality. */ |