diff options
author | Greg Hudson <ghudson@mit.edu> | 2020-01-23 14:49:24 -0500 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2020-01-24 22:24:19 -0500 |
commit | f3c4932ef88f227374bee49094097174429db123 (patch) | |
tree | 8950892bbfda16f076b6d773e35a20ad0c901c71 | |
parent | 17570dd94056df70c19108c14d46cd6132509e6a (diff) | |
download | krb5-f3c4932ef88f227374bee49094097174429db123.zip krb5-f3c4932ef88f227374bee49094097174429db123.tar.gz krb5-f3c4932ef88f227374bee49094097174429db123.tar.bz2 |
Further simplify test KDB module authdata code
Commit 94f7c9705879500b1dc8dda8592490efce05688f simplified the
generation of authdata elements, but left behind some unnecessary
conditionalization when assembling the elements into a list, causing a
Coverity defect. Further simplify the code.
(cherry picked from commit d035dc269e80b58cb73fd2b644b06bc5fb53e9cb)
ticket: 8868
version_fixed: 1.18
-rw-r--r-- | src/plugins/kdb/test/kdb_test.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/kdb/test/kdb_test.c b/src/plugins/kdb/test/kdb_test.c index 7f62c9c..d95a7fa 100644 --- a/src/plugins/kdb/test/kdb_test.c +++ b/src/plugins/kdb/test/kdb_test.c @@ -885,20 +885,22 @@ test_sign_authdata(krb5_context context, unsigned int flags, krb5_data **inds, d; int i, val; + /* Possibly create a PAC authdata element. */ generate_pac(context, flags, client_princ, server_princ, client, header_server, local_tgt, server_key, header_key, local_tgt_key, authtime, ad_info, &pac_ad); - /* Add our TEST_AD_TYPE authdata */ + /* Always create a TEST_AD_TYPE element. */ test_ad = ealloc(sizeof(*test_ad)); test_ad->magic = KV5M_AUTHDATA; test_ad->ad_type = TEST_AD_TYPE; test_ad->contents = (uint8_t *)estrdup("db-authdata-test"); test_ad->length = strlen((char *)test_ad->contents); + /* Assemble the authdata into a one-element or two-element list. */ list = ealloc(3 * sizeof(*list)); - list[0] = (test_ad != NULL) ? test_ad : pac_ad; - list[1] = (test_ad != NULL) ? pac_ad : NULL; + list[0] = test_ad; + list[1] = pac_ad; list[2] = NULL; *signed_auth_data = list; |