single `ffi` module

1 files changed, 34 insertions, 73 deletions

diff --git a/src/crypto/pkey.rs b/src/crypto/pkey.rs
index 5c4b108f..d95e7738 100644
--- a/src/crypto/pkey.rs
+++ b/src/crypto/pkey.rs
@@ -1,50 +1,11 @@
-use libc::{c_char, c_int, c_uint, c_void};
-use libc;
+use libc::{c_int, c_uint};
 use std::mem;
 use std::ptr;
-use bio::{mod, MemBio};
+use bio::{MemBio};
 use crypto::hash::{HashType, MD5, SHA1, SHA224, SHA256, SHA384, SHA512, RIPEMD160};
-use crypto::symm::{EVP_CIPHER};
+use ffi;
 use ssl::error::{SslError, StreamError};
 
-#[allow(non_camel_case_types)]
-pub type EVP_PKEY = *mut libc::c_void;
-
-#[allow(non_camel_case_types)]
-pub type RSA = *mut libc::c_void;
-
-pub type PrivateKeyWriteCallback = extern "C" fn(buf: *mut c_char, size: c_int, rwflag: c_int, user_data: *mut c_void) -> c_int;
-
-#[link(name = "crypto")]
-extern {
-    fn EVP_PKEY_new() -> *mut EVP_PKEY;
-    fn EVP_PKEY_free(k: *mut EVP_PKEY);
-    fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *const c_char) -> c_int;
-    fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;
-    fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int;
-
-    fn i2d_RSA_PUBKEY(k: *mut RSA, buf: *const *mut u8) -> c_int;
-    fn d2i_RSA_PUBKEY(k: *const *mut RSA, buf: *const *const u8, len: c_uint) -> *mut RSA;
-    fn i2d_RSAPrivateKey(k: *mut RSA, buf: *const *mut u8) -> c_int;
-    fn d2i_RSAPrivateKey(k: *const *mut RSA, buf: *const *const u8, len: c_uint) -> *mut RSA;
-
-    fn RSA_generate_key(modsz: c_uint, e: c_uint, cb: *const u8, cbarg: *const u8) -> *mut RSA;
-    fn RSA_size(k: *mut RSA) -> c_uint;
-
-    fn RSA_public_encrypt(flen: c_uint, from: *const u8, to: *mut u8, k: *mut RSA,
-                          pad: c_int) -> c_int;
-    fn RSA_private_decrypt(flen: c_uint, from: *const u8, to: *mut u8, k: *mut RSA,
-                           pad: c_int) -> c_int;
-    fn RSA_sign(t: c_int, m: *const u8, mlen: c_uint, sig: *mut u8, siglen: *mut c_uint,
-                k: *mut RSA) -> c_int;
-    fn RSA_verify(t: c_int, m: *const u8, mlen: c_uint, sig: *const u8, siglen: c_uint,
-                  k: *mut RSA) -> c_int;
-
-    fn PEM_write_bio_PrivateKey(bio: *mut bio::ffi::BIO, pkey: *mut EVP_PKEY, cipher: *const EVP_CIPHER,
-                                kstr: *mut c_char, klen: c_int,
-                                callback: *mut c_void,
-                                user_data: *mut c_void) -> c_int;
-}
 
 enum Parts {
     Neither,
@@ -86,7 +47,7 @@ fn openssl_hash_nid(hash: HashType) -> c_int {
 }
 
 pub struct PKey {
-    evp: *mut EVP_PKEY,
+    evp: *mut ffi::EVP_PKEY,
     parts: Parts,
 }
 
@@ -95,15 +56,15 @@ impl PKey {
     pub fn new() -> PKey {
         unsafe {
             PKey {
-                evp: EVP_PKEY_new(),
+                evp: ffi::EVP_PKEY_new(),
                 parts: Neither,
             }
         }
     }
 
-    fn _tostr(&self, f: unsafe extern "C" fn(*mut RSA, *const *mut u8) -> c_int) -> Vec<u8> {
+    fn _tostr(&self, f: unsafe extern "C" fn(*mut ffi::RSA, *const *mut u8) -> c_int) -> Vec<u8> {
         unsafe {
-            let rsa = EVP_PKEY_get1_RSA(self.evp);
+            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
             let len = f(rsa, ptr::null());
             if len < 0 as c_int { return vec!(); }
             let mut s = Vec::from_elem(len as uint, 0u8);
@@ -115,17 +76,17 @@ impl PKey {
         }
     }
 
-    fn _fromstr(&mut self, s: &[u8], f: unsafe extern "C" fn(*const *mut RSA, *const *const u8, c_uint) -> *mut RSA) {
+    fn _fromstr(&mut self, s: &[u8], f: unsafe extern "C" fn(*const *mut ffi::RSA, *const *const u8, c_uint) -> *mut ffi::RSA) {
         unsafe {
             let rsa = ptr::null_mut();
             f(&rsa, &s.as_ptr(), s.len() as c_uint);
-            EVP_PKEY_set1_RSA(self.evp, rsa);
+            ffi::EVP_PKEY_set1_RSA(self.evp, rsa);
         }
     }
 
     pub fn gen(&mut self, keysz: uint) {
         unsafe {
-            let rsa = RSA_generate_key(
+            let rsa = ffi::RSA_generate_key(
                 keysz as c_uint,
                 65537u as c_uint,
                 ptr::null(),
@@ -133,7 +94,7 @@ impl PKey {
             );
 
             // XXX: 6 == NID_rsaEncryption
-            EVP_PKEY_assign(
+            ffi::EVP_PKEY_assign(
                 self.evp,
                 6 as c_int,
                 mem::transmute(rsa));
@@ -146,14 +107,14 @@ impl PKey {
      * Returns a serialized form of the public key, suitable for load_pub().
      */
     pub fn save_pub(&self) -> Vec<u8> {
-        self._tostr(i2d_RSA_PUBKEY)
+        self._tostr(ffi::i2d_RSA_PUBKEY)
     }
 
     /**
      * Loads a serialized form of the public key, as produced by save_pub().
      */
     pub fn load_pub(&mut self, s: &[u8]) {
-        self._fromstr(s, d2i_RSA_PUBKEY);
+        self._fromstr(s, ffi::d2i_RSA_PUBKEY);
         self.parts = Public;
     }
 
@@ -162,14 +123,14 @@ impl PKey {
      * load_priv().
      */
     pub fn save_priv(&self) -> Vec<u8> {
-        self._tostr(i2d_RSAPrivateKey)
+        self._tostr(ffi::i2d_RSAPrivateKey)
     }
     /**
      * Loads a serialized form of the public and private keys, as produced by
      * save_priv().
      */
     pub fn load_priv(&mut self, s: &[u8]) {
-        self._fromstr(s, d2i_RSAPrivateKey);
+        self._fromstr(s, ffi::d2i_RSAPrivateKey);
         self.parts = Both;
     }
 
@@ -178,8 +139,8 @@ impl PKey {
     pub fn write_pem(&self, writer: &mut Writer/*, password: Option<String>*/) -> Result<(), SslError> {
         let mut mem_bio = try!(MemBio::new());
         unsafe {
-            try_ssl!(PEM_write_bio_PrivateKey(mem_bio.get_handle(), self.evp, ptr::null(),
-                                              ptr::null_mut(), -1, ptr::null_mut(), ptr::null_mut()));
+            try_ssl!(ffi::PEM_write_bio_PrivateKey(mem_bio.get_handle(), self.evp, ptr::null(),
+                                                   ptr::null_mut(), -1, ptr::null_mut(), ptr::null_mut()));
 
         }
         let buf = try!(mem_bio.read_to_end().map_err(StreamError));
@@ -191,7 +152,7 @@ impl PKey {
      */
     pub fn size(&self) -> uint {
         unsafe {
-            RSA_size(EVP_PKEY_get1_RSA(self.evp)) as uint
+            ffi::RSA_size(ffi::EVP_PKEY_get1_RSA(self.evp)) as uint
         }
     }
 
@@ -229,8 +190,8 @@ impl PKey {
      */
     pub fn max_data(&self) -> uint {
         unsafe {
-            let rsa = EVP_PKEY_get1_RSA(self.evp);
-            let len = RSA_size(rsa);
+            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
+            let len = ffi::RSA_size(rsa);
 
             // 41 comes from RSA_public_encrypt(3) for OAEP
             len as uint - 41u
@@ -239,14 +200,14 @@ impl PKey {
 
     pub fn encrypt_with_padding(&self, s: &[u8], padding: EncryptionPadding) -> Vec<u8> {
         unsafe {
-            let rsa = EVP_PKEY_get1_RSA(self.evp);
-            let len = RSA_size(rsa);
+            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
+            let len = ffi::RSA_size(rsa);
 
             assert!(s.len() < self.max_data());
 
             let mut r = Vec::from_elem(len as uint + 1u, 0u8);
 
-            let rv = RSA_public_encrypt(
+            let rv = ffi::RSA_public_encrypt(
                 s.len() as c_uint,
                 s.as_ptr(),
                 r.as_mut_ptr(),
@@ -264,14 +225,14 @@ impl PKey {
 
     pub fn decrypt_with_padding(&self, s: &[u8], padding: EncryptionPadding) -> Vec<u8> {
         unsafe {
-            let rsa = EVP_PKEY_get1_RSA(self.evp);
-            let len = RSA_size(rsa);
+            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
+            let len = ffi::RSA_size(rsa);
 
-            assert_eq!(s.len() as c_uint, RSA_size(rsa));
+            assert_eq!(s.len() as c_uint, ffi::RSA_size(rsa));
 
             let mut r = Vec::from_elem(len as uint + 1u, 0u8);
 
-            let rv = RSA_private_decrypt(
+            let rv = ffi::RSA_private_decrypt(
                 s.len() as c_uint,
                 s.as_ptr(),
                 r.as_mut_ptr(),
@@ -312,11 +273,11 @@ impl PKey {
 
     pub fn sign_with_hash(&self, s: &[u8], hash: HashType) -> Vec<u8> {
         unsafe {
-            let rsa = EVP_PKEY_get1_RSA(self.evp);
-            let mut len = RSA_size(rsa);
+            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
+            let mut len = ffi::RSA_size(rsa);
             let mut r = Vec::from_elem(len as uint + 1u, 0u8);
 
-            let rv = RSA_sign(
+            let rv = ffi::RSA_sign(
                 openssl_hash_nid(hash),
                 s.as_ptr(),
                 s.len() as c_uint,
@@ -335,9 +296,9 @@ impl PKey {
 
     pub fn verify_with_hash(&self, m: &[u8], s: &[u8], hash: HashType) -> bool {
         unsafe {
-            let rsa = EVP_PKEY_get1_RSA(self.evp);
+            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
 
-            let rv = RSA_verify(
+            let rv = ffi::RSA_verify(
                 openssl_hash_nid(hash),
                 m.as_ptr(),
                 m.len() as c_uint,
@@ -350,7 +311,7 @@ impl PKey {
         }
     }
 
-    pub unsafe fn get_handle(&self) -> *mut EVP_PKEY {
+    pub unsafe fn get_handle(&self) -> *mut ffi::EVP_PKEY {
         return self.evp
     }
 }
@@ -358,7 +319,7 @@ impl PKey {
 impl Drop for PKey {
     fn drop(&mut self) {
         unsafe {
-            EVP_PKEY_free(self.evp);
+            ffi::EVP_PKEY_free(self.evp);
         }
     }
 }