diff options
| author | Ansley Peduru <[email protected]> | 2018-01-01 15:40:02 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-01-01 15:40:02 -0500 |
| commit | c2430b87f77a7396aca08e23d99b0fbea589627e (patch) | |
| tree | 32dec00c09d6b7e8d796dd00a0134fe3dec3b959 /openssl/src/x509 | |
| parent | Fix x509 doc examples (diff) | |
| parent | Merge pull request #813 from sfackler/ssl-filetype (diff) | |
| download | rust-openssl-c2430b87f77a7396aca08e23d99b0fbea589627e.tar.xz rust-openssl-c2430b87f77a7396aca08e23d99b0fbea589627e.zip | |
Merge branch 'master' into x509-docs
Diffstat (limited to 'openssl/src/x509')
| -rw-r--r-- | openssl/src/x509/mod.rs | 17 | ||||
| -rw-r--r-- | openssl/src/x509/tests.rs | 14 |
2 files changed, 6 insertions, 25 deletions
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index 0ee02f0c..9aff6dc1 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -80,23 +80,6 @@ pub mod store; #[cfg(test)] mod tests; -/// The file type of the encoded `X509` certificate. -pub struct X509Filetype(c_int); - -impl X509Filetype { - /// Returns the raw OpenSSL value represented by this type. - pub fn as_raw(&self) -> c_int { - self.0 - } - - /// `PEM` encoded `X509` certificate. - pub const PEM: X509Filetype = X509Filetype(ffi::X509_FILETYPE_PEM); - /// `ASN.1` encoded `X509` certificate. - pub const ASN1: X509Filetype = X509Filetype(ffi::X509_FILETYPE_ASN1); - /// Default encoded `X509` certificate. - pub const DEFAULT: X509Filetype = X509Filetype(ffi::X509_FILETYPE_DEFAULT); -} - foreign_type_and_impl_send_sync! { type CType = ffi::X509_STORE_CTX; fn drop = ffi::X509_STORE_CTX_free; diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs index b6db948b..2d9348e8 100644 --- a/openssl/src/x509/tests.rs +++ b/openssl/src/x509/tests.rs @@ -1,4 +1,4 @@ -use hex::{FromHex, ToHex}; +use hex::{self, FromHex}; use asn1::Asn1Time; use bn::{BigNum, MsbOption}; @@ -231,17 +231,15 @@ fn test_stack_from_pem() { assert_eq!(certs.len(), 2); assert_eq!( - certs[0] + hex::encode(certs[0] .fingerprint(MessageDigest::sha1()) - .unwrap() - .to_hex(), + .unwrap()), "59172d9313e84459bcff27f967e79e6e9217e584" ); assert_eq!( - certs[1] + hex::encode(certs[1] .fingerprint(MessageDigest::sha1()) - .unwrap() - .to_hex(), + .unwrap()), "c0cbdf7cdd03c9773e5468e1f6d2da7d5cbb1875" ); } @@ -263,7 +261,7 @@ fn signature() { let cert = X509::from_pem(cert).unwrap(); let signature = cert.signature(); assert_eq!( - signature.as_slice().to_hex(), + hex::encode(signature.as_slice()), "4af607b889790b43470442cfa551cdb8b6d0b0340d2958f76b9e3ef6ad4992230cead6842587f0ecad5\ 78e6e11a221521e940187e3d6652de14e84e82f6671f097cc47932e022add3c0cb54a26bf27fa84c107\ 4971caa6bee2e42d34a5b066c427f2d452038082b8073993399548088429de034fdd589dcfb0dd33be7\ |