Restore initiator flag to BaseSession type

This commit is contained in:
Alex Stokes
2019-09-08 15:37:41 -04:00
parent f38899e26e
commit 2025a5c7f1
3 changed files with 12 additions and 6 deletions

View File

@ -57,8 +57,9 @@ class SecureSession(BaseSession):
remote_peer: PeerID,
remote_encryption_parameters: AuthenticatedEncryptionParameters,
conn: MsgIOReadWriter,
initiator: bool,
) -> None:
super().__init__(local_peer, local_private_key, remote_peer)
super().__init__(local_peer, local_private_key, initiator, remote_peer)
self.conn = conn
self.local_encryption_parameters = local_encryption_parameters
@ -359,6 +360,7 @@ def _mk_session_from(
local_private_key: PrivateKey,
session_parameters: SessionParameters,
conn: MsgIOReadWriter,
initiator: bool,
) -> SecureSession:
key_set1, key_set2 = initialize_pair_for_encryption(
session_parameters.local_encryption_parameters.cipher_type,
@ -376,6 +378,7 @@ def _mk_session_from(
session_parameters.remote_peer,
key_set2,
conn,
initiator,
)
return session
@ -406,7 +409,8 @@ async def create_secure_session(
await conn.close()
raise e
session = _mk_session_from(local_private_key, session_parameters, msg_io)
initiator = remote_peer is None
session = _mk_session_from(local_private_key, session_parameters, msg_io, initiator)
received_nonce = await _finish_handshake(session, remote_nonce)
if received_nonce != local_nonce: