diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2011-07-30 19:53:21 +0200 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2011-07-30 19:53:21 +0200 |
commit | e5c2ef881de7f561e6a0a9ec641357f65a4283fe (patch) | |
tree | a94d62b1e14ed81d751b1857cda9625fd43e5410 | |
parent | 877fce05e5c26c1c3339b06918a83cb19797ff4b (diff) | |
download | rsa-git-e5c2ef881de7f561e6a0a9ec641357f65a4283fe.tar.gz |
Using key.X rather than key['X']
-rw-r--r-- | rsa/pkcs1.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/rsa/pkcs1.py b/rsa/pkcs1.py index 9a76e40..3955c30 100644 --- a/rsa/pkcs1.py +++ b/rsa/pkcs1.py @@ -156,16 +156,16 @@ def encrypt(message, pub_key): >>> crypto = encrypt(message, pub_key) The crypto text should be just as long as the public key 'n' component: - >>> len(crypto) == common.byte_size(pub_key['n']) + >>> len(crypto) == common.byte_size(pub_key.n) True ''' - keylength = common.byte_size(pub_key['n']) + keylength = common.byte_size(pub_key.n) padded = _pad_for_encryption(message, keylength) payload = transform.bytes2int(padded) - encrypted = core.encrypt_int(payload, pub_key['e'], pub_key['n']) + encrypted = core.encrypt_int(payload, pub_key.e, pub_key.n) block = transform.int2bytes(encrypted, keylength) return block @@ -197,9 +197,9 @@ def decrypt(crypto, priv_key): ''' - blocksize = common.byte_size(priv_key['n']) + blocksize = common.byte_size(priv_key.n) encrypted = transform.bytes2int(crypto) - decrypted = core.decrypt_int(encrypted, priv_key['d'], priv_key['n']) + decrypted = core.decrypt_int(encrypted, priv_key.d, priv_key.n) cleartext = transform.int2bytes(decrypted, blocksize) # If we can't find the cleartext marker, decryption failed. @@ -242,11 +242,11 @@ def sign(message, priv_key, hash): # Encrypt the hash with the private key cleartext = asn1code + hash - keylength = common.byte_size(priv_key['n']) + keylength = common.byte_size(priv_key.n) padded = _pad_for_signing(cleartext, keylength) payload = transform.bytes2int(padded) - encrypted = core.encrypt_int(payload, priv_key['d'], priv_key['n']) + encrypted = core.encrypt_int(payload, priv_key.d, priv_key.n) block = transform.int2bytes(encrypted, keylength) return block @@ -263,9 +263,9 @@ def verify(message, signature, pub_key): @raise VerificationError: when the signature doesn't match the message. ''' - blocksize = common.byte_size(pub_key['n']) + blocksize = common.byte_size(pub_key.n) encrypted = transform.bytes2int(signature) - decrypted = core.decrypt_int(encrypted, pub_key['e'], pub_key['n']) + decrypted = core.decrypt_int(encrypted, pub_key.e, pub_key.n) clearsig = transform.int2bytes(decrypted, blocksize) # If we can't find the signature marker, verification failed. |