Unverified Commit 6d556313 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1714 from wiktor-k/add-brainpool 

Add NID constants for Brainpool curves
parents 6ff603ec b82aae32

openssl-sys/src/obj_mac.rs

+6 −0
Original line number Diff line number Diff line
@@ -94,6 +94,12 @@ pub const NID_sect409k1: c_int = 731; 
pub const NID_sect409r1: c_int = 732;

pub const NID_sect571k1: c_int = 733;

pub const NID_sect571r1: c_int = 734;

#[cfg(ossl110)]

pub const NID_brainpoolP256r1: c_int = 927;

#[cfg(ossl110)]

pub const NID_brainpoolP384r1: c_int = 931;

#[cfg(ossl110)]

pub const NID_brainpoolP512r1: c_int = 933;

pub const NID_wap_wsg_idm_ecid_wtls1: c_int = 735;

pub const NID_wap_wsg_idm_ecid_wtls3: c_int = 736;

pub const NID_wap_wsg_idm_ecid_wtls4: c_int = 737;

openssl/src/nid.rs

+6 −0
Original line number Diff line number Diff line
@@ -215,6 +215,12 @@ impl Nid { 
    pub const SECT409R1: Nid = Nid(ffi::NID_sect409r1);

    pub const SECT571K1: Nid = Nid(ffi::NID_sect571k1);

    pub const SECT571R1: Nid = Nid(ffi::NID_sect571r1);

    #[cfg(ossl110)]

    pub const BRAINPOOL_P256R1: Nid = Nid(ffi::NID_brainpoolP256r1);

    #[cfg(ossl110)]

    pub const BRAINPOOL_P384R1: Nid = Nid(ffi::NID_brainpoolP384r1);

    #[cfg(ossl110)]

    pub const BRAINPOOL_P512R1: Nid = Nid(ffi::NID_brainpoolP512r1);

    pub const WAP_WSG_IDM_ECID_WTLS1: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls1);

    pub const WAP_WSG_IDM_ECID_WTLS3: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls3);

    pub const WAP_WSG_IDM_ECID_WTLS4: Nid = Nid(ffi::NID_wap_wsg_idm_ecid_wtls4);

systest/build.rs

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ fn main() { 
        .header("openssl/x509v3.h")

        .header("openssl/safestack.h")

        .header("openssl/hmac.h")

        .header("openssl/obj_mac.h")

        .header("openssl/ssl.h")

        .header("openssl/err.h")

        .header("openssl/rand.h")