Skip to content

Commit fbd92f2

Browse files
authored
Merge pull request bitcoin#1436 from theStack/bip324_handsake_remove_initiating_param
bip-0324: remove `initiating` parameter from `ellswift_create` calls
2 parents 6e82728 + 59915df commit fbd92f2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

bip-0324.mediawiki

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,11 @@ As explained before, these messages are sent to set up the connection:
181181
----------------------------------------------------------------------------------------------------
182182
| Initiator Responder |
183183
| |
184-
| x, ellswift_X = ellswift_create(initiating=True) |
184+
| x, ellswift_X = ellswift_create() |
185185
| |
186186
| --- ellswift_X + initiator_garbage (initiator_garbage_len bytes; max 4095) ---> |
187187
| |
188-
| y, ellswift_Y = ellswift_create(initiating=False) |
188+
| y, ellswift_Y = ellswift_create() |
189189
| ecdh_secret = v2_ecdh( |
190190
| y, ellswift_X, ellswift_Y, initiating=False) |
191191
| v2_initialize(initiator, ecdh_secret, initiating=False) |
@@ -333,7 +333,7 @@ To establish a v2 encrypted connection, the initiator generates an ephemeral sec
333333

334334
<pre>
335335
def initiate_v2_handshake(peer, garbage_len):
336-
peer.privkey_ours, peer.ellswift_ours = ellswift_create(initiating=True)
336+
peer.privkey_ours, peer.ellswift_ours = ellswift_create()
337337
peer.sent_garbage = rand_bytes(garbage_len)
338338
send(peer, peer.ellswift_ours + peer.sent_garbage)
339339
</pre>
@@ -350,7 +350,7 @@ def respond_v2_handshake(peer, garbage_len):
350350
while len(peer.received_prefix) < 12:
351351
peer.received_prefix += receive(peer, 1)
352352
if peer.received_prefix[-1] != V1_PREFIX[len(peer.received_prefix) - 1]:
353-
peer.privkey_ours, peer.ellswift_ours = ellswift_create(initiating=False)
353+
peer.privkey_ours, peer.ellswift_ours = ellswift_create()
354354
peer.sent_garbage = rand_bytes(garbage_len)
355355
send(peer, ellswift_Y + peer.sent_garbage)
356356
return

0 commit comments

Comments
 (0)