From 5fd23d38d523c3be3138acb4aa2849e271d15b16 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 24 Feb 2018 20:46:03 -0800
Subject: Add the ability to push errors back onto the error stack.

---
 openssl/src/ssl/callbacks.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'openssl/src/ssl')

diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs
index 2fc43ac0..c06d32a0 100644
--- a/openssl/src/ssl/callbacks.rs
+++ b/openssl/src/ssl/callbacks.rs
@@ -162,8 +162,8 @@ where
             mem::forget(dh);
             ptr
         }
-        Err(_) => {
-            // FIXME reset error stack
+        Err(e) => {
+            e.put();
             ptr::null_mut()
         }
     }
@@ -189,8 +189,8 @@ where
             mem::forget(ec_key);
             ptr
         }
-        Err(_) => {
-            // FIXME reset error stack
+        Err(e) => {
+            e.put();
             ptr::null_mut()
         }
     }
@@ -214,8 +214,8 @@ where
             mem::forget(dh);
             ptr
         }
-        Err(_) => {
-            // FIXME reset error stack
+        Err(e) => {
+            e.put();
             ptr::null_mut()
         }
     }
@@ -240,8 +240,8 @@ where
             mem::forget(ec_key);
             ptr
         }
-        Err(_) => {
-            // FIXME reset error stack
+        Err(e) => {
+            e.put();
             ptr::null_mut()
         }
     }
@@ -262,8 +262,8 @@ where
         match ret {
             Ok(true) => ffi::SSL_TLSEXT_ERR_OK,
             Ok(false) => ffi::SSL_TLSEXT_ERR_NOACK,
-            Err(_) => {
-                // FIXME reset error stack
+            Err(e) => {
+                e.put();
                 ffi::SSL_TLSEXT_ERR_ALERT_FATAL
             }
         }
@@ -271,8 +271,8 @@ where
         match ret {
             Ok(true) => 1,
             Ok(false) => 0,
-            Err(_) => {
-                // FIXME reset error stack
+            Err(e) => {
+                e.put();
                 -1
             }
         }
-- 
cgit v1.2.3