diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-06-20 19:21:43 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-06-20 19:21:43 -0400 |
| commit | 5e12f87d5c297771b59116914dcb2500dde25294 (patch) | |
| tree | aaf9c544e2aaf7a053ab0b8dd2c819d4acdeed1b | |
| parent | b2c2ff493c08f1c713fc88e3d2c4d9293beff4b9 (diff) | |
| parent | dccbc9b00a17afcfdee35505fcf69bf3ce076056 (diff) | |
| download | cryptography-5e12f87d5c297771b59116914dcb2500dde25294.tar.gz cryptography-5e12f87d5c297771b59116914dcb2500dde25294.tar.bz2 cryptography-5e12f87d5c297771b59116914dcb2500dde25294.zip | |
Merge pull request #2034 from reaperhulk/windows-flags
enable ASLR and NX on windows builds (affects 2.x only)
| -rw-r--r-- | src/_cffi_src/build_constant_time.py | 6 | ||||
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 7 | ||||
| -rw-r--r-- | src/_cffi_src/build_padding.py | 6 | ||||
| -rw-r--r-- | src/_cffi_src/utils.py | 9 |
4 files changed, 20 insertions, 8 deletions
diff --git a/src/_cffi_src/build_constant_time.py b/src/_cffi_src/build_constant_time.py index eae0f21a..6d9a8f54 100644 --- a/src/_cffi_src/build_constant_time.py +++ b/src/_cffi_src/build_constant_time.py @@ -5,8 +5,9 @@ from __future__ import absolute_import, division, print_function import os +import sys -from _cffi_src.utils import build_ffi +from _cffi_src.utils import build_ffi, extra_link_args with open(os.path.join( @@ -22,5 +23,6 @@ with open(os.path.join( ffi = build_ffi( module_name="_constant_time", cdef_source=types, - verify_source=functions + verify_source=functions, + extra_link_args=extra_link_args(sys.platform), ) diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index 4c30fe48..1ebadccb 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -7,9 +7,7 @@ from __future__ import absolute_import, division, print_function import os import sys -from _cffi_src.utils import ( - build_ffi_for_binding -) +from _cffi_src.utils import build_ffi_for_binding, extra_link_args def _get_openssl_libraries(platform): @@ -94,5 +92,6 @@ ffi = build_ffi_for_binding( ], pre_include=_OSX_PRE_INCLUDE, post_include=_OSX_POST_INCLUDE, - libraries=_get_openssl_libraries(sys.platform) + libraries=_get_openssl_libraries(sys.platform), + extra_link_args=extra_link_args(sys.platform), ) diff --git a/src/_cffi_src/build_padding.py b/src/_cffi_src/build_padding.py index 3eeac2e2..5df93d80 100644 --- a/src/_cffi_src/build_padding.py +++ b/src/_cffi_src/build_padding.py @@ -5,8 +5,9 @@ from __future__ import absolute_import, division, print_function import os +import sys -from _cffi_src.utils import build_ffi +from _cffi_src.utils import build_ffi, extra_link_args with open(os.path.join( @@ -22,5 +23,6 @@ with open(os.path.join( ffi = build_ffi( module_name="_padding", cdef_source=types, - verify_source=functions + verify_source=functions, + extra_link_args=extra_link_args(sys.platform), ) diff --git a/src/_cffi_src/utils.py b/src/_cffi_src/utils.py index b1ad74d4..65f9f120 100644 --- a/src/_cffi_src/utils.py +++ b/src/_cffi_src/utils.py @@ -80,3 +80,12 @@ def build_ffi(module_name, cdef_source, verify_source, libraries=[], extra_link_args=extra_link_args, ) return ffi + + +def extra_link_args(platform): + if platform != "win32": + return [] + else: + # Enable NX and ASLR for Windows builds. These are enabled by default + # on Python 3.3+ but not on 2.x. + return ["/NXCOMPAT", "/DYNAMICBASE"] |