diff options
| author | Steffan Karger <steffan.karger@fox-it.com> | 2018-01-17 17:06:41 +0100 |
|---|---|---|
| committer | Benjamin Kaduk <kaduk@mit.edu> | 2018-01-24 12:45:36 -0600 |
| commit | 78d0afaa69c2ec662f6c97b47473c2c6a69d636c (patch) | |
| tree | afc63e9991558054b1154feb95dfe108f8cda0e2 /include | |
| parent | e23ac62594e85296cb90f70480d156f73207218e (diff) | |
Fix SSL_CTX_get_{min,max}_proto_version integer conversion warning
When using the SSL_CTX_get_min_min_version macro while compiling with
-Wall, my compiler rightfully complains about this construction:
warning: passing argument 3 of ‘SSL_CTX_ctrl’ makes integer from
pointer without a cast [-Wint-conversion]
These macro's should use 0, instead of NULL, for the third argument,
like most other SSL_CTX_ctrl 'get' wrappers do.
CLA: trivial
Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/5099)
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 cfb069695b..b044015977 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1406,9 +1406,9 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #define SSL_CTX_set_max_proto_version(ctx, version) \ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) #define SSL_CTX_get_min_proto_version(ctx) \ - SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, NULL, NULL) + SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL) #define SSL_CTX_get_max_proto_version(ctx) \ - SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, NULL, NULL) + SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL) #define SSL_set_min_proto_version(s, version) \ SSL_ctrl(s, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) #define SSL_set_max_proto_version(s, version) \ |