diff options
Diffstat (limited to 'src/lib/krb5/krb/ser_key.c')
-rw-r--r-- | src/lib/krb5/krb/ser_key.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/lib/krb5/krb/ser_key.c b/src/lib/krb5/krb/ser_key.c index eacbf011a5..d999647b53 100644 --- a/src/lib/krb5/krb/ser_key.c +++ b/src/lib/krb5/krb/ser_key.c @@ -64,8 +64,7 @@ krb5_keyblock_size(kcontext, arg, sizep) /* * krb5_keyblock requires: * krb5_int32 for KV5M_KEYBLOCK - * krb5_int32 for keytype - * krb5_int32 for etype; + * krb5_int32 for enctype * krb5_int32 for length * keyblock->length for contents * krb5_int32 for KV5M_KEYBLOCK @@ -110,12 +109,8 @@ krb5_keyblock_externalize(kcontext, arg, buffer, lenremain) /* Our identifier */ (void) krb5_ser_pack_int32(KV5M_KEYBLOCK, &bp, &remain); - /* Our keytype */ - (void) krb5_ser_pack_int32((krb5_int32) keyblock->keytype, - &bp, &remain); - - /* Our etype */ - (void) krb5_ser_pack_int32((krb5_int32) keyblock->etype, + /* Our enctype */ + (void) krb5_ser_pack_int32((krb5_int32) keyblock->enctype, &bp, &remain); /* Our length */ @@ -168,13 +163,9 @@ krb5_keyblock_internalize(kcontext, argp, buffer, lenremain) (keyblock = (krb5_keyblock *) malloc(sizeof(krb5_keyblock)))) { memset(keyblock, 0, sizeof(krb5_keyblock)); - /* Get the keytype */ - (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain); - keyblock->keytype = (krb5_keytype) ibuf; - - /* Get the etype */ + /* Get the enctype */ (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain); - keyblock->etype = (krb5_enctype) ibuf; + keyblock->enctype = (krb5_enctype) ibuf; /* Get the length */ (void) krb5_ser_unpack_int32(&ibuf, &bp, &remain); |