diff options
| author | Jethro Beekman <[email protected]> | 2015-06-30 22:30:54 -0700 |
|---|---|---|
| committer | Jethro Beekman <[email protected]> | 2015-07-01 00:18:45 -0700 |
| commit | 2fa134436707454d8c46a0fba8a7e252fb9f1668 (patch) | |
| tree | 7460f6eddbfc9f85088c6bd4964268adde0eb4f9 /openssl/src/x509/tests.rs | |
| parent | Implement arbitrary X509 Extended Key Usage values (diff) | |
| download | rust-openssl-2fa134436707454d8c46a0fba8a7e252fb9f1668.tar.xz rust-openssl-2fa134436707454d8c46a0fba8a7e252fb9f1668.zip | |
Add public generic extension interface to X509Generator
* Add add_extension and add_extensions functions
* Deprecate set_usage and set_ext_usage
* Change test to use add_extension
Diffstat (limited to 'openssl/src/x509/tests.rs')
| -rw-r--r-- | openssl/src/x509/tests.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs index 66dc33d3..806bc671 100644 --- a/openssl/src/x509/tests.rs +++ b/openssl/src/x509/tests.rs @@ -5,8 +5,9 @@ use std::fs::File; use crypto::hash::Type::{SHA256}; use x509::{X509, X509Generator}; -use x509::KeyUsage::{DigitalSignature, KeyEncipherment}; -use x509::ExtKeyUsage::{self, ClientAuth, ServerAuth}; +use x509::extension::Extension::{KeyUsage,ExtKeyUsage}; +use x509::extension::KeyUsageOption::{DigitalSignature, KeyEncipherment}; +use x509::extension::ExtKeyUsageOption::{self, ClientAuth, ServerAuth}; use nid::Nid; #[test] @@ -16,8 +17,8 @@ fn test_cert_gen() { .set_valid_period(365*2) .set_CN("test_me") .set_sign_hash(SHA256) - .set_usage(&[DigitalSignature, KeyEncipherment]) - .set_ext_usage(&[ClientAuth, ServerAuth, ExtKeyUsage::Other("2.999".to_owned())]); + .add_extension(KeyUsage(vec![DigitalSignature, KeyEncipherment])) + .add_extension(ExtKeyUsage(vec![ClientAuth, ServerAuth, ExtKeyUsageOption::Other("2.999".to_owned())])); let (cert, pkey) = gen.generate().unwrap(); cert.write_pem(&mut io::sink()).unwrap(); |