mirror of https://github.com/voidlizard/hbs2
move emit PeerAsymmInfoKey to PeerMain
This commit is contained in:
parent
e43f2c439d
commit
e53c6e84fc
|
@ -94,13 +94,6 @@ encryptionHandshakeProto :: forall e s m .
|
|||
, Response e (EncryptionHandshake e) m
|
||||
, Request e (EncryptionHandshake e) m
|
||||
, Sessions e (KnownPeer e) m
|
||||
-- , Sessions e (EncryptionHandshake e) m
|
||||
-- , HasNonces (EncryptionHandshake e) m
|
||||
-- , HasPeerNonce e m
|
||||
-- , Nonce (EncryptionHandshake e) ~ EENonce
|
||||
-- , Pretty (Peer e)
|
||||
-- , EventEmitter e (EncryptionHandshake e) m
|
||||
, EventEmitter e (PeerAsymmInfo e) m
|
||||
, HasCredentials s m
|
||||
, Asymm s
|
||||
, Signatures s
|
||||
|
@ -151,7 +144,6 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
|
|||
|
||||
-- Только после этого прописываем его ключ у себя
|
||||
encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey)
|
||||
-- emit PeerAsymmInfoKey (PeerAsymmPubKey peer theirpubkey)
|
||||
|
||||
AckEncryptionExchange nonce0 theirsign theirpubkey -> do
|
||||
peer <- thatPeer proto
|
||||
|
@ -162,7 +154,6 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
|
|||
|
||||
-- Прописываем его ключ у себя
|
||||
encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey)
|
||||
-- emit PeerAsymmInfoKey (PeerAsymmPubKey peer theirpubkey)
|
||||
|
||||
where
|
||||
proto = Proxy @(EncryptionHandshake e)
|
||||
|
|
|
@ -648,6 +648,7 @@ runPeer opts = U.handle (\e -> myException e
|
|||
|
||||
let encryptionHshakeAdapter ::
|
||||
( MonadIO m
|
||||
, EventEmitter e (PeerAsymmInfo e) m
|
||||
) => EncryptionHandshakeAdapter L4Proto m s
|
||||
encryptionHshakeAdapter = EncryptionHandshakeAdapter
|
||||
{ encHandshake_considerPeerAsymmKey = \peer mpeerData -> \case
|
||||
|
@ -655,6 +656,7 @@ runPeer opts = U.handle (\e -> myException e
|
|||
deletePeerAsymmKey brains peer
|
||||
deletePeerSymmKey brains peer
|
||||
Just pk -> do
|
||||
emit PeerAsymmInfoKey (PeerAsymmPubKey peer pk)
|
||||
insertPeerAsymmKey brains peer pk
|
||||
insertPeerSymmKey brains peer $
|
||||
genCommonSecret @s
|
||||
|
|
Loading…
Reference in New Issue