Unverified Commit 92dca6bc authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #1947 from reaperhulk/ec-more 

add get_asn1_flag to EcGroupRef
parents d5cc54be 37966b32

openssl-sys/src/handwritten/ec.rs

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ extern "C" { 


    pub fn EC_GROUP_set_asn1_flag(key: *mut EC_GROUP, flag: c_int);



    pub fn EC_GROUP_get_asn1_flag(group: *const EC_GROUP) -> c_int;



    pub fn EC_GROUP_get_curve_GFp(

        group: *const EC_GROUP,

        p: *mut BIGNUM,

openssl/src/ec.rs

+15 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ impl PointConversionForm { 
/// Named Curve or Explicit

///

/// This type acts as a boolean as to whether the `EcGroup` is named or explicit.

#[derive(Copy, Clone)]

#[derive(Copy, Clone, Debug, PartialEq)]

pub struct Asn1Flag(c_int);



impl Asn1Flag {
@@ -294,6 +294,12 @@ impl EcGroupRef { 
        }

    }



    /// Gets the flag determining if the group corresponds to a named curve.

    #[corresponds(EC_GROUP_get_asn1_flag)]

    pub fn asn1_flag(&mut self) -> Asn1Flag {

        unsafe { Asn1Flag(ffi::EC_GROUP_get_asn1_flag(self.as_ptr())) }

    }



    /// Returns the name of the curve, if a name is associated.

    #[corresponds(EC_GROUP_get_curve_name)]

    pub fn curve_name(&self) -> Option<Nid> {
@@ -1265,4 +1271,12 @@ mod test { 
        let group2 = EcGroup::from_curve_name(Nid::X9_62_PRIME239V3).unwrap();

        assert!(!g.is_on_curve(&group2, &mut ctx).unwrap());

    }



    #[test]

    #[cfg(any(boringssl, ossl111, libressl350))]

    fn asn1_flag() {

        let mut group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();

        let flag = group.asn1_flag();

        assert_eq!(flag, Asn1Flag::NAMED_CURVE);

    }

}