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

remove writing of old keyfile, and treat --convert-file as just

Browse Source 
reading and writing the keyfile without asking for a new key


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8604 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-07-08 15:01:13 +00:00
parent e6bce967d0
commit b6d34dc1a8
1 changed files with 22 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
kdc/kstash.c
View File

@@ -53,7 +53,7 @@ struct getargs args[] = {
{ "version4-key-file", '4', arg_string, &v4_keyfile,
"kerberos 4 master key file", "file" },
{ "convert-file", 0, arg_flag, &convert_flag,
"convert keytype of keyfile" },
"just convert keyfile to now format" },
{ "master-key-fd", 0, arg_integer, &master_key_fd,
"filedescriptor to read passphrase from", "fd" },
{ "help", 'h', arg_flag, &help_flag },
@@ -62,99 +62,10 @@ struct getargs args[] = {
int num_args = sizeof(args) / sizeof(args[0]);
static void
write_keyfile(EncryptionKey key)
{
FILE *f;
char buf[1024];
size_t len;
#ifdef HAVE_UMASK
umask(077);
#endif
f = fopen(keyfile, "w");
if(f == NULL)
krb5_err(context, 1, errno, "%s", keyfile);
encode_EncryptionKey((unsigned char *)buf + sizeof(buf) - 1,
sizeof(buf), &key, &len);
fwrite(buf + sizeof(buf) - len, len, 1, f);
memset(buf, 0, sizeof(buf));
if(ferror(f)) {
int e = errno;
unlink(keyfile);
krb5_err(context, 1, e, "%s", keyfile);
}
fclose(f);
chmod(keyfile, 0400);
}
static int
convert_file(void)
{
FILE *f;
unsigned char buf[1024];
char *fn;
size_t len;
EncryptionKey key;
krb5_error_code ret;
f = fopen(keyfile, "r");
if(f == NULL) {
krb5_warn(context, errno, "%s", keyfile);
return 1;
}
len = fread(buf, 1, sizeof(buf), f);
if(ferror(f)) {
krb5_warn(context, errno, "fread");
ret = 1;
goto out1;
}
fclose(f);
ret = decode_EncryptionKey(buf, len, &key, &len);
memset(buf, 0, sizeof(buf));
if(ret) {
krb5_warn(context, ret, "decode_EncryptionKey");
goto out2;
}
if(key.keytype == KEYTYPE_DES)
key.keytype = ETYPE_DES_CBC_MD5;
else if(key.keytype == ETYPE_DES_CBC_MD5) {
krb5_warnx(context, "keyfile already converted");
ret = 0;
goto out2;
} else {
krb5_warnx(context, "bad encryption key type (%d)", key.keytype);
ret = 1;
goto out2;
}
asprintf(&fn, "%s.old", keyfile);
if(fn == NULL) {
krb5_warn(context, ENOMEM, "malloc");
ret = 1;
goto out1;
}
if(rename(keyfile, fn) < 0) {
krb5_warn(context, errno, "rename");
ret = 1;
goto out1;
}
write_keyfile(key);
krb5_free_keyblock_contents(context, &key);
return 0;
out1:
memset(buf, 0, sizeof(buf));
return ret ? 1 : 0;
out2:
krb5_free_keyblock_contents(context, &key);
return ret ? 1 : 0;
}
int
main(int argc, char **argv)
{
char buf[1024];
krb5_keyblock key;
krb5_error_code ret;
krb5_enctype enctype;
@@ -170,18 +81,16 @@ main(int argc, char **argv)
exit(0);
}
if(convert_flag)
exit(convert_file());
ret = krb5_string_to_enctype(context, enctype_str, &enctype);
if(ret)
krb5_err(context, 1, ret, "krb5_string_to_enctype");
ret = hdb_read_master_key(context, keyfile, &mkey);
if(ret)
if(ret && ret != ENOENT)
krb5_err(context, 1, ret, "reading master key");
{
if(!convert_flag) {
krb5_keyblock key;
krb5_salt salt;
salt.salttype = KRB5_PW_SALT;
/* XXX better value? */
@@ -199,30 +108,41 @@ main(int argc, char **argv)
exit(1);
}
krb5_string_to_key_salt(context, enctype, buf, salt, &key);
ret = hdb_add_master_key(context, &key, &mkey);
krb5_free_keyblock_contents(context, &key);
}
ret = hdb_add_master_key(context, &key, &mkey);
krb5_free_keyblock_contents(context, &key);
{
char *new, *old;
asprintf(&old, "%s.old", keyfile);
asprintf(&new, "%s.new", keyfile);
if(unlink(new) < 0 && errno != ENOENT) {
ret = errno;
goto out;
}
krb5_warnx(context, "writing key to `%s'", keyfile);
ret = hdb_write_master_key(context, new, mkey);
if(ret)
unlink(new);
else {
if(link(keyfile, old) < 0)
unlink(old);
if(link(keyfile, old) < 0 && errno != ENOENT) {
ret = errno;
else if(rename(new, keyfile) < 0)
unlink(new);
} else if(rename(new, keyfile) < 0) {
ret = errno;
}
}
out:
free(old);
free(new);
if(ret)
krb5_warn(context, errno, "writing master key file");
}
hdb_free_master_key(context, mkey);
exit(0);
exit(ret != 0);
}