diff --git a/examples/certgen.py b/examples/certgen.py index f1572357d..28bdf806b 100644 --- a/examples/certgen.py +++ b/examples/certgen.py @@ -25,7 +25,7 @@ def createKeyPair(type, bits): pkey.generate_key(type, bits) return pkey -def createCertRequest(pkey, digest="md5", **name): +def createCertRequest(pkey, digest="sha256", **name): """ Create a certificate request. diff --git a/examples/mk_simple_certs.py b/examples/mk_simple_certs.py index 9dfdd2ed5..ed2a53d1f 100644 --- a/examples/mk_simple_certs.py +++ b/examples/mk_simple_certs.py @@ -4,14 +4,18 @@ from OpenSSL import crypto from certgen import * # yes yes, I know, I'm lazy -cakey = createKeyPair(TYPE_RSA, 1024) +cakey = createKeyPair(TYPE_RSA, 2048) careq = createCertRequest(cakey, CN='Certificate Authority') cacert = createCertificate(careq, (careq, cakey), 0, (0, 60*60*24*365*5)) # five years +print('Creating Certificate Authority private key in "simple/CA.pkey"') open('simple/CA.pkey', 'w').write(crypto.dump_privatekey(crypto.FILETYPE_PEM, cakey)) +print('Creating Certificate Authority certificate in "simple/CA.cert"') open('simple/CA.cert', 'w').write(crypto.dump_certificate(crypto.FILETYPE_PEM, cacert)) for (fname, cname) in [('client', 'Simple Client'), ('server', 'Simple Server')]: - pkey = createKeyPair(TYPE_RSA, 1024) + pkey = createKeyPair(TYPE_RSA, 2048) req = createCertRequest(pkey, CN=cname) cert = createCertificate(req, (cacert, cakey), 1, (0, 60*60*24*365*5)) # five years + print('Creating Certificate %s private key in "simple/%s.pkey"' % (fname, fname)) open('simple/%s.pkey' % (fname,), 'w').write(crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey)) + print('Creating Certificate %s certificate in "simple/%s.cert"' % (fname, fname)) open('simple/%s.cert' % (fname,), 'w').write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert))