diff options
| -rw-r--r-- | README.md | 22 | ||||
| -rw-r--r-- | openssl-sys/Cargo.toml | 4 | ||||
| -rw-r--r-- | openssl-sys/src/lib.rs | 2 | ||||
| -rw-r--r-- | openssl/Cargo.toml | 6 | ||||
| -rw-r--r-- | openssl/src/lib.rs | 2 |
5 files changed, 16 insertions, 20 deletions
@@ -2,7 +2,7 @@ [](https://travis-ci.org/sfackler/rust-openssl) -See the [rustdoc output](https://sfackler.github.io/rust-openssl/doc/openssl). +[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.6.3/openssl). ## Building @@ -67,19 +67,15 @@ build script will skip the pkg-config step. ## Testing Several tests expect a local test server to be running to bounce requests off of. It's easy to do this. Open a separate terminal window and `cd` to the -rust-openssl directory. Then run one of the following commands: +rust-openssl directory. Then run one of the following command: -* Windows: `openssl s_server -accept 15418 -www -cert test/cert.pem -key - test/key.pem > NUL` -* Linux: `openssl s_server -accept 15418 -www -cert test/cert.pem -key - test/key.pem >/dev/null` - -Then in the original terminal, run `cargo test`. If everything is set up -correctly, all tests should pass. You might get some warnings in the `openssl -s_server` window. Those aren't anything to worry about. You can stop the server -using Control-C. +```bash +./openssl/test/test.sh +``` -For DTLS testing each test requires its own instance of OpenSSL's s_server. On -Linux you can run the bash script in `openssl/tests/test.sh`. +This will boot a bunch of `openssl s_server` processes that the tests connect +to. Then in the original terminal, run `cargo test`. If everything is set up +correctly, all tests should pass. You can stop the servers with `killall +openssl`. [1]: http://slproweb.com/products/Win32OpenSSL.html diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index fd1e425a..f3fbfc18 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "openssl-sys" -version = "0.6.2" +version = "0.6.3" authors = ["Alex Crichton <[email protected]>", "Steven Fackler <[email protected]>"] license = "MIT" description = "FFI bindings to OpenSSL" repository = "https://github.com/sfackler/rust-openssl" -documentation = "https://sfackler.github.io/rust-openssl/doc/openssl_sys" +documentation = "https://sfackler.github.io/rust-openssl/doc/v0.6.3/openssl_sys" links = "openssl" build = "build.rs" diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 8437a80f..d77264be 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1,6 +1,6 @@ #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] #![allow(dead_code)] -#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc")] +#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.3")] extern crate libc; diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index a89e9f0c..c2097774 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "openssl" -version = "0.6.2" +version = "0.6.3" authors = ["Steven Fackler <[email protected]>"] license = "Apache-2.0" description = "OpenSSL bindings" repository = "https://github.com/sfackler/rust-openssl" -documentation = "https://sfackler.github.io/rust-openssl/doc/openssl" +documentation = "https://sfackler.github.io/rust-openssl/doc/v0.6.3/openssl" readme = "../README.md" keywords = ["crypto", "tls", "ssl", "dtls"] @@ -20,7 +20,7 @@ npn = ["openssl-sys/npn"] [dependencies.openssl-sys] path = "../openssl-sys" -version = "0.6.2" +version = "0.6.3" [dependencies] bitflags = "0.2" diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs index 4c9b176a..06c514a1 100644 --- a/openssl/src/lib.rs +++ b/openssl/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc")] +#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.3")] #[macro_use] extern crate bitflags; |