Skip to content

Fix SSL_CTX_get_{min,max}_proto_version integer conversion warning#5099

Closed
syzzer wants to merge 1 commit intoopenssl:masterfrom
syzzer:fix-get_proto_version
Closed

Fix SSL_CTX_get_{min,max}_proto_version integer conversion warning#5099
syzzer wants to merge 1 commit intoopenssl:masterfrom
syzzer:fix-get_proto_version

Conversation

@syzzer
Copy link
Contributor

@syzzer syzzer commented Jan 17, 2018

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.

Signed-off-by: Steffan Karger steffan.karger@fox-it.com

I consider this to be a 'trivial' contribution, but am willing to sign a CLA if needed.

@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Jan 17, 2018
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>
@syzzer syzzer force-pushed the fix-get_proto_version branch from 4e44e88 to 61e1996 Compare January 17, 2018 16:06
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Jan 17, 2018
Copy link
Contributor

@kaduk kaduk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formality: I agree this is trivial.

(@syzzer if you put the literal text "CLA: trivial" on a line by itself in the body of the commit message, usually at at the end of it, that will appease the cla-bot check. But your current note should be enough for this time.)

@kroeckx kroeckx added branch: master Applies to master branch 1.1.0 approval: done This pull request has the required number of approvals labels Jan 17, 2018
@mattcaswell mattcaswell added this to the 1.1.1 milestone Jan 24, 2018
Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree this is trivial. @kaduk - will you merge?

@kaduk
Copy link
Contributor

kaduk commented Jan 24, 2018

I will merge, but see also my comment on #5126.

levitte pushed a commit that referenced this pull request Jan 24, 2018
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 #5099)
levitte pushed a commit that referenced this pull request Jan 24, 2018
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 #5099)

(cherry picked from commit 78d0afa)
@kaduk
Copy link
Contributor

kaduk commented Jan 24, 2018

Pushed to master (78d0afa) and 1.1.0 (b52566f), thanks!
Closing...

@kaduk kaduk closed this Jan 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: done This pull request has the required number of approvals branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants