Skip to content

Fix signature of min/max proto getter#5126

Closed
tiran wants to merge 1 commit intoopenssl:masterfrom
tiran:min_proto_fix
Closed

Fix signature of min/max proto getter#5126
tiran wants to merge 1 commit intoopenssl:masterfrom
tiran:min_proto_fix

Conversation

@tiran
Copy link
Contributor

@tiran tiran commented Jan 21, 2018

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 #4364

Signed-off-by: Christian Heimes christian@python.org

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 openssl#4364

Signed-off-by: Christian Heimes <christian@python.org>
@tiran
Copy link
Contributor Author

tiran commented Jan 21, 2018

I'm sorry, I just realized that I messed up my original PR.

@kroeckx
Copy link
Member

kroeckx commented Jan 21, 2018

This is a duplicate of #5099, but it didn't change the SSL_get_* functions, only the SSL_CTX_get_*

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.

I propose for the committer to rebase this on top of #5099 so as to preserve credit.

@kaduk
Copy link
Contributor

kaduk commented Jan 24, 2018

merged (with the wrong ticket in the commit message link, sigh) to master (1f82eba) and 1.1.0 (77882a9); thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants