diff options
| author | Sam Hartman <hartmans@mit.edu> | 2011-10-05 21:30:12 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2011-10-05 21:30:12 +0000 |
| commit | 22eae763a45f9047a3bd52f60a7cf0942d3285da (patch) | |
| tree | ca9481b5996f0ac2ff6ae15a0e5d2fbb73cea9ae /src/plugins | |
| parent | 65b1771e7b6b0240a4ef29351b763f73b53d49cd (diff) | |
| download | krb5-22eae763a45f9047a3bd52f60a7cf0942d3285da.tar.gz krb5-22eae763a45f9047a3bd52f60a7cf0942d3285da.tar.xz krb5-22eae763a45f9047a3bd52f60a7cf0942d3285da.zip | |
Treat the client's list of supported KDFs as an unordered list
Signed-off-by: Margaret Wasserman <mrw@painless-security.com>
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25303 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/preauth/pkinit/pkinit_srv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c index a79b25c295..de6f03cd20 100644 --- a/src/plugins/preauth/pkinit/pkinit_srv.c +++ b/src/plugins/preauth/pkinit/pkinit_srv.c @@ -664,10 +664,10 @@ pkinit_pick_kdf_alg(krb5_context context, *alg_oid = NULL; - /* for each of the OIDs in the client's request... */ - for (i = 0; NULL != (req_oid = kdf_list[i]); i++) { - /* if the requested OID is supported, use it. */ - for (j = 0; NULL != (supp_oid = supported_kdf_alg_ids[j]); j++) { + /* for each of the OIDs that the server supports... */ + for (i = 0; NULL != (supp_oid = supported_kdf_alg_ids[i]); i++) { + /* if the requested OID is in the client's list, use it. */ + for (j = 0; NULL != (req_oid = kdf_list[j]); j++) { if ((req_oid->length == supp_oid->length) && (0 == memcmp(req_oid->data, supp_oid->data, req_oid->length))) { tmp_oid = k5alloc(sizeof(krb5_octet_data), &retval); @@ -679,6 +679,7 @@ pkinit_pick_kdf_alg(krb5_context context, tmp_oid->length = supp_oid->length; memcpy(tmp_oid->data, supp_oid->data, supp_oid->length); *alg_oid = tmp_oid; + /* don't free the OID in clean-up if we are returning it */ tmp_oid = NULL; goto cleanup; } |