Merge remote-tracking branch 'openssl/master'

Author: zh-jq

openssl-sys/src/obj_mac.rs

@@ -95,6 +95,11 @@ 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_brainpoolP224r1: c_int = 925;
+#[cfg(libressl)]
+pub const NID_brainpoolP224r1: c_int = 926;
+
 #[cfg(ossl110)]
 pub const NID_brainpoolP256r1: c_int = 927;
 #[cfg(libressl)]
@@ -115,6 +120,11 @@ pub const NID_brainpoolP512r1: c_int = 933;
 #[cfg(libressl)]
 pub const NID_brainpoolP512r1: c_int = 934;
 
+#[cfg(ossl110)]
+pub const NID_brainpoolP224t1: c_int = 926;
+#[cfg(libressl)]
+pub const NID_brainpoolP224t1: c_int = 927;
+
 #[cfg(ossl110)]
 pub const NID_brainpoolP256t1: c_int = 928;
 #[cfg(libressl)]

openssl/src/nid.rs

@@ -215,6 +215,8 @@ impl Nid {
     pub const SECT571K1: Nid = Nid(ffi::NID_sect571k1);
     pub const SECT571R1: Nid = Nid(ffi::NID_sect571r1);
     #[cfg(any(ossl110, libressl))]
+    pub const BRAINPOOL_P224R1: Nid = Nid(ffi::NID_brainpoolP224r1);
+    #[cfg(any(ossl110, libressl))]
     pub const BRAINPOOL_P256R1: Nid = Nid(ffi::NID_brainpoolP256r1);
     #[cfg(any(ossl110, libressl))]
     pub const BRAINPOOL_P320R1: Nid = Nid(ffi::NID_brainpoolP320r1);
@@ -223,6 +225,8 @@ impl Nid {
     #[cfg(any(ossl110, libressl))]
     pub const BRAINPOOL_P512R1: Nid = Nid(ffi::NID_brainpoolP512r1);
     #[cfg(any(ossl110, libressl))]
+    pub const BRAINPOOL_P224T1: Nid = Nid(ffi::NID_brainpoolP224t1);
+    #[cfg(any(ossl110, libressl))]
     pub const BRAINPOOL_P256T1: Nid = Nid(ffi::NID_brainpoolP256t1);
     #[cfg(any(ossl110, libressl))]
     pub const BRAINPOOL_P320T1: Nid = Nid(ffi::NID_brainpoolP320t1);