diff options
-rw-r--r-- | openssl-sys-extras/src/openssl_shim.c | 4 | ||||
-rw-r--r-- | openssl/Cargo.toml | 1 | ||||
-rw-r--r-- | openssl/src/c_helpers.c | 4 | ||||
-rw-r--r-- | openssl/src/c_helpers.rs | 1 | ||||
-rw-r--r-- | openssl/src/x509/mod.rs | 6 | ||||
-rw-r--r-- | openssl/src/x509/tests.rs | 1 | ||||
-rwxr-xr-x | openssl/test/run.sh | 2 |
7 files changed, 12 insertions, 7 deletions
diff --git a/openssl-sys-extras/src/openssl_shim.c b/openssl-sys-extras/src/openssl_shim.c index db2a8786..974312b9 100644 --- a/openssl-sys-extras/src/openssl_shim.c +++ b/openssl-sys-extras/src/openssl_shim.c @@ -138,7 +138,3 @@ DH *DH_new_from_params(BIGNUM *p, BIGNUM *g, BIGNUM *q) { long SSL_set_tlsext_host_name_shim(SSL *s, char *name) { return SSL_set_tlsext_host_name(s, name); } - -STACK_OF(X509_EXTENSION) *X509_get_extensions_shim(X509 *x) { - return x->cert_info ? x->cert_info->extensions : NULL; -} diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 4669f7e5..f4f4673c 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -28,6 +28,7 @@ pkcs5_pbkdf2_hmac = ["openssl-sys/pkcs5_pbkdf2_hmac"] c_helpers = ["gcc"] x509_clone = ["c_helpers"] +x509_generator_request = ["c_helpers"] ssl_context_clone = ["c_helpers"] [dependencies] diff --git a/openssl/src/c_helpers.c b/openssl/src/c_helpers.c index 5b1b9615..f8bc2d0d 100644 --- a/openssl/src/c_helpers.c +++ b/openssl/src/c_helpers.c @@ -7,3 +7,7 @@ void rust_SSL_CTX_clone(SSL_CTX *ctx) { void rust_X509_clone(X509 *x509) { CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509); } + +STACK_OF(X509_EXTENSION) *rust_X509_get_extensions(X509 *x) { + return x->cert_info ? x->cert_info->extensions : NULL; +} diff --git a/openssl/src/c_helpers.rs b/openssl/src/c_helpers.rs index 3d938192..f074d404 100644 --- a/openssl/src/c_helpers.rs +++ b/openssl/src/c_helpers.rs @@ -4,4 +4,5 @@ use ffi; extern "C" { pub fn rust_SSL_CTX_clone(cxt: *mut ffi::SSL_CTX); pub fn rust_X509_clone(x509: *mut ffi::X509); + pub fn rust_X509_get_extensions(x: *mut ffi::X509) -> *mut ffi::stack_st_X509_EXTENSION; } diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index b7503e0a..3bdbaa67 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -17,7 +17,6 @@ use crypto::hash::Type as HashType; use crypto::pkey::PKey; use crypto::rand::rand_bytes; use ffi; -use ffi_extras; use nid::Nid; use error::ErrorStack; @@ -346,6 +345,9 @@ impl X509Generator { } /// Obtain a certificate signing request (CSR) + /// + /// Requries the `x509_generator_request` feature. + #[cfg(feature = "x509_generator_request")] pub fn request(&self, p_key: &PKey) -> Result<X509Req, ErrorStack> { let cert = match self.sign(p_key) { Ok(c) => c, @@ -356,7 +358,7 @@ impl X509Generator { let req = ffi::X509_to_X509_REQ(cert.handle(), ptr::null_mut(), ptr::null()); try_ssl_null!(req); - let exts = ffi_extras::X509_get_extensions(cert.handle()); + let exts = ::c_helpers::rust_X509_get_extensions(cert.handle()); if exts != ptr::null_mut() { try_ssl!(ffi::X509_REQ_add_extensions(req, exts)); } diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs index ab480836..c09b31cd 100644 --- a/openssl/src/x509/tests.rs +++ b/openssl/src/x509/tests.rs @@ -69,6 +69,7 @@ fn test_cert_gen_extension_bad_ordering() { } #[test] +#[cfg(feature = "x509_generator_request")] fn test_req_gen() { let pkey = pkey(); diff --git a/openssl/test/run.sh b/openssl/test/run.sh index 9f833e65..22a54c4d 100755 --- a/openssl/test/run.sh +++ b/openssl/test/run.sh @@ -4,7 +4,7 @@ set -e MAIN_TARGETS=https://static.rust-lang.org/dist if [ "$TEST_FEATURES" == "true" ]; then - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac x509_clone ssl_context_clone" + FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac x509_clone ssl_context_clone x509_generator_request" fi if [ "$TRAVIS_OS_NAME" != "osx" ]; then |