From 043670432712cd99a1bfdb6c0d0a161fc3c693c9 Mon Sep 17 00:00:00 2001
From: Hans Svensson <hans.svensson@quviq.com>
Date: Mon, 7 May 2018 10:02:30 +0200
Subject: [PATCH] Report decrypt error upstream (instead of crashing)

---
 src/enoise_connection.erl | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/enoise_connection.erl b/src/enoise_connection.erl
index 19979cc..772188e 100644
--- a/src/enoise_connection.erl
+++ b/src/enoise_connection.erl
@@ -85,11 +85,17 @@ handle_call({active, Pid, NewActive}, _From, S) ->
 handle_cast(_Msg, S) ->
     {noreply, S}.
 
-handle_info({tcp, TS, Data}, S = #state{ tcp_sock = TS }) ->
-    {S1, Msgs} = handle_data(S, Data),
-    S2 = handle_msgs(S1#state{ msgbuf = S1#state.msgbuf ++ Msgs }),
-    set_active(S2),
-    {noreply, S2};
+handle_info({tcp, TS, Data}, S = #state{ tcp_sock = TS, owner = O }) ->
+    try
+        {S1, Msgs} = handle_data(S, Data),
+        S2 = handle_msgs(S1#state{ msgbuf = S1#state.msgbuf ++ Msgs }),
+        set_active(S2),
+        {noreply, S2}
+    catch error:{enoise_error, _} ->
+        %% We are not likely to recover, but leave the decision to upstream
+        O ! {enoise_error, TS, decrypt_error},
+        {noreply, S}
+    end;
 handle_info({tcp_closed, TS}, S = #state{ tcp_sock = TS, owner = O }) ->
     O ! {tcp_closed, TS},
     {noreply, S#state{ tcp_sock = closed }};