From patchwork Mon Feb 4 22:32:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 10796697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 907E21669 for ; Mon, 4 Feb 2019 22:32:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 825862B625 for ; Mon, 4 Feb 2019 22:32:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80A502C079; Mon, 4 Feb 2019 22:32:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 120E12B625 for ; Mon, 4 Feb 2019 22:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725900AbfBDWc4 (ORCPT ); Mon, 4 Feb 2019 17:32:56 -0500 Received: from mga03.intel.com ([134.134.136.65]:13773 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726083AbfBDWc4 (ORCPT ); Mon, 4 Feb 2019 17:32:56 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Feb 2019 14:32:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,560,1539673200"; d="scan'208";a="297254667" Received: from ldmartin-desk.jf.intel.com ([10.7.200.78]) by orsmga005.jf.intel.com with ESMTP; 04 Feb 2019 14:32:55 -0800 From: Lucas De Marchi To: linux-modules@vger.kernel.org Cc: Yauheni Kaliuta Subject: [PATCH 1/2] testsuite: fix modinfo test without openssl Date: Mon, 4 Feb 2019 14:32:48 -0800 Message-Id: <20190204223249.27531-1-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 Sender: owner-linux-modules@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP --- .../correct-sig_hashalgo-openssl.txt | 3 +++ .../test-modinfo/correct-sig_hashalgo.txt | 3 ++- .../test-modinfo/correct-sig_key-openssl.txt | 3 +++ .../test-modinfo/correct-sig_key.txt | 2 +- .../test-modinfo/correct-signer-openssl.txt | 3 +++ .../test-modinfo/correct-signer.txt | 2 +- testsuite/test-modinfo.c | 16 ++++++++++++---- 7 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt create mode 100644 testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt new file mode 100644 index 0000000..f97c4fa --- /dev/null +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo-openssl.txt @@ -0,0 +1,3 @@ +sha1 +sha256 +sha256 diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt index f97c4fa..23cb933 100644 --- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_hashalgo.txt @@ -1,3 +1,4 @@ sha1 sha256 -sha256 +unknown + diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt new file mode 100644 index 0000000..25a75a8 --- /dev/null +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key-openssl.txt @@ -0,0 +1,3 @@ +E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9 +E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9 +26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68 diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt index 25a75a8..7dc4c6a 100644 --- a/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt +++ b/testsuite/rootfs-pristine/test-modinfo/correct-sig_key.txt @@ -1,3 +1,3 @@ E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9 E3:C8:FC:A7:3F:B3:1D:DE:84:81:EF:38:E3:4C:DE:4B:0C:FD:1B:F9 -26:DA:C3:EB:0F:0D:1A:56:A2:D8:B2:13:F0:D7:53:47:1D:0D:48:68 + diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt new file mode 100644 index 0000000..2b979f9 --- /dev/null +++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer-openssl.txt @@ -0,0 +1,3 @@ +Magrathea: Glacier signing key +Magrathea: Glacier signing key +Build time autogenerated kernel key diff --git a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt index 2b979f9..afe83df 100644 --- a/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt +++ b/testsuite/rootfs-pristine/test-modinfo/correct-signer.txt @@ -1,3 +1,3 @@ Magrathea: Glacier signing key Magrathea: Glacier signing key -Build time autogenerated kernel key + diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c index 504d9dd..373dc95 100644 --- a/testsuite/test-modinfo.c +++ b/testsuite/test-modinfo.c @@ -27,7 +27,7 @@ static const char *progname = ABS_TOP_BUILDDIR "/tools/modinfo"; -#define DEFINE_MODINFO_TEST(_field, ...) \ +#define DEFINE_MODINFO_TEST(_field, _flavor, ...) \ static noreturn int test_modinfo_##_field(const struct test *t) \ { \ const char *const args[] = { \ @@ -44,20 +44,28 @@ DEFINE_TEST(test_modinfo_##_field, \ [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modinfo/", \ }, \ .output = { \ - .out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field ".txt", \ + .out = TESTSUITE_ROOTFS "test-modinfo/correct-" #_field #_flavor ".txt", \ }) #define DEFINE_MODINFO_GENERIC_TEST(_field) \ - DEFINE_MODINFO_TEST(_field, \ + DEFINE_MODINFO_TEST(_field, , \ "/mod-simple-i386.ko", \ "/mod-simple-x86_64.ko", \ "/mod-simple-sparc64.ko") +#ifdef ENABLE_OPENSSL #define DEFINE_MODINFO_SIGN_TEST(_field) \ - DEFINE_MODINFO_TEST(_field, \ + DEFINE_MODINFO_TEST(_field, -openssl, \ "/mod-simple-sha1.ko", \ "/mod-simple-sha256.ko", \ "/mod-simple-pkcs7.ko") +#else +#define DEFINE_MODINFO_SIGN_TEST(_field) \ + DEFINE_MODINFO_TEST(_field, , \ + "/mod-simple-sha1.ko", \ + "/mod-simple-sha256.ko", \ + "/mod-simple-pkcs7.ko") +#endif DEFINE_MODINFO_GENERIC_TEST(filename); DEFINE_MODINFO_GENERIC_TEST(author);