Unverified Commit 0854ffd6 authored by Jack Rickard's avatar Jack Rickard Committed by GitHub
Browse files

Merge pull request #1847 from sfackler/x509-revoked-extra-methods 

Add issuer_name and reason_code to X509RevokedRef
parents 48876d4a 95680c81

openssl-sys/src/handwritten/asn1.rs

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ extern "C" { 
    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_ENUMERATED_free(a: *mut ASN1_ENUMERATED);

    #[cfg(ossl110)]

    pub fn ASN1_ENUMERATED_get_int64(pr: *mut i64, a: *const ASN1_ENUMERATED) -> c_int;

}



const_ptr_api! {

openssl-sys/src/handwritten/types.rs

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ use libc::*; 
use super::super::*;



pub enum ASN1_INTEGER {}

pub enum ASN1_ENUMERATED {}

pub enum ASN1_GENERALIZEDTIME {}

pub enum ASN1_STRING {}

pub enum ASN1_BIT_STRING {}

openssl-sys/src/x509v3.rs

+11 −0
Original line number Diff line number Diff line
@@ -91,3 +91,14 @@ pub const X509_PURPOSE_OCSP_HELPER: c_int = 8; 
pub const X509_PURPOSE_TIMESTAMP_SIGN: c_int = 9;

pub const X509_PURPOSE_MIN: c_int = 1;

pub const X509_PURPOSE_MAX: c_int = 9;



pub const CRL_REASON_UNSPECIFIED: c_int = 0;

pub const CRL_REASON_KEY_COMPROMISE: c_int = 1;

pub const CRL_REASON_CA_COMPROMISE: c_int = 2;

pub const CRL_REASON_AFFILIATION_CHANGED: c_int = 3;

pub const CRL_REASON_SUPERSEDED: c_int = 4;

pub const CRL_REASON_CESSATION_OF_OPERATION: c_int = 5;

pub const CRL_REASON_CERTIFICATE_HOLD: c_int = 6;

pub const CRL_REASON_REMOVE_FROM_CRL: c_int = 8;

pub const CRL_REASON_PRIVILEGE_WITHDRAWN: c_int = 9;

pub const CRL_REASON_AA_COMPROMISE: c_int = 10;

openssl/src/asn1.rs

+26 −0
Original line number Diff line number Diff line
@@ -706,6 +706,32 @@ cfg_if! { 
    }

}



foreign_type_and_impl_send_sync! {

    type CType = ffi::ASN1_ENUMERATED;

    fn drop = ffi::ASN1_ENUMERATED_free;



    /// An ASN.1 enumerated.

    pub struct Asn1Enumerated;

    /// A reference to an [`Asn1Enumerated`].

    pub struct Asn1EnumeratedRef;

}



impl Asn1EnumeratedRef {

    /// Get the value, if it fits in the required bounds.

    #[corresponds(ASN1_ENUMERATED_get_int64)]

    #[cfg(ossl110)]

    pub fn get_i64(&self) -> Result<i64, ErrorStack> {

        let mut crl_reason = 0;

        unsafe {

            cvt(ffi::ASN1_ENUMERATED_get_int64(

                &mut crl_reason,

                self.as_ptr(),

            ))?;

        }

        Ok(crl_reason)

    }

}



#[cfg(test)]

mod tests {

    use super::*;

openssl/src/nid.rs

+2 −2
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ pub struct Nid(c_int); 
#[allow(non_snake_case)]

impl Nid {

    /// Create a `Nid` from an integer representation.

    pub fn from_raw(raw: c_int) -> Nid {

    pub const fn from_raw(raw: c_int) -> Nid {

        Nid(raw)

    }



    /// Return the integer representation of a `Nid`.

    #[allow(clippy::trivially_copy_pass_by_ref)]

    pub fn as_raw(&self) -> c_int {

    pub const fn as_raw(&self) -> c_int {

        self.0

    }