From 285884c9254e2cdf0cc03b17600c5ebb92a39287 Mon Sep 17 00:00:00 2001
From: Benjamin Cheng <ben@bcheng.cf>
Date: Sat, 2 Jun 2018 15:49:59 -0400
Subject: [PATCH] push PSK callback errors onto ErrorStack

---
 openssl/src/ssl/callbacks.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs
index e34bc745..f45146c6 100644
--- a/openssl/src/ssl/callbacks.rs
+++ b/openssl/src/ssl/callbacks.rs
@@ -84,7 +84,10 @@ where
         let psk_sl = slice::from_raw_parts_mut(psk as *mut u8, max_psk_len as usize);
         match (*callback)(ssl, hint, identity_sl, psk_sl) {
             Ok(psk_len) => psk_len as u32,
-            _ => 0,
+            Err(e) => {
+                e.put();
+                0
+            }
         }
     }
 }
@@ -118,7 +121,10 @@ where
         let psk_sl = slice::from_raw_parts_mut(psk as *mut u8, max_psk_len as usize);
         match (*callback)(ssl, identity, psk_sl) {
             Ok(psk_len) => psk_len as u32,
-            _ => 0,
+            Err(e) => {
+                e.put();
+                0
+            }
         }
     }
 }