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

s/random_key/random_key_flag/, From Dave Love <d.love@dl.ac.uk>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14515 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-01-17 13:40:08 +00:00
parent 62dc17f843
commit bc686b4cbf
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kdc/kstash.c
View File

@@ -37,24 +37,24 @@ RCSID("$Id$");
krb5_context context; krb5_context context;
const char *keyfile = HDB_DB_DIR "/m-key"; static const char *keyfile = HDB_DB_DIR "/m-key";
int convert_flag; static int convert_flag;
int help_flag; static int help_flag;
int version_flag; static int version_flag;
int master_key_fd = -1; static int master_key_fd = -1;
int random_key; static int random_key_flag;
const char *enctype_str = "des3-cbc-sha1"; static const char *enctype_str = "des3-cbc-sha1";
struct getargs args[] = { static struct getargs args[] = {
{ "enctype", 'e', arg_string, &enctype_str, "encryption type" }, { "enctype", 'e', arg_string, &enctype_str, "encryption type" },
{ "key-file", 'k', arg_string, &keyfile, "master key file", "file" }, { "key-file", 'k', arg_string, &keyfile, "master key file", "file" },
{ "convert-file", 0, arg_flag, &convert_flag, { "convert-file", 0, arg_flag, &convert_flag,
"just convert keyfile to new format" }, "just convert keyfile to new format" },
{ "master-key-fd", 0, arg_integer, &master_key_fd, { "master-key-fd", 0, arg_integer, &master_key_fd,
"filedescriptor to read passphrase from", "fd" }, "filedescriptor to read passphrase from", "fd" },
{ "random-key", 0, arg_flag, &random_key, "generate a random master key" }, { "random-key", 0, arg_flag, &random_key_flag, "generate a random master key" },
{ "help", 'h', arg_flag, &help_flag }, { "help", 'h', arg_flag, &help_flag },
{ "version", 0, arg_flag, &version_flag } { "version", 0, arg_flag, &version_flag }
}; };
@@ -80,7 +80,7 @@ main(int argc, char **argv)
exit(0); exit(0);
} }
if (master_key_fd != -1 && random_key) if (master_key_fd != -1 && random_key_flag)
krb5_errx(context, 1, "random-key and master-key-fd " krb5_errx(context, 1, "random-key and master-key-fd "
"is mutual exclusive"); "is mutual exclusive");
@@ -102,7 +102,7 @@ main(int argc, char **argv)
/* XXX better value? */ /* XXX better value? */
salt.saltvalue.data = NULL; salt.saltvalue.data = NULL;
salt.saltvalue.length = 0; salt.saltvalue.length = 0;
if (random_key) { if (random_key_flag) {
ret = krb5_generate_random_keyblock(context, enctype, &key); ret = krb5_generate_random_keyblock(context, enctype, &key);
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_generate_random_keyblock"); krb5_err(context, 1, ret, "krb5_generate_random_keyblock");