From: "Leonidas S. Barbosa" <leosilva@linux.vnet.ibm.com>
To: linux-crypto@vger.kernel.org,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org,
Marcelo Henrique Cerri <mhcerri@linux.vnet.ibm.com>,
Fionnuala Gunter <fin@linux.vnet.ibm.com>
Subject: [PATCH 9/9] Disable ccm and ccm4309 in fips mod
Date: Tue, 28 Oct 2014 15:51:54 -0200 [thread overview]
Message-ID: <20141028175146.GA18467@bluepex.com> (raw)
NX CCM has not support to keys larger than 128 neither our hardware.
In cases where a system is running in fips mode enabled a tcrypt test will
crash the system in a kernel panic call.
This patch disable, for now, CCM's algorithms in fips mode to avoid this.
Signed-off-by: Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
---
drivers/crypto/nx/nx.c | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
index aa8c38d..a32239c 100644
--- a/drivers/crypto/nx/nx.c
+++ b/drivers/crypto/nx/nx.c
@@ -35,6 +35,7 @@
#include <linux/of.h>
#include <asm/hvcall.h>
#include <asm/vio.h>
+#include <linux/fips.h>
#include "nx_csbcpb.h"
#include "nx.h"
@@ -566,13 +567,15 @@ static int nx_register_algs(void)
if (rc)
goto out_unreg_gcm;
- rc = crypto_register_alg(&nx_ccm_aes_alg);
- if (rc)
- goto out_unreg_gcm4106;
+ if (!fips_enabled) {
+ rc = crypto_register_alg(&nx_ccm_aes_alg);
+ if (rc)
+ goto out_unreg_gcm4106;
- rc = crypto_register_alg(&nx_ccm4309_aes_alg);
- if (rc)
- goto out_unreg_ccm;
+ rc = crypto_register_alg(&nx_ccm4309_aes_alg);
+ if (rc)
+ goto out_unreg_ccm;
+ }
rc = crypto_register_shash(&nx_shash_sha256_alg);
if (rc)
@@ -593,9 +596,11 @@ out_unreg_s512:
out_unreg_s256:
crypto_unregister_shash(&nx_shash_sha256_alg);
out_unreg_ccm4309:
- crypto_unregister_alg(&nx_ccm4309_aes_alg);
+ if (!fips_enabled)
+ crypto_unregister_alg(&nx_ccm4309_aes_alg);
out_unreg_ccm:
- crypto_unregister_alg(&nx_ccm_aes_alg);
+ if (fips_enabled)
+ crypto_unregister_alg(&nx_ccm_aes_alg);
out_unreg_gcm4106:
crypto_unregister_alg(&nx_gcm4106_aes_alg);
out_unreg_gcm:
@@ -746,8 +751,15 @@ static int nx_remove(struct vio_dev *viodev)
if (nx_driver.of.status == NX_OKAY) {
NX_DEBUGFS_FINI(&nx_driver);
- crypto_unregister_alg(&nx_ccm_aes_alg);
- crypto_unregister_alg(&nx_ccm4309_aes_alg);
+ /* CCM algorithm has not support to keys larger than 128
+ * however tcrypt test uses key larger than. If a system
+ * runs with fips enabled it'll crash. For now we need to
+ * disable this two algorithms in fips mode.
+ */
+ if (!fips_enabled) {
+ crypto_unregister_alg(&nx_ccm_aes_alg);
+ crypto_unregister_alg(&nx_ccm4309_aes_alg);
+ }
crypto_unregister_alg(&nx_gcm_aes_alg);
crypto_unregister_alg(&nx_gcm4106_aes_alg);
crypto_unregister_alg(&nx_ctr_aes_alg);
--
1.7.1
next reply other threads:[~2014-10-28 17:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 17:51 Leonidas S. Barbosa [this message]
2014-11-06 15:03 ` [PATCH 9/9] Disable ccm and ccm4309 in fips mod Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141028175146.GA18467@bluepex.com \
--to=leosilva@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=fin@linux.vnet.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhcerri@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.