From 9269a4428a40a5a462abf2279050f1d983bf5da3 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Fri, 14 Mar 2014 21:10:53 -0500 Subject: [PATCH] Add missing KRB-FX-CF2 test vectors (3DES broken) Note that this shows that the our KRB-FX-CF2 is broken as to 3DES (and the 1DES PRF is still missing). --- lib/krb5/test_fx.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/lib/krb5/test_fx.c b/lib/krb5/test_fx.c index 10aa2aebd..1fc2d5bff 100644 --- a/lib/krb5/test_fx.c +++ b/lib/krb5/test_fx.c @@ -82,7 +82,30 @@ struct { "\x88\xbd\xb2\xa9\xf\x3e\x52\x5a\xb0\x5f\x68\xc5\x43\x9a\x4d\x5e" "\x9c\x2b\xfd\x2b\x02\x24\xde\x39\xb5\x82\xf4\xbb\x05\xfe\x2\x2e", 32 - } + }, + { + "key1", "a", ETYPE_ARCFOUR_HMAC_MD5, + "key2", "b", ETYPE_ARCFOUR_HMAC_MD5, + ETYPE_ARCFOUR_HMAC_MD5, + "\x24\xd7\xf6\xb6\xba\xe4\xe5\xc0\x0d\x20\x82\xc5\xeb\xab\x36\x72", + 16 + }, + /* We don't yet have a PRF for 1DES in Heimdal */ + { + "key1", "a", ETYPE_DES_CBC_CRC, + "key2", "b", ETYPE_DES_CBC_CRC, + ETYPE_DES_CBC_CRC, + "\x43\xba\xe3\x73\x8c\x94\x67\xe6", + 8 + }, + { + "key1", "a", ETYPE_DES3_CBC_SHA1, + "key2", "b", ETYPE_DES3_CBC_SHA1, + ETYPE_DES3_CBC_SHA1, + "\xe5\x8f\x9e\xb6\x43\x86\x2c\x13\xad\x38\xe5\x29\x31\x34\x62\xa7" + "\xf7\x3e\x62\x83\x4f\xe5\x4a\x01", + 24 + }, }; @@ -95,6 +118,7 @@ test_cf2(krb5_context context) krb5_keyblock k1, k2, k3; krb5_crypto c1, c2; unsigned int i; + unsigned int errors = 0; for (i = 0; i < sizeof(cf2)/sizeof(cf2[0]); i++) { pw.data = cf2[i].p1; @@ -140,14 +164,26 @@ test_cf2(krb5_context context) p2.length = strlen(cf2[i].pepper2); ret = krb5_crypto_fx_cf2(context, c1, c2, &p1, &p2, cf2[i].e3, &k3); - if (ret) + if (ret == KRB5_PROG_ETYPE_NOSUPP) { + krb5_warn(context, ret, "KRB-FX-CF2 not supported for enctype %d", + cf2[i].e1); + continue; + } else if (ret) { krb5_err(context, 1, ret, "krb5_crypto_fx_cf2"); + } - if (k3.keytype != cf2[i].e3) - krb5_errx(context, 1, "length not right"); + if (k3.keytype != cf2[i].e3) { + errors++; + krb5_warnx(context, "length not right for enctype %d", cf2[i].e3); + continue; + } if (k3.keyvalue.length != cf2[i].len || - memcmp(k3.keyvalue.data, cf2[i].key, cf2[i].len) != 0) - krb5_errx(context, 1, "key not same"); + memcmp(k3.keyvalue.data, cf2[i].key, cf2[i].len) != 0) { + errors++; + krb5_warnx(context, "key not same for enctypes %d %d %d", + cf2[i].e1, cf2[i].e2, cf2[i].e3); + continue; + } krb5_crypto_destroy(context, c1); krb5_crypto_destroy(context, c2); @@ -156,6 +192,9 @@ test_cf2(krb5_context context) krb5_free_keyblock_contents(context, &k2); krb5_free_keyblock_contents(context, &k3); } + + if (errors) + krb5_errx(context, 1, "%u KRB-FX-CF2 vectors failed", errors); } static int version_flag = 0; -- 2.11.4.GIT