86 lines
6.1 KiB
Diff
86 lines
6.1 KiB
Diff
From 152e88043117927c334fead93bb3bd3dd74593b7 Mon Sep 17 00:00:00 2001
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
|
Date: Tue, 16 Apr 2019 14:16:39 -0400
|
|
Subject: [PATCH] Update ASN.1 SAM tests to use a modern enctype
|
|
|
|
(cherry picked from commit 3e94e53febc6d5636272f31ae9dba8e3babe9263)
|
|
---
|
|
src/tests/asn.1/krb5_decode_test.c | 2 +-
|
|
src/tests/asn.1/ktest.c | 4 ++--
|
|
src/tests/asn.1/reference_encode.out | 4 ++--
|
|
src/tests/asn.1/trval_reference.out | 4 ++--
|
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
|
|
index ee70fa4b9..cbd99ba63 100644
|
|
--- a/src/tests/asn.1/krb5_decode_test.c
|
|
+++ b/src/tests/asn.1/krb5_decode_test.c
|
|
@@ -934,7 +934,7 @@ int main(argc, argv)
|
|
/* decode_sam_challenge_2_body */
|
|
{
|
|
setup(krb5_sam_challenge_2_body,ktest_make_sample_sam_challenge_2_body);
|
|
- decode_run("sam_challenge_2_body","","30 64 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A8 05 02 03 54 32 10 A9 03 02 01 01",decode_krb5_sam_challenge_2_body,ktest_equal_sam_challenge_2_body,krb5_free_sam_challenge_2_body);
|
|
+ decode_run("sam_challenge_2_body","","30 64 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A8 05 02 03 54 32 10 A9 03 02 01 14",decode_krb5_sam_challenge_2_body,ktest_equal_sam_challenge_2_body,krb5_free_sam_challenge_2_body);
|
|
ktest_empty_sam_challenge_2_body(&ref);
|
|
|
|
}
|
|
diff --git a/src/tests/asn.1/ktest.c b/src/tests/asn.1/ktest.c
|
|
index 5bfdc5be2..6bf6e54ac 100644
|
|
--- a/src/tests/asn.1/ktest.c
|
|
+++ b/src/tests/asn.1/ktest.c
|
|
@@ -507,7 +507,7 @@ ktest_make_sample_sam_challenge_2_body(krb5_sam_challenge_2_body *p)
|
|
krb5_data_parse(&p->sam_response_prompt, "response_prompt ipse");
|
|
p->sam_pk_for_sad = empty_data();
|
|
p->sam_nonce = 0x543210;
|
|
- p->sam_etype = ENCTYPE_DES_CBC_CRC;
|
|
+ p->sam_etype = ENCTYPE_AES256_CTS_HMAC_SHA384_192;
|
|
}
|
|
|
|
void
|
|
@@ -518,7 +518,7 @@ ktest_make_sample_sam_response_2(krb5_sam_response_2 *p)
|
|
p->sam_flags = KRB5_SAM_USE_SAD_AS_KEY; /* KRB5_SAM_* values */
|
|
krb5_data_parse(&p->sam_track_id, "track data");
|
|
krb5_data_parse(&p->sam_enc_nonce_or_sad.ciphertext, "nonce or sad");
|
|
- p->sam_enc_nonce_or_sad.enctype = ENCTYPE_DES_CBC_CRC;
|
|
+ p->sam_enc_nonce_or_sad.enctype = ENCTYPE_AES256_CTS_HMAC_SHA384_192;
|
|
p->sam_enc_nonce_or_sad.kvno = 3382;
|
|
p->sam_nonce = 0x543210;
|
|
}
|
|
diff --git a/src/tests/asn.1/reference_encode.out b/src/tests/asn.1/reference_encode.out
|
|
index a76deead2..80b18a2fb 100644
|
|
--- a/src/tests/asn.1/reference_encode.out
|
|
+++ b/src/tests/asn.1/reference_encode.out
|
|
@@ -49,8 +49,8 @@ encode_krb5_enc_data: 30 23 A0 03 02 01 00 A1 03 02 01 05 A2 17 04 15 6B 72 62 4
|
|
encode_krb5_enc_data(MSB-set kvno): 30 26 A0 03 02 01 00 A1 06 02 04 FF 00 00 00 A2 17 04 15 6B 72 62 41 53 4E 2E 31 20 74 65 73 74 20 6D 65 73 73 61 67 65
|
|
encode_krb5_enc_data(kvno=-1): 30 23 A0 03 02 01 00 A1 03 02 01 FF A2 17 04 15 6B 72 62 41 53 4E 2E 31 20 74 65 73 74 20 6D 65 73 73 61 67 65
|
|
encode_krb5_sam_challenge_2: 30 22 A0 0D 30 0B 04 09 63 68 61 6C 6C 65 6E 67 65 A1 11 30 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34
|
|
-encode_krb5_sam_challenge_2_body: 30 64 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A8 05 02 03 54 32 10 A9 03 02 01 01
|
|
-encode_krb5_sam_response_2: 30 42 A0 03 02 01 2B A1 07 03 05 00 80 00 00 00 A2 0C 04 0A 74 72 61 63 6B 20 64 61 74 61 A3 1D 30 1B A0 03 02 01 01 A1 04 02 02 0D 36 A2 0E 04 0C 6E 6F 6E 63 65 20 6F 72 20 73 61 64 A4 05 02 03 54 32 10
|
|
+encode_krb5_sam_challenge_2_body: 30 64 A0 03 02 01 2A A1 07 03 05 00 80 00 00 00 A2 0B 04 09 74 79 70 65 20 6E 61 6D 65 A4 11 04 0F 63 68 61 6C 6C 65 6E 67 65 20 6C 61 62 65 6C A5 10 04 0E 63 68 61 6C 6C 65 6E 67 65 20 69 70 73 65 A6 16 04 14 72 65 73 70 6F 6E 73 65 5F 70 72 6F 6D 70 74 20 69 70 73 65 A8 05 02 03 54 32 10 A9 03 02 01 14
|
|
+encode_krb5_sam_response_2: 30 42 A0 03 02 01 2B A1 07 03 05 00 80 00 00 00 A2 0C 04 0A 74 72 61 63 6B 20 64 61 74 61 A3 1D 30 1B A0 03 02 01 14 A1 04 02 02 0D 36 A2 0E 04 0C 6E 6F 6E 63 65 20 6F 72 20 73 61 64 A4 05 02 03 54 32 10
|
|
encode_krb5_enc_sam_response_enc_2: 30 1F A0 03 02 01 58 A1 18 04 16 65 6E 63 5F 73 61 6D 5F 72 65 73 70 6F 6E 73 65 5F 65 6E 63 5F 32
|
|
encode_krb5_pa_for_user: 30 4B A0 1A 30 18 A0 03 02 01 01 A1 11 30 0F 1B 06 68 66 74 73 61 69 1B 05 65 78 74 72 61 A1 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 A2 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34 A3 0A 1B 08 6B 72 62 35 64 61 74 61
|
|
encode_krb5_pa_s4u_x509_user: 30 68 A0 55 30 53 A0 06 02 04 00 CA 14 9A A1 1A 30 18 A0 03 02 01 01 A1 11 30 0F 1B 06 68 66 74 73 61 69 1B 05 65 78 74 72 61 A2 10 1B 0E 41 54 48 45 4E 41 2E 4D 49 54 2E 45 44 55 A3 12 04 10 70 61 5F 73 34 75 5F 78 35 30 39 5F 75 73 65 72 A4 07 03 05 00 80 00 00 00 A1 0F 30 0D A0 03 02 01 01 A1 06 04 04 31 32 33 34
|
|
diff --git a/src/tests/asn.1/trval_reference.out b/src/tests/asn.1/trval_reference.out
|
|
index e5c715924..432fdcebb 100644
|
|
--- a/src/tests/asn.1/trval_reference.out
|
|
+++ b/src/tests/asn.1/trval_reference.out
|
|
@@ -1180,7 +1180,7 @@ encode_krb5_sam_challenge_2_body:
|
|
. [5] [Octet String] "challenge ipse"
|
|
. [6] [Octet String] "response_prompt ipse"
|
|
. [8] [Integer] 5517840
|
|
-. [9] [Integer] 1
|
|
+. [9] [Integer] 20
|
|
|
|
encode_krb5_sam_response_2:
|
|
|
|
@@ -1189,7 +1189,7 @@ encode_krb5_sam_response_2:
|
|
. [1] [Bit String] 0x80000000
|
|
. [2] [Octet String] "track data"
|
|
. [3] [Sequence/Sequence Of]
|
|
-. . [0] [Integer] 1
|
|
+. . [0] [Integer] 20
|
|
. . [1] [Integer] 3382
|
|
. . [2] [Octet String] "nonce or sad"
|
|
. [4] [Integer] 5517840
|