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

Replace contents with keyvalue.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1897 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-06-10 15:17:44 +00:00
parent c8fe1ef20f
commit 44826fcb13
7 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/dump.c
View File

@@ -20,10 +20,10 @@ key2str(krb5_keyblock *key)
int i; int i;
if(s) if(s)
free(s); free(s);
s = malloc(key->contents.length/2+10); s = malloc(key->keyvalue.length/2+10);
sprintf(s, "%d:", key->keytype); sprintf(s, "%d:", key->keytype);
p = (unsigned char*)key->contents.data; p = (unsigned char*)key->keyvalue.data;
for(i = 0; i < key->contents.length; i++) for(i = 0; i < key->keyvalue.length; i++)
sprintf(s + strlen(s), "%02x", p[i]); sprintf(s + strlen(s), "%02x", p[i]);
return s; return s;
} }

8
admin/extkeytab.c
View File

@@ -40,10 +40,10 @@ ext_keytab(int argc, char **argv)
krb5_copy_principal (context, ent.principal, &key_entry.principal); krb5_copy_principal (context, ent.principal, &key_entry.principal);
key_entry.vno = ent.kvno; key_entry.vno = ent.kvno;
key_entry.keyblock.keytype = ent.keyblock.keytype; key_entry.keyblock.keytype = ent.keyblock.keytype;
key_entry.keyblock.contents.length = 0; key_entry.keyblock.keyvalue.length = 0;
krb5_data_copy(&key_entry.keyblock.contents, krb5_data_copy(&key_entry.keyblock.keyvalue,
ent.keyblock.contents.data, ent.keyblock.keyvalue.data,
ent.keyblock.contents.length); ent.keyblock.keyvalue.length);
ret = krb5_kt_default (context, &kid); ret = krb5_kt_default (context, &kid);
if (ret) { if (ret) {

11
admin/init.c
View File

@@ -80,10 +80,9 @@ init(int argc, char **argv)
/* Create `krbtgt/REALM' */ /* Create `krbtgt/REALM' */
ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.keytype = KEYTYPE_DES;
ent.keyblock.contents.length = 8; ent.keyblock.keyvalue.length = 8;
ent.keyblock.contents.data = malloc(ent.keyblock.contents.length); ent.keyblock.keyvalue.data = malloc(ent.keyblock.keyvalue.length);
des_rand_data(ent.keyblock.contents.data, des_new_random_key(ent.keyblock.keyvalue.data);
ent.keyblock.contents.length);
ent.kvno = 1; ent.kvno = 1;
ent.max_life = max_life; ent.max_life = max_life;
ent.max_renew = max_renew; ent.max_renew = max_renew;
@@ -106,8 +105,8 @@ init(int argc, char **argv)
"default", "default",
NULL); NULL);
ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.keytype = KEYTYPE_DES;
ent.keyblock.contents.length = 0; ent.keyblock.keyvalue.length = 0;
ent.keyblock.contents.data = NULL; ent.keyblock.keyvalue.data = NULL;
ent.kvno = 1; ent.kvno = 1;
ent.max_life = default_life; ent.max_life = default_life;
ent.max_renew = default_renew; ent.max_renew = default_renew;

6
admin/load.c
View File

@@ -84,13 +84,13 @@ doit(char *filename, int merge)
} }
ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.keytype = KEYTYPE_DES;
ent.keyblock.contents.data = malloc(strlen(e.key)/2+1); ent.keyblock.keyvalue.data = malloc(strlen(e.key)/2+1);
for(i = 1; i < strlen(e.key) - 1; i += 2){ for(i = 1; i < strlen(e.key) - 1; i += 2){
unsigned tmp; unsigned tmp;
sscanf(e.key + i, "%2x", &tmp); sscanf(e.key + i, "%2x", &tmp);
((unsigned char *)ent.keyblock.contents.data)[i/2] = tmp; ((unsigned char *)ent.keyblock.keyvalue.data)[i/2] = tmp;
} }
ent.keyblock.contents.length = i / 2; ent.keyblock.keyvalue.length = i / 2;
ent.kvno = atoi(e.kvno); ent.kvno = atoi(e.kvno);
ent.max_life = atoi(e.max_life); ent.max_life = atoi(e.max_life);
ent.max_renew = atoi(e.max_renew); ent.max_renew = atoi(e.max_renew);

6
kadmin/dump.c
View File

@@ -20,10 +20,10 @@ key2str(krb5_keyblock *key)
int i; int i;
if(s) if(s)
free(s); free(s);
s = malloc(key->contents.length/2+10); s = malloc(key->keyvalue.length/2+10);
sprintf(s, "%d:", key->keytype); sprintf(s, "%d:", key->keytype);
p = (unsigned char*)key->contents.data; p = (unsigned char*)key->keyvalue.data;
for(i = 0; i < key->contents.length; i++) for(i = 0; i < key->keyvalue.length; i++)
sprintf(s + strlen(s), "%02x", p[i]); sprintf(s + strlen(s), "%02x", p[i]);
return s; return s;
} }

11
kadmin/init.c
View File

@@ -80,10 +80,9 @@ init(int argc, char **argv)
/* Create `krbtgt/REALM' */ /* Create `krbtgt/REALM' */
ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.keytype = KEYTYPE_DES;
ent.keyblock.contents.length = 8; ent.keyblock.keyvalue.length = 8;
ent.keyblock.contents.data = malloc(ent.keyblock.contents.length); ent.keyblock.keyvalue.data = malloc(ent.keyblock.keyvalue.length);
des_rand_data(ent.keyblock.contents.data, des_new_random_key(ent.keyblock.keyvalue.data);
ent.keyblock.contents.length);
ent.kvno = 1; ent.kvno = 1;
ent.max_life = max_life; ent.max_life = max_life;
ent.max_renew = max_renew; ent.max_renew = max_renew;
@@ -106,8 +105,8 @@ init(int argc, char **argv)
"default", "default",
NULL); NULL);
ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.keytype = KEYTYPE_DES;
ent.keyblock.contents.length = 0; ent.keyblock.keyvalue.length = 0;
ent.keyblock.contents.data = NULL; ent.keyblock.keyvalue.data = NULL;
ent.kvno = 1; ent.kvno = 1;
ent.max_life = default_life; ent.max_life = default_life;
ent.max_renew = default_renew; ent.max_renew = default_renew;

6
kadmin/load.c
View File

@@ -84,13 +84,13 @@ doit(char *filename, int merge)
} }
ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.keytype = KEYTYPE_DES;
ent.keyblock.contents.data = malloc(strlen(e.key)/2+1); ent.keyblock.keyvalue.data = malloc(strlen(e.key)/2+1);
for(i = 1; i < strlen(e.key) - 1; i += 2){ for(i = 1; i < strlen(e.key) - 1; i += 2){
unsigned tmp; unsigned tmp;
sscanf(e.key + i, "%2x", &tmp); sscanf(e.key + i, "%2x", &tmp);
((unsigned char *)ent.keyblock.contents.data)[i/2] = tmp; ((unsigned char *)ent.keyblock.keyvalue.data)[i/2] = tmp;
} }
ent.keyblock.contents.length = i / 2; ent.keyblock.keyvalue.length = i / 2;
ent.kvno = atoi(e.kvno); ent.kvno = atoi(e.kvno);
ent.max_life = atoi(e.max_life); ent.max_life = atoi(e.max_life);
ent.max_renew = atoi(e.max_renew); ent.max_renew = atoi(e.max_renew);