1 From d8166808a98fd1c3772de5d75e27656ed2ab124d Mon Sep 17 00:00:00 2001
2 From: Simo Sorce <simo@redhat.com>
3 Date: Tue, 27 Feb 2018 11:59:25 -0500
4 Subject: [PATCH] Always use the encype we selected
6 The enctype is selected from the keytab or from the fallback code.
7 Either way make sure to use the enctype stored in the key block.
9 Signed-off-by: Simo Sorce <simo@redhat.com>
10 Reviewed-by: Robbie Harwood <rharwood@redhat.com>
12 (cherry picked from commit d73c96d658059ce64ecd41ff2924071d86f2b54f)
14 proxy/src/gp_export.c | 7 +++----
15 1 file changed, 3 insertions(+), 4 deletions(-)
17 diff --git a/proxy/src/gp_export.c b/proxy/src/gp_export.c
18 index c9f5fd4..5e8e160 100644
19 --- a/proxy/src/gp_export.c
20 +++ b/proxy/src/gp_export.c
21 @@ -168,11 +168,10 @@ uint32_t gp_init_creds_handle(uint32_t *min, const char *svc_name,
22 GP_CREDS_HANDLE_KEY_ENCTYPE, 0,
25 - ret = krb5_c_make_random_key(handle->context,
26 - GP_CREDS_HANDLE_KEY_ENCTYPE,
27 + ret = krb5_c_make_random_key(handle->context, handle->key->enctype,
29 GPDEBUG("Service: %s, Enckey: [ephemeral], Enctype: %d\n",
30 - svc_name, GP_CREDS_HANDLE_KEY_ENCTYPE);
31 + svc_name, handle->key->enctype);
35 @@ -254,7 +253,7 @@ static int gp_decrypt_buffer(krb5_context context, krb5_keyblock *key,
37 memset(&enc_handle, '\0', sizeof(krb5_enc_data));
39 - enc_handle.enctype = GP_CREDS_HANDLE_KEY_ENCTYPE;
40 + enc_handle.enctype = key->enctype;
41 enc_handle.ciphertext.data = in->octet_string_val;
42 enc_handle.ciphertext.length = in->octet_string_len;