diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-16 23:24:44 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-17 09:18:43 -0500 |
| commit | 0b3a231efd3a29aa8a1e8dfaecb008e4798d9923 (patch) | |
| tree | e7c58f84f257a3e9bbae287a6accb21d74809a0f | |
| parent | 3f22ed2fcf83a6306f4a06307278c779e49ba3df (diff) | |
RT4247: Add missing patch
Missed the camellia EVP update.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
| -rw-r--r-- | crypto/evp/e_camellia.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |