* scc_read.c, scc_write.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog
index 9f797ce475307727b52186decd52ca223c1f94dc..1d84c8aac33a162603d8732c6d3b8d7d2212e7c1 100644 (file)
--- a/src/lib/krb5/ccache/stdio/ChangeLog
+++ b/src/lib/krb5/ccache/stdio/ChangeLog
@@ -1,3 +1,6 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * scc_read.c, scc_write.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
 
 Tue Sep 05 22:58:52 1995
 

diff --git a/src/lib/krb5/ccache/stdio/scc_read.c b/src/lib/krb5/ccache/stdio/scc_read.c
index 633e9e1dfae3ea6cd4653fb007d9104758171ef5..de297949d400ef666ee788e8813205595ffd86c7 100644 (file)
--- a/src/lib/krb5/ccache/stdio/scc_read.c
+++ b/src/lib/krb5/ccache/stdio/scc_read.c
@@ -197,12 +197,12 @@ krb5_scc_read_keyblock(context, id, keyblock)
      keyblock->contents = 0;
 
      kret = krb5_scc_read_ui_2(context, id, &ui2);
-     keyblock->keytype = ui2;
+     keyblock->enctype = ui2;
      CHECK(kret);
      if (data->version == KRB5_SCC_FVNO_3) {
-               /* This works because the old etype is the same as the new keytype. */
+               /* This works because the old etype is the same as the new enctype. */
             kret = krb5_scc_read_ui_2(context, id, &ui2);
-            keyblock->keytype = ui2;
+            keyblock->enctype = ui2;
             CHECK(kret);
      }
 

diff --git a/src/lib/krb5/ccache/stdio/scc_write.c b/src/lib/krb5/ccache/stdio/scc_write.c
index 4347b5e2347ac62fb3d5b7af273246d726e785f6..3c552004ae234f0cb45265bcfa1f0daad41d058d 100644 (file)
--- a/src/lib/krb5/ccache/stdio/scc_write.c
+++ b/src/lib/krb5/ccache/stdio/scc_write.c
@@ -148,10 +148,10 @@ krb5_scc_store_keyblock(context, id, keyblock)
      krb5_scc_data *data = (krb5_scc_data *)id->data;
      krb5_error_code ret;
 
-     ret = krb5_scc_store_ui_2(context, id, keyblock->keytype);
+     ret = krb5_scc_store_ui_2(context, id, keyblock->enctype);
      CHECK(ret);
      if (data->version == KRB5_SCC_FVNO_3) {
-        ret = krb5_scc_store_ui_2(context, id, keyblock->keytype);
+        ret = krb5_scc_store_ui_2(context, id, keyblock->enctype);
         CHECK(ret);
      }
      ret = krb5_scc_store_int32(context, id, keyblock->length);