From patchwork Mon Nov 14 21:01:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Cope X-Patchwork-Id: 9428403 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 498E36047D for ; Mon, 14 Nov 2016 21:02:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 469B9289F8 for ; Mon, 14 Nov 2016 21:02:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B82328AC3; Mon, 14 Nov 2016 21:02:00 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 7922E289F8 for ; Mon, 14 Nov 2016 21:01:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935645AbcKNVB6 (ORCPT ); Mon, 14 Nov 2016 16:01:58 -0500 Received: from mail-pf0-f178.google.com ([209.85.192.178]:35323 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753274AbcKNVB4 (ORCPT ); Mon, 14 Nov 2016 16:01:56 -0500 Received: by mail-pf0-f178.google.com with SMTP id i88so31318922pfk.2 for ; Mon, 14 Nov 2016 13:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UhR8z27O4MpS7kmS43WKL8OtWam20+iF2zLF6nKcjkM=; b=h8UFRCNyI2zFoRWyC9f+H9YxfmAxn4lLUV9sFgs1Jjs8QeTHetgMvkGzN+Y7m5jro2 RPt90VEKPqbtYp1J6YNVdUgZiWWqXqgUIROrBr8SQlSr7PdTJdw+r/dIn2z2IkrjdKIm wsmH9EyeOmi1lJvrwLHZ0PIXUtbk0aNLF3fOTp6E2b0l2W2xqSopBOCJzjOVfnw0fEPE obHOlMisINl1l1WqDTjUl3H3XimRfg8UrXSY5gR839+jGk8aglgXkkiQnla3FQdRKLbE t1c5wse3dkituQ9bYg9C/r8g6uzUvFg07vhm1Mne34kpVsPhBejQGXNYlzfZ3X9Lfgtq tyZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UhR8z27O4MpS7kmS43WKL8OtWam20+iF2zLF6nKcjkM=; b=l/TllkRzSo9tTKlJ61sEl2iUjQFOg8EXfS0pYXxe/PaibIh/5fdl4msjmEr2lBvMP9 eQP+rHLntt1gZKeAwIuE1DIVcTw7QeP0PNNa0PSra3lgPFcZ0qPPovzQrm/lDvhgZ5wU CF+LLy9ZOYoKK27WltDK7FKmkW+CzfLJcm8ap6XJyXz/aZDHoM/0EEHEMZlp01uB562D Ssy+Nu1Qc/zszSbAHlsS92O0k4/t3hGcYgC9pAFcWCga2XwJGYlic3ksAp2UIQJVgDNZ PGbE+RE+w/0cbOsqi5eAMKJnRSfSe5MBqhNSB7xfcI73rNKko4zkecrFnDIBDI8FLU5v F/WA== X-Gm-Message-State: ABUngveJqRfBFX/5N+7HeOVCFcjMQKMI3Kbp4B9LYH7L0lz3TSJJwKx/zY6HINJ5t1ZqNBhs X-Received: by 10.99.136.194 with SMTP id l185mr32197750pgd.106.1479157315453; Mon, 14 Nov 2016 13:01:55 -0800 (PST) Received: from alexcope-linuxxworkstation.kir.corp.google.com ([172.23.164.32]) by smtp.gmail.com with ESMTPSA id p25sm37314339pfk.20.2016.11.14.13.01.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Nov 2016 13:01:55 -0800 (PST) From: Alex Cope To: linux-crypto@vger.kernel.org Cc: mhalcrow@google.com, edknapp@google.com, Alex Cope , Eric Biggers Subject: [RFC][PATCH 6/7] crypto: testmgr - Add test vectors for HEH Date: Mon, 14 Nov 2016 13:01:17 -0800 Message-Id: <1479157277-10251-7-git-send-email-alexcope@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1479157277-10251-1-git-send-email-alexcope@google.com> References: <1479157277-10251-1-git-send-email-alexcope@google.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adding test vectors from https://tools.ietf.org/html/draft-cope-heh-00 Signed-off-by: Alex Cope Signed-off-by: Eric Biggers --- crypto/testmgr.c | 15 ++++ crypto/testmgr.h | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 241 insertions(+) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index ded50b6..bab027b 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -3481,6 +3481,21 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { + .alg = "heh(aes)", + .test = alg_test_skcipher, + .suite = { + .cipher = { + .enc = { + .vecs = aes_heh_enc_tv_template, + .count = AES_HEH_ENC_TEST_VECTORS + }, + .dec = { + .vecs = aes_heh_dec_tv_template, + .count = AES_HEH_DEC_TEST_VECTORS + } + } + } + }, { .alg = "hmac(crc32)", .test = alg_test_hash, .suite = { diff --git a/crypto/testmgr.h b/crypto/testmgr.h index e64a4ef..b2daad3 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -15172,6 +15172,8 @@ static struct cipher_testvec cast6_xts_dec_tv_template[] = { #define AES_DEC_TEST_VECTORS 4 #define AES_CBC_ENC_TEST_VECTORS 5 #define AES_CBC_DEC_TEST_VECTORS 5 +#define AES_HEH_ENC_TEST_VECTORS 4 +#define AES_HEH_DEC_TEST_VECTORS 4 #define HMAC_MD5_ECB_CIPHER_NULL_ENC_TEST_VECTORS 2 #define HMAC_MD5_ECB_CIPHER_NULL_DEC_TEST_VECTORS 2 #define HMAC_SHA1_ECB_CIPHER_NULL_ENC_TEST_VEC 2 @@ -15544,6 +15546,230 @@ static struct cipher_testvec aes_dec_tv_template[] = { }, }; +static struct cipher_testvec aes_heh_enc_tv_template[] = { + { + .key = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .klen = 48, + .iv = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00", + .input = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .ilen = 16, + .result = "\x61\x76\x38\xa5\x12\x0b\x6d\x89" + "\x92\x68\x30\x7e\x0d\x6e\x81\xe3", + .rlen = 16, + .also_non_np = 1, + .np = 2, + .tap = { 8, 8 }, + }, { + .key = "\x68\xf8\x27\x87\xdc\x30\x33\xfd" + "\x65\x5b\x8e\x51\x2e\x02\xff\x9d" + "\x21\x28\x1e\x64\xcd\x9c\x33\x88" + "\xf6\x2c\x43\x8f\xf5\x6f\xf5\x8f" + "\xa8\xda\x24\x9b\x5e\xfa\x13\xc2" + "\xc1\x94\xbf\x32\xba\x38\xa3\x77", + .klen = 48, + .iv = "\x4d\x47\x61\x37\x2b\x47\x86\xf0" + "\xd6\x47\xb5\xc2\xe8\xcf\x85\x27", + .input = "\xb8\xee\x29\xe4\xa5\xd1\xe7\x55" + "\xd0\xfd\xe7\x22\x63\x76\x36\xe2" + "\xf8\x0c\xf8\xfe\x65\x76\xe7\xca" + "\xc1\x42\xf5\xca\x5a\xa8\xac\x2a", + .ilen = 32, + .result = "\x1f\x4c\x6a\x1e\x1d\x20\x0d\x99" + "\xdf\xbb\x13\xd8\x35\xdc\x1d\xbe" + "\xed\x50\x0a\x9f\xfd\xd6\x94\x85" + "\xd0\x8b\xf7\xb4\x49\x7f\x70\x6d", + .rlen = 32, + .also_non_np = 1, + .np = 3, + .tap = { 16, 13, 3 }, + }, { + .key = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .klen = 48, + .iv = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00", + .input = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00", + .ilen = 63, + .result = "\xfb\x30\x90\x47\xc5\x4e\xcc\xfd" + "\xc4\x90\xa2\x9f\x7c\x03\x63\xc3" + "\xcb\xaf\x2e\xee\x62\x18\xeb\x20" + "\x62\x97\xe4\x9b\xf2\x8b\xf3\x3f" + "\x76\x3b\xaa\xab\xf0\x19\x54\xdb" + "\xb4\xaf\x2e\xd9\xa7\xe0\x92\x04" + "\x5a\xe4\x81\xfc\x58\xf2\xda\xbf" + "\x5d\xc9\xb1\x47\xd5\x08\xb1", + .rlen = 63, + .also_non_np = 1, + .np = 8, + .tap = { 20, 20, 10, 8, 2, 1, 1, 1 }, + }, { + .key = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .klen = 48, + .iv = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00", + .input = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00", + .ilen = 63, + .result = "\x9c\xdf\xa5\x50\x83\xe0\xa3\xb5" + "\x0d\x35\x83\x34\x6e\x6e\x40\xd6" + "\x0f\x81\xc8\x1a\x9c\x40\x81\xfb" + "\xb3\x6e\xb4\xbf\xfc\xca\xc9\x50" + "\xcd\x33\xfd\xb3\x43\x11\xe6\x32" + "\x02\x3d\x3e\xc6\x49\x6e\xcf\x58" + "\x3e\x14\x15\x6d\x39\x2a\x58\x99" + "\x83\xaf\xdd\x22\x3e\x7f\x6c", + .rlen = 63, + .also_non_np = 1, + .np = 8, + .tap = { 20, 20, 10, 8, 2, 1, 1, 1 }, + } +}; + +static struct cipher_testvec aes_heh_dec_tv_template[] = { + { + .key = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .klen = 48, + .iv = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00", + .input = "\x61\x76\x38\xa5\x12\x0b\x6d\x89" + "\x92\x68\x30\x7e\x0d\x6e\x81\xe3", + .ilen = 16, + .result = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .rlen = 16, + .also_non_np = 1, + .np = 2, + .tap = { 8, 8 }, + }, { + .key = "\x68\xf8\x27\x87\xdc\x30\x33\xfd" + "\x65\x5b\x8e\x51\x2e\x02\xff\x9d" + "\x21\x28\x1e\x64\xcd\x9c\x33\x88" + "\xf6\x2c\x43\x8f\xf5\x6f\xf5\x8f" + "\xa8\xda\x24\x9b\x5e\xfa\x13\xc2" + "\xc1\x94\xbf\x32\xba\x38\xa3\x77", + .klen = 48, + .iv = "\x4d\x47\x61\x37\x2b\x47\x86\xf0" + "\xd6\x47\xb5\xc2\xe8\xcf\x85\x27", + .input = "\x1f\x4c\x6a\x1e\x1d\x20\x0d\x99" + "\xdf\xbb\x13\xd8\x35\xdc\x1d\xbe" + "\xed\x50\x0a\x9f\xfd\xd6\x94\x85" + "\xd0\x8b\xf7\xb4\x49\x7f\x70\x6d", + .ilen = 32, + .result = "\xb8\xee\x29\xe4\xa5\xd1\xe7\x55" + "\xd0\xfd\xe7\x22\x63\x76\x36\xe2" + "\xf8\x0c\xf8\xfe\x65\x76\xe7\xca" + "\xc1\x42\xf5\xca\x5a\xa8\xac\x2a", + .rlen = 32, + .also_non_np = 1, + .np = 3, + .tap = { 16, 13, 3 }, + }, { + .key = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .klen = 48, + .iv = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00", + .result = "\xfb\x30\x90\x47\xc5\x4e\xcc\xfd" + "\xc4\x90\xa2\x9f\x7c\x03\x63\xc3" + "\xcb\xaf\x2e\xee\x62\x18\xeb\x20" + "\x62\x97\xe4\x9b\xf2\x8b\xf3\x3f" + "\x76\x3b\xaa\xab\xf0\x19\x54\xdb" + "\xb4\xaf\x2e\xd9\xa7\xe0\x92\x04" + "\x5a\xe4\x81\xfc\x58\xf2\xda\xbf" + "\x5d\xc9\xb1\x47\xd5\x08\xb1", + .ilen = 63, + .input = "\xfb\x30\x90\x47\xc5\x4e\xcc\xfd" + "\xc4\x90\xa2\x9f\x7c\x03\x63\xc3" + "\xcb\xaf\x2e\xee\x62\x18\xeb\x20" + "\x62\x97\xe4\x9b\xf2\x8b\xf3\x3f" + "\x76\x3b\xaa\xab\xf0\x19\x54\xdb" + "\xb4\xaf\x2e\xd9\xa7\xe0\x92\x04" + "\x5a\xe4\x81\xfc\x58\xf2\xda\xbf" + "\x5d\xc9\xb1\x47\xd5\x08\xb1", + .result = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00", + .rlen = 63, + .also_non_np = 1, + .np = 8, + .tap = { 20, 20, 10, 8, 2, 1, 1, 1 }, + }, { + .key = "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + "\x00\x01\x02\x03\x04\x05\x06\x07" + "\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F", + .klen = 48, + .iv = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00", + .input = "\x9c\xdf\xa5\x50\x83\xe0\xa3\xb5" + "\x0d\x35\x83\x34\x6e\x6e\x40\xd6" + "\x0f\x81\xc8\x1a\x9c\x40\x81\xfb" + "\xb3\x6e\xb4\xbf\xfc\xca\xc9\x50" + "\xcd\x33\xfd\xb3\x43\x11\xe6\x32" + "\x02\x3d\x3e\xc6\x49\x6e\xcf\x58" + "\x3e\x14\x15\x6d\x39\x2a\x58\x99" + "\x83\xaf\xdd\x22\x3e\x7f\x6c", + .ilen = 63, + .result = "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00\x01" + "\x00\x00\x00\x00\x00\x00\x00\x00" + "\x00\x00\x00\x00\x00\x00\x00", + .rlen = 63, + .also_non_np = 1, + .np = 8, + .tap = { 20, 20, 10, 8, 2, 1, 1, 1 }, + } +}; + static struct cipher_testvec aes_cbc_enc_tv_template[] = { { /* From RFC 3602 */ .key = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"