From patchwork Thu Sep 24 16:02:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Haxby X-Patchwork-Id: 7258041 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8A9AA9F32B for ; Thu, 24 Sep 2015 16:19:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAD33208EB for ; Thu, 24 Sep 2015 16:19:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0FF02092B for ; Thu, 24 Sep 2015 16:19:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757087AbbIXQTb (ORCPT ); Thu, 24 Sep 2015 12:19:31 -0400 Received: from ukc1-proxy-mwg04-o.oracle.com ([144.24.20.229]:44520 "EHLO sheep.uk.oracle.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757199AbbIXQTb (ORCPT ); Thu, 24 Sep 2015 12:19:31 -0400 X-Greylist: delayed 1004 seconds by postgrey-1.27 at vger.kernel.org; Thu, 24 Sep 2015 12:19:28 EDT Received: from sheep.uk.oracle.com (localhost.localdomain [127.0.0.1]) by sheep.uk.oracle.com (8.15.2/8.15.2) with ESMTP id t8OG2dhC023561; Thu, 24 Sep 2015 17:02:39 +0100 Received: (from jch@localhost) by sheep.uk.oracle.com (8.15.2/8.15.2/Submit) id t8OG2dqw023560; Thu, 24 Sep 2015 17:02:39 +0100 X-Authentication-Warning: sheep.uk.oracle.com: jch set sender to john.haxby@oracle.com using -f From: John Haxby To: linux-crypto@vger.kernel.org Cc: Herbert Xu , "David S. Miller" , John Haxby Subject: [PATCH 1/1] Disable fips-allowed for non-FIPS authenc ciphers Date: Thu, 24 Sep 2015 17:02:03 +0100 Message-Id: <1443110523-23473-2-git-send-email-john.haxby@oracle.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443110523-23473-1-git-send-email-john.haxby@oracle.com> References: <1443110523-23473-1-git-send-email-john.haxby@oracle.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Tests that contain non-FIPS ciphers and hashes cannot themselves be .fips-allowed because they will necessarily fail. Signed-off-by: John Haxby --- crypto/testmgr.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index fa18753..68799dc 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -2080,7 +2080,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "authenc(hmac(md5),ecb(cipher_null))", .test = alg_test_aead, - .fips_allowed = 1, .suite = { .aead = { .enc = { @@ -2110,7 +2109,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "authenc(hmac(sha1),cbc(des))", .test = alg_test_aead, - .fips_allowed = 1, .suite = { .aead = { .enc = { @@ -2138,7 +2136,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "authenc(hmac(sha1),ecb(cipher_null))", .test = alg_test_aead, - .fips_allowed = 1, .suite = { .aead = { .enc = { @@ -2158,7 +2155,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "authenc(hmac(sha224),cbc(des))", .test = alg_test_aead, - .fips_allowed = 1, .suite = { .aead = { .enc = { @@ -2200,7 +2196,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "authenc(hmac(sha256),cbc(des))", .test = alg_test_aead, - .fips_allowed = 1, .suite = { .aead = { .enc = { @@ -2228,7 +2223,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "authenc(hmac(sha384),cbc(des))", .test = alg_test_aead, - .fips_allowed = 1, .suite = { .aead = { .enc = { @@ -2270,7 +2264,6 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "authenc(hmac(sha512),cbc(des))", .test = alg_test_aead, - .fips_allowed = 1, .suite = { .aead = { .enc = {