Update to work with change in TcpStream api
This commit is contained in:
parent
1e706b8ef4
commit
89fb825e78
|
|
@ -14,13 +14,13 @@ fn test_new_ctx() {
|
|||
|
||||
#[test]
|
||||
fn test_new_sslstream() {
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verify_untrusted() {
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, None);
|
||||
match SslStream::new(&ctx, stream) {
|
||||
|
|
@ -31,7 +31,7 @@ fn test_verify_untrusted() {
|
|||
|
||||
#[test]
|
||||
fn test_verify_trusted() {
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, None);
|
||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||
|
|
@ -49,7 +49,7 @@ fn test_verify_untrusted_callback_override_ok() {
|
|||
fn callback(_preverify_ok: bool, _x509_ctx: &X509StoreContext) -> bool {
|
||||
true
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||
match SslStream::new(&ctx, stream) {
|
||||
|
|
@ -63,7 +63,7 @@ fn test_verify_untrusted_callback_override_bad() {
|
|||
fn callback(_preverify_ok: bool, _x509_ctx: &X509StoreContext) -> bool {
|
||||
false
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||
assert!(SslStream::new(&ctx, stream).is_err());
|
||||
|
|
@ -74,7 +74,7 @@ fn test_verify_trusted_callback_override_ok() {
|
|||
fn callback(_preverify_ok: bool, _x509_ctx: &X509StoreContext) -> bool {
|
||||
true
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||
|
|
@ -92,7 +92,7 @@ fn test_verify_trusted_callback_override_bad() {
|
|||
fn callback(_preverify_ok: bool, _x509_ctx: &X509StoreContext) -> bool {
|
||||
false
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||
|
|
@ -108,7 +108,7 @@ fn test_verify_callback_load_certs() {
|
|||
assert!(x509_ctx.get_current_cert().is_some());
|
||||
true
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||
assert!(SslStream::new(&ctx, stream).is_ok());
|
||||
|
|
@ -120,7 +120,7 @@ fn test_verify_trusted_get_error_ok() {
|
|||
assert!(x509_ctx.get_error().is_none());
|
||||
true
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||
|
|
@ -136,7 +136,7 @@ fn test_verify_trusted_get_error_err() {
|
|||
assert!(x509_ctx.get_error().is_some());
|
||||
false
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||
assert!(SslStream::new(&ctx, stream).is_err());
|
||||
|
|
@ -154,7 +154,7 @@ fn test_verify_callback_data() {
|
|||
}
|
||||
}
|
||||
}
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||
|
||||
// Node id was generated as SHA256 hash of certificate "test/cert.pem"
|
||||
|
|
@ -175,7 +175,7 @@ fn test_verify_callback_data() {
|
|||
|
||||
#[test]
|
||||
fn test_write() {
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap();
|
||||
stream.write("hello".as_bytes()).unwrap();
|
||||
stream.flush().unwrap();
|
||||
|
|
@ -185,7 +185,7 @@ fn test_write() {
|
|||
|
||||
#[test]
|
||||
fn test_read() {
|
||||
let stream = TcpStream::connect("127.0.0.1", 15418).unwrap();
|
||||
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
|
||||
let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap();
|
||||
stream.write("GET /\r\n\r\n".as_bytes()).unwrap();
|
||||
stream.flush().unwrap();
|
||||
|
|
|
|||
Loading…
Reference in New Issue