The branch master has been updated via ecdd0ff733985fb573d687fe85fa533f62f6cfd8 (commit) from 25be7a0feacdbd3326774f0da8aaeb966c1f57f8 (commit)
- Log ----------------------------------------------------------------- commit ecdd0ff733985fb573d687fe85fa533f62f6cfd8 Author: Rich Salz <rs...@akamai.com> Date: Fri Jan 15 22:37:11 2016 -0500 RT4247: Fix EVP_CIPHER_CTX opaque on sparc Via Rainer Jung Reviewed-by: Dr. Stephen Henson <st...@openssl.org> ----------------------------------------------------------------------- Summary of changes: crypto/evp/e_des.c | 2 +- crypto/evp/e_des3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c index 5536f62..929151c 100644 --- a/crypto/evp/e_des.c +++ b/crypto/evp/e_des.c @@ -247,7 +247,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, dat->stream.cbc = NULL; # if defined(SPARC_DES_CAPABLE) if (SPARC_DES_CAPABLE) { - int mode = ctx->cipher->flags & EVP_CIPH_MODE; + int mode = EVP_CIPHER_CTX_mode(ctx); if (mode == EVP_CIPH_CBC_MODE) { des_t4_key_expand(key, &dat->ks.ks); diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 16407e8..8b6c2b5 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -270,7 +270,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, dat->stream.cbc = NULL; # if defined(SPARC_DES_CAPABLE) if (SPARC_DES_CAPABLE) { - int mode = ctx->cipher->flags & EVP_CIPH_MODE; + int mode = EVP_CIPHER_CTX_mode(ctx); if (mode == EVP_CIPH_CBC_MODE) { des_t4_key_expand(&deskey[0], &dat->ks1); @@ -297,7 +297,7 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, dat->stream.cbc = NULL; # if defined(SPARC_DES_CAPABLE) if (SPARC_DES_CAPABLE) { - int mode = ctx->cipher->flags & EVP_CIPH_MODE; + int mode = EVP_CIPHER_CTX_mode(ctx); if (mode == EVP_CIPH_CBC_MODE) { des_t4_key_expand(&deskey[0], &dat->ks1); _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits