Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/_cffi_src/build_constant_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -22,5 +23,6 @@
ffi = build_ffi(
module_name="_constant_time",
cdef_source=types,
verify_source=functions
verify_source=functions,
extra_link_args=extra_link_args(sys.platform),
)
7 changes: 3 additions & 4 deletions src/_cffi_src/build_openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
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):
Expand Down Expand Up @@ -94,5 +92,6 @@ def _get_openssl_windows_libraries(link_type):
],
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),
)
6 changes: 4 additions & 2 deletions src/_cffi_src/build_padding.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -22,5 +23,6 @@
ffi = build_ffi(
module_name="_padding",
cdef_source=types,
verify_source=functions
verify_source=functions,
extra_link_args=extra_link_args(sys.platform),
)
9 changes: 9 additions & 0 deletions src/_cffi_src/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]