fail! -> panic!
This commit is contained in:
parent
6277635e5c
commit
1eb79df25a
|
|
@ -483,7 +483,7 @@ pub mod unchecked {
|
||||||
unsafe {
|
unsafe {
|
||||||
let r = ffi::BN_dup(self.raw());
|
let r = ffi::BN_dup(self.raw());
|
||||||
if r.is_null() {
|
if r.is_null() {
|
||||||
fail!("Unexpected null pointer from BN_dup(..)")
|
panic!("Unexpected null pointer from BN_dup(..)")
|
||||||
} else {
|
} else {
|
||||||
BigNum(r)
|
BigNum(r)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ use ffi;
|
||||||
///
|
///
|
||||||
/// # Failure
|
/// # Failure
|
||||||
///
|
///
|
||||||
/// This function will fail the current task if `a` and `b` do not have the same
|
/// This function will panic the current task if `a` and `b` do not have the same
|
||||||
/// length.
|
/// length.
|
||||||
pub fn eq(a: &[u8], b: &[u8]) -> bool {
|
pub fn eq(a: &[u8], b: &[u8]) -> bool {
|
||||||
assert!(a.len() == b.len());
|
assert!(a.len() == b.len());
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint, keylen: uint) -> Ve
|
||||||
iter as c_int, keylen as c_int,
|
iter as c_int, keylen as c_int,
|
||||||
out.as_mut_ptr());
|
out.as_mut_ptr());
|
||||||
|
|
||||||
if r != 1 { fail!(); }
|
if r != 1 { panic!(); }
|
||||||
|
|
||||||
out.set_len(keylen);
|
out.set_len(keylen);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ pub fn rand_bytes(len: uint) -> Vec<u8> {
|
||||||
|
|
||||||
ffi::init();
|
ffi::init();
|
||||||
let r = ffi::RAND_bytes(out.as_mut_ptr(), len as c_int);
|
let r = ffi::RAND_bytes(out.as_mut_ptr(), len as c_int);
|
||||||
if r != 1 as c_int { fail!() }
|
if r != 1 as c_int { panic!() }
|
||||||
|
|
||||||
out.set_len(len);
|
out.set_len(len);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ mod tests {
|
||||||
println!("Lengths differ: {} in computed vs {} expected",
|
println!("Lengths differ: {} in computed vs {} expected",
|
||||||
computed.len(), expected.len());
|
computed.len(), expected.len());
|
||||||
}
|
}
|
||||||
fail!("test failure");
|
panic!("test failure");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ impl SslError {
|
||||||
fn test_uknown_error_should_have_correct_messages() {
|
fn test_uknown_error_should_have_correct_messages() {
|
||||||
let errs = match SslError::from_error(336032784) {
|
let errs = match SslError::from_error(336032784) {
|
||||||
OpenSslErrors(errs) => errs,
|
OpenSslErrors(errs) => errs,
|
||||||
_ => fail!("This should always be an `OpenSslErrors` variant.")
|
_ => panic!("This should always be an `OpenSslErrors` variant.")
|
||||||
};
|
};
|
||||||
|
|
||||||
let UnknownError { ref library, ref function, ref reason } = errs[0];
|
let UnknownError { ref library, ref function, ref reason } = errs[0];
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ fn test_verify_untrusted() {
|
||||||
let mut ctx = SslContext::new(Sslv23).unwrap();
|
let mut ctx = SslContext::new(Sslv23).unwrap();
|
||||||
ctx.set_verify(SslVerifyPeer, None);
|
ctx.set_verify(SslVerifyPeer, None);
|
||||||
match SslStream::new(&ctx, stream) {
|
match SslStream::new(&ctx, stream) {
|
||||||
Ok(_) => fail!("expected failure"),
|
Ok(_) => panic!("expected failure"),
|
||||||
Err(err) => println!("error {}", err)
|
Err(err) => println!("error {}", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -36,11 +36,11 @@ fn test_verify_trusted() {
|
||||||
ctx.set_verify(SslVerifyPeer, None);
|
ctx.set_verify(SslVerifyPeer, None);
|
||||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||||
None => {}
|
None => {}
|
||||||
Some(err) => fail!("Unexpected error {}", err)
|
Some(err) => panic!("Unexpected error {}", err)
|
||||||
}
|
}
|
||||||
match SslStream::new(&ctx, stream) {
|
match SslStream::new(&ctx, stream) {
|
||||||
Ok(_) => (),
|
Ok(_) => (),
|
||||||
Err(err) => fail!("Expected success, got {}", err)
|
Err(err) => panic!("Expected success, got {}", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -54,7 +54,7 @@ fn test_verify_untrusted_callback_override_ok() {
|
||||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||||
match SslStream::new(&ctx, stream) {
|
match SslStream::new(&ctx, stream) {
|
||||||
Ok(_) => (),
|
Ok(_) => (),
|
||||||
Err(err) => fail!("Expected success, got {}", err)
|
Err(err) => panic!("Expected success, got {}", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -79,11 +79,11 @@ fn test_verify_trusted_callback_override_ok() {
|
||||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||||
None => {}
|
None => {}
|
||||||
Some(err) => fail!("Unexpected error {}", err)
|
Some(err) => panic!("Unexpected error {}", err)
|
||||||
}
|
}
|
||||||
match SslStream::new(&ctx, stream) {
|
match SslStream::new(&ctx, stream) {
|
||||||
Ok(_) => (),
|
Ok(_) => (),
|
||||||
Err(err) => fail!("Expected success, got {}", err)
|
Err(err) => panic!("Expected success, got {}", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -97,7 +97,7 @@ fn test_verify_trusted_callback_override_bad() {
|
||||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||||
None => {}
|
None => {}
|
||||||
Some(err) => fail!("Unexpected error {}", err)
|
Some(err) => panic!("Unexpected error {}", err)
|
||||||
}
|
}
|
||||||
assert!(SslStream::new(&ctx, stream).is_err());
|
assert!(SslStream::new(&ctx, stream).is_err());
|
||||||
}
|
}
|
||||||
|
|
@ -125,7 +125,7 @@ fn test_verify_trusted_get_error_ok() {
|
||||||
ctx.set_verify(SslVerifyPeer, Some(callback));
|
ctx.set_verify(SslVerifyPeer, Some(callback));
|
||||||
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
match ctx.set_CA_file(&Path::new("test/cert.pem")) {
|
||||||
None => {}
|
None => {}
|
||||||
Some(err) => fail!("Unexpected error {}", err)
|
Some(err) => panic!("Unexpected error {}", err)
|
||||||
}
|
}
|
||||||
assert!(SslStream::new(&ctx, stream).is_ok());
|
assert!(SslStream::new(&ctx, stream).is_ok());
|
||||||
}
|
}
|
||||||
|
|
@ -168,7 +168,7 @@ fn test_verify_callback_data() {
|
||||||
|
|
||||||
match SslStream::new(&ctx, stream) {
|
match SslStream::new(&ctx, stream) {
|
||||||
Ok(_) => (),
|
Ok(_) => (),
|
||||||
Err(err) => fail!("Expected success, got {}", err)
|
Err(err) => panic!("Expected success, got {}", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -390,7 +390,7 @@ impl<'ctx> X509<'ctx> {
|
||||||
match len.cmp(&act_len) {
|
match len.cmp(&act_len) {
|
||||||
Greater => None,
|
Greater => None,
|
||||||
Equal => Some(v),
|
Equal => Some(v),
|
||||||
Less => fail!("Fingerprint buffer was corrupted!")
|
Less => panic!("Fingerprint buffer was corrupted!")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue