* accept_sec_context.c, init_sec_context.c, util_seed.c :

		Remove krb5_enctype references, and replace with
		krb5_keytype where appropriate.

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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 6f5c30ddbb5e5054201adc949e8db3b3c899a56e..ab5a37ef9d96b41d0e557f9494ae3bb6bfd122a8 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,4 +1,10 @@
 
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * accept_sec_context.c, init_sec_context.c, util_seed.c : 
+               Remove krb5_enctype references, and replace with 
+               krb5_keytype where appropriate.
+
 Thu Aug 31 11:50:34 EDT 1995   Paul Park       (pjpark@mit.edu)
        * gssapiP_krb5.h - Add new V2 dispatch prototypes.  Update arguments
                to be compatible with V2 API.  Add tokens for V2 integrity

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index e4e089eaa3389d98c13aeb27be6a0b0cc9f609e9..f1e49815fbae8bc8a22e972de665b5eb975a0094 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -248,7 +248,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
 
    /* fill in the encryption descriptors */
 
-   krb5_use_cstype(context, &ctx->enc.eblock, ETYPE_RAW_DES_CBC);
+   krb5_use_keytype(context, &ctx->enc.eblock, KEYTYPE_DES_CBC_RAW);
    ctx->enc.processed = 0;
    if (code = krb5_copy_keyblock(context, ctx->subkey, &ctx->enc.key))
       return(code); 
@@ -256,7 +256,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
       /*SUPPRESS 113*/
       ctx->enc.key->contents[i] ^= 0xf0;
 
-   krb5_use_cstype(context, &ctx->seq.eblock, ETYPE_RAW_DES_CBC);
+   krb5_use_keytype(context, &ctx->seq.eblock, KEYTYPE_DES_CBC_RAW);
    ctx->seq.processed = 0;
    ctx->seq.key = ctx->subkey;
 

diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index c258c4c7df6c1b04ba18a2475e85c215a5058735..9e4b98730c3cfcf484fdc055e2461367ce6f3b4c 100644 (file)
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -294,7 +294,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
 
       /* the encryption key is the session key XOR 0xf0f0f0f0f0f0f0f0 */
 
-      krb5_use_cstype(context, &ctx->enc.eblock, ETYPE_RAW_DES_CBC);
+      krb5_use_keytype(context, &ctx->enc.eblock, KEYTYPE_DES_CBC_RAW);
       ctx->enc.processed = 0;
       if (code = krb5_copy_keyblock(context, ctx->subkey, &ctx->enc.key))
         return(code); 
@@ -302,7 +302,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
         /*SUPPRESS 113*/
         ctx->enc.key->contents[i] ^= 0xf0;
 
-      krb5_use_cstype(context, &ctx->seq.eblock, ETYPE_RAW_DES_CBC);
+      krb5_use_keytype(context, &ctx->seq.eblock, KEYTYPE_DES_CBC_RAW);
       ctx->seq.processed = 0;
       ctx->seq.key = ctx->subkey;
 

diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c
index 8792b8bd94000fa26484a5ffef87eec55db64b68..2089f6e9d709df8f864af6efb5be86bf8d37b0e3 100644 (file)
--- a/src/lib/gssapi/krb5/util_seed.c
+++ b/src/lib/gssapi/krb5/util_seed.c
@@ -45,7 +45,7 @@ kg_make_seed(key, seed)
    for (i=0; i<ed.key->length; i++)
       ed.key->contents[i] = key->contents[key->length - 1 - i];
 
-   krb5_use_cstype(kg_context, &ed.eblock, ETYPE_RAW_DES_CBC);
+   krb5_use_keytype(kg_context, &ed.eblock, KEYTYPE_DES_CBC_RAW);
    ed.processed = 0;
 
    code = kg_encrypt(&ed, NULL, zeros, seed, 16);