voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move emit PeerAsymmInfoKey to PeerMain

This commit is contained in:
Sergey Ivanov 2023-07-12 23:27:51 +04:00
parent e43f2c439d
commit e53c6e84fc
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbs2-core/lib/HBS2/Net/Proto/EncryptionHandshake.hs
View File

@ -94,13 +94,6 @@ encryptionHandshakeProto :: forall e s m .
, Response e (EncryptionHandshake e) m , Response e (EncryptionHandshake e) m
, Request e (EncryptionHandshake e) m , Request e (EncryptionHandshake e) m
, Sessions e (KnownPeer 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 , HasCredentials s m
, Asymm s , Asymm s
, Signatures s , Signatures s
@ -151,7 +144,6 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
-- Только после этого прописываем его ключ у себя -- Только после этого прописываем его ключ у себя
encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey) encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey)
-- emit PeerAsymmInfoKey (PeerAsymmPubKey peer theirpubkey)
AckEncryptionExchange nonce0 theirsign theirpubkey -> do AckEncryptionExchange nonce0 theirsign theirpubkey -> do
peer <- thatPeer proto peer <- thatPeer proto
@ -162,7 +154,6 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
-- Прописываем его ключ у себя -- Прописываем его ключ у себя
encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey) encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey)
-- emit PeerAsymmInfoKey (PeerAsymmPubKey peer theirpubkey)
where where
proto = Proxy @(EncryptionHandshake e) proto = Proxy @(EncryptionHandshake e)

2
hbs2-peer/app/PeerMain.hs
View File

@ -648,6 +648,7 @@ runPeer opts = U.handle (\e -> myException e
let encryptionHshakeAdapter :: let encryptionHshakeAdapter ::
( MonadIO m ( MonadIO m
, EventEmitter e (PeerAsymmInfo e) m
) => EncryptionHandshakeAdapter L4Proto m s ) => EncryptionHandshakeAdapter L4Proto m s
encryptionHshakeAdapter = EncryptionHandshakeAdapter encryptionHshakeAdapter = EncryptionHandshakeAdapter
{ encHandshake_considerPeerAsymmKey = \peer mpeerData -> \case { encHandshake_considerPeerAsymmKey = \peer mpeerData -> \case
@ -655,6 +656,7 @@ runPeer opts = U.handle (\e -> myException e
deletePeerAsymmKey brains peer deletePeerAsymmKey brains peer
deletePeerSymmKey brains peer deletePeerSymmKey brains peer
Just pk -> do Just pk -> do
emit PeerAsymmInfoKey (PeerAsymmPubKey peer pk)
insertPeerAsymmKey brains peer pk insertPeerAsymmKey brains peer pk
insertPeerSymmKey brains peer $ insertPeerSymmKey brains peer $
genCommonSecret @s genCommonSecret @s