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

Use headers.h. Add v4 m-keyfile support.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3326 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-09-01 15:54:14 +00:00
parent 3826f1cbfb
commit eab8b0bdfe
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
kdc/kstash.c
View File

@@ -36,16 +36,21 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "kdc_locl.h" #include "headers.h"
RCSID("$Id$"); RCSID("$Id$");
char *keyfile = "m-key"; char *keyfile = "m-key";
int help; char *v4_keyfile;
int help_flag;
int version_flag;
struct getargs args[] = { struct getargs args[] = {
{ "key-file", 'k', arg_string, &keyfile, "Master key file", "file" }, { "key-file", 'k', arg_string, &keyfile, "master key file", "file" },
{ "help", 'h', arg_flag, &help } { "version4-key-file", '4', arg_string, &v4_keyfile,
"kerberos 4 master key file", "file" },
{ "help", 'h', arg_flag, &help_flag },
{ "version", 0, arg_flag, &version_flag }
}; };
int num_args = sizeof(args) / sizeof(args[0]); int num_args = sizeof(args) / sizeof(args[0]);
@@ -57,24 +62,30 @@ int main(int argc, char **argv)
FILE *f; FILE *f;
size_t len; size_t len;
int optind = 0; int optind = 0;
krb5_context context = NULL;
set_progname(argv[0]); krb5_program_setup(&context, argc, argv, args, num_args, NULL);
if(getarg(args, num_args, argc, argv, &optind)){ if(help_flag)
arg_printusage (args, num_args, ""); krb5_std_usage(0, args, num_args);
exit(1); if(version_flag)
} krb5_errx(context, 0, "%s", heimdal_version);
if(help){
arg_printusage (args, num_args, "");
exit(0);
}
des_read_pw_string(buf, sizeof(buf), "Master key: ", 1);
key.keytype = KEYTYPE_DES; key.keytype = KEYTYPE_DES;
key.keyvalue.length = sizeof(des_cblock); key.keyvalue.length = sizeof(des_cblock);
key.keyvalue.data = malloc(key.keyvalue.length); key.keyvalue.data = malloc(key.keyvalue.length);
des_string_to_key(buf, key.keyvalue.data); if(v4_keyfile){
f = fopen(v4_keyfile, "r");
if(f == NULL)
krb5_err(context, 1, errno, "fopen(%s)", v4_keyfile);
fread(key.keyvalue.data, 1, key.keyvalue.length, f);
fclose(f);
}else{
des_read_pw_string(buf, sizeof(buf), "Master key: ", 1);
des_string_to_key(buf, key.keyvalue.data);
}
#ifdef HAVE_UMASK #ifdef HAVE_UMASK
umask(077); umask(077);
@@ -82,7 +93,7 @@ int main(int argc, char **argv)
f = fopen(keyfile, "w"); f = fopen(keyfile, "w");
if(f == NULL) if(f == NULL)
err(1, "Failed to open %s", keyfile); krb5_err(context, 1, errno, "fopen(%s)", keyfile);
encode_EncryptionKey(buf + sizeof(buf) - 1, sizeof(buf), &key, &len); encode_EncryptionKey(buf + sizeof(buf) - 1, sizeof(buf), &key, &len);
fwrite(buf + sizeof(buf) - len, len, 1, f); fwrite(buf + sizeof(buf) - len, len, 1, f);
fclose(f); fclose(f);