Commit fb98f482 authored by Manuel Schölling's avatar Manuel Schölling
Browse files

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
parent 3c03dd95

openssl/src/ssl/tests.rs

+1 −1
Original line number Diff line number Diff line
@@ -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;