* ktest.c, ktest.h, ktest_equal.c, ktest_equal.h : Remove krb5_enctype

		references, and replace with krb5_keytype where appropriate

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6688 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 22 insertions, 21 deletions

diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 182d78cd8..4333a05d5 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * ktest.c, ktest.h, ktest_equal.c, ktest_equal.h : Remove krb5_enctype 
+		references, and replace with krb5_keytype where appropriate
 
 Tue Aug 29 14:20:52 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* krb5_decode_test.c - Fix string constant.
diff --git a/src/tests/asn.1/ktest.c b/src/tests/asn.1/ktest.c
index 2a01cb353..27956cfc7 100644
--- a/src/tests/asn.1/ktest.c
+++ b/src/tests/asn.1/ktest.c
@@ -65,7 +65,6 @@ krb5_error_code ktest_make_sample_keyblock(kb)
      krb5_keyblock * kb;
 {
   kb->magic = KV5M_KEYBLOCK;
-  kb->etype = ETYPE_UNKNOWN;
   kb->keytype = 1;
   kb->length = 8;
   kb->contents = (krb5_octet*)calloc(8,sizeof(krb5_octet));
@@ -93,8 +92,8 @@ krb5_error_code ktest_make_sample_enc_data(ed)
 {
   krb5_error_code retval;
 
-  ed->etype = 0;
   ed->kvno = 5;
+  ed->keytype = 0;
   retval = krb5_data_parse(&(ed->ciphertext),"krbASN.1 test message");
   if(retval) return retval;
 
@@ -375,10 +374,10 @@ krb5_error_code ktest_make_sample_kdc_req(kr)
   kr->till = SAMPLE_TIME;
   kr->rtime = SAMPLE_TIME;
   kr->nonce = SAMPLE_NONCE;
-  kr->netypes = 2;
-  kr->etype = (krb5_enctype*)calloc(2,sizeof(krb5_enctype));
-  kr->etype[0] = 0;
-  kr->etype[1] = 1;
+  kr->nktypes = 2;
+  kr->ktype = (krb5_keytype*)calloc(2,sizeof(krb5_keytype));
+  kr->ktype[0] = 0;
+  kr->ktype[1] = 1;
   retval = ktest_make_sample_addresses(&(kr->addresses));
   if(retval) return retval;
   retval = ktest_make_sample_enc_data(&(kr->authorization_data));
@@ -404,10 +403,10 @@ krb5_error_code ktest_make_sample_kdc_req_body(krb)
   krb->till = SAMPLE_TIME;
   krb->rtime = SAMPLE_TIME;
   krb->nonce = SAMPLE_NONCE;
-  krb->netypes = 2;
-  krb->etype = (krb5_enctype*)calloc(2,sizeof(krb5_enctype));
-  krb->etype[0] = 0;
-  krb->etype[1] = 1;
+  krb->nktypes = 2;
+  krb->ktype = (krb5_keytype*)calloc(2,sizeof(krb5_keytype));
+  krb->ktype[0] = 0;
+  krb->ktype[1] = 1;
   retval = ktest_make_sample_addresses(&(krb->addresses));
   if(retval) return retval;
   retval = ktest_make_sample_enc_data(&(krb->authorization_data));
@@ -833,8 +832,8 @@ void ktest_destroy_sequence_of_integer(soi)
   *soi = NULL;
 }
 
-void ktest_destroy_sequence_of_enctype(soi)
-     krb5_enctype ** soi;
+void ktest_destroy_sequence_of_keytype(soi)
+     krb5_keytype ** soi;
 {
   free(*soi);
   *soi = NULL;
diff --git a/src/tests/asn.1/ktest.h b/src/tests/asn.1/ktest.h
index 6d087b2d5..59c07ccfb 100644
--- a/src/tests/asn.1/ktest.h
+++ b/src/tests/asn.1/ktest.h
@@ -125,8 +125,6 @@ void ktest_destroy_authdata
 	KRB5_PROTOTYPE((krb5_authdata **ad));
 void ktest_destroy_sequence_of_integer
 	KRB5_PROTOTYPE((long **soi));
-void ktest_destroy_sequence_of_enctype
-	KRB5_PROTOTYPE((krb5_enctype **soi));
 void ktest_destroy_sequence_of_ticket
 	KRB5_PROTOTYPE((krb5_ticket ***sot));
   void ktest_destroy_ticket
diff --git a/src/tests/asn.1/ktest_equal.c b/src/tests/asn.1/ktest_equal.c
index c9cf32941..8d9ff108d 100644
--- a/src/tests/asn.1/ktest_equal.c
+++ b/src/tests/asn.1/ktest_equal.c
@@ -103,7 +103,7 @@ int ktest_equal_enc_data(ref, var)
   int p=TRUE;
   if(ref==var) return TRUE;
   else if(ref == NULL || var == NULL) return FALSE;
-  p=p&&scalar_equal(etype);
+  p=p&&scalar_equal(keytype);
   p=p&&scalar_equal(kvno);
   p=p&&struct_equal(ciphertext,ktest_equal_data);
   return p;
@@ -363,7 +363,7 @@ int ktest_equal_as_req(ref, var)
   p=p&&scalar_equal(till);
   p=p&&scalar_equal(rtime);
   p=p&&scalar_equal(nonce);
-  p=p&&len_equal(netypes,etype,ktest_equal_array_of_enctype);
+  p=p&&len_equal(nktypes,ktype,ktest_equal_array_of_keytype);
   p=p&&ptr_equal(addresses,ktest_equal_addresses);
   p=p&&struct_equal(authorization_data,ktest_equal_enc_data);
 /* This field isn't actually in the ASN.1 encoding. */
@@ -392,7 +392,7 @@ int ktest_equal_kdc_req_body(ref, var)
   p=p&&scalar_equal(till);
   p=p&&scalar_equal(rtime);
   p=p&&scalar_equal(nonce);
-  p=p&&len_equal(netypes,etype,ktest_equal_array_of_enctype);
+  p=p&&len_equal(nktypes,ktype,ktest_equal_array_of_keytype);
   p=p&&ptr_equal(addresses,ktest_equal_addresses);
   p=p&&struct_equal(authorization_data,ktest_equal_enc_data);
   /* This isn't part of the ASN.1 encoding. */
@@ -536,10 +536,10 @@ int ktest_equal_array_of_char(length, ref, var)
   return p;
 }
 
-int ktest_equal_array_of_enctype(length, ref, var)
+int ktest_equal_array_of_keytype(length, ref, var)
      const int length;
-     krb5_enctype * ref;
-     krb5_enctype * var;
+     krb5_keytype * ref;
+     krb5_keytype * var;
 {
   int i, p=TRUE;
 
diff --git a/src/tests/asn.1/ktest_equal.h b/src/tests/asn.1/ktest_equal.h
index 375cc546d..43e1ab337 100644
--- a/src/tests/asn.1/ktest_equal.h
+++ b/src/tests/asn.1/ktest_equal.h
@@ -63,7 +63,7 @@ int ktest_equal_sequence_of_pa_data
 int ktest_equal_sequence_of_cred_info
 	KRB5_PROTOTYPE((krb5_cred_info **ref, krb5_cred_info **var));
 
-len_array(ktest_equal_array_of_enctype,krb5_enctype);
+len_array(ktest_equal_array_of_keytype,krb5_keytype);
 len_array(ktest_equal_array_of_data,krb5_data);
 len_array(ktest_equal_array_of_octet,krb5_octet);