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

Rev445, Fix ConnectionServer peer_id handling, Faster startup by creating ssl certs on FileServer start, Per-site connection_server, Fix double Db opening, Test site downloading, Sign testsite properly, Test ConnectionServer, Test FileRequest

Browse source
This commit is contained in:
HelloZeroNet 2015-09-24 22:08:08 +02:00
parent 891c5cc34a
commit 8fdc431b0b
26 changed files with 459 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Crypt/CryptConnection.py
View file

@ -53,12 +53,12 @@ class CryptConnectionManager:
if config.disable_encryption:
return False
if self.loadSslRsaCert():
if self.createSslRsaCert():
self.crypt_supported.append("tls-rsa")
# Try to create RSA server cert + sign for connection encryption
# Return: True on success
def loadSslRsaCert(self):
def createSslRsaCert(self):
import subprocess
if os.path.isfile("%s/cert-rsa.pem" % config.data_dir) and os.path.isfile("%s/key-rsa.pem" % config.data_dir):
@ -80,11 +80,11 @@ class CryptConnectionManager:
if os.path.isfile("%s/cert-rsa.pem" % config.data_dir) and os.path.isfile("%s/key-rsa.pem" % config.data_dir):
return True
else:
logging.error("RSA ECC SSL cert generation failed, cert or key files not exits.")
logging.error("RSA ECC SSL cert generation failed, cert or key files not exist.")
return False
# Not used yet: Missing on some platform
def createSslEccCert(self):
"""def createSslEccCert(self):
return False
import subprocess
@ -116,6 +116,6 @@ class CryptConnectionManager:
else:
self.logging.error("ECC SSL cert generation failed, cert or key files not exits.")
return False
"""
manager = CryptConnectionManager()