Skip to content

[3.6] bpo-30622: Change NPN detection: (GH-2079) #3314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2017

Conversation

tiran
Copy link
Member

@tiran tiran commented Sep 4, 2017

  • Change NPN detection:

Version breakdown, support disabled (pre-patch/post-patch):

  • pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False
  • 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will not be defined ->
    False/False
  • 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and
    OPENSSL_NO_NEXTPROTONEG will be defined -> True/False

Version breakdown support enabled (pre-patch/post-patch):

  • pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False
  • 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will be defined and
    OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True
  • 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and
    OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True
  • Refine NPN guard:
  • If NPN is disabled, but ALPN is available we need our callback
  • Make clinic's ssl behave the same way

This created a working ssl module for me, with NPN disabled and ALPN
enabled for OpenSSL 1.1.0f.

Concerns to address:
The initial commit for NPN support into OpenSSL [1], had the
OPENSSL_NPN_* variables defined inside the OPENSSL_NO_NEXTPROTONEG
guard. The question is if that ever made it into a release.
This would need an ugly hack, something like:

GH-if defined(OPENSSL_NO_NEXTPROTONEG) && \
	!defined(OPENSSL_NPN_NEGOTIATED)
GH-	define OPENSSL_NPN_UNSUPPORTED 0
GH-	define OPENSSL_NPN_NEGOTIATED 1
GH-	define OPENSSL_NPN_NO_OVERLAP 2
GH-endif

[1] openssl/openssl@68b33cc5c7
(cherry picked from commit b2d096b)

https://bugs.python.org/issue30622

@Mariatta
Copy link
Member

Mariatta commented Sep 4, 2017

adding skip news here is fine :) If you're so inclined, you can prepare another PR with the news item.

* Change NPN detection:

Version breakdown, support disabled (pre-patch/post-patch):
- pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False
- 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will not be defined ->
False/False
- 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and
OPENSSL_NO_NEXTPROTONEG will be defined -> True/False

Version breakdown support enabled (pre-patch/post-patch):
- pre-1.0.1: OPENSSL_NPN_NEGOTIATED will not be defined -> False/False
- 1.0.1 and 1.0.2: OPENSSL_NPN_NEGOTIATED will be defined and
OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True
- 1.1.0+: OPENSSL_NPN_NEGOTIATED will be defined and
OPENSSL_NO_NEXTPROTONEG will not be defined -> True/True

* Refine NPN guard:

- If NPN is disabled, but ALPN is available we need our callback
- Make clinic's ssl behave the same way

This created a working ssl module for me, with NPN disabled and ALPN
enabled for OpenSSL 1.1.0f.

Concerns to address:
The initial commit for NPN support into OpenSSL [1], had the
OPENSSL_NPN_* variables defined inside the OPENSSL_NO_NEXTPROTONEG
guard. The question is if that ever made it into a release.
This would need an ugly hack, something like:

	GH-if defined(OPENSSL_NO_NEXTPROTONEG) && \
		!defined(OPENSSL_NPN_NEGOTIATED)
	GH-	define OPENSSL_NPN_UNSUPPORTED 0
	GH-	define OPENSSL_NPN_NEGOTIATED 1
	GH-	define OPENSSL_NPN_NO_OVERLAP 2
	GH-endif

[1] openssl/openssl@68b33cc5c7
(cherry picked from commit b2d096b)
@tiran tiran force-pushed the backport-b2d096b-3.6 branch from 5031bef to b8e8ac0 Compare September 4, 2017 22:02
@tiran tiran merged commit 7316c6d into python:3.6 Sep 5, 2017
@tiran tiran deleted the backport-b2d096b-3.6 branch September 5, 2017 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants