From 4d3f9e0520ed25bb55a95f30fd07a2cb4cf74fa5 Mon Sep 17 00:00:00 2001
From: Valerii Hiora <valerii.hiora@gmail.com>
Date: Sat, 4 Oct 2014 06:37:48 +0300
Subject: [PATCH] Simpler setter for verify with data

There is no need in wrapping function in option as there is no
sense in providing data without function.
---
 src/ssl/mod.rs   | 6 ++++--
 src/ssl/tests.rs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs
index e1f35724..ab467f7e 100644
--- a/src/ssl/mod.rs
+++ b/src/ssl/mod.rs
@@ -222,13 +222,15 @@ impl SslContext {
 
     /// Configures the certificate verification method for new connections also
     /// carrying supplied data.
+    // Note: no option because there is no point to set data without providing
+    // a function handling it
     pub fn set_verify_with_data<T>(&mut self, mode: SslVerifyMode,
-                                   verify: Option<VerifyCallbackData<T>>,
+                                   verify: VerifyCallbackData<T>,
                                    data: T) {
         let data = box data;
         unsafe {
             ffi::SSL_CTX_set_ex_data(self.ctx, VERIFY_IDX,
-                                     mem::transmute(verify));
+                                     mem::transmute(Some(verify)));
             ffi::SSL_CTX_set_ex_data(self.ctx, get_verify_data_idx::<T>(),
                                      mem::transmute(data));
             ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(raw_verify_with_data::<T>));
diff --git a/src/ssl/tests.rs b/src/ssl/tests.rs
index 9dd90ae7..0e6edbf7 100644
--- a/src/ssl/tests.rs
+++ b/src/ssl/tests.rs
@@ -176,7 +176,7 @@ fn test_verify_callback_data() {
     // Please update if "test/cert.pem" will ever change
     let node_hash_str = "6204f6617e1af7495394250655f43600cd483e2dfc2005e92d0fe439d0723c34";
     let node_id = hash_str_to_vec(node_hash_str);
-    ctx.set_verify_with_data(SslVerifyNone, Some(callback), node_id);
+    ctx.set_verify_with_data(SslVerifyNone, callback, node_id);
     ctx.set_verify_depth(1);
 
     match SslStream::new(&ctx, stream) {