From patchwork Fri Jul 16 15:16:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Chikunov X-Patchwork-Id: 12382425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E726C07E95 for ; Fri, 16 Jul 2021 15:16:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 48051613F6 for ; Fri, 16 Jul 2021 15:16:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240625AbhGPPTM (ORCPT ); Fri, 16 Jul 2021 11:19:12 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]:57264 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237326AbhGPPTM (ORCPT ); Fri, 16 Jul 2021 11:19:12 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id 1242F72C8B4; Fri, 16 Jul 2021 18:16:16 +0300 (MSK) Received: from beacon.altlinux.org (unknown [193.43.10.9]) by imap.altlinux.org (Postfix) with ESMTPSA id ED2484A46E9; Fri, 16 Jul 2021 18:16:15 +0300 (MSK) From: Vitaly Chikunov To: Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org Cc: Elvira Khabirova , Stefan Berger Subject: [PATCH ima-evm-utils v9 1/3] Allow manual setting keyid for signing Date: Fri, 16 Jul 2021 18:16:00 +0300 Message-Id: <20210716151602.3575106-2-vt@altlinux.org> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210716151602.3575106-1-vt@altlinux.org> References: <20210716151602.3575106-1-vt@altlinux.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Allow user to set signature's keyid using `--keyid' option. Keyid should correspond to SKID in certificate, when keyid is calculated using SHA-1 in libimaevm it may mismatch keyid extracted by the kernel from SKID of certificate (the way public key is presented to the kernel), thus making signatures not verifiable. This may happen when certificate is using non SHA-1 SKID (see rfc7093) or just 'unique number' (see rfc5280 4.2.1.2). As a last resort user may specify arbitrary keyid using the new option. This commit creates ABI change for libimaevm, because of adding additional parameter to imaevm_params - newer libimaevm cannot work with older clients. Signed-off-by: Vitaly Chikunov Reported-by: Elvira Khabirova Reviewed-by: Stefan Berger --- README | 1 + src/evmctl.c | 20 ++++++++++++++++++++ src/imaevm.h | 1 + src/libimaevm.c | 6 +++++- tests/sign_verify.test | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/README b/README index 321045d..20fa009 100644 --- a/README +++ b/README @@ -48,6 +48,7 @@ OPTIONS --xattr-user store xattrs in user namespace (for testing purposes) --rsa use RSA key type and signing scheme v1 -k, --key path to signing key (default: /etc/keys/{privkey,pubkey}_evm.pem) + --keyid n overwrite signature keyid with a 32-bit value in hex (for signing) -o, --portable generate portable EVM signatures -p, --pass password for encrypted signing key -r, --recursive recurse into directories (sign) diff --git a/src/evmctl.c b/src/evmctl.c index 7a6f202..f272250 100644 --- a/src/evmctl.c +++ b/src/evmctl.c @@ -2514,6 +2514,7 @@ static void usage(void) " --xattr-user store xattrs in user namespace (for testing purposes)\n" " --rsa use RSA key type and signing scheme v1\n" " -k, --key path to signing key (default: /etc/keys/{privkey,pubkey}_evm.pem)\n" + " --keyid n overwrite signature keyid with a 32-bit value in hex (for signing)\n" " -o, --portable generate portable EVM signatures\n" " -p, --pass password for encrypted signing key\n" " -r, --recursive recurse into directories (sign)\n" @@ -2594,6 +2595,7 @@ static struct option opts[] = { {"ignore-violations", 0, 0, 141}, {"pcrs", 1, 0, 142}, {"verify-bank", 2, 0, 143}, + {"keyid", 1, 0, 144}, {} }; @@ -2638,6 +2640,8 @@ int main(int argc, char *argv[]) { int err = 0, c, lind; ENGINE *eng = NULL; + unsigned long keyid; + char *eptr; #if !(OPENSSL_VERSION_NUMBER < 0x10100000) OPENSSL_init_crypto( @@ -2785,6 +2789,22 @@ int main(int argc, char *argv[]) case 143: verify_bank = optarg; break; + case 144: + errno = 0; + keyid = strtoul(optarg, &eptr, 16); + /* + * ULONG_MAX is error from strtoul(3), + * UINT_MAX is `imaevm_params.keyid' maximum value, + * 0 is reserved for keyid being unset. + */ + if (errno || eptr - optarg != strlen(optarg) || + keyid == ULONG_MAX || keyid > UINT_MAX || + keyid == 0) { + log_err("Invalid keyid value.\n"); + exit(1); + } + imaevm_params.keyid = keyid; + break; case '?': exit(1); break; diff --git a/src/imaevm.h b/src/imaevm.h index 4503919..fe244f1 100644 --- a/src/imaevm.h +++ b/src/imaevm.h @@ -196,6 +196,7 @@ struct libimaevm_params { const char *hash_algo; const char *keyfile; const char *keypass; + uint32_t keyid; /* keyid overriding value, unless 0. (Host order.) */ }; struct RSA_ASN1_template { diff --git a/src/libimaevm.c b/src/libimaevm.c index 2856270..c59082b 100644 --- a/src/libimaevm.c +++ b/src/libimaevm.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -929,7 +930,10 @@ static int sign_hash_v2(const char *algo, const unsigned char *hash, return -1; } - calc_keyid_v2(&keyid, name, pkey); + if (imaevm_params.keyid) + keyid = htonl(imaevm_params.keyid); + else + calc_keyid_v2(&keyid, name, pkey); hdr->keyid = keyid; st = "EVP_PKEY_CTX_new"; diff --git a/tests/sign_verify.test b/tests/sign_verify.test index 3d7aa51..eccf5fa 100755 --- a/tests/sign_verify.test +++ b/tests/sign_verify.test @@ -365,6 +365,7 @@ sign_verify rsa1024 sha256 0x0301 --rsa sign_verify rsa1024 md5 0x030201:K:0080 sign_verify rsa1024 sha1 0x030202:K:0080 sign_verify rsa1024 sha224 0x030207:K:0080 +expect_pass check_sign TYPE=ima KEY=rsa1024 ALG=sha256 PREFIX=0x030204aabbccdd0080 OPTS=--keyid=aabbccdd sign_verify rsa1024 sha256 0x030204:K:0080 try_different_keys try_different_sigs From patchwork Fri Jul 16 15:16:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Chikunov X-Patchwork-Id: 12382427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B23DC07E95 for ; Fri, 16 Jul 2021 15:16:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B6DC613F1 for ; Fri, 16 Jul 2021 15:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239803AbhGPPTX (ORCPT ); Fri, 16 Jul 2021 11:19:23 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]:57358 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237326AbhGPPTU (ORCPT ); Fri, 16 Jul 2021 11:19:20 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id B87C372C8B4; Fri, 16 Jul 2021 18:16:23 +0300 (MSK) Received: from beacon.altlinux.org (unknown [193.43.10.9]) by imap.altlinux.org (Postfix) with ESMTPSA id 83A4D4A46E9; Fri, 16 Jul 2021 18:16:23 +0300 (MSK) From: Vitaly Chikunov To: Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org Subject: [PATCH ima-evm-utils v9 2/3] Allow manual setting keyid from a cert file Date: Fri, 16 Jul 2021 18:16:01 +0300 Message-Id: <20210716151602.3575106-3-vt@altlinux.org> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210716151602.3575106-1-vt@altlinux.org> References: <20210716151602.3575106-1-vt@altlinux.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Allow user to specify `--keyid-from-cert cert.pem' to extract keyid from SKID of the certificate file. PEM or DER format is auto-detected. This commit creates ABI change for libimaevm, due to adding new function ima_read_keyid(). Newer clients cannot work with older libimaevm. Together with previous commit it creates backward-incompatible ABI change, thus soname should be incremented on release. Signed-off-by: Vitaly Chikunov --- README | 2 + src/evmctl.c | 14 +++++ src/imaevm.h | 1 + src/libimaevm.c | 114 +++++++++++++++++++++++++++++++++++++++++ tests/sign_verify.test | 1 + 5 files changed, 132 insertions(+) diff --git a/README b/README index 20fa009..a130519 100644 --- a/README +++ b/README @@ -49,6 +49,8 @@ OPTIONS --rsa use RSA key type and signing scheme v1 -k, --key path to signing key (default: /etc/keys/{privkey,pubkey}_evm.pem) --keyid n overwrite signature keyid with a 32-bit value in hex (for signing) + --keyid-from-cert file + read keyid value from SKID of a x509 cert file -o, --portable generate portable EVM signatures -p, --pass password for encrypted signing key -r, --recursive recurse into directories (sign) diff --git a/src/evmctl.c b/src/evmctl.c index f272250..78be387 100644 --- a/src/evmctl.c +++ b/src/evmctl.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -57,12 +58,14 @@ #include #include +#include #include #include #include #include #include #include +#include #include "hash_info.h" #include "pcr.h" #include "utils.h" @@ -2515,6 +2518,8 @@ static void usage(void) " --rsa use RSA key type and signing scheme v1\n" " -k, --key path to signing key (default: /etc/keys/{privkey,pubkey}_evm.pem)\n" " --keyid n overwrite signature keyid with a 32-bit value in hex (for signing)\n" + " --keyid-from-cert file\n" + " read keyid value from SKID of a x509 cert file\n" " -o, --portable generate portable EVM signatures\n" " -p, --pass password for encrypted signing key\n" " -r, --recursive recurse into directories (sign)\n" @@ -2596,6 +2601,7 @@ static struct option opts[] = { {"pcrs", 1, 0, 142}, {"verify-bank", 2, 0, 143}, {"keyid", 1, 0, 144}, + {"keyid-from-cert", 1, 0, 145}, {} }; @@ -2805,6 +2811,14 @@ int main(int argc, char *argv[]) } imaevm_params.keyid = keyid; break; + case 145: + keyid = imaevm_read_keyid(optarg); + if (keyid == 0) { + log_err("Error reading keyid.\n"); + exit(1); + } + imaevm_params.keyid = keyid; + break; case '?': exit(1); break; diff --git a/src/imaevm.h b/src/imaevm.h index fe244f1..491f136 100644 --- a/src/imaevm.h +++ b/src/imaevm.h @@ -219,6 +219,7 @@ EVP_PKEY *read_pub_pkey(const char *keyfile, int x509); void calc_keyid_v1(uint8_t *keyid, char *str, const unsigned char *pkey, int len); void calc_keyid_v2(uint32_t *keyid, char *str, EVP_PKEY *pkey); int key2bin(RSA *key, unsigned char *pub); +uint32_t imaevm_read_keyid(const char *certfile); int sign_hash(const char *algo, const unsigned char *hash, int size, const char *keyfile, const char *keypass, unsigned char *sig); int verify_hash(const char *file, const unsigned char *hash, int size, unsigned char *sig, int siglen); diff --git a/src/libimaevm.c b/src/libimaevm.c index c59082b..ce1e276 100644 --- a/src/libimaevm.c +++ b/src/libimaevm.c @@ -53,10 +53,12 @@ #include #include +#include #include #include #include #include +#include #include #include "imaevm.h" @@ -745,6 +747,118 @@ void calc_keyid_v2(uint32_t *keyid, char *str, EVP_PKEY *pkey) X509_PUBKEY_free(pk); } +/* + * Extract SKID from x509 in openssl portable way. + */ +static const unsigned char *x509_get_skid(X509 *x, int *len) +{ +#if OPENSSL_VERSION_NUMBER < 0x10100000 + ASN1_STRING *skid; + + /* + * This will cache extensions. + * OpenSSL uses this method itself. + */ + if (X509_check_purpose(x, -1, -1) != 1) + return NULL; + skid = x->skid; +#else + const ASN1_OCTET_STRING *skid = X509_get0_subject_key_id(x); +#endif + if (len) + *len = ASN1_STRING_length(skid); +#if OPENSSL_VERSION_NUMBER < 0x10100000 + return ASN1_STRING_data(x->skid); +#else + return ASN1_STRING_get0_data(skid); +#endif +} + +/* + * read_keyid_from_cert() - Read keyid from SKID from x509 certificate file + * @keyid_be: Output 32-bit keyid in network order (BE); + * @certfile: Input filename. + * @try_der: true: try to read in DER from if there is no PEM, + * cert is considered mandatory and error will be issued + * if there is no cert; + * false: only try to read in PEM form, cert is considered + * optional. + * Return: 0 on success, -1 on error. + */ +static int read_keyid_from_cert(uint32_t *keyid_be, const char *certfile, int try_der) +{ + X509 *x = NULL; + FILE *fp; + const unsigned char *skid; + int skid_len; + + if (!(fp = fopen(certfile, "r"))) { + log_err("Cannot open %s: %s\n", certfile, strerror(errno)); + return -1; + } + if (!PEM_read_X509(fp, &x, NULL, NULL)) { + if (ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) { + ERR_clear_error(); + if (try_der) { + rewind(fp); + d2i_X509_fp(fp, &x); + } else { + /* + * Cert is optional and there is just no PEM + * header, then issue debug message and stop + * trying. + */ + log_debug("%s: x509 certificate not found\n", + certfile); + fclose(fp); + return -1; + } + } + } + fclose(fp); + if (!x) { + ERR_print_errors_fp(stderr); + log_err("read keyid: %s: Error reading x509 certificate\n", + certfile); + } + + if (!(skid = x509_get_skid(x, &skid_len))) { + log_err("read keyid: %s: SKID not found\n", certfile); + goto err_free; + } + if (skid_len < sizeof(*keyid_be)) { + log_err("read keyid: %s: SKID too short (len %d)\n", certfile, + skid_len); + goto err_free; + } + memcpy(keyid_be, skid + skid_len - sizeof(*keyid_be), sizeof(*keyid_be)); + log_info("keyid %04x (from %s)\n", ntohl(*keyid_be), certfile); + X509_free(x); + return 0; + +err_free: + X509_free(x); + return -1; +} + +/* + * imaevm_read_keyid() - Read 32-bit keyid from the cert file + * @certfile: File with certificate in PEM or DER form. + * + * Try to read keyid from Subject Key Identifier (SKID) of x509 certificate. + * Autodetect if cert is in PEM (tried first) or DER encoding. + * + * Return: 0 on error or 32-bit keyid in host order otherwise. + */ +uint32_t imaevm_read_keyid(const char *certfile) +{ + uint32_t keyid_be = 0; + + read_keyid_from_cert(&keyid_be, certfile, true); + /* On error keyid_be will not be set, returning 0. */ + return ntohl(keyid_be); +} + static EVP_PKEY *read_priv_pkey(const char *keyfile, const char *keypass) { FILE *fp; diff --git a/tests/sign_verify.test b/tests/sign_verify.test index eccf5fa..1fdd786 100755 --- a/tests/sign_verify.test +++ b/tests/sign_verify.test @@ -366,6 +366,7 @@ sign_verify rsa1024 md5 0x030201:K:0080 sign_verify rsa1024 sha1 0x030202:K:0080 sign_verify rsa1024 sha224 0x030207:K:0080 expect_pass check_sign TYPE=ima KEY=rsa1024 ALG=sha256 PREFIX=0x030204aabbccdd0080 OPTS=--keyid=aabbccdd +expect_pass check_sign TYPE=ima KEY=rsa1024 ALG=sha256 PREFIX=0x030204:K:0080 OPTS=--keyid-from-cert=test-rsa1024.cer sign_verify rsa1024 sha256 0x030204:K:0080 try_different_keys try_different_sigs From patchwork Fri Jul 16 15:16:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Chikunov X-Patchwork-Id: 12382429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC6C7C07E95 for ; Fri, 16 Jul 2021 15:16:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9040613F5 for ; Fri, 16 Jul 2021 15:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240673AbhGPPT2 (ORCPT ); Fri, 16 Jul 2021 11:19:28 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]:57430 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237326AbhGPPT1 (ORCPT ); Fri, 16 Jul 2021 11:19:27 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id DE63172C8B4; Fri, 16 Jul 2021 18:16:30 +0300 (MSK) Received: from beacon.altlinux.org (unknown [193.43.10.9]) by imap.altlinux.org (Postfix) with ESMTPSA id A6C324A46E9; Fri, 16 Jul 2021 18:16:30 +0300 (MSK) From: Vitaly Chikunov To: Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org Subject: [PATCH ima-evm-utils v9 3/3] Read keyid from the cert appended to the key file Date: Fri, 16 Jul 2021 18:16:02 +0300 Message-Id: <20210716151602.3575106-4-vt@altlinux.org> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210716151602.3575106-1-vt@altlinux.org> References: <20210716151602.3575106-1-vt@altlinux.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Allow to have certificate appended to the private key of `--key' specified (PEM) file (for v2 signing) to facilitate reading of keyid from the associated cert. This will allow users to have private and public key as a single file and avoid the need of manually specifying keyid. There is no check that public key form the cert matches associated private key. Signed-off-by: Vitaly Chikunov --- README | 3 +++ src/libimaevm.c | 8 ++++++-- tests/gen-keys.sh | 31 +++++++++++++++++++++++++------ tests/sign_verify.test | 1 + 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/README b/README index a130519..23e7d17 100644 --- a/README +++ b/README @@ -128,6 +128,9 @@ for signing and importing the key. Second key format uses X509 DER encoded public key certificates and uses asymmetric key support in the kernel (since kernel 3.9). CONFIG_INTEGRITY_ASYMMETRIC_KEYS must be enabled (default). +For v2 signatures x509 certificate (containing the public key) could be appended to the +private key (they both are in PEM format) to automatically extract keyid from its Subject +Key Identifier (SKID). Integrity keyrings ---------------- diff --git a/src/libimaevm.c b/src/libimaevm.c index ce1e276..7d5cbe0 100644 --- a/src/libimaevm.c +++ b/src/libimaevm.c @@ -1046,8 +1046,12 @@ static int sign_hash_v2(const char *algo, const unsigned char *hash, if (imaevm_params.keyid) keyid = htonl(imaevm_params.keyid); - else - calc_keyid_v2(&keyid, name, pkey); + else { + int keyid_read_failed = read_keyid_from_cert(&keyid, keyfile, false); + + if (keyid_read_failed) + calc_keyid_v2(&keyid, name, pkey); + } hdr->keyid = keyid; st = "EVP_PKEY_CTX_new"; diff --git a/tests/gen-keys.sh b/tests/gen-keys.sh index 46130cf..d2c2f80 100755 --- a/tests/gen-keys.sh +++ b/tests/gen-keys.sh @@ -20,13 +20,14 @@ PATH=../src:$PATH type openssl log() { - echo - "$*" + echo >&2 - "$*" eval "$@" } if [ "$1" = clean ]; then rm -f test-ca.conf -elif [ "$1" = force ] || [ ! -e test-ca.conf ]; then +elif [ "$1" = force ] || [ ! -e test-ca.conf ] \ + || [ gen-keys.sh -nt test-ca.conf ]; then cat > test-ca.conf <<- EOF [ req ] distinguished_name = req_distinguished_name @@ -43,26 +44,44 @@ cat > test-ca.conf <<- EOF basicConstraints=CA:TRUE subjectKeyIdentifier=hash authorityKeyIdentifier=keyid:always,issuer + + [ skid ] + basicConstraints=CA:TRUE + subjectKeyIdentifier=12345678 + authorityKeyIdentifier=keyid:always,issuer EOF fi # RSA # Second key will be used for wrong key tests. -for m in 1024 2048; do - if [ "$1" = clean ] || [ "$1" = force ]; then +for m in 1024 1024_skid 2048; do + if [ "$1" = clean ] || [ "$1" = force ] \ + || [ gen-keys.sh -nt test-rsa$m.key ]; then rm -f test-rsa$m.cer test-rsa$m.key test-rsa$m.pub fi if [ "$1" = clean ]; then continue fi + if [ -z "${m%%*_*}" ]; then + # Add named extension. + bits=${m%_*} + ext="-extensions ${m#*_}" + else + bits=$m + ext= + fi if [ ! -e test-rsa$m.key ]; then - log openssl req -verbose -new -nodes -utf8 -sha1 -days 10000 -batch -x509 \ + log openssl req -verbose -new -nodes -utf8 -sha1 -days 10000 -batch -x509 $ext \ -config test-ca.conf \ - -newkey rsa:$m \ + -newkey rsa:$bits \ -out test-rsa$m.cer -outform DER \ -keyout test-rsa$m.key # for v1 signatures log openssl pkey -in test-rsa$m.key -out test-rsa$m.pub -pubout + if [ $m = 1024_skid ]; then + # Create combined key+cert. + log openssl x509 -inform DER -in test-rsa$m.cer >> test-rsa$m.key + fi fi done diff --git a/tests/sign_verify.test b/tests/sign_verify.test index 1fdd786..df4304a 100755 --- a/tests/sign_verify.test +++ b/tests/sign_verify.test @@ -367,6 +367,7 @@ sign_verify rsa1024 sha1 0x030202:K:0080 sign_verify rsa1024 sha224 0x030207:K:0080 expect_pass check_sign TYPE=ima KEY=rsa1024 ALG=sha256 PREFIX=0x030204aabbccdd0080 OPTS=--keyid=aabbccdd expect_pass check_sign TYPE=ima KEY=rsa1024 ALG=sha256 PREFIX=0x030204:K:0080 OPTS=--keyid-from-cert=test-rsa1024.cer +expect_pass check_sign TYPE=ima KEY=rsa1024_skid ALG=sha256 PREFIX=0x030204123456780080 sign_verify rsa1024 sha256 0x030204:K:0080 try_different_keys try_different_sigs