print the used enctype for kerberos 5 keys
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11910 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 1998, 1999, 2002 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997-2003 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -42,7 +42,7 @@ int afs;
|
|||||||
char *principal;
|
char *principal;
|
||||||
char *cell;
|
char *cell;
|
||||||
char *password;
|
char *password;
|
||||||
const char *keytype_str = "des-cbc-md5";
|
const char *keytype_str = "des3-cbc-sha1";
|
||||||
int version;
|
int version;
|
||||||
int help;
|
int help;
|
||||||
|
|
||||||
@@ -76,8 +76,11 @@ tokey(krb5_context context,
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
krb5_keyblock key;
|
krb5_keyblock key;
|
||||||
|
char *e;
|
||||||
krb5_string_to_key_salt(context, enctype, password, salt, &key);
|
krb5_string_to_key_salt(context, enctype, password, salt, &key);
|
||||||
printf("%s: ", label);
|
krb5_enctype_to_string(context, enctype, &e);
|
||||||
|
printf(label, e);
|
||||||
|
printf(": ");
|
||||||
for(i = 0; i < key.keyvalue.length; i++)
|
for(i = 0; i < key.keyvalue.length; i++)
|
||||||
printf("%02x", ((unsigned char*)key.keyvalue.data)[i]);
|
printf("%02x", ((unsigned char*)key.keyvalue.data)[i]);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
@@ -115,23 +118,35 @@ main(int argc, char **argv)
|
|||||||
version5 = 1;
|
version5 = 1;
|
||||||
|
|
||||||
ret = krb5_string_to_enctype(context, keytype_str, &etype);
|
ret = krb5_string_to_enctype(context, keytype_str, &etype);
|
||||||
#if 0
|
|
||||||
if(ret) {
|
if(ret) {
|
||||||
krb5_keytype keytype;
|
krb5_keytype keytype;
|
||||||
|
int *etypes;
|
||||||
|
unsigned num;
|
||||||
ret = krb5_string_to_keytype(context, keytype_str, &keytype);
|
ret = krb5_string_to_keytype(context, keytype_str, &keytype);
|
||||||
ret = krb5_keytype_to_enctype(context, keytype, &etype);
|
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, &keytype_str);
|
||||||
|
if(num > 1 && version5)
|
||||||
|
krb5_warnx(context, "ambiguous keytype, using %s", keytype_str);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
if(ret)
|
|
||||||
krb5_err(context, 1, ret, "%s", keytype_str);
|
|
||||||
|
|
||||||
if((etype != ETYPE_DES_CBC_CRC &&
|
if((etype != ETYPE_DES_CBC_CRC &&
|
||||||
etype != ETYPE_DES_CBC_MD4 &&
|
etype != ETYPE_DES_CBC_MD4 &&
|
||||||
etype != ETYPE_DES_CBC_MD5) &&
|
etype != ETYPE_DES_CBC_MD5) &&
|
||||||
(afs || version4))
|
(afs || version4)) {
|
||||||
krb5_errx(context, 1,
|
if(!version5) {
|
||||||
"DES is the only valid keytype for AFS and Kerberos 4");
|
etype = ETYPE_DES_CBC_CRC;
|
||||||
|
} else {
|
||||||
|
krb5_errx(context, 1,
|
||||||
|
"DES is the only valid keytype for AFS and Kerberos 4");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(version5 && principal == NULL){
|
if(version5 && principal == NULL){
|
||||||
printf("Kerberos v5 principal: ");
|
printf("Kerberos v5 principal: ");
|
||||||
@@ -160,20 +175,20 @@ main(int argc, char **argv)
|
|||||||
if(version5){
|
if(version5){
|
||||||
krb5_parse_name(context, principal, &princ);
|
krb5_parse_name(context, principal, &princ);
|
||||||
krb5_get_pw_salt(context, princ, &salt);
|
krb5_get_pw_salt(context, princ, &salt);
|
||||||
tokey(context, etype, password, salt, "Kerberos v5 key");
|
tokey(context, etype, password, salt, "Kerberos 5 (%s)");
|
||||||
krb5_free_salt(context, salt);
|
krb5_free_salt(context, salt);
|
||||||
}
|
}
|
||||||
if(version4){
|
if(version4){
|
||||||
salt.salttype = KRB5_PW_SALT;
|
salt.salttype = KRB5_PW_SALT;
|
||||||
salt.saltvalue.length = 0;
|
salt.saltvalue.length = 0;
|
||||||
salt.saltvalue.data = NULL;
|
salt.saltvalue.data = NULL;
|
||||||
tokey(context, ETYPE_DES_CBC_MD5, password, salt, "Kerberos v4 key");
|
tokey(context, ETYPE_DES_CBC_MD5, password, salt, "Kerberos 4");
|
||||||
}
|
}
|
||||||
if(afs){
|
if(afs){
|
||||||
salt.salttype = KRB5_AFS3_SALT;
|
salt.salttype = KRB5_AFS3_SALT;
|
||||||
salt.saltvalue.length = strlen(cell);
|
salt.saltvalue.length = strlen(cell);
|
||||||
salt.saltvalue.data = cell;
|
salt.saltvalue.data = cell;
|
||||||
tokey(context, ETYPE_DES_CBC_MD5, password, salt, "AFS key");
|
tokey(context, ETYPE_DES_CBC_MD5, password, salt, "AFS");
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user