min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt code for rust-1.0.0-beta

This commit is contained in:
Manuel Schölling 2015-04-06 12:56:38 +02:00
parent 912cacf4bc
commit b3eae0e3f6
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openssl/src/ssl/tests.rs
View File

@ -22,12 +22,8 @@ use x509::X509FileType;
use x509::X509; use x509::X509;
use crypto::pkey::PKey; use crypto::pkey::PKey;
#[cfg(feature="dtlsv1")]
use ssl::connected_socket::Connect;
#[cfg(feature="dtlsv1")] #[cfg(feature="dtlsv1")]
use std::net::UdpSocket; use std::net::UdpSocket;
use crypto::pkey::PKey;
#[cfg(feature="dtlsv1")] #[cfg(feature="dtlsv1")]
use ssl::SslMethod::Dtlsv1; use ssl::SslMethod::Dtlsv1;
#[cfg(feature="dtlsv1")] #[cfg(feature="dtlsv1")]
@ -64,7 +60,6 @@ macro_rules! run_test(
use crypto::hash::Type::SHA256; use crypto::hash::Type::SHA256;
use x509::X509StoreContext; use x509::X509StoreContext;
use serialize::hex::FromHex; use serialize::hex::FromHex;
use std::time::duration::Duration;
#[test] #[test]
fn sslv23() { fn sslv23() {
@ -76,7 +71,8 @@ macro_rules! run_test(
#[cfg(feature="dtlsv1")] #[cfg(feature="dtlsv1")]
fn dtlsv1() { fn dtlsv1() {
let sock = UdpSocket::bind("127.0.0.1:0").unwrap(); let sock = UdpSocket::bind("127.0.0.1:0").unwrap();
let stream = sock.connect(udp::next_server().as_slice()).unwrap(); let server = udp::next_server();
let stream = sock.connect(&server[..]).unwrap();
$blk(SslMethod::Dtlsv1, stream); $blk(SslMethod::Dtlsv1, stream);
} }
@ -433,7 +429,7 @@ fn test_npn_server_advertise_multiple() {
#[cfg(test)] #[cfg(test)]
mod dtlsv1 { mod dtlsv1 {
use serialize::hex::FromHex; use serialize::hex::FromHex;
use std::old_io::net::tcp::TcpStream; use std::net::TcpStream;
use std::old_io::{Writer}; use std::old_io::{Writer};
use std::thread; use std::thread;
@ -441,7 +437,7 @@ mod dtlsv1 {
use ssl::SslMethod; use ssl::SslMethod;
use ssl::SslMethod::Dtlsv1; use ssl::SslMethod::Dtlsv1;
use ssl::{SslContext, SslStream, VerifyCallback}; use ssl::{SslContext, SslStream, VerifyCallback};
use ssl::SslVerifyMode::SSL_VERIFY_PEER; use ssl::SSL_VERIFY_PEER;
use x509::{X509StoreContext}; use x509::{X509StoreContext};
const PROTOCOL:SslMethod = Dtlsv1; const PROTOCOL:SslMethod = Dtlsv1;
@ -456,7 +452,8 @@ mod dtlsv1 {
#[cfg(feature = "dtlsv1")] #[cfg(feature = "dtlsv1")]
fn test_read_dtlsv1() { fn test_read_dtlsv1() {
let sock = UdpSocket::bind("127.0.0.1:0").unwrap(); let sock = UdpSocket::bind("127.0.0.1:0").unwrap();
let stream = sock.connect(udp::next_server().as_slice()).unwrap(); let server = udp::next_server();
let stream = sock.connect(&server[..]).unwrap();
let mut stream = SslStream::new(&SslContext::new(Dtlsv1).unwrap(), stream).unwrap(); let mut stream = SslStream::new(&SslContext::new(Dtlsv1).unwrap(), stream).unwrap();
let mut buf = [0u8;100]; let mut buf = [0u8;100];