summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/krb5/asn.1/ChangeLog4
-rw-r--r--src/lib/krb5/asn.1/asn1_k_decode.c20
-rw-r--r--src/lib/krb5/asn.1/asn1_k_decode.h8
-rw-r--r--src/lib/krb5/asn.1/asn1_k_encode.c10
-rw-r--r--src/lib/krb5/asn.1/asn1_k_encode.h6
-rw-r--r--src/lib/krb5/asn.1/krb5_decode.c2
-rw-r--r--src/lib/krb5/asn.1/krb5_encode.c4
7 files changed, 29 insertions, 25 deletions
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 7e14b92f99..662c280b8f 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+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
Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu)
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index c781c8d04f..93db3055e0 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -156,7 +156,7 @@ 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_enctype,krb5_enctype)
integer_convert(asn1_decode_cksumtype,krb5_cksumtype)
integer_convert(asn1_decode_octet,krb5_octet)
integer_convert(asn1_decode_addrtype,krb5_addrtype)
@@ -240,7 +240,7 @@ 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;
@@ -254,7 +254,7 @@ asn1_error_code asn1_decode_encrypted_data(buf, val)
{
setup();
{ begin_structure();
- get_field(val->keytype,0,asn1_decode_keytype);
+ 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();
@@ -409,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->nktypes,val->ktype,8,asn1_decode_sequence_of_keytype);
+ 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.keytype = 0;
+ val->authorization_data.enctype = 0;
val->authorization_data.kvno = 0;
val->authorization_data.ciphertext.data = NULL;
val->authorization_data.ciphertext.length = 0;
@@ -632,21 +632,21 @@ asn1_error_code asn1_decode_last_req_entry(buf, val)
cleanup();
}
-asn1_error_code asn1_decode_sequence_of_keytype(buf, num, val)
+asn1_error_code asn1_decode_sequence_of_enctype(buf, num, val)
asn1buf * buf;
int * num;
- krb5_keytype ** val;
+ krb5_enctype ** val;
{
asn1_error_code retval;
{ sequence_of(buf);
while(asn1buf_remains(&seqbuf) > 0){
size++;
if (*val == NULL)
- *val = (krb5_keytype*)malloc(size*sizeof(krb5_keytype));
+ *val = (krb5_enctype*)malloc(size*sizeof(krb5_enctype));
else
- *val = (krb5_keytype*)realloc(*val,size*sizeof(krb5_keytype));
+ *val = (krb5_enctype*)realloc(*val,size*sizeof(krb5_enctype));
if(*val == NULL) return ENOMEM;
- retval = asn1_decode_keytype(&seqbuf,&((*val)[size-1]));
+ retval = asn1_decode_enctype(&seqbuf,&((*val)[size-1]));
if(retval) return retval;
}
*num = size;
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h
index 74964453af..9490619c00 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode.h
@@ -70,8 +70,8 @@ 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
@@ -153,8 +153,8 @@ asn1_error_code asn1_decode_sequence_of_pa_data
asn1_error_code asn1_decode_last_req
PROTOTYPE((asn1buf *buf, krb5_last_req_entry ***val));
-asn1_error_code asn1_decode_sequence_of_keytype
- PROTOTYPE((asn1buf *buf, int *num, krb5_keytype **val));
+asn1_error_code asn1_decode_sequence_of_enctype
+ PROTOTYPE((asn1buf *buf, int *num, krb5_enctype **val));
asn1_error_code asn1_decode_sequence_of_passwdsequence
PROTOTYPE((asn1buf *buf, passwd_phrase_element ***val));
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c
index 67b51a18f5..9ea9c5c1ca 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->keytype,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->nktypes,rep->ktype,8,asn1_encode_sequence_of_keytype);
+ 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();
@@ -641,10 +641,10 @@ asn1_error_code asn1_encode_ticket(buf, val, retlen)
asn1_cleanup();
}
-asn1_error_code asn1_encode_sequence_of_keytype(buf, len, val, retlen)
+asn1_error_code asn1_encode_sequence_of_enctype(buf, len, val, retlen)
asn1buf * buf;
const int len;
- const krb5_keytype * val;
+ const krb5_enctype * val;
int * retlen;
{
asn1_setup();
diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h
index cad25e2444..6add4dad4b 100644
--- a/src/lib/krb5/asn.1/asn1_k_encode.h
+++ b/src/lib/krb5/asn.1/asn1_k_encode.h
@@ -65,7 +65,7 @@
asn1_encode_last_req
asn1_encode_sequence_of_pa_data
asn1_encode_sequence_of_ticket
- asn1_encode_sequence_of_keytype
+ asn1_encode_sequence_of_enctype
asn1_encode_sequence_of_krb_cred_info
*/
@@ -176,9 +176,9 @@ asn1_error_code asn1_encode_sequence_of_pa_data
asn1_error_code asn1_encode_sequence_of_ticket
PROTOTYPE((asn1buf *buf, const krb5_ticket **val, int *retlen));
-asn1_error_code asn1_encode_sequence_of_keytype
+asn1_error_code asn1_encode_sequence_of_enctype
PROTOTYPE((asn1buf *buf,
- const int len, const krb5_keytype *val,
+ const int len, const krb5_enctype *val,
int *retlen));
asn1_error_code asn1_encode_kdc_req
diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c
index 7e745e6629..09de37d9a1 100644
--- a/src/lib/krb5/asn.1/krb5_decode.c
+++ b/src/lib/krb5/asn.1/krb5_decode.c
@@ -206,7 +206,7 @@ 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;
diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c
index 885eb03d06..8b5b7e4ab1 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();