From: Ezra Peisach Date: Tue, 12 Sep 1995 00:42:25 +0000 (+0000) Subject: Reinstate the keytype -> enctype changes and keep the new Mac changes X-Git-Tag: krb5-1.0-beta6~1101 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c780f15806131ee3586a7527be44b842409feb9;p=krb5.git Reinstate the keytype -> enctype changes and keep the new Mac changes git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6761 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index aa82aec0e..8401f5109 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -2,6 +2,11 @@ Sun Sep 10 12:00:00 1995 * asn1_encode.c: Removed use of localtime for encoding of generaltime. +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * asn1_k_decode.c, asn1_k_decode.h, asn1_k_encode.c, asn1_k_encode.h, + * krb5_decode.c, krb5_encode.c: s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g + Wed Sept 6 12:00:00 1995 * asn1_encode.c: added EPOCH to account for macintosh time keeping @@ -9,6 +14,12 @@ Wed Sept 6 12:00:00 1995 * asn1buf.c: removed some debugging cruft. +Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) + + * asn1_k_decode.c, asn1_k_decode.h, asn1_k_encode.c, asn1_k_encode.h + * krb5_decode.c : Remove krb5_enctype references, and replace with + krb5_keytype where appropriate + Mon Aug 28 12:54:05 1995 * krb5_decode.c (decode_krb5_alt_method, diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c index 187f1917b..93db3055e 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.c +++ b/src/lib/krb5/asn.1/asn1_k_decode.c @@ -156,9 +156,8 @@ asn1_error_code fname(buf, val)\ integer_convert(asn1_decode_int,int) integer_convert(asn1_decode_int32,krb5_int32) integer_convert(asn1_decode_kvno,krb5_kvno) -integer_convert(asn1_decode_keytype,krb5_keytype) -integer_convert(asn1_decode_cksumtype,krb5_cksumtype) integer_convert(asn1_decode_enctype,krb5_enctype) +integer_convert(asn1_decode_cksumtype,krb5_cksumtype) integer_convert(asn1_decode_octet,krb5_octet) integer_convert(asn1_decode_addrtype,krb5_addrtype) integer_convert(asn1_decode_authdatatype,krb5_authdatatype) @@ -241,11 +240,10 @@ asn1_error_code asn1_decode_encryption_key(buf, val) { setup(); { begin_structure(); - get_field(val->keytype,0,asn1_decode_keytype); + get_field(val->enctype,0,asn1_decode_enctype); get_lenfield(val->length,val->contents,1,asn1_decode_octetstring); end_structure(); val->magic = KV5M_KEYBLOCK; - val->etype = ETYPE_UNKNOWN; } cleanup(); } @@ -256,7 +254,7 @@ asn1_error_code asn1_decode_encrypted_data(buf, val) { setup(); { begin_structure(); - get_field(val->etype,0,asn1_decode_enctype); + get_field(val->enctype,0,asn1_decode_enctype); opt_field(val->kvno,1,asn1_decode_kvno,0); get_lenfield(val->ciphertext.length,val->ciphertext.data,2,asn1_decode_charstring); end_structure(); @@ -411,13 +409,13 @@ asn1_error_code asn1_decode_kdc_req_body(buf, val) get_field(val->till,5,asn1_decode_kerberos_time); opt_field(val->rtime,6,asn1_decode_kerberos_time,0); get_field(val->nonce,7,asn1_decode_int32); - get_lenfield(val->netypes,val->etype,8,asn1_decode_sequence_of_enctype); + get_lenfield(val->nktypes,val->ktype,8,asn1_decode_sequence_of_enctype); opt_field(val->addresses,9,asn1_decode_host_addresses,0); if(tagnum == 10){ get_field(val->authorization_data,10,asn1_decode_encrypted_data); } else{ val->authorization_data.magic = 0; - val->authorization_data.etype = 0; + val->authorization_data.enctype = 0; val->authorization_data.kvno = 0; val->authorization_data.ciphertext.data = NULL; val->authorization_data.ciphertext.length = 0; diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h index a411d1b2e..9490619c0 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.h +++ b/src/lib/krb5/asn.1/asn1_k_decode.h @@ -70,14 +70,12 @@ asn1_error_code asn1_decode_int32 PROTOTYPE((asn1buf *buf, krb5_int32 *val)); asn1_error_code asn1_decode_kvno PROTOTYPE((asn1buf *buf, krb5_kvno *val)); -asn1_error_code asn1_decode_keytype - PROTOTYPE((asn1buf *buf, krb5_keytype *val)); +asn1_error_code asn1_decode_enctype + PROTOTYPE((asn1buf *buf, krb5_enctype *val)); asn1_error_code asn1_decode_msgtype PROTOTYPE((asn1buf *buf, krb5_msgtype *val)); asn1_error_code asn1_decode_cksumtype PROTOTYPE((asn1buf *buf, krb5_cksumtype *val)); -asn1_error_code asn1_decode_enctype - PROTOTYPE((asn1buf *buf, krb5_enctype *val)); asn1_error_code asn1_decode_octet PROTOTYPE((asn1buf *buf, krb5_octet *val)); asn1_error_code asn1_decode_addrtype diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 2bdcf7c7e..9ea9c5c1c 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -228,7 +228,7 @@ asn1_error_code asn1_encode_encrypted_data(buf, val, retlen) asn1_addlenfield(val->ciphertext.length,val->ciphertext.data,2,asn1_encode_charstring); if(val->kvno) asn1_addfield(val->kvno,1,asn1_encode_integer); - asn1_addfield(val->etype,0,asn1_encode_integer); + asn1_addfield(val->enctype,0,asn1_encode_integer); asn1_makeseq(); @@ -431,7 +431,7 @@ asn1_error_code asn1_encode_kdc_req_body(buf, rep, retlen) /* etype[8] SEQUENCE OF INTEGER, -- EncryptionType, */ /* -- in preference order */ - asn1_addlenfield(rep->netypes,rep->etype,8,asn1_encode_sequence_of_enctype); + asn1_addlenfield(rep->nktypes,rep->ktype,8,asn1_encode_sequence_of_enctype); /* nonce[7] INTEGER, */ asn1_addfield(rep->nonce,7,asn1_encode_integer); @@ -485,7 +485,7 @@ asn1_error_code asn1_encode_encryption_key(buf, val, retlen) if(val == NULL || val->contents == NULL) return ASN1_MISSING_FIELD; asn1_addlenfield(val->length,val->contents,1,asn1_encode_octetstring); - asn1_addfield(val->keytype,0,asn1_encode_integer); + asn1_addfield(val->enctype,0,asn1_encode_integer); asn1_makeseq(); asn1_cleanup(); diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index 1a5a988bb..09de37d9a 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -206,11 +206,10 @@ krb5_error_code decode_krb5_encryption_key(code, rep) alloc_field(*rep,krb5_keyblock); { begin_structure(); - get_field((*rep)->keytype,0,asn1_decode_keytype); + get_field((*rep)->enctype,0,asn1_decode_enctype); get_lenfield((*rep)->length,(*rep)->contents,1,asn1_decode_octetstring); end_structure(); (*rep)->magic = KV5M_KEYBLOCK; - (*rep)->etype = ETYPE_UNKNOWN; } cleanup(); } diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c index 885eb03d0..8b5b7e4ab 100644 --- a/src/lib/krb5/asn.1/krb5_encode.c +++ b/src/lib/krb5/asn.1/krb5_encode.c @@ -232,8 +232,8 @@ krb5_error_code encode_krb5_encryption_key(rep, code) /* keyvalue[1] OCTET STRING */ krb5_addlenfield(rep->length,rep->contents,1,asn1_encode_octetstring); - /* keytype[0] INTEGER */ - krb5_addfield(rep->keytype,0,asn1_encode_integer); + /* enctype[0] INTEGER */ + krb5_addfield(rep->enctype,0,asn1_encode_integer); /* EncryptionKey ::= SEQUENCE */ krb5_makeseq();