From bad4d14cf642b213f0c132a0979193be909c5a43 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 29 Mar 2019 02:29:32 +0100 Subject: [PATCH] Save OpenSSL rand file in data directory to avoid error message on Windows --- src/Crypt/CryptConnection.py | 7 +++++-- src/Test/conftest.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Crypt/CryptConnection.py b/src/Crypt/CryptConnection.py index 1d1c1eb8..25ebc52e 100644 --- a/src/Crypt/CryptConnection.py +++ b/src/Crypt/CryptConnection.py @@ -16,7 +16,10 @@ class CryptConnectionManager: self.openssl_bin = "dist\\openssl\\openssl.exe" else: self.openssl_bin = "openssl" - self.openssl_env = {"OPENSSL_CONF": "src/lib/openssl/openssl.cnf"} + self.openssl_env = { + "OPENSSL_CONF": "src/lib/openssl/openssl.cnf", + "RANDFILE": config.data_dir + "/openssl-rand.tmp" + } self.crypt_supported = [] # Supported cryptos @@ -57,7 +60,7 @@ class CryptConnectionManager: def removeCerts(self): if config.keep_ssl_cert: return False - for file_name in ["cert-rsa.pem", "key-rsa.pem", "cacert-rsa.pem", "cakey-rsa.pem", "cacert-rsa.srl", "cert-rsa.csr"]: + for file_name in ["cert-rsa.pem", "key-rsa.pem", "cacert-rsa.pem", "cakey-rsa.pem", "cacert-rsa.srl", "cert-rsa.csr", "openssl-rand.tmp"]: file_path = "%s/%s" % (config.data_dir, file_name) if os.path.isfile(file_path): os.unlink(file_path) diff --git a/src/Test/conftest.py b/src/Test/conftest.py index 91b5d7c7..1bf14e72 100644 --- a/src/Test/conftest.py +++ b/src/Test/conftest.py @@ -107,7 +107,7 @@ def cleanup(): for dir_path in [config.data_dir, config.data_dir + "-temp"]: for file_name in os.listdir(dir_path): ext = file_name.rsplit(".", 1)[-1] - if ext not in ["csr", "pem", "srl", "db", "json"]: + if ext not in ["csr", "pem", "srl", "db", "json", "tmp"]: continue file_path = dir_path + "/" + file_name if os.path.isfile(file_path):