diff options
| author | Pauli <paul.dale@oracle.com> | 2020-11-16 11:57:52 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-11-19 07:38:58 +1000 |
| commit | 572e6df7dba37552d520e563ab97f3de9ad14ee9 (patch) | |
| tree | 9c56cf3293529114850c87f4f5159624d3770642 /crypto/md5 | |
| parent | 627b73cc72d0c42a01c464b8b567ea0f7d907e05 (diff) | |
rename md5_block_asm_data_order to ossl_md5_block_asm_data_order
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13417)
Diffstat (limited to 'crypto/md5')
| -rw-r--r-- | crypto/md5/asm/md5-586.pl | 2 | ||||
| -rw-r--r-- | crypto/md5/asm/md5-sparcv9.pl | 8 | ||||
| -rwxr-xr-x | crypto/md5/asm/md5-x86_64.pl | 16 | ||||
| -rw-r--r-- | crypto/md5/md5_local.h | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/crypto/md5/asm/md5-586.pl b/crypto/md5/asm/md5-586.pl index 2a9e910d4f..8dd8fa0cf7 100644 --- a/crypto/md5/asm/md5-586.pl +++ b/crypto/md5/asm/md5-586.pl @@ -42,7 +42,7 @@ $X="esi"; 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9, # R3 ); -&md5_block("md5_block_asm_data_order"); +&md5_block("ossl_md5_block_asm_data_order"); &asm_finish(); close STDOUT or die "error closing STDOUT: $!"; diff --git a/crypto/md5/asm/md5-sparcv9.pl b/crypto/md5/asm/md5-sparcv9.pl index 755648e5f8..64e53a003f 100644 --- a/crypto/md5/asm/md5-sparcv9.pl +++ b/crypto/md5/asm/md5-sparcv9.pl @@ -216,9 +216,9 @@ $code.=<<___; SPARC_PIC_THUNK(%g1) #endif -.globl md5_block_asm_data_order +.globl ossl_md5_block_asm_data_order .align 32 -md5_block_asm_data_order: +ossl_md5_block_asm_data_order: SPARC_LOAD_ADDRESS_LEAF(OPENSSL_sparcv9cap_P,%g1,%g5) ld [%g1+4],%g1 ! OPENSSL_sparcv9cap_P[1] @@ -371,8 +371,8 @@ $code.=<<___; wr %g0,$saved_asi,%asi ret restore -.type md5_block_asm_data_order,#function -.size md5_block_asm_data_order,(.-md5_block_asm_data_order) +.type ossl_md5_block_asm_data_order,#function +.size ossl_md5_block_asm_data_order,(.-ossl_md5_block_asm_data_order) .asciz "MD5 block transform for SPARCv9, CRYPTOGAMS by <appro\@openssl.org>" .align 4 diff --git a/crypto/md5/asm/md5-x86_64.pl b/crypto/md5/asm/md5-x86_64.pl index c09d8f20ed..6625fb7d08 100755 --- a/crypto/md5/asm/md5-x86_64.pl +++ b/crypto/md5/asm/md5-x86_64.pl @@ -139,9 +139,9 @@ $code .= <<EOF; .text .align 16 -.globl md5_block_asm_data_order -.type md5_block_asm_data_order,\@function,3 -md5_block_asm_data_order: +.globl ossl_md5_block_asm_data_order +.type ossl_md5_block_asm_data_order,\@function,3 +ossl_md5_block_asm_data_order: .cfi_startproc push %rbp .cfi_push %rbp @@ -283,7 +283,7 @@ $code .= <<EOF; .Lepilogue: ret .cfi_endproc -.size md5_block_asm_data_order,.-md5_block_asm_data_order +.size ossl_md5_block_asm_data_order,.-ossl_md5_block_asm_data_order EOF # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, @@ -378,13 +378,13 @@ se_handler: .section .pdata .align 4 - .rva .LSEH_begin_md5_block_asm_data_order - .rva .LSEH_end_md5_block_asm_data_order - .rva .LSEH_info_md5_block_asm_data_order + .rva .LSEH_begin_ossl_md5_block_asm_data_order + .rva .LSEH_end_ossl_md5_block_asm_data_order + .rva .LSEH_info_ossl_md5_block_asm_data_order .section .xdata .align 8 -.LSEH_info_md5_block_asm_data_order: +.LSEH_info_ossl_md5_block_asm_data_order: .byte 9,0,0,0 .rva se_handler ___ diff --git a/crypto/md5/md5_local.h b/crypto/md5/md5_local.h index 629fccdc04..1bd392b979 100644 --- a/crypto/md5/md5_local.h +++ b/crypto/md5/md5_local.h @@ -15,11 +15,11 @@ #ifdef MD5_ASM # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) -# define md5_block_data_order md5_block_asm_data_order +# define md5_block_data_order ossl_md5_block_asm_data_order # elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64) -# define md5_block_data_order md5_block_asm_data_order +# define md5_block_data_order ossl_md5_block_asm_data_order # elif defined(__sparc) || defined(__sparc__) -# define md5_block_data_order md5_block_asm_data_order +# define md5_block_data_order ossl_md5_block_asm_data_order # endif #endif |