Staging
v0.8.1
v0.8.1
https://github.com/python/cpython
Revision 7316c6d4a57931e9786c06eae168b227d7463317 authored by Christian Heimes on 05 September 2017, 14:00:44 UTC, committed by GitHub on 05 September 2017, 14:00:44 UTC
* 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] https://github.com/openssl/openssl/commit/68b33cc5c7 (cherry picked from commit b2d096b)
1 parent e2543a6
Tip revision: 7316c6d4a57931e9786c06eae168b227d7463317 authored by Christian Heimes on 05 September 2017, 14:00:44 UTC
[3.6] bpo-30622: Change NPN detection: (GH-2079) (#3314)
[3.6] bpo-30622: Change NPN detection: (GH-2079) (#3314)
Tip revision: 7316c6d
File | Mode | Size |
---|---|---|
Python.asdl | -rw-r--r-- | 5.0 KB |
acceler.c | -rw-r--r-- | 3.3 KB |
asdl.py | -rw-r--r-- | 12.6 KB |
asdl_c.py | -rw-r--r-- | 43.7 KB |
bitset.c | -rw-r--r-- | 1.0 KB |
firstsets.c | -rw-r--r-- | 2.8 KB |
grammar.c | -rw-r--r-- | 7.4 KB |
grammar1.c | -rw-r--r-- | 1.3 KB |
listnode.c | -rw-r--r-- | 1.2 KB |
metagrammar.c | -rw-r--r-- | 2.4 KB |
myreadline.c | -rw-r--r-- | 9.9 KB |
node.c | -rw-r--r-- | 4.4 KB |
parser.c | -rw-r--r-- | 11.6 KB |
parser.h | -rw-r--r-- | 1.0 KB |
parsetok.c | -rw-r--r-- | 10.6 KB |
parsetok_pgen.c | -rw-r--r-- | 35 bytes |
pgen.c | -rw-r--r-- | 17.9 KB |
pgenmain.c | -rw-r--r-- | 4.0 KB |
printgrammar.c | -rw-r--r-- | 2.9 KB |
tokenizer.c | -rw-r--r-- | 54.3 KB |
tokenizer.h | -rw-r--r-- | 3.8 KB |
tokenizer_pgen.c | -rw-r--r-- | 36 bytes |
Computing file changes ...