More documentation and a more intuitive step_handshake

2018-03-14 10:37:48 +01:00
parent 8f3aff4d8b
commit d81f973bca
3 changed files with 143 additions and 34 deletions
@@ -6,6 +6,71 @@

 -include_lib("eunit/include/eunit.hrl").

+noise_interactive_test_() ->
+    %% Test vectors from https://raw.githubusercontent.com/rweather/noise-c/master/tests/vector/noise-c-basic.txt
+    {setup,
+        fun() -> test_utils:noise_test_vectors() end,
+        fun(_X) -> ok end,
+        fun(Tests) ->
+            [ {maps:get(name, T), fun() -> noise_interactive(T) end}
+              || T <- test_utils:noise_test_filter(Tests) ]
+        end
+    }.
+
+noise_interactive(V = #{ name := Name }) ->
+    Protocol = enoise_protocol:from_name(Name),
+
+    FixK = fun(undefined) -> undefined;
+              (Bin) -> test_utils:hex_str_to_bin("0x" ++ binary_to_list(Bin)) end,
+
+    Init = #{ prologue => FixK(maps:get(init_prologue, V, <<>>))
+            , e        => FixK(maps:get(init_ephemeral, V, undefined))
+            , s        => FixK(maps:get(init_static, V, undefined))
+            , rs       => FixK(maps:get(init_remote_static, V, undefined)) },
+    Resp = #{ prologue => FixK(maps:get(resp_prologue, V, <<>>))
+            , e        => FixK(maps:get(resp_ephemeral, V, undefined))
+            , s        => FixK(maps:get(resp_static, V, undefined))
+            , rs       => FixK(maps:get(resp_remote_static, V, undefined)) },
+    Messages = maps:get(messages, V),
+    HandshakeHash = maps:get(handshake_hash, V),
+
+    noise_interactive(Name, Protocol, Init, Resp, Messages, FixK(HandshakeHash)),
+
+    ok.
+
+noise_interactive(_Name, Protocol, Init, Resp, Messages, HSHash) ->
+    DH = enoise_protocol:dh(Protocol),
+    SecK = fun(undefined) -> undefined; (Sec) -> enoise_keypair:new(DH, Sec, undefined) end,
+    PubK = fun(undefined) -> undefined; (Pub) -> enoise_keypair:new(DH, Pub) end,
+
+    HSInit = fun(#{ e := E, s := S, rs := RS, prologue := PL }, R) ->
+                Opts = [{noise, Protocol}, {s, SecK(S)}, {e, SecK(E)}, {rs, PubK(RS)}, {prologue, PL}],
+                enoise:handshake(Opts, R)
+             end,
+    {ok, InitHS} = HSInit(Init, initiator),
+    {ok, RespHS} = HSInit(Resp, responder),
+
+    noise_interactive(Messages, InitHS, RespHS, HSHash).
+
+noise_interactive([#{ payload := PL0, ciphertext := CT0 } | Msgs], SendHS, RecvHS, HSHash) ->
+    PL = test_utils:hex_str_to_bin("0x" ++ binary_to_list(PL0)),
+    CT = test_utils:hex_str_to_bin("0x" ++ binary_to_list(CT0)),
+    case enoise_hs_state:next_message(SendHS) of
+        out ->
+            {ok, send, Message, SendHS1} = enoise:step_handshake(SendHS, {send, PL}),
+            ?assertEqual(CT, Message),
+            {ok, rcvd, PL1, RecvHS1} = enoise:step_handshake(RecvHS, {rcvd, Message}),
+            ?assertEqual(PL, PL1),
+            noise_interactive(Msgs, RecvHS1, SendHS1, HSHash);
+        done ->
+            {ok, done, #{ rx := RX1, tx := TX1, hs_hash := HSHash1 }} = enoise:step_handshake(SendHS, done),
+            {ok, done, #{ rx := RX2, tx := TX2, hs_hash := HSHash2 }} = enoise:step_handshake(RecvHS, done),
+            ?assertEqual(RX1, TX2), ?assertEqual(RX2, TX1),
+            ?assertEqual(HSHash, HSHash1), ?assertEqual(HSHash, HSHash2)
+    end.
+
+
+
 noise_dh25519_test_() ->
    %% Test vectors from https://raw.githubusercontent.com/rweather/noise-c/master/tests/vector/noise-c-basic.txt
    {setup,
@@ -91,27 +156,27 @@ need_rs(Role, Protocol) ->
    lists:member({in, [s]}, PreMsgs).

 %% Talks to local echo-server (noise-c)
-client_test() ->
-    TestProtocol = enoise_protocol:from_name("Noise_XK_25519_ChaChaPoly_BLAKE2b"),
-    ClientPrivKey = <<64,168,119,119,151,194,94,141,86,245,144,220,78,53,243,231,168,216,66,199,49,148,202,117,98,40,61,109,170,37,133,122>>,
-    ClientPubKey  = <<115,39,86,77,44,85,192,176,202,11,4,6,194,144,127,123, 34,67,62,180,190,232,251,5,216,168,192,190,134,65,13,64>>,
-    ServerPubKey  = <<112,91,141,253,183,66,217,102,211,40,13,249,238,51,77,114,163,159,32,1,162,219,76,106,89,164,34,71,149,2,103,59>>,
+%% client_test() ->
+%%     TestProtocol = enoise_protocol:from_name("Noise_XK_25519_ChaChaPoly_BLAKE2b"),
+%%     ClientPrivKey = <<64,168,119,119,151,194,94,141,86,245,144,220,78,53,243,231,168,216,66,199,49,148,202,117,98,40,61,109,170,37,133,122>>,
+%%     ClientPubKey  = <<115,39,86,77,44,85,192,176,202,11,4,6,194,144,127,123, 34,67,62,180,190,232,251,5,216,168,192,190,134,65,13,64>>,
+%%     ServerPubKey  = <<112,91,141,253,183,66,217,102,211,40,13,249,238,51,77,114,163,159,32,1,162,219,76,106,89,164,34,71,149,2,103,59>>,

-    {ok, TcpSock} = gen_tcp:connect("localhost", 7890, [{active, once}, binary, {reuseaddr, true}], 1000),
-    gen_tcp:send(TcpSock, <<0,8,0,0,3>>), %% "Noise_XK_25519_ChaChaPoly_Blake2b"
+%%     {ok, TcpSock} = gen_tcp:connect("localhost", 7890, [{active, once}, binary, {reuseaddr, true}], 1000),
+%%     gen_tcp:send(TcpSock, <<0,8,0,0,3>>), %% "Noise_XK_25519_ChaChaPoly_Blake2b"

-    Opts = [ {noise, TestProtocol}
-           , {s, enoise_keypair:new(dh25519, ClientPrivKey, ClientPubKey)}
-           , {rs, enoise_keypair:new(dh25519, ServerPubKey)}
-           , {prologue, <<0,8,0,0,3>>}],
+%%     Opts = [ {noise, TestProtocol}
+%%            , {s, enoise_keypair:new(dh25519, ClientPrivKey, ClientPubKey)}
+%%            , {rs, enoise_keypair:new(dh25519, ServerPubKey)}
+%%            , {prologue, <<0,8,0,0,3>>}],

-    {ok, EConn} = enoise:connect(TcpSock, Opts),
-    ok = enoise:send(EConn, <<"ok\n">>),
-    receive
-        {noise, EConn, <<"ok\n">>} -> ok
-    after 1000 -> error(timeout) end,
-    %% {ok, <<"ok\n">>} = enoise:recv(EConn, 3, 1000),
-    enoise:close(EConn).
+%%     {ok, EConn} = enoise:connect(TcpSock, Opts),
+%%     ok = enoise:send(EConn, <<"ok\n">>),
+%%     receive
+%%         {noise, EConn, <<"ok\n">>} -> ok
+%%     after 1000 -> error(timeout) end,
+%%     %% {ok, <<"ok\n">>} = enoise:recv(EConn, 3, 1000),
+%%     enoise:close(EConn).


 %% Expects a call-in from a local echo-client (noise-c)