From: Rich Salz <rsalz@akamai.com>
Date: Sun, 17 Jan 2016 04:24:44 +0000 (-0500)
Subject: RT4247: Add missing patch
X-Git-Tag: OpenSSL_1_1_0-pre3~510
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b3a231efd3a29aa8a1e8dfaecb008e4798d9923;p=oweals%2Fopenssl.git

RT4247: Add missing patch

Missed the camellia EVP update.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c
index b225a971dd..7062775477 100644
--- a/crypto/evp/e_camellia.c
+++ b/crypto/evp/e_camellia.c
@@ -119,10 +119,10 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                             const unsigned char *iv, int enc)
 {
     int ret, mode, bits;
-    EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *) ctx->cipher_data;
+    EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *) EVP_CIPHER_CTX_cipher_data(ctx);
 
-    mode = ctx->cipher->flags & EVP_CIPH_MODE;
-    bits = ctx->key_len * 8;
+    mode = EVP_CIPHER_CTX_mode(ctx);
+    bits = EVP_CIPHER_CTX_key_length(ctx) * 8;
 
     cmll_t4_set_key(key, bits, &dat->ks);