From 3c03dd9535f473c1553e6774e2f9a30516d066a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= <manuel.schoelling@gmx.de>
Date: Thu, 19 Mar 2015 10:15:02 +0100
Subject: [PATCH] Add ability to load private keys from files and use raw keys
 and certificates for SslContext

Conflicts:
	openssl/src/ssl/tests.rs
---
 openssl/src/ssl/tests.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index b9442010..8de0d448 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -26,6 +26,9 @@ use crypto::pkey::PKey;
 use ssl::connected_socket::Connect;
 #[cfg(feature="dtlsv1")]
 use std::net::UdpSocket;
+use ssl::SslVerifyMode::SslVerifyPeer;
+use x509::{X509StoreContext,X509};
+use crypto::pkey::PKey;
 
 #[cfg(feature="dtlsv1")]
 use ssl::SslMethod::Dtlsv1;
@@ -119,7 +122,7 @@ run_test!(verify_trusted, |method, stream| {
         Err(err) => panic!("Expected success, got {:?}", err)
     }
 });
-/*
+
 run_test!(verify_untrusted_callback_override_ok, |method, stream| {
     fn callback(_preverify_ok: bool, _x509_ctx: &X509StoreContext) -> bool {
         true
@@ -288,7 +291,7 @@ run_test!(clear_ctx_options, |method, _| {
     let opts = ctx.clear_options(ssl::SSL_OP_ALL);
     assert!(!opts.contains(ssl::SSL_OP_ALL));
 });
-*/
+
 #[test]
 fn test_write() {
     let stream = TcpStream::connect("127.0.0.1:15418").unwrap();