diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 19:09:02 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 19:09:02 +0000 |
| commit | 5a1d0b18daef4208ee59d2b494e4308449c00035 (patch) | |
| tree | f33146988c586d3a243b973eafd5835083d7d30c /src | |
| parent | 349892a1ec0c57177ff4c61f104247598088b7cc (diff) | |
| download | krb5-5a1d0b18daef4208ee59d2b494e4308449c00035.tar.gz krb5-5a1d0b18daef4208ee59d2b494e4308449c00035.tar.xz krb5-5a1d0b18daef4208ee59d2b494e4308449c00035.zip | |
* accept_sec_context.c, init_sec_context.c, util.c :
s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6716 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/init_sec_context.c | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/util_seed.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index ab5a37ef9d..c6811ed89f 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * accept_sec_context.c, init_sec_context.c, util.c : + s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index f1e49815fb..55b0eb6b7b 100644 --- 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_keytype(context, &ctx->enc.eblock, KEYTYPE_DES_CBC_RAW); + 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); @@ -256,7 +256,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle, /*SUPPRESS 113*/ ctx->enc.key->contents[i] ^= 0xf0; - krb5_use_keytype(context, &ctx->seq.eblock, KEYTYPE_DES_CBC_RAW); + 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 9e4b98730c..03298646ad 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_keytype(context, &ctx->enc.eblock, KEYTYPE_DES_CBC_RAW); + 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_keytype(context, &ctx->seq.eblock, KEYTYPE_DES_CBC_RAW); + 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 2089f6e9d7..ed60922d51 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; i<ed.key->length; i++) ed.key->contents[i] = key->contents[key->length - 1 - i]; - krb5_use_keytype(kg_context, &ed.eblock, KEYTYPE_DES_CBC_RAW); + krb5_use_enctype(kg_context, &ed.eblock, ENCTYPE_DES_CBC_RAW); ed.processed = 0; code = kg_encrypt(&ed, NULL, zeros, seed, 16); |