Remove deprecated APIs

1 files changed, 1 insertions, 24 deletions

diff --git a/openssl/src/dsa.rs b/openssl/src/dsa.rs
index e1b9a666..2c9f7de4 100644
--- a/openssl/src/dsa.rs
+++ b/openssl/src/dsa.rs
@@ -7,15 +7,13 @@
 
 use ffi;
 use foreign_types::ForeignTypeRef;
-use libc::{c_char, c_int, c_void};
+use libc::c_int;
 use std::fmt;
 use std::ptr;
 
 use {cvt, cvt_p};
-use bio::MemBioSlice;
 use bn::BigNumRef;
 use error::ErrorStack;
-use util::{invoke_passwd_cb_old, CallbackState};
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::DSA;
@@ -158,27 +156,6 @@ impl Dsa {
     private_key_from_der!(Dsa, ffi::d2i_DSAPrivateKey);
     public_key_from_pem!(Dsa, ffi::PEM_read_bio_DSA_PUBKEY);
     public_key_from_der!(Dsa, ffi::d2i_DSAPublicKey);
-
-    #[deprecated(since = "0.9.2", note = "use private_key_from_pem_callback")]
-    pub fn private_key_from_pem_cb<F>(buf: &[u8], pass_cb: F) -> Result<Dsa, ErrorStack>
-    where
-        F: FnOnce(&mut [c_char]) -> usize,
-    {
-        ffi::init();
-        let mut cb = CallbackState::new(pass_cb);
-        let mem_bio = MemBioSlice::new(buf)?;
-
-        unsafe {
-            let cb_ptr = &mut cb as *mut _ as *mut c_void;
-            let dsa = cvt_p(ffi::PEM_read_bio_DSAPrivateKey(
-                mem_bio.as_ptr(),
-                ptr::null_mut(),
-                Some(invoke_passwd_cb_old::<F>),
-                cb_ptr,
-            ))?;
-            Ok(Dsa(dsa))
-        }
-    }
 }
 
 impl fmt::Debug for Dsa {