Staging
v0.5.1
v0.5.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 |
---|---|---|
clinic | ||
Python-ast.c | -rw-r--r-- | 262.9 KB |
README | -rw-r--r-- | 62 bytes |
_warnings.c | -rw-r--r-- | 34.8 KB |
asdl.c | -rw-r--r-- | 1.4 KB |
ast.c | -rw-r--r-- | 158.1 KB |
bltinmodule.c | -rw-r--r-- | 80.5 KB |
ceval.c | -rw-r--r-- | 170.0 KB |
ceval_gil.h | -rw-r--r-- | 8.9 KB |
codecs.c | -rw-r--r-- | 45.0 KB |
compile.c | -rw-r--r-- | 151.7 KB |
condvar.h | -rw-r--r-- | 11.0 KB |
dtoa.c | -rw-r--r-- | 78.5 KB |
dup2.c | -rw-r--r-- | 705 bytes |
dynamic_annotations.c | -rw-r--r-- | 6.6 KB |
dynload_aix.c | -rw-r--r-- | 5.7 KB |
dynload_dl.c | -rw-r--r-- | 581 bytes |
dynload_hpux.c | -rw-r--r-- | 1.9 KB |
dynload_next.c | -rw-r--r-- | 3.9 KB |
dynload_shlib.c | -rw-r--r-- | 3.3 KB |
dynload_stub.c | -rw-r--r-- | 186 bytes |
dynload_win.c | -rw-r--r-- | 10.0 KB |
errors.c | -rw-r--r-- | 31.6 KB |
fileutils.c | -rw-r--r-- | 42.3 KB |
formatter_unicode.c | -rw-r--r-- | 50.1 KB |
frozen.c | -rw-r--r-- | 1.7 KB |
frozenmain.c | -rw-r--r-- | 2.7 KB |
future.c | -rw-r--r-- | 4.9 KB |
getargs.c | -rw-r--r-- | 72.2 KB |
getcompiler.c | -rw-r--r-- | 366 bytes |
getcopyright.c | -rw-r--r-- | 511 bytes |
getopt.c | -rw-r--r-- | 3.4 KB |
getplatform.c | -rw-r--r-- | 130 bytes |
getversion.c | -rw-r--r-- | 289 bytes |
graminit.c | -rw-r--r-- | 43.3 KB |
import.c | -rw-r--r-- | 57.5 KB |
importdl.c | -rw-r--r-- | 6.9 KB |
importdl.h | -rw-r--r-- | 487 bytes |
importlib.h | -rw-r--r-- | 95.5 KB |
importlib_external.h | -rw-r--r-- | 129.7 KB |
makeopcodetargets.py | -rwxr-xr-x | 1.6 KB |
marshal.c | -rw-r--r-- | 49.7 KB |
modsupport.c | -rw-r--r-- | 14.8 KB |
mysnprintf.c | -rw-r--r-- | 3.3 KB |
mystrtoul.c | -rw-r--r-- | 8.1 KB |
opcode_targets.h | -rw-r--r-- | 6.3 KB |
peephole.c | -rw-r--r-- | 27.1 KB |
pyarena.c | -rw-r--r-- | 5.5 KB |
pyctype.c | -rw-r--r-- | 7.7 KB |
pyfpe.c | -rw-r--r-- | 621 bytes |
pyhash.c | -rw-r--r-- | 12.9 KB |
pylifecycle.c | -rw-r--r-- | 46.4 KB |
pymath.c | -rw-r--r-- | 1.5 KB |
pystate.c | -rw-r--r-- | 27.3 KB |
pystrcmp.c | -rw-r--r-- | 613 bytes |
pystrhex.c | -rw-r--r-- | 1.6 KB |
pystrtod.c | -rw-r--r-- | 40.1 KB |
pythonrun.c | -rw-r--r-- | 41.5 KB |
pytime.c | -rw-r--r-- | 18.9 KB |
random.c | -rw-r--r-- | 17.4 KB |
sigcheck.c | -rw-r--r-- | 529 bytes |
strdup.c | -rw-r--r-- | 247 bytes |
structmember.c | -rw-r--r-- | 8.6 KB |
symtable.c | -rw-r--r-- | 56.8 KB |
sysmodule.c | -rw-r--r-- | 70.0 KB |
thread.c | -rw-r--r-- | 12.4 KB |
thread_foobar.h | -rw-r--r-- | 2.2 KB |
thread_nt.h | -rw-r--r-- | 9.6 KB |
thread_pthread.h | -rw-r--r-- | 17.8 KB |
traceback.c | -rw-r--r-- | 22.3 KB |
wordcode_helpers.h | -rw-r--r-- | 1.1 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...