[28334] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix krb5int_c_combine_keys
daemon@ATHENA.MIT.EDU (Greg Hudson)
Wed May 21 11:34:15 2014
Date: Wed, 21 May 2014 11:34:07 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201405211534.s4LFY7ff020048@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/89803a5a781107365d5a4534eebf48dbaf010f96
commit 89803a5a781107365d5a4534eebf48dbaf010f96
Author: Ken Hornstein <kenh@cmf.nrl.navy.mil>
Date: Tue May 20 14:50:22 2014 -0400
Fix krb5int_c_combine_keys
When krb5int_c_combine_keys was updated to use the new crypto
interface, a small bug was introduced. It turns out the temporary
keyblock created needs to have its enctype set; otherwise, when
krb5int_derive_keyblock() is called later, it will fail with
KRB5_BAD_ENCTYPE.
ticket: 7914
target_version: 1.12.2
tags: pullup
src/lib/crypto/krb/combine_keys.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/lib/crypto/krb/combine_keys.c b/src/lib/crypto/krb/combine_keys.c
index 0c44e8b..9ab0ac4 100644
--- a/src/lib/crypto/krb/combine_keys.c
+++ b/src/lib/crypto/krb/combine_keys.c
@@ -155,6 +155,7 @@ krb5int_c_combine_keys(krb5_context context, krb5_keyblock *key1,
randbits.data = (char *) rnd;
tkeyblock.length = keylength;
tkeyblock.contents = output;
+ tkeyblock.enctype = key1->enctype;
ret = (*ktp->rand2key)(&randbits, &tkeyblock);
if (ret)
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
