2
0
mirror of https://github.com/mozilla/cipherscan.git synced 2024-11-22 14:23:41 +01:00

Merge pull request #43 from ScriptFanix/master

don't expect openssl to be in cwd
This commit is contained in:
Julien Vehent 2014-12-30 15:36:11 -05:00
commit a90fc8bc58

View File

@ -410,7 +410,7 @@ def build_ciphers_lists(opensslbin):
# use system openssl if not on linux 64 # use system openssl if not on linux 64
if not opensslbin: if not opensslbin:
if platform.system() == 'Linux' and platform.architecture()[0] == '64bit': if platform.system() == 'Linux' and platform.architecture()[0] == '64bit':
opensslbin='./openssl' opensslbin=mypath + '/openssl'
else: else:
opensslbin='openssl' opensslbin='openssl'
print("warning: analyze.py is using system's openssl, which may limit the tested ciphers and recommendations") print("warning: analyze.py is using system's openssl, which may limit the tested ciphers and recommendations")
@ -456,6 +456,7 @@ def main():
help='use nagios-conformant exit codes') help='use nagios-conformant exit codes')
args = parser.parse_args() args = parser.parse_args()
global mypath
mypath = os.path.dirname(os.path.realpath(sys.argv[0])) mypath = os.path.dirname(os.path.realpath(sys.argv[0]))
if args.debug: if args.debug: