cryptix/caberl - Change D3HMPRMP5FLENJQY2REYLVZZPLIANAPGBR4DANOIUO4C5VQN252AC

use PSK

TODO: use fork with removed length prefix patch on enoise

Created by Henry on October 28, 2025

D3HMPRMP5FLENJQY2REYLVZZPLIANAPGBR4DANOIUO4C5VQN252AC

Dependencies

In channels

main

Change contents

Replacement in apps/enoise_chat/src/enoise_chat.hrl at line 1 [2.22]

B:BD[2.22] → [2.23:122]

-define(NOISE_PROTO, "Noise_XK_25519_ChaChaPoly_BLAKE2b").
-define(NOISE_PROLOGUE, <<0,8,0,0,3>>).

[2.22]

-define(NOISE_PROTO, "Noise_XXpsk0_25519_ChaChaPoly_BLAKE2b").
-define(NOISE_PROLOGUE, <<"CABLE1.0">>).

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 16 [3.150]

B:BD[3.419] → [3.419:448]

    case parse_args(Args) of

[3.419]

[4.22]

    Defaults =
        #{port => 7891,
          keys => "keys.txt",
          host => "localhost",
          psk =>
              hex:hexstr_to_bin("0808080808080808080808080808080808080808080808080808080808080808")},
    Parsed = parse_args(Args),
    Merged = maps:merge(Defaults, Parsed),
    case Merged of

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 31 [3.150]

B:BD[5.123] → [5.123:162]

∅:D[6.119] → [3.522:580]

∅:D[7.157] → [3.522:580]

∅:D[5.162] → [3.522:580]

B:BD[3.522] → [3.522:580]

B:BD[3.580] → [7.158:213]

∅:D[6.165] → [3.645:715]

∅:D[7.213] → [3.645:715]

B:BD[3.645] → [3.645:715]

          server_pk := ServerPKStr} ->
            {ClientSK, ClientPK} = load_keypair(KeyFile),
            ServerPK = hex:hexstr_to_bin(ServerPKStr),
            client_connect(Host, Port, ClientSK, ClientPK, ServerPK);

[5.123]

[5.163]

          psk := PSK} ->
            KeyPair = load_keypair(KeyFile),
            client_connect(Host, Port, KeyPair, PSK);

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 36 [3.150]

B:BD[5.213] → [5.213:243]

∅:D[5.243] → [3.775:886]

B:BD[3.775] → [3.775:886]

          keys := KeyFile} ->
            {ServerSK, ServerPK} = load_keypair(KeyFile),
            server_listen(Port, ServerSK, ServerPK);

[5.213]

[3.886]

          keys := KeyFile,
          psk := PSK} ->
            KeyPair = load_keypair(KeyFile),
            server_listen(Port, KeyPair, PSK);

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 118 [3.150]
B:BD[3.1014] → [3.1014:1074]
```
client_connect(Host, Port, ClientSK, ClientPK, ServerPK) ->
```
[3.1014]
[2.1602]
```
client_connect(Host, Port, KeyPair, PSK) ->
```
Replacement in apps/enoise_chat/src/enoise_chat.erl at line 120 [3.150]
∅:D[2.1662] → [3.1157:1216]
B:BD[3.1157] → [3.1157:1216]
```
    TcpOpts = [binary, {active, true}, {reuseaddr, true}],
```
[2.1662]
[3.1216]
```
    TcpOpts = [binary, {packet, 0}, {active, true}, {reuseaddr, true}],
```

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 124 [3.150]

B:BD[5.498] → [5.498:642]

B:BD[5.642] → [2.1663:1710]

                [{noise, TestProtocol},
                 {s, enoise_keypair:new(dh25519, ClientSK, ClientPK)},
                 {rs, ServerPK},
                 {prologue, ?NOISE_PROLOGUE}],

[5.498]

[3.1641]

                [{noise, TestProtocol}, {s, KeyPair}, {psks, [PSK]}, {prologue, ?NOISE_PROLOGUE}],

Deletion in apps/enoise_chat/src/enoise_chat.erl at line 137 [3.150]
B:BD[3.2139] → [3.2139:2140]
Replacement in apps/enoise_chat/src/enoise_chat.erl at line 143 [3.150]
∅:D[2.1771] → [5.1905:1964]
B:BD[3.2740] → [5.1905:1964]
```
    TcpOpts = [binary, {active, true}, {reuseaddr, true}],
```
[2.1771]
[3.2814]
```
    TcpOpts = [binary, {packet, 0}, {active, true}, {reuseaddr, true}],
```
Replacement in apps/enoise_chat/src/enoise_chat.erl at line 153 [3.150]
B:BD[3.3125] → [3.3125:3179]
```
accept_loop(ListenSock, Proto, ServerSK, ServerPK) ->
```
[3.3125]
[5.1965]
```
accept_loop(ListenSock, Proto, KeyPair, PSK) ->
```

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 156 [3.150]

B:BD[3.3250] → [5.2009:2132]

B:BD[5.2132] → [2.1772:1819]

            Opts =
                [{noise, Proto},
                 {s, enoise_keypair:new(dh25519, ServerSK, ServerPK)},
                 {prologue, ?NOISE_PROLOGUE}],

[3.3250]

[2.1819]

            Opts = [{noise, Proto}, {s, KeyPair}, {psks, [PSK]}, {prologue, ?NOISE_PROLOGUE}],

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 165 [3.150]
∅:D[2.2161] → [3.3986:4050]
∅:D[5.2684] → [3.3986:4050]
B:BD[3.3986] → [3.3986:4050]
```
            accept_loop(ListenSock, Proto, ServerSK, ServerPK);
```
[2.2161]
[3.4050]
```
            accept_loop(ListenSock, Proto, KeyPair, PSK);
```

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 170 [3.150]

B:BD[3.4203] → [3.4203:4266]

            accept_loop(ListenSock, Proto, ServerSK, ServerPK)

[3.4203]

[3.4266]

            accept_loop(ListenSock, Proto, KeyPair, PSK)

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 181 [3.150]

B:BD[3.4853] → [7.294:362]

                    {hex:hexstr_to_bin(SK), hex:hexstr_to_bin(PK)};

[3.4853]

[3.4893]

                    enoise_keypair:new(dh25519, hex:hexstr_to_bin(SK), hex:hexstr_to_bin(PK));

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 210 [3.150]

B:BD[3.6698] → [6.517:616]

parse_args(["-server-pk", PubKey | Rest], Acc) ->
    parse_args(Rest, Acc#{server_pk => PubKey});

[3.6698]

parse_args(["-psk", PSK | Rest], Acc) ->
    Bin = hex:hexstr_to_bin(PSK),
    32 = byte_size(Bin),
    parse_args(Rest, Acc#{psk => Bin});

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 224 [3.150]

B:BD[3.7023] → [2.2162:2235]

    io:format("  enoise_chat -mode server -port 7891 -keys keys.txt~n"),

[3.7023]

[3.7098]

    io:format("  enoise_chat -mode server (-port 7891) (-keys keys.txt) (-psk "
              "hexstring)~n"),

Replacement in apps/enoise_chat/src/enoise_chat.erl at line 227 [3.150]

B:BD[3.7138] → [2.2236:2313]

∅:D[2.2313] → [5.2797:2846]

B:BD[5.2797] → [5.2797:2846]

    io:format("  enoise_chat -mode client -host localhost -port 7891 -keys "
              "keys.txt -sever-pk hexstring~n").

[3.7138]

    io:format("  enoise_chat -mode client (-host localhost) (-port 7891) (-keys "
              "keys.txt) (-psk hexstring)~n").