oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save OpenSSL rand file in data directory to avoid error message on Windows

Browse source
This commit is contained in:
shortcutme 2019-03-29 02:29:32 +01:00
parent b814a633c6
commit bad4d14cf6
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Crypt/CryptConnection.py
View file

@ -16,7 +16,10 @@ class CryptConnectionManager:
self.openssl_bin = "dist\\openssl\\openssl.exe" self.openssl_bin = "dist\\openssl\\openssl.exe"
else: else:
self.openssl_bin = "openssl" 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 self.crypt_supported = [] # Supported cryptos
@ -57,7 +60,7 @@ class CryptConnectionManager:
def removeCerts(self): def removeCerts(self):
if config.keep_ssl_cert: if config.keep_ssl_cert:
return False 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) file_path = "%s/%s" % (config.data_dir, file_name)
if os.path.isfile(file_path): if os.path.isfile(file_path):
os.unlink(file_path) os.unlink(file_path)

2
src/Test/conftest.py
View file

@ -107,7 +107,7 @@ def cleanup():
for dir_path in [config.data_dir, config.data_dir + "-temp"]: for dir_path in [config.data_dir, config.data_dir + "-temp"]:
for file_name in os.listdir(dir_path): for file_name in os.listdir(dir_path):
ext = file_name.rsplit(".", 1)[-1] 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 continue
file_path = dir_path + "/" + file_name file_path = dir_path + "/" + file_name
if os.path.isfile(file_path): if os.path.isfile(file_path):