From: Chris Provenzano Date: Wed, 6 Sep 1995 19:06:09 +0000 (+0000) Subject: * cnv_tkt_skey.c, conv_creds.c, get_cred.c k524init.c krb524d.c, X-Git-Tag: krb5-1.0-beta6~1151 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2fe2dba1a4731aae6afab3e3837005c3bbb4184f;p=krb5.git * cnv_tkt_skey.c, conv_creds.c, get_cred.c k524init.c krb524d.c, * test.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6710 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 0b4ed0cec..fb4e4953d 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * cnv_tkt_skey.c, conv_creds.c, get_cred.c k524init.c krb524d.c, + * test.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g + Wed Sep 6 00:11:53 1995 Mark Eichin * krb524d.c (main): set timeout inside while loop to prevent spin. diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c index 0b4bd0deb..f433e5407 100644 --- a/src/krb524/cnv_tkt_skey.c +++ b/src/krb524/cnv_tkt_skey.c @@ -60,11 +60,11 @@ int krb524_convert_tkt_skey(context, v5tkt, v4tkt, skey) return ret; } - if (v5etkt->session->keytype != KEYTYPE_DES_CBC_CRC || + if (v5etkt->session->enctype != ENCTYPE_DES_CBC_CRC || v5etkt->session->length != sizeof(C_Block)) { if (krb524_debug) fprintf(stderr, "v5 session keyblock type %d length %d != C_Block size %d\n", - v5etkt->session->keytype, + v5etkt->session->enctype, v5etkt->session->length, sizeof(C_Block)); krb5_free_enc_tkt_part(context, v5etkt); diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c index dce260ef3..cd62d4cb1 100644 --- a/src/krb524/conv_creds.c +++ b/src/krb524/conv_creds.c @@ -92,7 +92,7 @@ int krb524_convert_creds_plain(context, v5creds, v4creds) v4creds->instance))) return ret; - /* Check keytype too */ + /* Check enctype too */ if (v5creds->keyblock.length != sizeof(C_Block)) { if (krb524_debug) fprintf(stderr, "v5 session keyblock length %d != C_Block size %d\n", diff --git a/src/krb524/getcred.c b/src/krb524/getcred.c index c5b396242..21dd80882 100644 --- a/src/krb524/getcred.c +++ b/src/krb524/getcred.c @@ -55,7 +55,7 @@ main(argc, argv) v5creds.client = client; v5creds.server = server; v5creds.times.endtime = 0; - v5creds.keyblock.keytype = KEYTYPE_DES_CBC_MD5; + v5creds.keyblock.enctype = ENCTYPE_DES_CBC_MD5; if (ret = krb5_get_credentials(context, 0, cc, &v5creds)) { com_err("getcred", ret, "getting V5 credentials"); exit(1); diff --git a/src/krb524/k524init.c b/src/krb524/k524init.c index 048f53053..61c180aa4 100644 --- a/src/krb524/k524init.c +++ b/src/krb524/k524init.c @@ -108,7 +108,7 @@ int main(argc, argv) increds.client = client; increds.server = server; increds.times.endtime = 0; - increds.keyblock.keytype = KEYTYPE_DES_CBC_MD5; + increds.keyblock.enctype = ENCTYPE_DES_CBC_MD5; if ((code = krb5_get_credentials(context, 0, cc, &increds, &v5creds))) { com_err("k524init", code, "getting V5 credentials"); exit(1); diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index fe128809f..bf15d9886 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -223,8 +223,8 @@ void init_master(context) free(realm); } - master_keyblock.keytype = KEYTYPE_DES_CBC_MD5; - krb5_use_keytype(context, &master_encblock, master_keyblock.keytype); + master_keyblock.enctype = ENCTYPE_DES_CBC_MD5; + krb5_use_enctype(context, &master_encblock, master_keyblock.enctype); if ((ret = krb5_db_fetch_mkey(context, master_princ, &master_encblock, FALSE, /* non-manual type-in */ FALSE, /* irrelevant, given prev. arg */ @@ -275,9 +275,9 @@ krb5_error_code do_connection(s, context) if (debug) printf("V5 ticket decoded\n"); - /* XXX KEYTYPE_DES_CBC_MD5 shouldn't be hardcoded here. Should be + /* XXX ENCTYPE_DES_CBC_MD5 shouldn't be hardcoded here. Should be derived from the ticket. */ - if ((ret = lookup_service_key(context, v5tkt->server, KEYTYPE_DES_CBC_MD5, + if ((ret = lookup_service_key(context, v5tkt->server, ENCTYPE_DES_CBC_MD5, &service_key))) goto error; if (debug) @@ -336,7 +336,7 @@ write_msg: krb5_error_code lookup_service_key(context, p, ktype, key) krb5_context context; krb5_principal p; - krb5_keytype ktype; + krb5_enctype ktype; krb5_keyblock *key; { int ret; diff --git a/src/krb524/test.c b/src/krb524/test.c index 3f52fb120..1b90d7460 100644 --- a/src/krb524/test.c +++ b/src/krb524/test.c @@ -77,7 +77,7 @@ void krb5_print_keyblock(msg, key) char *msg; krb5_keyblock *key; { - printf("%s: Keytype: %d\n", msg, key->keytype); + printf("%s: Keytype: %d\n", msg, key->enctype); printf("%s: Length: %d\n", msg, key->length); printf("%s: Key: ", msg); C_Block_print(key->contents); @@ -253,7 +253,7 @@ int main(argc, argv) increds.client = client; increds.server = server; increds.times.endtime = 0; - increds.keyblock.keytype = KEYTYPE_DES_CBC_MD5; + increds.keyblock.enctype = ENCTYPE_DES_CBC_MD5; if ((ret = krb5_get_credentials(context, 0, cc, &increds, &v5creds))) { com_err("test", ret, "getting V5 credentials"); exit(1); @@ -280,7 +280,7 @@ int main(argc, argv) keybuf[i] += c; } - key.keytype = KEYTYPE_DES_CBC_MD5; + key.enctype = ENCTYPE_DES_CBC_MD5; key.length = KEYSIZE; /* presumably */ key.contents = (krb5_octet *) keybuf;