From f41fd223a822878e8ff744fcbb7ed413928fb264 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Tue, 12 Sep 1995 17:01:25 +0000 Subject: [PATCH] Reintegrate the keytab -> enctype changes git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6768 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/krb5/accept_sec_context.c | 4 ++-- src/lib/gssapi/krb5/init_sec_context.c | 4 ++-- src/lib/gssapi/krb5/util_seed.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 725a67dc7..b4287b20f 100644 --- 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 41c12dbf5..bcd999ae7 100644 --- 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 8792b8bd9..ed60922d5 100644 --- 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; ilength; 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); -- 2.26.2