diff options
| author | Steven Fackler <[email protected]> | 2018-07-07 20:20:45 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-07 20:20:45 -0700 |
| commit | 1392b006e2af882fa2a12eeaf9967988ac119c53 (patch) | |
| tree | d4b9baf098fd26bbb98a887f2f0c6c5db0614e80 /openssl-sys | |
| parent | Clean up IGE example (diff) | |
| parent | Only grab the name entry count when needed (diff) | |
| download | rust-openssl-1392b006e2af882fa2a12eeaf9967988ac119c53.tar.xz rust-openssl-1392b006e2af882fa2a12eeaf9967988ac119c53.zip | |
Merge pull request #937 from marcoh00/iterable-x509names
X509NameRef: Provide an iterator over all entries
Diffstat (limited to 'openssl-sys')
| -rw-r--r-- | openssl-sys/src/libressl/mod.rs | 2 | ||||
| -rw-r--r-- | openssl-sys/src/openssl/v10x.rs | 2 | ||||
| -rw-r--r-- | openssl-sys/src/openssl/v110.rs | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/openssl-sys/src/libressl/mod.rs b/openssl-sys/src/libressl/mod.rs index c65f6464..b9732cdd 100644 --- a/openssl-sys/src/libressl/mod.rs +++ b/openssl-sys/src/libressl/mod.rs @@ -593,8 +593,10 @@ extern "C" { loc: c_int, set: c_int, ) -> c_int; + pub fn X509_NAME_entry_count(n: *mut ::X509_NAME) -> c_int; pub fn X509_NAME_get_entry(n: *mut ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY; pub fn X509_NAME_ENTRY_get_data(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING; + pub fn X509_NAME_ENTRY_get_object(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT; pub fn X509_STORE_CTX_get_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509; pub fn X509V3_EXT_nconf_nid( conf: *mut ::CONF, diff --git a/openssl-sys/src/openssl/v10x.rs b/openssl-sys/src/openssl/v10x.rs index c22bb7fc..92ad295c 100644 --- a/openssl-sys/src/openssl/v10x.rs +++ b/openssl-sys/src/openssl/v10x.rs @@ -959,8 +959,10 @@ extern "C" { ppval: *mut *mut c_void, alg: *mut ::X509_ALGOR, ); + pub fn X509_NAME_entry_count(n: *mut ::X509_NAME) -> c_int; pub fn X509_NAME_get_entry(n: *mut ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY; pub fn X509_NAME_ENTRY_get_data(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING; + pub fn X509_NAME_ENTRY_get_object(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT; pub fn X509_STORE_CTX_get_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509; pub fn X509V3_EXT_nconf_nid( conf: *mut ::CONF, diff --git a/openssl-sys/src/openssl/v110.rs b/openssl-sys/src/openssl/v110.rs index 493385da..3c633491 100644 --- a/openssl-sys/src/openssl/v110.rs +++ b/openssl-sys/src/openssl/v110.rs @@ -198,8 +198,10 @@ extern "C" { ppval: *mut *const c_void, alg: *const ::X509_ALGOR, ); + pub fn X509_NAME_entry_count(n: *const ::X509_NAME) -> c_int; pub fn X509_NAME_get_entry(n: *const ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY; pub fn X509_NAME_ENTRY_get_data(ne: *const ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING; + pub fn X509_NAME_ENTRY_get_object(ne: *const ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT; pub fn X509V3_EXT_nconf_nid( conf: *mut ::CONF, ctx: *mut ::X509V3_CTX, |