[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  0b3a231efd3a29aa8a1e8dfaecb008e4798d9923 (commit)
      from  3f22ed2fcf83a6306f4a06307278c779e49ba3df (commit)


- Log -----------------------------------------------------------------
commit 0b3a231efd3a29aa8a1e8dfaecb008e4798d9923
Author: Rich Salz <rsalz at akamai.com>
Date:   Sat Jan 16 23:24:44 2016 -0500

    RT4247: Add missing patch
    
    Missed the camellia EVP update.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/e_camellia.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c
index b225a97..7062775 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);