Unverified Commit a888f7a0 authored by Jack Rickard's avatar Jack Rickard
Browse files

Implement cmp and to_owned for Asn1Integer

parent 74785856

openssl-sys/src/handwritten/asn1.rs

+2 −0
Original line number Diff line number Diff line
@@ -43,8 +43,10 @@ extern "C" { 
    pub fn ASN1_TIME_set(from: *mut ASN1_TIME, to: time_t) -> *mut ASN1_TIME;



    pub fn ASN1_INTEGER_free(x: *mut ASN1_INTEGER);

    pub fn ASN1_INTEGER_dup(a: *const ASN1_INTEGER) -> *mut ASN1_INTEGER;

    pub fn ASN1_INTEGER_get(dest: *const ASN1_INTEGER) -> c_long;

    pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;

    pub fn ASN1_INTEGER_cmp(a: *const ASN1_INTEGER, b: *const ASN1_INTEGER) -> c_int;

    pub fn BN_to_ASN1_INTEGER(bn: *const BIGNUM, ai: *mut ASN1_INTEGER) -> *mut ASN1_INTEGER;

    pub fn ASN1_INTEGER_to_BN(ai: *const ASN1_INTEGER, bn: *mut BIGNUM) -> *mut BIGNUM;

openssl/src/asn1.rs

+41 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
use cfg_if::cfg_if;

use foreign_types::{ForeignType, ForeignTypeRef};

use libc::{c_char, c_int, c_long, time_t};

#[cfg(ossl102)]

use std::cmp::Ordering;

use std::ffi::CString;

use std::fmt;
@@ -512,6 +511,23 @@ impl Asn1Integer { 
    }

}



impl Ord for Asn1Integer {

    fn cmp(&self, other: &Self) -> Ordering {

        Asn1IntegerRef::cmp(self, other)

    }

}

impl PartialOrd for Asn1Integer {

    fn partial_cmp(&self, other: &Asn1Integer) -> Option<Ordering> {

        Some(self.cmp(other))

    }

}

impl Eq for Asn1Integer {}

impl PartialEq for Asn1Integer {

    fn eq(&self, other: &Asn1Integer) -> bool {

        Asn1IntegerRef::eq(self, other)

    }

}



impl Asn1IntegerRef {

    #[allow(missing_docs, clippy::unnecessary_cast)]

    #[deprecated(since = "0.10.6", note = "use to_bn instead")]
@@ -536,6 +552,30 @@ impl Asn1IntegerRef { 
    pub fn set(&mut self, value: i32) -> Result<(), ErrorStack> {

        unsafe { cvt(ffi::ASN1_INTEGER_set(self.as_ptr(), value as c_long)).map(|_| ()) }

    }



    /// Creates a new Asn1Integer with the same value.

    #[corresponds(ASN1_INTEGER_dup)]

    pub fn to_owned(&self) -> Result<Asn1Integer, ErrorStack> {

        unsafe { cvt_p(ffi::ASN1_INTEGER_dup(self.as_ptr())).map(|p| Asn1Integer::from_ptr(p)) }

    }

}



impl Ord for Asn1IntegerRef {

    fn cmp(&self, other: &Self) -> Ordering {

        let res = unsafe { ffi::ASN1_INTEGER_cmp(self.as_ptr(), other.as_ptr()) };

        res.cmp(&0)

    }

}

impl PartialOrd for Asn1IntegerRef {

    fn partial_cmp(&self, other: &Asn1IntegerRef) -> Option<Ordering> {

        Some(self.cmp(other))

    }

}

impl Eq for Asn1IntegerRef {}

impl PartialEq for Asn1IntegerRef {

    fn eq(&self, other: &Asn1IntegerRef) -> bool {

        self.cmp(other) == Ordering::Equal

    }

}



foreign_type_and_impl_send_sync! {