From d49e496940dace7ba83fd00a9a130f2272b7bc37 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@palantir.com>
Date: Mon, 19 Mar 2018 20:41:08 +0000
Subject: Remove a last couple features

---
 openssl/src/pkey.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'openssl/src/pkey.rs')

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);
-- 
cgit v1.2.3