diff options
| -rw-r--r-- | scripts/rpki/left_right.py | 4 | ||||
| -rw-r--r-- | scripts/rpki/pkcs10.py | 4 | ||||
| -rw-r--r-- | scripts/rpki/x509.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 985c61b8..7c6c8ea9 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -2,7 +2,7 @@ """RPKI "left-right" protocol.""" -import base64, rpki.sax_utils, rpki.resource_set, lxml.etree, rpki.x509, rpki.sql, rpki.exceptions +import base64, rpki.sax_utils, rpki.resource_set, lxml.etree, rpki.x509, rpki.sql, rpki.exceptions, rpki.pkcs10 xmlns = "http://www.hactrn.net/uris/rpki/left-right-spec/" @@ -192,7 +192,7 @@ class bsc_elt(data_elt): if q_pdu.clear_signing_certs: self.signing_cert = [] self.signing_cert.extend(q_pdu.signing_cert) - if self.generate_keypair: + if q_pdu.generate_keypair: # # Hard wire 2048-bit RSA with SHA-256 in schema for now. # Assume no HSM for now. diff --git a/scripts/rpki/pkcs10.py b/scripts/rpki/pkcs10.py index 4d6a024a..357fde71 100644 --- a/scripts/rpki/pkcs10.py +++ b/scripts/rpki/pkcs10.py @@ -15,7 +15,7 @@ def make_request(keypair): digest = POW.Digest(POW.SHA1_DIGEST) digest.update(keypair.get_POW().derWrite(POW.RSA_PUBLIC_KEY)) - commonName = "0x" + binascii.hexify(digest.digest()) + commonName = "0x" + binascii.hexlify(digest.digest()) try: config_filename = "req.tmp.conf" @@ -26,7 +26,7 @@ def make_request(keypair): i,o = os.popen2(["openssl", "req", "-config", config_filename, "-new", "-key", "/dev/stdin", "-outform", "DER"]) i.write(keypair.get_PEM()) i.close() - pkcs10 = o.read() + pkcs10 = rpki.x509.PKCS10_Request(DER = o.read()) o.close() finally: diff --git a/scripts/rpki/x509.py b/scripts/rpki/x509.py index 56ba8df1..2082986c 100644 --- a/scripts/rpki/x509.py +++ b/scripts/rpki/x509.py @@ -314,7 +314,7 @@ class RSA_Keypair(DER_object): def generate(self, keylength): self.clear() - self.set(POW=POW.Assymetric(POW.RSA_CIPHER, keylength)) + self.set(POW=POW.Asymmetric(POW.RSA_CIPHER, keylength)) def get_public_DER(self): return self.get_POW().derWrite(POW.RSA_PUBLIC_KEY) |