Browse Source

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)
master
Pauli 2 years ago
parent
commit
572e6df7db
5 changed files with 18 additions and 18 deletions
  1. +1
    -1
      crypto/md5/asm/md5-586.pl
  2. +4
    -4
      crypto/md5/asm/md5-sparcv9.pl
  3. +8
    -8
      crypto/md5/asm/md5-x86_64.pl
  4. +3
    -3
      crypto/md5/md5_local.h
  5. +2
    -2
      crypto/rc4/asm/rc4-md5-x86_64.pl

+ 1
- 1
crypto/md5/asm/md5-586.pl View File

@ -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: $!";


+ 4
- 4
crypto/md5/asm/md5-sparcv9.pl View File

@ -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


+ 8
- 8
crypto/md5/asm/md5-x86_64.pl View File

@ -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
___


+ 3
- 3
crypto/md5/md5_local.h View File

@ -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


+ 2
- 2
crypto/rc4/asm/rc4-md5-x86_64.pl View File

@ -27,7 +27,7 @@
# minimize register usage, which was used as "main thread" with RC4
# weaved into it, one RC4 round per one MD5 round. In addition to the
# stiched subroutine the script can generate standalone replacement
# md5_block_asm_data_order and RC4. Below are performance numbers in
# ossl_md5_block_asm_data_order and RC4. Below are performance numbers in
# cycles per processed byte, less is better, for these the standalone
# subroutines, sum of them, and stitched one:
#
@ -76,7 +76,7 @@ if ($rc4 && !$md5) {
$func="RC4"; $nargs=4;
} elsif ($md5 && !$rc4) {
($ctx,$inp,$len) = ("%rdi","%rsi","%rdx");
$func="md5_block_asm_data_order"; $nargs=3;
$func="ossl_md5_block_asm_data_order"; $nargs=3;
} else {
($dat,$in0,$out,$ctx,$inp,$len) = ("%rdi","%rsi","%rdx","%rcx","%r8","%r9");
$func="rc4_md5_enc"; $nargs=6;


Loading…
Cancel
Save