aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
Diffstat (limited to 'netlib')
-rw-r--r--netlib/certutils.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py
index 7dcb5450..dab7e318 100644
--- a/netlib/certutils.py
+++ b/netlib/certutils.py
@@ -1,4 +1,4 @@
-import os, ssl, time, datetime, tempfile, shutil
+import os, ssl, time, datetime
from pyasn1.type import univ, constraint, char, namedtype, tag
from pyasn1.codec.der.decoder import decode
from pyasn1.error import PyAsn1Error
@@ -92,24 +92,16 @@ def dummy_cert(ca, commonname, sans):
ca = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, raw)
key = OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM, raw)
- req = OpenSSL.crypto.X509Req()
- subj = req.get_subject()
- subj.CN = commonname
- req.set_pubkey(ca.get_pubkey())
- req.sign(key, "sha1")
- if ss:
- req.add_extensions([OpenSSL.crypto.X509Extension("subjectAltName", True, ss)])
-
cert = OpenSSL.crypto.X509()
cert.gmtime_adj_notBefore(-3600)
cert.gmtime_adj_notAfter(60 * 60 * 24 * 30)
cert.set_issuer(ca.get_subject())
- cert.set_subject(req.get_subject())
+ cert.get_subject().CN = commonname
cert.set_serial_number(int(time.time()*10000))
if ss:
cert.set_version(2)
cert.add_extensions([OpenSSL.crypto.X509Extension("subjectAltName", True, ss)])
- cert.set_pubkey(req.get_pubkey())
+ cert.set_pubkey(ca.get_pubkey())
cert.sign(key, "sha1")
return SSLCert(cert)