aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2018-07-17 17:05:56 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2018-07-17 17:14:15 +0200
commit4027ec1d700c6d054a84ced0266320fff8d1534d (patch)
tree1053dc962f3626df8b8a78babc2a053e925bb772 /contrib
parent8fceae0d6fa6f255caf2eee922723703e24a8bae (diff)
parent37d363dd4acf7d41196d44b295593019add241c3 (diff)
Merge #13647: Scripts and tools: Fix BIND_NOW check in security-check.py
37d363dd4acf7d41196d44b295593019add241c3 Tools: fix BIND_NOW check in security-check.py (Conrado Gouvea) Pull request description: Previously, the BIND_NOW check would work only if it was the first value in FLAGS. Tree-SHA512: 39cd83f673a6b521803be5585ada516f2db4eede718f0c5aea3377825ed1adcefed5bbb41dd9a5f24a26f7d27116cfc81bde7e26283232593b72768c5ae3d321
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/devtools/security-check.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index c9516ef83f..47195f73c8 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -97,7 +97,7 @@ def check_ELF_RELRO(executable):
raise IOError('Error opening file')
for line in stdout.splitlines():
tokens = line.split()
- if len(tokens)>1 and tokens[1] == '(BIND_NOW)' or (len(tokens)>2 and tokens[1] == '(FLAGS)' and 'BIND_NOW' in tokens[2]):
+ if len(tokens)>1 and tokens[1] == '(BIND_NOW)' or (len(tokens)>2 and tokens[1] == '(FLAGS)' and 'BIND_NOW' in tokens[2:]):
have_bindnow = True
return have_gnu_relro and have_bindnow