Fix NPN guard for OpenSSL 1.1

[melvyn-sopacua]

BPO	30622
Nosy	@tiran, @ned-deily, @melvyn-sopacua
PRs	bpo-30622: Change NPN detection: #2079 [3.6] bpo-30622: Change NPN detection: (GH-2079) #3314 [2.7] bpo-30622: Change NPN detection: (GH-2079) #3316 [2.7] bpo-30622: Change NPN detection: (GH-2079) #5341 bpo-30622: Change NPN detection #5343 bpo-30622: Improve NPN support detection #5859 [3.7] bpo-30622: Improve NPN support detection (GH-5859) #5860 [3.6] bpo-30622: Improve NPN support detection (GH-5859) #5861 [2.7] bpo-30622: Improve NPN support detection (GH-5859) #5863 bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 #5876 [3.7] bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 (GH-5876) #5880 [3.6] bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 (GH-5876) #5881 [2.7] bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 (GH-5876) #5882 bpo-30622: Fix backport of NPN fix #6102

^{Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.}

Show more details

GitHub fields:

assignee = 'https://github.com/tiran'
closed_at = <Date 2017-09-05.14:06:39.186>
created_at = <Date 2017-06-10.15:08:14.661>
labels = ['expert-SSL', 'build', '3.7']
title = 'Fix NPN guard for OpenSSL 1.1'
updated_at = <Date 2018-03-28.18:27:17.332>
user = 'https://github.com/melvyn-sopacua'

bugs.python.org fields:

activity = <Date 2018-03-28.18:27:17.332>
actor = 'ned.deily'
assignee = 'christian.heimes'
closed = True
closed_date = <Date 2017-09-05.14:06:39.186>
closer = 'christian.heimes'
components = ['SSL']
creation = <Date 2017-06-10.15:08:14.661>
creator = 'msopacua'
dependencies = []
files = []
hgrepos = []
issue_num = 30622
keywords = []
message_count = 15.0
messages = ['295643', '301268', '301281', '301312', '301313', '312757', '312762', '312788', '312789', '312803', '312807', '312811', '312812', '313811', '314616']
nosy_count = 3.0
nosy_names = ['christian.heimes', 'ned.deily', 'msopacua']
pr_nums = ['2079', '3314', '3316', '5341', '5343', '5859', '5860', '5861', '5863', '5876', '5880', '5881', '5882', '6102']
priority = 'normal'
resolution = 'fixed'
stage = 'resolved'
status = 'closed'
superseder = None
type = 'compile error'
url = 'https://bugs.python.org/issue30622'
versions = ['Python 2.7', 'Python 3.6', 'Python 3.7']

[melvyn-sopacua]

Starting OpenSSL 1.1, the variable OPENSSL_NPN_NEGOTIATED is always defined. This makes the NPN detection fail.

Related info: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=217703

[tiran]

New changeset b2d096b by Christian Heimes (Melvyn Sopacua) in branch 'master':
bpo-30622: Change NPN detection: (bpo-2079)
b2d096b

[tiran]

New changeset 72ed233 by Christian Heimes in branch '2.7':
[2.7] bpo-30622: Change NPN detection: (GH-2079) (bpo-3316)
72ed233

[tiran]

New changeset 7316c6d by Christian Heimes in branch '3.6':
[3.6] bpo-30622: Change NPN detection: (GH-2079) (bpo-3314)
7316c6d

[tiran]

Thanks for your patch!

I have merged it into master, 3.6, and 2.7. The other branches are in security fix-only mode.

[tiran]

New changeset 6cdb795 by Christian Heimes in branch 'master':
bpo-30622: Improve NPN support detection (bpo-5859)
6cdb795

[tiran]

New changeset 01d9c23 by Christian Heimes (Miss Islington (bot)) in branch '3.7':
[3.7] bpo-30622: Improve NPN support detection (GH-5859) (bpo-5860)
01d9c23

[tiran]

New changeset 48707a1 by Christian Heimes in branch '3.6':
[3.6] bpo-30622: Improve NPN support detection (GH-5859) (bpo-5861)
48707a1

[tiran]

New changeset 3d87f4c by Christian Heimes in branch '2.7':
[2.7] bpo-30622: Improve NPN support detection (GH-5859) (bpo-5863)
3d87f4c

[tiran]

New changeset 29eab55 by Christian Heimes in branch 'master':
bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 (bpo-5876)
29eab55

[tiran]

New changeset 9617741 by Christian Heimes (Miss Islington (bot)) in branch '3.7':
[3.7] bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 (GH-5876) (bpo-5880)
9617741

[tiran]

New changeset df1732a by Christian Heimes in branch '2.7':
[2.7] bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 (GH-5876) (bpo-5882)
df1732a

[tiran]

New changeset a79591c by Christian Heimes in branch '3.6':
[3.6] bpo-30622: Fix NPN for OpenSSL 1.1.1-pre1 (GH-5876) (bpo-5881)
a79591c

[tiran]

New changeset 0ec0290 by Christian Heimes in branch '3.6':
bpo-30622: Fix backport of NPN fix (bpo-6102)
0ec0290

[ned-deily]

New changeset 15b6400 by Ned Deily (Christian Heimes) in branch '3.6':
bpo-30622: Fix backport of NPN fix (bpo-6102)
15b6400