aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2014-10-07 23:18:33 -0400
committerSteven Fackler <[email protected]>2014-10-07 23:18:33 -0400
commitc9eef510ce28f451516030c82fe2461c08a0fd9e (patch)
tree1cb0974cc5cd3fb0e3583de03632b791b23a823c /src
parentMerge pull request #66 from jroesch/fix-failing-test (diff)
parentRevert "Fix #65: failing test case" (diff)
downloadrust-openssl-c9eef510ce28f451516030c82fe2461c08a0fd9e.tar.xz
rust-openssl-c9eef510ce28f451516030c82fe2461c08a0fd9e.zip
Merge pull request #72 from sfackler/revert-66-fix-failing-test
Revert "Fix #65: failing test case"
Diffstat (limited to 'src')
-rw-r--r--src/ssl/error.rs2
-rw-r--r--src/ssl/mod.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ssl/error.rs b/src/ssl/error.rs
index 56df2747..56105253 100644
--- a/src/ssl/error.rs
+++ b/src/ssl/error.rs
@@ -42,8 +42,8 @@ fn get_reason(err: c_ulong) -> String {
}
#[test]
+#[ignore] // FIXME #65
fn test_uknown_error_should_have_correct_messages() {
- unsafe { ffi::SSL_load_error_strings(); }
let err = 336032784;
let library = get_lib(err);
let function = get_func(err);
diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs
index 67437b52..b37d3142 100644
--- a/src/ssl/mod.rs
+++ b/src/ssl/mod.rs
@@ -25,7 +25,7 @@ fn init() {
INIT.doit(|| {
ffi::SSL_library_init();
ffi::SSL_load_error_strings();
- ffi::ERR_load_crypto_strings(); // necessary?
+ ffi::ERR_load_crypto_strings();
let verify_idx = ffi::SSL_CTX_get_ex_new_index(0, ptr::null(), None,
None, None);
assert!(verify_idx >= 0);