Reintegrate the keytab -> enctype changes

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

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 725a67dc74d2721be625531f1d8c2adb759506a8..b4287b20f5db3757f2d589ff243143cdeab23529 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -252,7 +252,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_enctype(context, &ctx->enc.eblock, ENCTYPE_DES_CBC_RAW);
    ctx->enc.processed = 0;
    if (code = krb5_copy_keyblock(context, ctx->subkey, &ctx->enc.key))
       return(code); 
@@ -260,7 +260,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_enctype(context, &ctx->seq.eblock, ENCTYPE_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 41c12dbf59bc1c683bf905d74bca08c5573e4231..bcd999ae70ce118cfc5ddc9113670e4cd3460d80 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_enctype(context, &ctx->enc.eblock, ENCTYPE_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_enctype(context, &ctx->seq.eblock, ENCTYPE_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..ed60922d51c3c1d2b6441e1bf6d82d4b26b20ed9 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_enctype(kg_context, &ed.eblock, ENCTYPE_DES_CBC_RAW);
    ed.processed = 0;
 
    code = kg_encrypt(&ed, NULL, zeros, seed, 16);