Skip to content

Commit

Permalink
rename (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
kigawas authored Nov 23, 2019
1 parent 4710cb6 commit 7b854a0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
24 changes: 12 additions & 12 deletions ecies/tests/test_crypt.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,28 @@ def test_hdkf(self):
def test_elliptic(self):
data = self.test_string
k = generate_eth_key()
prvhex = k.to_hex()
pubhex = k.public_key.to_hex()
self.assertEqual(data, decrypt(prvhex, encrypt(pubhex, data)))
sk_hex = k.to_hex()
pk_hex = k.public_key.to_hex()
self.assertEqual(data, decrypt(sk_hex, encrypt(pk_hex, data)))

k = generate_key()
prvhex = k.to_hex()
pubhex = k.public_key.format(False).hex()
self.assertEqual(data, decrypt(prvhex, encrypt(pubhex, data)))
sk_hex = k.to_hex()
pk_hex = k.public_key.format(False).hex()
self.assertEqual(data, decrypt(sk_hex, encrypt(pk_hex, data)))
self.assertEqual(
data, decrypt(bytes.fromhex(prvhex), encrypt(bytes.fromhex(pubhex), data))
data, decrypt(bytes.fromhex(sk_hex), encrypt(bytes.fromhex(pk_hex), data))
)

k = generate_key()
prvhex = k.to_hex()
pubhex = k.public_key.format(True).hex()
self.assertEqual(data, decrypt(prvhex, encrypt(pubhex, data)))
sk_hex = k.to_hex()
pk_hex = k.public_key.format(True).hex()
self.assertEqual(data, decrypt(sk_hex, encrypt(pk_hex, data)))
self.assertEqual(
data, decrypt(bytes.fromhex(prvhex), encrypt(bytes.fromhex(pubhex), data))
data, decrypt(bytes.fromhex(sk_hex), encrypt(bytes.fromhex(pk_hex), data))
)

self.assertRaises(TypeError, encrypt, 1, data)
self.assertRaises(TypeError, decrypt, 1, encrypt(bytes.fromhex(pubhex), data))
self.assertRaises(TypeError, decrypt, 1, encrypt(bytes.fromhex(pk_hex), data))

def test_aes(self):
data = self.big_data
Expand Down
10 changes: 5 additions & 5 deletions ecies/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ def hex2pub(pub_hex: str) -> PublicKey:
>>> cc_prv = hex2prv(eth_prv.to_hex())
>>> eth_prv.sign_msg_hash(data_hash).to_bytes() == cc_prv.sign_recoverable(data)
True
>>> pubhex = eth_prv.public_key.to_hex()
>>> computed_pub = hex2pub(pubhex)
>>> pk_hex = eth_prv.public_key.to_hex()
>>> computed_pub = hex2pub(pk_hex)
>>> computed_pub == cc_prv.public_key
True
"""
Expand All @@ -129,9 +129,9 @@ def hex2prv(prv_hex: str) -> PrivateKey:
A secp256k1 private key
>>> k = generate_eth_key()
>>> prvhex = k.to_hex()
>>> pubhex = k.public_key.to_hex()
>>> computed_prv = hex2prv(prvhex)
>>> sk_hex = k.to_hex()
>>> pk_hex = k.public_key.to_hex()
>>> computed_prv = hex2prv(sk_hex)
>>> computed_prv.to_int() == int(k.to_hex(), 16)
True
"""
Expand Down

0 comments on commit 7b854a0

Please sign in to comment.