oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add keytype support. Default to version 5 keys.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3532 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-09-22 18:23:30 +00:00
parent 2b1793bc18
commit dadf39203d
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kdc/string2key.c
View File

@@ -47,6 +47,7 @@ int afs;
char *principal; char *principal;
char *cell; char *cell;
char *password; char *password;
char *keytype_str = "des";
int version; int version;
int help; int help;
@@ -59,6 +60,7 @@ struct getargs args[] = {
#endif #endif
{ "password", 'w', arg_string, &password, "Password to use", "password" }, { "password", 'w', arg_string, &password, "Password to use", "password" },
{ "principal",'p', arg_string, &principal, "Kerberos v5 principal to use", "principal" }, { "principal",'p', arg_string, &principal, "Kerberos v5 principal to use", "principal" },
{ "keytype", 'k', arg_string, &keytype_str, "Keytype" },
{ "version", 0, arg_flag, &version, "print version" }, { "version", 0, arg_flag, &version, "print version" },
{ "help", 0, arg_flag, &help, NULL } { "help", 0, arg_flag, &help, NULL }
}; };
@@ -81,8 +83,11 @@ int main(int argc, char **argv)
int i; int i;
int optind; int optind;
char buf[1024]; char buf[1024];
krb5_keytype keytype;
krb5_error_code ret;
set_progname(argv[0]); set_progname(argv[0]);
krb5_init_context(&context);
optind = 0; optind = 0;
if(getarg(args, num_args, argc, argv, &optind)) if(getarg(args, num_args, argc, argv, &optind))
usage(1); usage(1);
@@ -101,6 +106,18 @@ int main(int argc, char **argv)
if (argc > 1) if (argc > 1)
usage(1); usage(1);
if(!version5 && !version4 && !afs)
version5 = 1;
ret = krb5_string_to_keytype(context, keytype_str, &keytype);
if(ret)
krb5_err(context, 1, ret, "%s", keytype);
if(keytype != KEYTYPE_DES && (afs || version4))
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: ");
fgets(buf, sizeof(buf), stdin); fgets(buf, sizeof(buf), stdin);
@@ -123,12 +140,11 @@ int main(int argc, char **argv)
} }
if(version5){ if(version5){
krb5_init_context(&context);
krb5_parse_name(context, principal, &princ); krb5_parse_name(context, principal, &princ);
salt.length = 0; salt.length = 0;
salt.data = NULL; salt.data = NULL;
krb5_get_salt(princ, &salt); krb5_get_salt(princ, &salt);
krb5_string_to_key(password, &salt, &key); krb5_string_to_key(password, &salt, keytype, &key);
printf("Kerberos v5 key: "); printf("Kerberos v5 key: ");
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]);