Commit ecdd0ff7 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

RT4247: Fix EVP_CIPHER_CTX opaque on sparc 



Via Rainer Jung

Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent 25be7a0f

crypto/evp/e_des.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

crypto/evp/e_des3.c

+2 −2
Original line number Diff line number Diff line
@@ -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);