From 2b29f4483fcfb4c280748739201391ed49183ab7 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 5 Dec 2021 13:45:44 -0500
Subject: [PATCH] fixes

---
 openssl-sys/src/bio.rs            |  1 -
 openssl-sys/src/ec.rs             | 10 ++++++++++
 openssl-sys/src/handwritten/ec.rs | 10 ----------
 openssl-sys/src/types.rs          |  3 +++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/openssl-sys/src/bio.rs b/openssl-sys/src/bio.rs
index c9b9ee271..cfd25fb62 100644
--- a/openssl-sys/src/bio.rs
+++ b/openssl-sys/src/bio.rs
@@ -68,7 +68,6 @@ extern "C" {
 
 #[allow(clashing_extern_declarations)]
 extern "C" {
-    // FIXME should wrap in Option
     #[cfg(any(ossl110, libressl273))]
     #[link_name = "BIO_meth_set_write"]
     pub fn BIO_meth_set_write__fixed_rust(
diff --git a/openssl-sys/src/ec.rs b/openssl-sys/src/ec.rs
index 7c2f67c34..c01d6f22a 100644
--- a/openssl-sys/src/ec.rs
+++ b/openssl-sys/src/ec.rs
@@ -4,3 +4,13 @@ use std::ptr;
 use *;
 
 pub const OPENSSL_EC_NAMED_CURVE: c_int = 1;
+
+#[cfg(ossl300)]
+pub unsafe fn EVP_EC_gen(curve: *const c_char) -> *mut EVP_PKEY {
+    EVP_PKEY_Q_keygen(
+        ptr::null_mut(),
+        ptr::null_mut(),
+        "EC\0".as_ptr().cast(),
+        curve,
+    )
+}
diff --git a/openssl-sys/src/handwritten/ec.rs b/openssl-sys/src/handwritten/ec.rs
index 47c800b67..0470ef404 100644
--- a/openssl-sys/src/handwritten/ec.rs
+++ b/openssl-sys/src/handwritten/ec.rs
@@ -238,13 +238,3 @@ extern "C" {
 
     pub fn i2d_ECDSA_SIG(sig: *const ECDSA_SIG, out: *mut *mut c_uchar) -> c_int;
 }
-
-#[cfg(ossl300)]
-pub unsafe fn EVP_EC_gen(curve: *const c_char) -> *mut EVP_PKEY {
-    EVP_PKEY_Q_keygen(
-        ptr::null_mut(),
-        ptr::null_mut(),
-        "EC\0".as_ptr().cast(),
-        curve,
-    )
-}
diff --git a/openssl-sys/src/types.rs b/openssl-sys/src/types.rs
index c19e66f1e..dbf11291a 100644
--- a/openssl-sys/src/types.rs
+++ b/openssl-sys/src/types.rs
@@ -1,3 +1,6 @@
+use libc::*;
+use *;
+
 cfg_if! {
     if #[cfg(any(ossl110, libressl280))] {
         pub enum EVP_PKEY {}
-- 
GitLab