starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 19:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

use M2Crypto.RSA instead of Crypto.Public key (which was using an unpadded RSA\!\!\!)

Browse Source
This commit is contained in:
Eric Wustrow
2012-07-11 02:23:44 -04:00
parent e336d2cb0e
commit 2399b46354
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client-webserver/sni_challenge.py
+8 -8
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import subprocess import subprocess
from Crypto.PublicKey import RSA import M2Crypto
from Crypto import Random from Crypto import Random
import hmac import hmac
import hashlib import hashlib
@@ -9,7 +9,7 @@ from shutil import move
from os import remove, close from os import remove, close
import binascii import binascii
CHOC_DIR = "/home/james/Documents/apache_choc/" CHOC_DIR = "../sample-files/"
CHOC_CERT_CONF = "choc_cert_extensions.cnf" CHOC_CERT_CONF = "choc_cert_extensions.cnf"
OPTIONS_SSL_CONF = CHOC_DIR + "options-ssl.conf" OPTIONS_SSL_CONF = CHOC_DIR + "options-ssl.conf"
APACHE_CHALLENGE_CONF = CHOC_DIR + "choc_sni_cert_challenge.conf" APACHE_CHALLENGE_CONF = CHOC_DIR + "choc_sni_cert_challenge.conf"
@@ -80,8 +80,8 @@ def createChallengeCert(oid, ext, nonce, csr, key):
def generateExtension(key, y): def generateExtension(key, y):
rsaPrivKey = RSA.importKey(open(key).read()) rsaPrivKey = M2Crypto.RSA.load_key(key)
r = rsaPrivKey.decrypt(y) r = rsaPrivKey.private_decrypt(y, M2Crypto.RSA.pkcs1_oaep_padding)
#print r #print r
s = Random.get_random_bytes(S_SIZE) s = Random.get_random_bytes(S_SIZE)
@@ -133,10 +133,10 @@ def perform_sni_cert_challenge(listSNITuple, csr, key):
apache_restart() apache_restart()
def main(): def main():
key = CHOC_DIR + "testing.key" key = CHOC_DIR + "test.key"
csr = CHOC_DIR + "choc.csr" csr = CHOC_DIR + "choc.csr"
testkey = RSA.importKey(open(key).read()) testkey = M2Crypto.RSA.load_key(key)
r = Random.get_random_bytes(S_SIZE) r = Random.get_random_bytes(S_SIZE)
r = "testValueForR" r = "testValueForR"
@@ -147,8 +147,8 @@ def main():
#the second parameter is ignored #the second parameter is ignored
#https://www.dlitz.net/software/pycrypto/api/current/ #https://www.dlitz.net/software/pycrypto/api/current/
y = testkey.encrypt(r, 0) y = testkey.public_encrypt(r, M2Crypto.RSA.pkcs1_oaep_padding)
y2 = testkey.encrypt(r2, 0) y2 = testkey.public_encrypt(r2, M2Crypto.RSA.pkcs1_oaep_padding)
nonce = binascii.hexlify(nonce) nonce = binascii.hexlify(nonce)
nonce2 = binascii.hexlify(nonce2) nonce2 = binascii.hexlify(nonce2)