diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 19:17:35 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 19:17:35 +0000 |
| commit | ad523c3bbb17d78b309552aea3967b382023abcd (patch) | |
| tree | 6760fd2e5eb8a6c88d32a27ab1664fd29e5a987f /src/lib/krb5/krb/ser_eblk.c | |
| parent | 95f4e069cd07e5c5ff16405a2bff07a4c6e7aa49 (diff) | |
| download | krb5-ad523c3bbb17d78b309552aea3967b382023abcd.tar.gz krb5-ad523c3bbb17d78b309552aea3967b382023abcd.tar.xz krb5-ad523c3bbb17d78b309552aea3967b382023abcd.zip | |
* auth_con.c, decrypt_tk.c, encode_kdc.c, encrypt_tk.c,
* gc_frm_kdc.c, gen_seqnum.c, get_creds.c, get_in_tkt.c,
* in_tkt_ktb.c, in_tkt_pwd.c, in_tkt_sky.c, init_ctx.c,
* kdc_rep_dc.c, mk_cred.c, mk_priv.c, mk_rep.c, mk_req._ext.c,
* preauth.c, rd_cred.c, rd_priv.c, rd_rep.c, rd_req_dec.c,
* send_tgs.c, sendauth.c, ser_actx.c, ser_ctx.c, ser_eblk.c,
* ser_key.c, t_ser.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6727 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/ser_eblk.c')
| -rw-r--r-- | src/lib/krb5/krb/ser_eblk.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/krb5/krb/ser_eblk.c b/src/lib/krb5/krb/ser_eblk.c index dcc73d04d..20b3da672 100644 --- a/src/lib/krb5/krb/ser_eblk.c +++ b/src/lib/krb5/krb/ser_eblk.c @@ -63,13 +63,13 @@ krb5_encrypt_block_size(kcontext, arg, sizep) size_t required; /* - * NOTE: This ASSuMES that keytype are sufficient to recreate + * NOTE: This ASSuMES that enctype are sufficient to recreate * the _krb5_cryptosystem_entry. If this is not true, then something else * had better be encoded here. * * krb5_encrypt_block base requirements: * krb5_int32 for KV5M_ENCRYPT_BLOCK - * krb5_int32 for keytype + * krb5_int32 for enctype * krb5_int32 for private length * encrypt_block->priv_size for private contents * krb5_int32 for KV5M_ENCRYPT_BLOCK @@ -122,9 +122,9 @@ krb5_encrypt_block_externalize(kcontext, arg, buffer, lenremain) /* Our identifier */ (void) krb5_ser_pack_int32(KV5M_ENCRYPT_BLOCK, &bp, &remain); - /* Our keytype */ + /* Our enctype */ (void) krb5_ser_pack_int32((krb5_int32) encrypt_block-> - crypto_entry->proto_keytype, + crypto_entry->proto_enctype, &bp, &remain); /* Our length */ @@ -171,7 +171,7 @@ krb5_encrypt_block_internalize(kcontext, argp, buffer, lenremain) krb5_error_code kret; krb5_encrypt_block *encrypt_block; krb5_int32 ibuf; - krb5_keytype ktype; + krb5_enctype ktype; krb5_octet *bp; size_t remain; @@ -190,12 +190,12 @@ krb5_encrypt_block_internalize(kcontext, argp, buffer, lenremain) malloc(sizeof(krb5_encrypt_block)))) { memset(encrypt_block, 0, sizeof(krb5_encrypt_block)); - /* Get the keytype */ + /* Get the enctype */ (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain); - ktype = (krb5_keytype) ibuf; + ktype = (krb5_enctype) ibuf; /* Use the ktype to determine the crypto_system entry. */ - krb5_use_keytype(kcontext, encrypt_block, ktype); + krb5_use_enctype(kcontext, encrypt_block, ktype); /* Get the length */ (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain); |