1 files changed, 6 insertions, 5 deletions

diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
index 562001cb412b..2f327f090c3e 100644
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
@@ -401,11 +401,6 @@ static inline int crypto_skcipher_setkey(struct crypto_skcipher *tfm,
         return tfm->setkey(tfm, key, keylen);
 }
 
-static inline bool crypto_skcipher_has_setkey(struct crypto_skcipher *tfm)
-{
-        return tfm->keysize;
-}
-
 static inline unsigned int crypto_skcipher_default_keysize(
         struct crypto_skcipher *tfm)
 {
@@ -442,6 +437,9 @@ static inline int crypto_skcipher_encrypt(struct skcipher_request *req)
 {
         struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
 
+        if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
+                return -ENOKEY;
+
         return tfm->encrypt(req);
 }
 
@@ -460,6 +458,9 @@ static inline int crypto_skcipher_decrypt(struct skcipher_request *req)
 {
         struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
 
+        if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
+                return -ENOKEY;
+
         return tfm->decrypt(req);
 }