Commit 7f8d9b75 authored by Richard Levitte's avatar Richard Levitte Committed by Richard Levitte
Browse files

Improve the definition of STITCHED_CALL in e_rc4_hmac_md5.c 



The definition of STITCHED_CALL relies on OPENSSL_NO_ASM.  However,
when a configuration simply lacks the assembler implementation for RC4
(which is where we have implemented the stitched call), OPENSSL_NO_ASM
isn't implemented.  Better, then, to rely on specific macros that
indicated that RC4 (and MD5) are implemented in assembler.

For this to work properly, we must also make sure Configure adds the
definition of RC4_ASM among the C flags.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(cherry picked from commit 216e8d91)
parent a35d8fb1

Configure

+3 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,9 @@ unless ($disabled{asm}) { 
	push @{$config{defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);

	push @{$config{defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);

    }

    if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) {

	push @{$config{defines}}, "RC4_ASM";

    }

    if ($target{md5_asm_src}) {

	push @{$config{defines}}, "MD5_ASM";

    }

crypto/evp/e_rc4_hmac_md5.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, 
    return 1;

}



# if     !defined(OPENSSL_NO_ASM) &&     ( \

# if     defined(RC4_ASM) && defined(MD5_ASM) &&     (	   \

        defined(__x86_64)       || defined(__x86_64__)  || \

        defined(_M_AMD64)       || defined(_M_X64)      )

#  define STITCHED_CALL