aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/pkey.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-03-19 20:41:08 +0000
committerSteven Fackler <[email protected]>2018-03-19 20:41:08 +0000
commitd49e496940dace7ba83fd00a9a130f2272b7bc37 (patch)
tree3831d590365cd46a61c691d3a422c81a6cc0536e /openssl/src/pkey.rs
parentMerge pull request #856 from Flakebi/master (diff)
downloadrust-openssl-d49e496940dace7ba83fd00a9a130f2272b7bc37.tar.xz
rust-openssl-d49e496940dace7ba83fd00a9a130f2272b7bc37.zip
Remove a last couple features
Diffstat (limited to 'openssl/src/pkey.rs')
-rw-r--r--openssl/src/pkey.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/openssl/src/pkey.rs b/openssl/src/pkey.rs
index 322e6416..063e8619 100644
--- a/openssl/src/pkey.rs
+++ b/openssl/src/pkey.rs
@@ -184,9 +184,7 @@ impl<T> PKeyRef<T> {
///
/// [`EVP_PKEY_id`]: https://www.openssl.org/docs/man1.1.0/crypto/EVP_PKEY_id.html
pub fn id(&self) -> Id {
- unsafe {
- Id::from_raw(ffi::EVP_PKEY_id(self.as_ptr()))
- }
+ unsafe { Id::from_raw(ffi::EVP_PKEY_id(self.as_ptr())) }
}
}
@@ -367,12 +365,12 @@ impl PKey<Private> {
/// Creates a new `PKey` containing a CMAC key.
///
- /// CMAC is only supported since the version 1.1.0 of OpenSSL.
+ /// Requires OpenSSL 1.1.0 or newer.
///
/// # Note
///
/// To compute CMAC values, use the `sign` module.
- #[cfg(any(all(ossl110, feature = "v110"), all(ossl111, feature = "v111")))]
+ #[cfg(ossl110)]
pub fn cmac(cipher: &::symm::Cipher, key: &[u8]) -> Result<PKey<Private>, ErrorStack> {
unsafe {
assert!(key.len() <= c_int::max_value() as usize);