From e15208b9e23a9d8c5a8220e41a6a6a0840fbfbe8 Mon Sep 17 00:00:00 2001
From: Hubert Hirtz <hubert@hirtz.pm>
Date: Sat, 14 Sep 2024 16:44:43 +0200
Subject: [PATCH 1/2] Make future_utils a dev-dependency

This dep was used for future::poll_fn, which has been stabilized in rust
1.64.0:

https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html

Keeping it for tests since they also use future::join.
---
 Cargo.toml | 2 +-
 src/lib.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 30d565e..201d37f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,10 +10,10 @@ An implementation of SSL streams for Tokio backed by OpenSSL
 """
 
 [dependencies]
-futures-util = { version = "0.3", default-features = false }
 openssl = "0.10.61"
 openssl-sys = "0.9"
 tokio = "1.0"
 
 [dev-dependencies]
+futures-util = { version = "0.3", default-features = false }
 tokio = { version = "1.0", features = ["full"] }
diff --git a/src/lib.rs b/src/lib.rs
index b016573..47ff62f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,10 +5,10 @@
 //! blocking [`Read`] and [`Write`] traits.
 #![warn(missing_docs)]
 
-use futures_util::future;
 use openssl::error::ErrorStack;
 use openssl::ssl::{self, ErrorCode, ShutdownResult, Ssl, SslRef};
 use std::fmt;
+use std::future;
 use std::io::{self, Read, Write};
 use std::pin::Pin;
 use std::task::{Context, Poll};

From 2d3cf8383ac2ab830cdd3527b0583cf48b1aead8 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 14 Sep 2024 13:04:29 -0400
Subject: [PATCH 2/2] Fix CI

---
 build.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.rs b/build.rs
index 71e3670..662540b 100644
--- a/build.rs
+++ b/build.rs
@@ -2,6 +2,8 @@
 use std::env;
 
 fn main() {
+    println!("cargo:rustc-check-cfg=cfg(ossl111)");
+
     if let Ok(version) = env::var("DEP_OPENSSL_VERSION_NUMBER") {
         let version = u64::from_str_radix(&version, 16).unwrap();