min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #809 from sfackler/issuer-name 

Add issuer name access.
This commit is contained in:
Steven Fackler 2017-12-29 10:55:39 -08:00 committed by GitHub
parent a97a90cf05 89dd50b3ce
commit 6238b4a20a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openssl-sys/src/libressl/mod.rs
View File

@ -542,6 +542,7 @@ extern "C" {
-> *mut ::EC_KEY,
);
pub fn X509_get_subject_name(x: *mut ::X509) -> *mut ::X509_NAME;
pub fn X509_get_issuer_name(x: *mut ::X509) -> *mut ::X509_NAME;
pub fn X509_set_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
pub fn X509_set_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
pub fn X509_get_ext_d2i(

1
openssl-sys/src/ossl10x.rs
View File

@ -830,6 +830,7 @@ extern "C" {
-> *mut ::EC_KEY,
);
pub fn X509_get_subject_name(x: *mut ::X509) -> *mut ::X509_NAME;
pub fn X509_get_issuer_name(x: *mut ::X509) -> *mut ::X509_NAME;
pub fn X509_set_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
pub fn X509_set_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
pub fn X509_get_ext_d2i(

1
openssl-sys/src/ossl110.rs
View File

@ -107,6 +107,7 @@ extern "C" {
pub fn DTLS_method() -> *const ::SSL_METHOD;
pub fn SSL_CIPHER_get_version(cipher: *const ::SSL_CIPHER) -> *const c_char;
pub fn X509_get_subject_name(x: *const ::X509) -> *mut ::X509_NAME;
pub fn X509_get_issuer_name(x: *const ::X509) -> *mut ::X509_NAME;
pub fn X509_set1_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
pub fn X509_set1_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
pub fn X509_get_ext_d2i(

50
openssl/src/x509/mod.rs
View File

@ -263,14 +263,37 @@ foreign_type_and_impl_send_sync! {
}
impl X509Ref {
/// Returns this certificate's subject name.
///
/// This corresponds to [`X509_get_subject_name`].
///
/// [`X509_get_subject_name`]: https://www.openssl.org/docs/man1.1.0/crypto/X509_get_subject_name.html
pub fn subject_name(&self) -> &X509NameRef {
unsafe {
let name = ffi::X509_get_subject_name(self.as_ptr());
assert!(!name.is_null());
X509NameRef::from_ptr(name)
}
}
/// Returns this certificate's SAN entries, if they exist.
/// Returns this certificate's issuer name.
///
/// This corresponds to [`X509_get_issuer_name`].
///
/// [`X509_get_issuer_name`]: https://www.openssl.org/docs/man1.1.0/crypto/X509_get_subject_name.html
pub fn issuer_name(&self) -> &X509NameRef {
unsafe {
let name = ffi::X509_get_issuer_name(self.as_ptr());
assert!(!name.is_null());
X509NameRef::from_ptr(name)
}
}
/// Returns this certificate's subject alternative name entries, if they exist.
///
/// This corresponds to [`X509_get_ext_d2i`] called with `NID_subject_alt_name`.
///
/// [`X509_get_ext_d2i`]: https://www.openssl.org/docs/man1.1.0/crypto/X509_get_ext_d2i.html
pub fn subject_alt_names(&self) -> Option<Stack<GeneralName>> {
unsafe {
let stack = ffi::X509_get_ext_d2i(
@ -280,10 +303,31 @@ impl X509Ref {
ptr::null_mut(),
);
if stack.is_null() {
return None;
None
} else {
Some(Stack::from_ptr(stack as *mut _))
}
}
}
Some(Stack::from_ptr(stack as *mut _))
/// Returns this certificate's issuer alternative name entries, if they exist.
///
/// This corresponds to [`X509_get_ext_d2i`] called with `NID_issuer_alt_name`.
///
/// [`X509_get_ext_d2i`]: https://www.openssl.org/docs/man1.1.0/crypto/X509_get_ext_d2i.html
pub fn issuer_alt_names(&self) -> Option<Stack<GeneralName>> {
unsafe {
let stack = ffi::X509_get_ext_d2i(
self.as_ptr(),
ffi::NID_issuer_alt_name,
ptr::null_mut(),
ptr::null_mut(),
);
if stack.is_null() {
None
} else {
Some(Stack::from_ptr(stack as *mut _))
}
}
}