Skip to content

Conversation

@Lukasa
Copy link
Member

@Lukasa Lukasa commented Mar 28, 2014

Next Protocol Negotiation was added in OpenSSL 1.0.1. This pull request would expose the necessary functions for use in pyca/pyopenssl#79.

I've had some testing 'fun' with this, probably because I've got no experience with CFFI or with OpenSSL. I'm opening this PR to see whether your CI infrastructure likes it or not. If it doesn't, I'll try to chase down why.

@jenkins-cryptography
Copy link

Can one of the admins verify this patch?

@public
Copy link
Member

public commented Mar 28, 2014

I wonder if this works for me...

@public
Copy link
Member

public commented Mar 28, 2014

ok to test

Copy link
Member

Choose a reason for hiding this comment

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

Can you remove the names (ssl, out, outlen etc) from these too please?

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you just want them removed from the arguments to the function pointer, or from all the arguments to the function?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed by c731023.

@public
Copy link
Member

public commented Mar 28, 2014

Doesn't look like it :(

@Lukasa
Copy link
Member Author

Lukasa commented Mar 28, 2014

Looks to be building to me. =)

@public
Copy link
Member

public commented Mar 28, 2014

Not on Jenkins :( https://jenkins.cryptography.io/

@Lukasa
Copy link
Member Author

Lukasa commented Mar 28, 2014

=( That's OK, there's gotta be at least one more round of fixes, OpenSSL 0.9.8 doesn't like this at all.

Copy link
Member

Choose a reason for hiding this comment

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

You didn't fully functionpointerise this one :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Aha, good spot, thankyou! =)

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed by b5db2da.

@Lukasa
Copy link
Member Author

Lukasa commented Mar 28, 2014

For obvious reasons I'll squash all of these commits down when the build finishes.

@reaperhulk reaperhulk added this to the Fourth Release milestone Mar 28, 2014
@reaperhulk
Copy link
Member

ok to test

@jenkins-cryptography
Copy link

Test PASSed.
Refer to this link for build results: https://jenkins.cryptography.io/job/cryptography-pr-experimental/1276/

Copy link
Member

Choose a reason for hiding this comment

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

Nitpick, but the space between (*) and (SSL *, should be removed (and the alignment adjusted on the subsequent lines).

@reaperhulk
Copy link
Member

Other than my tiny style nits this looks good. Unfortunately sphinx_rtd_theme is failing to install inside tox with the latest update, so the docs job is failing even though this PR doesn't touch the docs.

@Lukasa
Copy link
Member Author

Lukasa commented Mar 28, 2014

@reaperhunk Those nits fixed in 9341ddc.

@reaperhulk
Copy link
Member

Thanks @Lukasa as soon as tests pass I'll merge.

@jenkins-cryptography
Copy link

Test PASSed.
Refer to this link for build results: https://jenkins.cryptography.io/job/cryptography-pr-experimental/1278/

reaperhulk added a commit that referenced this pull request Mar 28, 2014
Add Next Protocol Negotiation functions for OpenSSL
@reaperhulk reaperhulk merged commit a32dfde into pyca:master Mar 28, 2014
@Lukasa Lukasa mentioned this pull request Apr 19, 2014
@Lukasa Lukasa mentioned this pull request Jun 7, 2014
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 13, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants