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

ASN1_TIME_from_string_x509 was added in 1.1.1

This commit is contained in:
Steven Fackler 2019-01-27 13:12:22 -08:00
parent 691ce7ca2a
commit 34755f8a6b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ extern "C" {
pub fn ASN1_INTEGER_to_BN(ai: *const ASN1_INTEGER, bn: *mut BIGNUM) -> *mut BIGNUM; pub fn ASN1_INTEGER_to_BN(ai: *const ASN1_INTEGER, bn: *mut BIGNUM) -> *mut BIGNUM;
pub fn ASN1_TIME_set_string(s: *mut ASN1_TIME, str: *const c_char) -> c_int; pub fn ASN1_TIME_set_string(s: *mut ASN1_TIME, str: *const c_char) -> c_int;
#[cfg(ossl111)]
pub fn ASN1_TIME_set_string_X509(s: *mut ASN1_TIME, str: *const c_char) -> c_int; pub fn ASN1_TIME_set_string_X509(s: *mut ASN1_TIME, str: *const c_char) -> c_int;
} }

4
openssl/src/asn1.rs
View File

@ -149,7 +149,10 @@ impl Asn1Time {
/// ///
/// This corresponds to [`ASN1_TIME_set_string_X509`]. /// This corresponds to [`ASN1_TIME_set_string_X509`].
/// ///
/// Requires OpenSSL 1.1.1 or newer.
///
/// [`ASN1_TIME_set_string`]: https://www.openssl.org/docs/manmaster/man3/ASN1_TIME_set_string.html /// [`ASN1_TIME_set_string`]: https://www.openssl.org/docs/manmaster/man3/ASN1_TIME_set_string.html
#[cfg(ossl111)]
pub fn from_str_x509(s: &str) -> Result<Asn1Time, ErrorStack> { pub fn from_str_x509(s: &str) -> Result<Asn1Time, ErrorStack> {
unsafe { unsafe {
let s = CString::new(s).unwrap(); let s = CString::new(s).unwrap();
@ -385,6 +388,7 @@ mod tests {
#[test] #[test]
fn time_from_str() { fn time_from_str() {
Asn1Time::from_str("99991231235959Z").unwrap(); Asn1Time::from_str("99991231235959Z").unwrap();
#[cfg(ossl111)]
Asn1Time::from_str_x509("99991231235959Z").unwrap(); Asn1Time::from_str_x509("99991231235959Z").unwrap();
} }
} }