diff options
Diffstat (limited to 'src/lib/krb5')
| -rw-r--r-- | src/lib/krb5/krb/str_conv.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/krb/t_get_etype_info.py | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c index 3d05724..c8421a8 100644 --- a/src/lib/krb5/krb/str_conv.c +++ b/src/lib/krb5/krb/str_conv.c @@ -61,11 +61,9 @@ struct salttype_lookup_entry { #include "kdb.h" static const struct salttype_lookup_entry salttype_table[] = { { KRB5_KDB_SALTTYPE_NORMAL, "normal" }, - { KRB5_KDB_SALTTYPE_V4, "v4", }, { KRB5_KDB_SALTTYPE_NOREALM, "norealm", }, { KRB5_KDB_SALTTYPE_ONLYREALM, "onlyrealm", }, { KRB5_KDB_SALTTYPE_SPECIAL, "special", }, - { KRB5_KDB_SALTTYPE_AFS3, "afs3", }, }; static const int salttype_table_nents = sizeof(salttype_table)/ sizeof(salttype_table[0]); diff --git a/src/lib/krb5/krb/t_get_etype_info.py b/src/lib/krb5/krb/t_get_etype_info.py index 7c400be..3c91685 100644 --- a/src/lib/krb5/krb/t_get_etype_info.py +++ b/src/lib/krb5/krb/t_get_etype_info.py @@ -9,9 +9,6 @@ realm.run([kadminl, 'ank', '-nokey', '+preauth', 'pnokey']) realm.run([kadminl, 'ank', '-e', 'aes256-cts:special', '-pw', 'pw', 'exp']) realm.run([kadminl, 'ank', '-e', 'aes256-cts:special', '-pw', 'pw', '+preauth', 'pexp']) -realm.run([kadminl, 'ank', '-e', 'des-cbc-crc:afs3', '-pw', 'pw', 'afs']) -realm.run([kadminl, 'ank', '-e', 'des-cbc-crc:afs3', '-pw', 'pw', '+preauth', - 'pafs']) # Extract the explicit salt values from the database. out = realm.run([kdb5_util, 'tabdump', 'keyinfo']) @@ -56,8 +53,4 @@ realm.run(['./t_get_etype_info', 'exp'], realm.run(['./t_get_etype_info', 'pexp'], expected_msg='etype: aes256-cts\nsalt: ' + pexp_salt + '\n') -msg = 'etype: des-cbc-crc\nsalt: KRBTEST.COM\ns2kparams: 01\n' -realm.run(['./t_get_etype_info', 'afs'], expected_msg=msg) -realm.run(['./t_get_etype_info', 'pafs'], expected_msg=msg) - success('krb5_get_etype_info() tests') |