Rename the openssl_sys crate through Cargo.toml

openssl/Cargo.toml

@@ -17,7 +17,7 @@ v102 = []
 v110 = []
 v111 = []
 
-vendored = ['openssl-sys/vendored']
+vendored = ['ffi/vendored']
 
 [dependencies]
 bitflags = "1.0"
@@ -26,7 +26,7 @@ foreign-types = "0.3.1"
 libc = "0.2"
 once_cell = "1.5.2"
 
-openssl-sys = { version = "0.9.60", path = "../openssl-sys" }
+ffi = { package = "openssl-sys", version = "0.9.60", path = "../openssl-sys" }
 
 [dev-dependencies]
 tempdir = "0.3"

openssl/src/aes.rs

@@ -55,7 +55,6 @@
 //! assert_eq!(&orig_key[..], &key_to_wrap[..]);
 //! ```
 //!
-use ffi;
 use libc::{c_int, c_uint};
 use std::{mem, ptr};
 

openssl/src/asn1.rs

@@ -24,7 +24,6 @@
 //! use openssl::asn1::Asn1Time;
 //! let tomorrow = Asn1Time::days_from_now(1);
 //! ```
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::{c_char, c_int, c_long, time_t};
 #[cfg(ossl102)]

openssl/src/base64.rs

@@ -1,7 +1,6 @@
 //! Base64 encoding support.
 use crate::cvt_n;
 use crate::error::ErrorStack;
-use ffi;
 use libc::c_int;
 
 /// Encodes a slice of bytes to a base64 string.

openssl/src/bio.rs

@@ -1,4 +1,3 @@
-use ffi;
 use libc::c_int;
 use std::marker::PhantomData;
 use std::ptr;

openssl/src/bn.rs

@@ -22,7 +22,6 @@
 //! ```
 //!
 //! [`BIGNUM`]: https://wiki.openssl.org/index.php/Manual:Bn_internal(3)
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::cmp::Ordering;

openssl/src/cms.rs

@@ -5,7 +5,6 @@
 //! generated from a `Vec` of bytes.  This `Vec` follows the smime protocol standards.
 //! Data accepted by this module will be smime type `enveloped-data`.
 
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use std::ptr;
 

openssl/src/conf.rs

@@ -1,5 +1,4 @@
 //! Interface for processing OpenSSL configuration files.
-use ffi;
 
 use crate::cvt_p;
 use crate::error::ErrorStack;

openssl/src/derive.rs

@@ -1,5 +1,4 @@
 //! Shared secret derivation.
-use ffi;
 use foreign_types::ForeignTypeRef;
 use std::marker::PhantomData;
 use std::ptr;

openssl/src/dh.rs

@@ -1,5 +1,4 @@
 use crate::error::ErrorStack;
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use std::mem;
 use std::ptr;

openssl/src/dsa.rs

@@ -5,7 +5,6 @@
 //! using the private key that can be validated with the public key but not be generated
 //! without the private key.
 
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::fmt;

openssl/src/ec.rs

@@ -15,7 +15,6 @@
 //! [`EcGroup`]: struct.EcGroup.html
 //! [`Nid`]: ../nid/struct.Nid.html
 //! [Eliptic Curve Cryptography]: https://wiki.openssl.org/index.php/Elliptic_Curve_Cryptography
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::fmt;

openssl/src/ecdsa.rs

@@ -1,6 +1,5 @@
 //! Low level Elliptic Curve Digital Signature Algorithm (ECDSA) functions.
 
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::mem;

openssl/src/envelope.rs

@@ -30,7 +30,6 @@ use crate::error::ErrorStack;
 use crate::pkey::{HasPrivate, HasPublic, PKey, PKeyRef};
 use crate::symm::Cipher;
 use crate::{cvt, cvt_p};
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::cmp;

openssl/src/error.rs

@@ -24,8 +24,6 @@ use std::io;
 use std::ptr;
 use std::str;
 
-use ffi;
-
 /// Collection of [`Error`]s from OpenSSL.
 ///
 /// [`Error`]: struct.Error.html

openssl/src/fips.rs

@@ -5,7 +5,6 @@
 //! [OpenSSL's documentation]: https://www.openssl.org/docs/fips/UserGuide-2.0.pdf
 use crate::cvt;
 use crate::error::ErrorStack;
-use ffi;
 
 /// Moves the library into or out of the FIPS 140-2 mode of operation.
 ///

openssl/src/hash.rs

@@ -1,4 +1,3 @@
-use ffi;
 use std::ffi::CString;
 use std::fmt;
 use std::io;

openssl/src/lib.rs

@@ -118,8 +118,6 @@ extern crate cfg_if;
 #[macro_use]
 extern crate foreign_types;
 
-extern crate openssl_sys as ffi;
-
 #[cfg(test)]
 extern crate hex;
 

openssl/src/memcmp.rs

@@ -29,7 +29,6 @@
 //! assert!(!eq(&a, &b));
 //! assert!(!eq(&a, &c));
 //! ```
-use ffi;
 use libc::size_t;
 
 /// Returns `true` iff `a` and `b` contain the same bytes.

openssl/src/nid.rs

@@ -1,5 +1,4 @@
 //! A collection of numerical identifiers for OpenSSL objects.
-use ffi;
 use libc::{c_char, c_int};
 
 use std::ffi::CStr;

openssl/src/ocsp.rs

@@ -1,4 +1,3 @@
-use ffi;
 use foreign_types::ForeignTypeRef;
 use libc::{c_int, c_long, c_ulong};
 use std::mem;

openssl/src/pkcs12.rs

@@ -1,6 +1,5 @@
 //! PKCS #12 archives.
 
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::ffi::CString;

openssl/src/pkcs5.rs

@@ -1,4 +1,3 @@
-use ffi;
 use libc::c_int;
 use std::ptr;
 

openssl/src/pkcs7.rs

@@ -6,7 +6,6 @@ use crate::symm::Cipher;
 use crate::x509::store::X509StoreRef;
 use crate::x509::{X509Ref, X509};
 use crate::{cvt, cvt_p};
-use ffi;
 use foreign_types::ForeignTypeRef;
 use libc::c_int;
 use std::ptr;

openssl/src/pkey.rs

@@ -45,7 +45,6 @@
 //! }
 //! ```
 
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::{c_int, c_long};
 use std::ffi::CString;

openssl/src/rand.rs

@@ -10,7 +10,6 @@
 //! let mut buf = [0; 256];
 //! rand_bytes(&mut buf).unwrap();
 //! ```
-use ffi;
 use libc::c_int;
 
 use crate::cvt;

openssl/src/rsa.rs

@@ -28,7 +28,6 @@
 //!     let encrypted_len = rsa.public_encrypt(data, &mut buf, Padding::PKCS1).unwrap();
 //! }
 //! ```
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::c_int;
 use std::fmt;

openssl/src/sha.rs

@@ -45,7 +45,6 @@
 //!     println!("Hash = {}", hex::encode(hash));
 //! }
 //! ```
-use ffi;
 use libc::c_void;
 use std::mem;
 

openssl/src/sign.rs

@@ -61,7 +61,6 @@
 //! # let target = hmac.clone();
 //! assert!(memcmp::eq(&hmac, &target));
 //! ```
-use ffi;
 use foreign_types::ForeignTypeRef;
 use libc::c_int;
 use std::io::{self, Write};

openssl/src/srtp.rs

@@ -1,5 +1,4 @@
 use crate::stack::Stackable;
-use ffi;
 use foreign_types::ForeignTypeRef;
 use libc::c_ulong;
 use std::ffi::CStr;

openssl/src/ssl/callbacks.rs

@@ -1,4 +1,3 @@
-use ffi;
 use foreign_types::ForeignType;
 use foreign_types::ForeignTypeRef;
 #[cfg(any(ossl111, not(osslconf = "OPENSSL_NO_PSK")))]

openssl/src/ssl/error.rs

@@ -1,4 +1,3 @@
-use ffi;
 use libc::c_int;
 use std::error;
 use std::error::Error as StdError;

openssl/src/ssl/mod.rs

@@ -57,7 +57,6 @@
 //!     }
 //! }
 //! ```
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef, Opaque};
 use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void};
 use once_cell::sync::{Lazy, OnceCell};

openssl/src/stack.rs

@@ -1,4 +1,3 @@
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef, Opaque};
 use libc::c_int;
 use std::borrow::Borrow;

openssl/src/string.rs

@@ -1,4 +1,3 @@
-use ffi;
 use foreign_types::ForeignTypeRef;
 use libc::{c_char, c_void};
 use std::convert::AsRef;

openssl/src/symm.rs

@@ -52,7 +52,6 @@
 //! println!("Decrypted: '{}'", output_string);
 //! ```
 
-use ffi;
 use libc::c_int;
 use std::cmp;
 use std::ptr;

openssl/src/x509/mod.rs

@@ -7,7 +7,6 @@
 //! Internet protocols, including SSL/TLS, which is the basis for HTTPS,
 //! the secure protocol for browsing the web.
 
-use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::{c_int, c_long};
 use std::error::Error;

openssl/src/x509/store.rs

@@ -40,7 +40,6 @@
 //! }
 //! ```
 
-use ffi;
 use foreign_types::ForeignTypeRef;
 use std::mem;
 

openssl/src/x509/verify.rs

@@ -1,4 +1,3 @@
-use ffi;
 use foreign_types::ForeignTypeRef;
 use libc::{c_uint, c_ulong};
 use std::net::IpAddr;