From 89803a5a781107365d5a4534eebf48dbaf010f96 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Tue, 20 May 2014 14:50:22 -0400 Subject: 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 file changed, 1 insertion(+) (limited to 'src/lib') diff --git a/src/lib/crypto/krb/combine_keys.c b/src/lib/crypto/krb/combine_keys.c index 0c44e8b43..9ab0ac4f9 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) -- cgit