On Fri, Jan 11, 2019 at 08:10:56PM +0100, Stephan Müller wrote:
> Add known answer tests to the testmgr for the HKDF (RFC5869) cipher.
>
> The known answer tests are derived from RFC 5869 appendix A.
>
> Note, the HKDF is considered to be a FIPS 140-2 allowed (not approved)
> cipher as of now. Yet, an allowed cipher is usable under FIPS 140-2
> rules.
>
> Signed-off-by: Stephan Mueller <smueller@xxxxxxxxxx>
> ---
> crypto/testmgr.c | 32 +++++++++++++
> crypto/testmgr.h | 115 +++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 147 insertions(+)
>
> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
> index ff9051bffa1f..aba7a3645293 100644
> --- a/crypto/testmgr.c
> +++ b/crypto/testmgr.c
> @@ -3187,6 +3187,38 @@ static const struct alg_test_desc alg_test_descs[] = {
> .suite = {
> .hash = __VECS(ghash_tv_template)
> }
> + }, {
> + .alg = "hkdf(hmac(sha1))",
> + .test = alg_test_kdf,
> + .fips_allowed = 1,
> + .suite = {
> + .kdf = {
> + .vecs = hkdf_hmac_sha1_tv_template,
> + .count = ARRAY_SIZE(hkdf_hmac_sha1_tv_template)
Use the __VECS() macro.
> + }
> + }
> + }, {
> + .alg = "hkdf(hmac(sha224))",
> + .test = alg_test_null,
> + .fips_allowed = 1,
I think it is dumb to add algorithms to the testmgr with no tests just so the
'fips_allowed' flag can be set. And doesn't FIPS sometimes require tests
anyway? I don't think the "null test" should count as a test :-)
Perhaps just include sha256 and sha512, and have tests for them?
> + }, {
> + .alg = "hkdf(hmac(sha256))",
> + .test = alg_test_kdf,
> + .fips_allowed = 1,
> + .suite = {
> + .kdf = {
> + .vecs = hkdf_hmac_sha256_tv_template,
> + .count = ARRAY_SIZE(hkdf_hmac_sha256_tv_template)
> + }
> + }
> + }, {
> + .alg = "hkdf(hmac(sha384))",
> + .test = alg_test_null,
> + .fips_allowed = 1,
> + }, {
> + .alg = "hkdf(hmac(sha512))",
> + .test = alg_test_null,
> + .fips_allowed = 1,
> }, {
> .alg = "hmac(md5)",
> .test = alg_test_hash,
> diff --git a/crypto/testmgr.h b/crypto/testmgr.h
> index a729b66f8757..7c4aa694e0f3 100644
> --- a/crypto/testmgr.h
> +++ b/crypto/testmgr.h
> @@ -28002,6 +28002,121 @@ static struct kdf_testvec kdf_dpi_hmac_sha256_tv_template[] = {
> }
> };
>
> +/* Test vectors from RFC 5869 appendix A */
> +static struct kdf_testvec hkdf_hmac_sha256_tv_template[] = {
const
Likewise for all other kdf_testvecs.
> + {
> + .K1 = (unsigned char *)
No need for this cast if you make the pointers const in struct kdf_testvec.
Likewise for all other testvecs.
> +#ifdef __LITTLE_ENDIAN
> + "\x08\x00" /* rta length */
> + "\x01\x00" /* rta type */
> + "\x0d\x00\x00\x00" /* salt length */
> +#else
> + "\x00\x08" /* rta length */
> + "\x00\x01" /* rta type */
> + "\x00\x00\x00\x0d" /* salt length */
> +#endif
> + "\x00\x01\x02\x03\x04\x05\x06\x07"
> + "\x08\x09\x0a\x0b\x0c" /* salt */
> + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
> + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
> + "\x0b\x0b\x0b\x0b\x0b\x0b", /* IKM */
> + .K1len = 43,
> + .context = (unsigned char *)
> + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
> + "\xf8\xf9",
> + .contextlen = 10,
> + .expected = (unsigned char *)
> + "\x3c\xb2\x5f\x25\xfa\xac\xd5\x7a"
> + "\x90\x43\x4f\x64\xd0\x36\x2f\x2a"
> + "\x2d\x2d\x0a\x90\xcf\x1a\x5a\x4c"
> + "\x5d\xb0\x2d\x56\xec\xc4\xc5\xbf"
> + "\x34\x00\x72\x08\xd5\xb8\x87\x18"
> + "\x58\x65",
> + .expectedlen = 42
> + }, {
> + .K1 = (unsigned char *)
> +#ifdef __LITTLE_ENDIAN
> + "\x08\x00" /* rta length */
> + "\x01\x00" /* rta type */
> +#else
> + "\x00\x08" /* rta length */
> + "\x00\x01" /* rta type */
> +#endif
> + "\x00\x00\x00\x00" /* salt length */
> + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
> + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
> + "\x0b\x0b\x0b\x0b\x0b\x0b", /* IKM */
> + .K1len = 30,
> + .context = NULL,
> + .contextlen = 0,
> + .expected = (unsigned char *)
> + "\x8d\xa4\xe7\x75\xa5\x63\xc1\x8f"
> + "\x71\x5f\x80\x2a\x06\x3c\x5a\x31"
> + "\xb8\xa1\x1f\x5c\x5e\xe1\x87\x9e"
> + "\xc3\x45\x4e\x5f\x3c\x73\x8d\x2d"
> + "\x9d\x20\x13\x95\xfa\xa4\xb6\x1a"
> + "\x96\xc8",
> + .expectedlen = 42
> + }
> +};
> +
> +/* Test vectors from RFC 5869 appendix A */
> +static struct kdf_testvec hkdf_hmac_sha1_tv_template[] = {
> + {
> + .K1 = (unsigned char *)
> +#ifdef __LITTLE_ENDIAN
> + "\x08\x00" /* rta length */
> + "\x01\x00" /* rta type */
> + "\x0d\x00\x00\x00" /* salt length */
> +#else
> + "\x00\x08" /* rta length */
> + "\x00\x01" /* rta type */
> + "\x00\x00\x00\x0d" /* salt length */
> +#endif
> + "\x00\x01\x02\x03\x04\x05\x06\x07"
> + "\x08\x09\x0a\x0b\x0c" /* salt */
> + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
> + "\x0b\x0b\x0b", /* IKM */
> + .K1len = 32,
> + .context = (unsigned char *)
> + "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
> + "\xf8\xf9",
> + .contextlen = 10,
> + .expected = (unsigned char *)
> + "\x08\x5a\x01\xea\x1b\x10\xf3\x69"
> + "\x33\x06\x8b\x56\xef\xa5\xad\x81"
> + "\xa4\xf1\x4b\x82\x2f\x5b\x09\x15"
> + "\x68\xa9\xcd\xd4\xf1\x55\xfd\xa2"
> + "\xc2\x2e\x42\x24\x78\xd3\x05\xf3"
> + "\xf8\x96",
> + .expectedlen = 42
> + }, {
> + .K1 = (unsigned char *)
> +#ifdef __LITTLE_ENDIAN
> + "\x08\x00" /* rta length */
> + "\x01\x00" /* rta type */
> +#else
> + "\x00\x08" /* rta length */
> + "\x00\x01" /* rta type */
> +#endif
> + "\x00\x00\x00\x00" /* salt length */
> + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
> + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
> + "\x0b\x0b\x0b\x0b\x0b\x0b", /* IKM */
> + .K1len = 30,
> + .context = NULL,
> + .contextlen = 0,
> + .expected = (unsigned char *)
> + "\x0a\xc1\xaf\x70\x02\xb3\xd7\x61"
> + "\xd1\xe5\x52\x98\xda\x9d\x05\x06"
> + "\xb9\xae\x52\x05\x72\x20\xa3\x06"
> + "\xe0\x7b\x6b\x87\xe8\xdf\x21\xd0"
> + "\xea\x00\x03\x3d\xe0\x39\x84\xd3"
> + "\x49\x18",
> + .expectedlen = 42
> + }
> +};
> +
> /* Cast5 test vectors from RFC 2144 */
> static const struct cipher_testvec cast5_tv_template[] = {
> {
> --
> 2.20.1
>
>
>
>
