diff options
author | Tom Yu <tlyu@mit.edu> | 2009-12-07 15:30:37 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 2009-12-07 15:30:37 +0000 |
commit | 741938feb12538b659a36d7e0329efe6a5550669 (patch) | |
tree | fc7f1244a33a1c2bfa25b2e518ba1fa7c84c5ffb /src/lib/kdb/kdb_default.c | |
parent | 6f699dde6aee55fa7086f1cf8cb0811c1d1a4927 (diff) | |
download | krb5-741938feb12538b659a36d7e0329efe6a5550669.tar.gz krb5-741938feb12538b659a36d7e0329efe6a5550669.tar.xz krb5-741938feb12538b659a36d7e0329efe6a5550669.zip |
handle negative enctypes better
krb5_dbe_def_search_enctype and krb5int_parse_enctype_list were making
assumptions that enctype numbers are positive. Potentially more code
makes this assumption, but these appear to be the major ones.
ticket: 6592
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23454 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb/kdb_default.c')
-rw-r--r-- | src/lib/kdb/kdb_default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c index 81c70f36c5..ea24d36fd6 100644 --- a/src/lib/kdb/kdb_default.c +++ b/src/lib/kdb/kdb_default.c @@ -98,7 +98,7 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap) } - if (ktype > 0) { + if (ktype != -1) { if ((ret = krb5_c_enctype_compare(kcontext, (krb5_enctype) ktype, dbentp->key_data[i].key_data_type[0], &similar))) @@ -106,7 +106,7 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap) return(ret); } - if (((ktype <= 0) || similar) && + if (((ktype == -1) || similar) && ((db_stype == stype) || (stype < 0))) { if (kvno >= 0) { if (kvno == dbentp->key_data[i].key_data_kvno) { |