From 59dd1bebbdfc13df4762030f063a171fdafed345 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Mon, 4 Mar 2019 11:07:45 -0500 Subject: [PATCH] Fix ASN.1 test secure cookie comparison One of the comparisons in ktest_equal_secure_cookie() was tautological. Use scalar_equal() for consistency with other tests. Also use scalar_equal() in ktest_equal_kkdcp_message(). --- src/tests/asn.1/ktest_equal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/asn.1/ktest_equal.c b/src/tests/asn.1/ktest_equal.c index 714cc4398a..98a7c79508 100644 --- a/src/tests/asn.1/ktest_equal.c +++ b/src/tests/asn.1/ktest_equal.c @@ -1055,7 +1055,7 @@ ktest_equal_kkdcp_message(krb5_kkdcp_message *ref, krb5_kkdcp_message *var) else if (ref == NULL || var == NULL) return FALSE; p = p && data_eq(ref->kerb_message, var->kerb_message); p = p && data_eq(ref->target_domain, var->target_domain); - p = p && (ref->dclocator_hint == var->dclocator_hint); + p = p && scalar_equal(dclocator_hint); return p; } @@ -1098,7 +1098,7 @@ ktest_equal_secure_cookie(krb5_secure_cookie *ref, krb5_secure_cookie *var) if (ref == var) return TRUE; else if (ref == NULL || var == NULL) return FALSE; p = p && ktest_equal_sequence_of_pa_data(ref->data, var->data); - p = p && ref->time == ref->time; + p = p && scalar_equal(time); return p; } -- 2.47.2