Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update changes to include changing `RequestSecretKey.diffie_hellman()` to `RequestSecretKey.derive_shared_secret()`.

pull/3134/head
derekpierre 2023-06-01 11:29:34 -04:00
parent d3bab657f3
commit 7c79a76296
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nucypher/characters/lawful.py
View File

@ -609,7 +609,7 @@ class Bob(Character):
for ursula in cohort:
ursula_checksum_address = to_checksum_address(ursula.checksum_address)
participant_public_key = participant_public_keys[ursula_checksum_address]
shared_secret = requester_sk.diffie_hellman(participant_public_key)
shared_secret = requester_sk.derive_shared_secret(participant_public_key)
encrypted_decryption_request = decryption_request.encrypt(
shared_secret=shared_secret,
requester_public_key=requester_public_key,

4
nucypher/crypto/powers.py
View File

@ -358,7 +358,7 @@ class ThresholdRequestDecryptingPower(DerivedKeyBasedPower):
encrypted_request.ritual_id
)
requester_public_key = encrypted_request.requester_public_key
shared_secret = secret_key.diffie_hellman(requester_public_key)
shared_secret = secret_key.derive_shared_secret(requester_public_key)
decrypted_request = encrypted_request.decrypt(shared_secret)
return decrypted_request
except Exception as e:
@ -373,7 +373,7 @@ class ThresholdRequestDecryptingPower(DerivedKeyBasedPower):
secret_key = self._get_secret_key_from_ritual_id(
decryption_response.ritual_id
)
shared_secret = secret_key.diffie_hellman(requester_public_key)
shared_secret = secret_key.derive_shared_secret(requester_public_key)
encrypted_decryption_response = decryption_response.encrypt(shared_secret)
return encrypted_decryption_response
except Exception as e:

2
requirements.txt
View File

@ -56,7 +56,7 @@ msgpack==1.0.5
msgpack-python==0.5.6
multidict==5.2.0 ; python_version >= '3.6'
mypy-extensions==0.4.4 ; python_version >= '2.7'
nucypher-core @ git+https://github.com/derekpierre/nucypher-core.git@56fd463141b9e0479876157680dc8abd449601ad#subdirectory=nucypher-core-python
nucypher-core @ git+https://github.com/derekpierre/nucypher-core.git@9f86a761a5bdf10080535bbe9d3371ca3aae5b96#subdirectory=nucypher-core-python
packaging==23.1 ; python_version >= '3.7'
parsimonious==0.9.0
pendulum==3.0.0a1 ; python_version >= '3.7' and python_version < '4.0'

4
tests/integration/config/test_keystore_integration.py
View File

@ -189,7 +189,7 @@ def test_ritualist(temp_dir_path, testerchain, dkg_public_key):
requester_sk = RequestSecretKey.random()
requester_public_key = requester_sk.public_key()
shared_secret = requester_sk.diffie_hellman(ursula_request_public_key)
shared_secret = requester_sk.derive_shared_secret(ursula_request_public_key)
encrypted_decryption_request = decryption_request.encrypt(
shared_secret=shared_secret,
requester_public_key=requester_public_key,
@ -204,7 +204,7 @@ def test_ritualist(temp_dir_path, testerchain, dkg_public_key):
# failed encryption - incorrect encrypting key used
invalid_encrypted_decryption_request = decryption_request.encrypt(
shared_secret=RequestSecretKey.random().diffie_hellman(
shared_secret=RequestSecretKey.random().derive_shared_secret(
ursula_request_public_key
),
requester_public_key=requester_public_key,