From 263c7ce1e694a3b2ed16e1d99acbba3cc5280edb Mon Sep 17 00:00:00 2001
From: Steffen Eiden <seiden@linux.ibm.com>
Date: Tue, 13 Dec 2022 19:15:37 +0100
Subject: [PATCH] Add X509_NAME_add_entry binding

Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
---
 openssl-sys/src/handwritten/x509.rs |  7 +++++++
 openssl/src/x509/mod.rs             | 15 +++++++++++++++
 openssl/src/x509/tests.rs           | 18 ++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/openssl-sys/src/handwritten/x509.rs b/openssl-sys/src/handwritten/x509.rs
index 2203b6081d..57737a0b06 100644
--- a/openssl-sys/src/handwritten/x509.rs
+++ b/openssl-sys/src/handwritten/x509.rs
@@ -286,6 +286,13 @@ const_ptr_api! {
         pub fn X509_NAME_dup(x: #[const_ptr_if(ossl300)] X509_NAME) -> *mut X509_NAME;
         #[cfg(any(ossl110, libressl270))]
         pub fn X509_dup(x: #[const_ptr_if(ossl300)] X509) -> *mut X509;
+        #[cfg(any(ossl101, libressl350))]
+        pub fn X509_NAME_add_entry(
+            name: *mut X509_NAME,
+            ne: #[const_ptr_if(any(ossl110, libressl))] X509_NAME_ENTRY,
+            loc: c_int,
+            set: c_int,
+            ) -> c_int;
     }
 }
 extern "C" {
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index edd54aa840..f7518e937a 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -872,6 +872,21 @@ impl X509NameBuilder {
         }
     }
 
+    /// Add a name entry
+    #[corresponds(X509_NAME_add_entry)]
+    #[cfg(any(ossl101, libressl350))]
+    pub fn append_entry(&mut self, ne: &X509NameEntryRef) -> std::result::Result<(), ErrorStack> {
+        unsafe {
+            cvt(ffi::X509_NAME_add_entry(
+                self.0.as_ptr(),
+                ne.as_ptr(),
+                -1,
+                0,
+            ))
+            .map(|_| ())
+        }
+    }
+
     /// Add a field entry by str.
     ///
     /// This corresponds to [`X509_NAME_add_entry_by_txt`].
diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs
index 336de3c914..9622dfae8f 100644
--- a/openssl/src/x509/tests.rs
+++ b/openssl/src/x509/tests.rs
@@ -693,3 +693,21 @@ fn test_load_cert_file() {
         .init(&store, &cert, &chain, |c| c.verify_cert())
         .unwrap());
 }
+
+#[test]
+#[cfg(any(ossl101, libressl350))]
+fn test_add_name_entry() {
+    let cert = include_bytes!("../../test/cert.pem");
+    let cert = X509::from_pem(cert).unwrap();
+    let inp_name = cert.subject_name().entries().next().unwrap();
+
+    let mut names = X509Name::builder().unwrap();
+    names.append_entry(inp_name).unwrap();
+    let names = names.build();
+
+    let mut entries = names.entries();
+    let outp_name = entries.next().unwrap();
+    assert_eq!(outp_name.object().nid(), inp_name.object().nid());
+    assert_eq!(outp_name.data().as_slice(), inp_name.data().as_slice());
+    assert!(entries.next().is_none());
+}