Drop this keytype code, there is only enctypes
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23669 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -125,25 +125,8 @@ main(int argc, char **argv)
|
||||
version5 = 1;
|
||||
|
||||
ret = krb5_string_to_enctype(context, keytype_str, &etype);
|
||||
if(ret) {
|
||||
krb5_keytype keytype;
|
||||
int *etypes;
|
||||
unsigned num;
|
||||
char *str;
|
||||
ret = krb5_string_to_keytype(context, keytype_str, &keytype);
|
||||
if(ret)
|
||||
krb5_err(context, 1, ret, "%s", keytype_str);
|
||||
ret = krb5_keytype_to_enctypes(context, keytype, &num, &etypes);
|
||||
if(ret)
|
||||
krb5_err(context, 1, ret, "%s", keytype_str);
|
||||
if(num == 0)
|
||||
krb5_errx(context, 1, "there are no encryption types for that keytype");
|
||||
etype = etypes[0];
|
||||
krb5_enctype_to_string(context, etype, &str);
|
||||
keytype_str = str;
|
||||
if(num > 1 && version5)
|
||||
krb5_warnx(context, "ambiguous keytype, using %s", keytype_str);
|
||||
}
|
||||
if(ret)
|
||||
krb5_err(context, 1, ret, "krb5_string_to_enctype");
|
||||
|
||||
if((etype != ETYPE_DES_CBC_CRC &&
|
||||
etype != ETYPE_DES_CBC_MD4 &&
|
||||
|
Reference in New Issue
Block a user