Commit eefdcd04 authored by Zhang Jingqiang's avatar Zhang Jingqiang
Browse files

update cfg condition and use new Asn1OctetString

parent e8108cb2

openssl-sys/src/handwritten/x509v3.rs

+5 −5
Original line number Diff line number Diff line
@@ -96,15 +96,15 @@ extern "C" { 
        indent: c_int,

    ) -> c_int;



    #[cfg(ossl111)]

    #[cfg(ossl110)]

    pub fn X509_get_extension_flags(x: *mut X509) -> u32;

    #[cfg(ossl111)]

    #[cfg(ossl110)]

    pub fn X509_get_key_usage(x: *mut X509) -> u32;

    #[cfg(ossl111)]

    #[cfg(ossl110)]

    pub fn X509_get_extended_key_usage(x: *mut X509) -> u32;

    #[cfg(ossl111)]

    #[cfg(ossl110)]

    pub fn X509_get0_subject_key_id(x: *mut X509) -> *const ASN1_OCTET_STRING;

    #[cfg(ossl111)]

    #[cfg(ossl110)]

    pub fn X509_get0_authority_key_id(x: *mut X509) -> *const ASN1_OCTET_STRING;

    #[cfg(ossl111)]

    pub fn X509_get0_authority_issuer(x: *mut X509) -> *const stack_st_GENERAL_NAME;

openssl/src/x509/mod.rs

+6 −6
Original line number Diff line number Diff line
@@ -485,21 +485,21 @@ impl X509Ref { 


    /// Returns this certificate's subject key id, if it exists.

    #[corresponds(X509_get0_subject_key_id)]

    #[cfg(ossl111)]

    pub fn subject_key_id(&self) -> Option<&Asn1StringRef> {

    #[cfg(ossl110)]

    pub fn subject_key_id(&self) -> Option<&Asn1OctetStringRef> {

        unsafe {

            let data = ffi::X509_get0_subject_key_id(self.as_ptr());

            Asn1StringRef::from_const_ptr_opt(data as *const _)

            Asn1OctetStringRef::from_const_ptr_opt(data)

        }

    }



    /// Returns this certificate's authority key id, if it exists.

    #[corresponds(X509_get0_authority_key_id)]

    #[cfg(ossl111)]

    pub fn authority_key_id(&self) -> Option<&Asn1StringRef> {

    #[cfg(ossl110)]

    pub fn authority_key_id(&self) -> Option<&Asn1OctetStringRef> {

        unsafe {

            let data = ffi::X509_get0_authority_key_id(self.as_ptr());

            Asn1StringRef::from_const_ptr_opt(data as *const _)

            Asn1OctetStringRef::from_const_ptr_opt(data)

        }

    }