From: Ezra Peisach <epeisach@mit.edu>
Date: Tue, 12 Sep 1995 00:27:48 +0000 (+0000)
Subject: Rvert lost changes
X-Git-Tag: krb5-1.0-beta6~1102
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=467e34d067d2a79d679a3f0e732bf811daba39e7;p=krb5.git

Rvert lost changes

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

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index b0d2207e6..8851b64cd 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * string2key.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
+
 Thu Aug 24 18:51:53 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* .Sanitize: Update file list
diff --git a/src/lib/des425/string2key.c b/src/lib/des425/string2key.c
index 89c816955..58ed9a3cd 100644
--- a/src/lib/des425/string2key.c
+++ b/src/lib/des425/string2key.c
@@ -35,7 +35,7 @@ extern int des_debug;
 
 /*
 	converts the string pointed to by "data" into an encryption key
-	of type "keytype".  *keyblock is filled in with the key info;
+	of type "enctype".  *keyblock is filled in with the key info;
 	in particular, keyblock->contents is to be set to allocated storage.
 	It is the responsibility of the caller to release this storage
 	when the generated key no longer needed.
@@ -44,13 +44,13 @@ extern int des_debug;
 	algorithm.
 
 	If the particular function called does not know how to make a
-	key of type "keytype", an error may be returned.
+	key of type "enctype", an error may be returned.
 
 	returns: errors
  */
 
-krb5_error_code mit_des_string_to_key (keytype, keyblock, data, princ)
-    const krb5_keytype keytype;
+krb5_error_code mit_des_string_to_key (enctype, keyblock, data, princ)
+    const krb5_enctype enctype;
     krb5_keyblock * keyblock;
     const krb5_data * data;
     krb5_const_principal princ;
@@ -71,8 +71,8 @@ krb5_error_code mit_des_string_to_key (keytype, keyblock, data, princ)
 
 #define min(A, B) ((A) < (B) ? (A): (B))
 
-    if ( keytype != KEYTYPE_DES )
-	return (KRB5_PROG_KEYTYPE_NOSUPP);
+    if ( enctype != ENCTYPE_DES )
+	return (KRB5_PROG_ENCTYPE_NOSUPP);
 
     if ( !(keyblock->contents = (krb5_octet *)malloc(sizeof(mit_des_cblock))) )
 	return(ENOMEM);
@@ -80,7 +80,7 @@ krb5_error_code mit_des_string_to_key (keytype, keyblock, data, princ)
 #define cleanup() {memset(keyblock->contents, 0, sizeof(mit_des_cblock));\
 		       krb5_xfree(keyblock->contents);}
 
-    keyblock->keytype = KEYTYPE_DES;
+    keyblock->enctype = ENCTYPE_DES;
     keyblock->length = sizeof(mit_des_cblock);
     key = keyblock->contents;