Correct ownership semantics of SSL_{CTX_,}use_PrivateKey

rustls · Apr 9, 2024 · 517a530 · 517a530
1 parent 16f975c
commit 517a530
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/rustls-libssl/src/entry.rs b/rustls-libssl/src/entry.rs
@@ -604,7 +604,7 @@ entry! {
             return Error::null_pointer().raise().into();
         }
 
-        let pkey = EvpPkey::new_adopt(pkey);
+        let pkey = EvpPkey::new_incref(pkey);
 
         match ctx
             .lock()
@@ -1514,7 +1514,7 @@ entry! {
             return Error::null_pointer().raise().into();
         }
 
-        let pkey = EvpPkey::new_adopt(pkey);
+        let pkey = EvpPkey::new_incref(pkey);
 
         match ssl
             .lock()

diff --git a/rustls-libssl/src/evp_pkey.rs b/rustls-libssl/src/evp_pkey.rs
@@ -17,9 +17,12 @@ pub struct EvpPkey {
 }
 
 impl EvpPkey {
-    /// Use a pre-existing private key, adopting ownership.
-    pub fn new_adopt(pkey: *mut EVP_PKEY) -> Self {
+    /// Use a pre-existing private key, incrementing ownership.
+    ///
+    /// `pkey` continues to belong to the caller.
+    pub fn new_incref(pkey: *mut EVP_PKEY) -> Self {
         debug_assert!(!pkey.is_null());
+        unsafe { EVP_PKEY_up_ref(pkey) };
         Self { pkey }
     }