From fb98f482e23a7283458d44289db51c99fa74e480 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/crypto/pkey.rs
	openssl/src/ssl/tests.rs
---
 openssl/src/ssl/tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index 8de0d448..609bb3ce 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -26,7 +26,7 @@ use crypto::pkey::PKey;
 use ssl::connected_socket::Connect;
 #[cfg(feature="dtlsv1")]
 use std::net::UdpSocket;
-use ssl::SslVerifyMode::SslVerifyPeer;
+use ssl::SSL_VERIFY_PEER;
 use x509::{X509StoreContext,X509};
 use crypto::pkey::PKey;