From c972e700df5ab3edafc3d966d74eaa99bc9d460a Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 28 May 2023 09:18:18 -0500
Subject: [PATCH] reimplement Dsa::generate in terms of
 generate_params/generate_key

---
 openssl/src/dsa.rs | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/openssl/src/dsa.rs b/openssl/src/dsa.rs
index d8dcaa9fdb..1f594f28b4 100644
--- a/openssl/src/dsa.rs
+++ b/openssl/src/dsa.rs
@@ -229,29 +229,10 @@ impl Dsa<Params> {
 impl Dsa<Private> {
     /// Generate a DSA key pair.
     ///
-    /// Calls [`DSA_generate_parameters_ex`] to populate the `p`, `g`, and `q` values.
-    /// These values are used to generate the key pair with [`DSA_generate_key`].
-    ///
     /// The `bits` parameter corresponds to the length of the prime `p`.
-    ///
-    /// [`DSA_generate_parameters_ex`]: https://www.openssl.org/docs/manmaster/crypto/DSA_generate_parameters_ex.html
-    /// [`DSA_generate_key`]: https://www.openssl.org/docs/manmaster/crypto/DSA_generate_key.html
     pub fn generate(bits: u32) -> Result<Dsa<Private>, ErrorStack> {
-        ffi::init();
-        unsafe {
-            let dsa = Dsa::from_ptr(cvt_p(ffi::DSA_new())?);
-            cvt(ffi::DSA_generate_parameters_ex(
-                dsa.0,
-                bits as BitType,
-                ptr::null(),
-                0,
-                ptr::null_mut(),
-                ptr::null_mut(),
-                ptr::null_mut(),
-            ))?;
-            cvt(ffi::DSA_generate_key(dsa.0))?;
-            Ok(dsa)
-        }
+        let params = Dsa::generate_params(bits)?;
+        params.generate_key()
     }
 
     /// Create a DSA key pair with the given parameters