moved client/server stream crypto init code into subroutines

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/server.c b/server.c
index d679c87..86a43e4 100644
--- a/server.c
+++ b/server.c
@@ -66,14 +66,10 @@ enum recv_return protocol_request_client_auth(struct connection * const state,
     }
 
     log_bin2hex_sodium("Client AUTH with PublicKey", auth_pkt->client_publickey, sizeof(auth_pkt->client_publickey));
-
-    if (generate_session_keypair_sodium(state) != 0) {
+    if (init_crypto_server(state, auth_pkt->server_rx_header, sizeof(auth_pkt->server_rx_header)) != 0) {
         LOG(ERROR, "Client session keypair generation failed");
         return RECV_FATAL;
     }
-    crypto_secretstream_xchacha20poly1305_init_pull(&state->crypto_rx_state,
-                                                    auth_pkt->server_rx_header,
-                                                    state->session_keys->rx);
 
     if (ev_protocol_server_helo(state, "Welcome.") != 0) {
         LOG(ERROR, "Server AUTH response failed");