DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Use the run_openssl() helper for running openssl

Browse source 
This avoids unnecessary duplication of the same functionality to run
openssl and check result.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-12-27 19:38:44 +02:00
parent 47ccb9ce24
commit 662c2fa01a
1 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
tests/hwsim/test_ap_eap.py
View file

@ -4455,16 +4455,7 @@ def root_ocsp(cert):
arg = ["openssl", "ocsp", "-reqout", fn2, "-issuer", ca, "-sha256", arg = ["openssl", "ocsp", "-reqout", fn2, "-issuer", ca, "-sha256",
"-cert", cert, "-no_nonce", "-text"] "-cert", cert, "-no_nonce", "-text"]
logger.info(' '.join(arg)) run_openssl(arg)
cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
res = cmd.stdout.read().decode() + "\n" + cmd.stderr.read().decode()
cmd.stdout.close()
cmd.stderr.close()
cmd.wait()
if cmd.returncode != 0:
raise Exception("bad return code from openssl ocsp\n\n" + res)
logger.info("OCSP request:\n" + res)
fd, fn = tempfile.mkstemp() fd, fn = tempfile.mkstemp()
os.close(fd) os.close(fd)
@ -4473,15 +4464,7 @@ def root_ocsp(cert):
"-CA", ca, "-issuer", ca, "-verify_other", ca, "-trust_other", "-CA", ca, "-issuer", ca, "-verify_other", ca, "-trust_other",
"-ndays", "7", "-reqin", fn2, "-resp_no_certs", "-respout", fn, "-ndays", "7", "-reqin", fn2, "-resp_no_certs", "-respout", fn,
"-text"] "-text"]
cmd = subprocess.Popen(arg, stdout=subprocess.PIPE, run_openssl(arg)
stderr=subprocess.PIPE)
res = cmd.stdout.read().decode() + "\n" + cmd.stderr.read().decode()
cmd.stdout.close()
cmd.stderr.close()
cmd.wait()
if cmd.returncode != 0:
raise Exception("bad return code from openssl ocsp\n\n" + res)
logger.info("OCSP response:\n" + res)
os.unlink(fn2) os.unlink(fn2)
return fn return fn
@ -4495,15 +4478,7 @@ def ica_ocsp(cert, md="-sha256"):
arg = ["openssl", "ocsp", "-reqout", fn2, "-issuer", ca, md, arg = ["openssl", "ocsp", "-reqout", fn2, "-issuer", ca, md,
"-cert", cert, "-no_nonce", "-text"] "-cert", cert, "-no_nonce", "-text"]
cmd = subprocess.Popen(arg, stdout=subprocess.PIPE, run_openssl(arg)
stderr=subprocess.PIPE)
res = cmd.stdout.read().decode() + "\n" + cmd.stderr.read().decode()
cmd.stdout.close()
cmd.stderr.close()
cmd.wait()
if cmd.returncode != 0:
raise Exception("bad return code from openssl ocsp\n\n" + res)
logger.info("OCSP request:\n" + res)
fd, fn = tempfile.mkstemp() fd, fn = tempfile.mkstemp()
os.close(fd) os.close(fd)
@ -4512,15 +4487,7 @@ def ica_ocsp(cert, md="-sha256"):
"-CA", ca, "-issuer", ca, "-verify_other", ca, "-trust_other", "-CA", ca, "-issuer", ca, "-verify_other", ca, "-trust_other",
"-ndays", "7", "-reqin", fn2, "-resp_no_certs", "-respout", fn, "-ndays", "7", "-reqin", fn2, "-resp_no_certs", "-respout", fn,
"-text"] "-text"]
cmd = subprocess.Popen(arg, stdout=subprocess.PIPE, run_openssl(arg)
stderr=subprocess.PIPE)
res = cmd.stdout.read().decode() + "\n" + cmd.stderr.read().decode()
cmd.stdout.close()
cmd.stderr.close()
cmd.wait()
if cmd.returncode != 0:
raise Exception("bad return code from openssl ocsp\n\n" + res)
logger.info("OCSP response:\n" + res)
os.unlink(fn2) os.unlink(fn2)
return fn return fn