From 3675334e2b92eabedbd2f0eb452ade30283b0e56 Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 25 May 2021 10:40:44 +1000 Subject: aes: rename new bsaes_ symbols -> ossl_bsaes_ ones bsaes_cbc_encrypt -> ossl_bsaes_cbc_encrypt bsaes_ctr32_encrypt_blocks -> ossl_bsaes_ctr32_encrypt_blocks bsaes_xts_decrypt -> ossl_bsaes_xts_decrypt bsaes_xts_encrypt -> ossl_bsaes_xts_encrypt Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/15445) --- crypto/aes/asm/bsaes-armv7.pl | 32 ++++++++++++++++---------------- crypto/aes/asm/bsaes-x86_64.pl | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'crypto/aes') diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl index 39ccc3dbed..f97dea2077 100644 --- a/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/aes/asm/bsaes-armv7.pl @@ -1119,10 +1119,10 @@ $code.=<<___; .extern AES_cbc_encrypt .extern AES_decrypt -.global bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,%function +.global ossl_bsaes_cbc_encrypt +.type ossl_bsaes_cbc_encrypt,%function .align 5 -bsaes_cbc_encrypt: +ossl_bsaes_cbc_encrypt: #ifndef __KERNEL__ cmp $len, #128 #ifndef __thumb__ @@ -1384,7 +1384,7 @@ bsaes_cbc_encrypt: vst1.8 {@XMM[15]}, [$ivp] @ return IV VFP_ABI_POP ldmia sp!, {r4-r10, pc} -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt +.size ossl_bsaes_cbc_encrypt,.-ossl_bsaes_cbc_encrypt ___ } { @@ -1394,10 +1394,10 @@ my $keysched = "sp"; $code.=<<___; .extern AES_encrypt -.global bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,%function +.global ossl_bsaes_ctr32_encrypt_blocks +.type ossl_bsaes_ctr32_encrypt_blocks,%function .align 5 -bsaes_ctr32_encrypt_blocks: +ossl_bsaes_ctr32_encrypt_blocks: cmp $len, #8 @ use plain AES for blo .Lctr_enc_short @ small sizes @@ -1620,7 +1620,7 @@ bsaes_ctr32_encrypt_blocks: vstmia sp!, {q0-q1} ldmia sp!, {r4-r8, pc} -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks +.size ossl_bsaes_ctr32_encrypt_blocks,.-ossl_bsaes_ctr32_encrypt_blocks ___ } { @@ -1635,10 +1635,10 @@ my $twmask=@XMM[5]; my @T=@XMM[6..7]; $code.=<<___; -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,%function +.globl ossl_bsaes_xts_encrypt +.type ossl_bsaes_xts_encrypt,%function .align 4 -bsaes_xts_encrypt: +ossl_bsaes_xts_encrypt: mov ip, sp stmdb sp!, {r4-r10, lr} @ 0x20 VFP_ABI_PUSH @@ -2037,12 +2037,12 @@ $code.=<<___; VFP_ABI_POP ldmia sp!, {r4-r10, pc} @ return -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt +.size ossl_bsaes_xts_encrypt,.-ossl_bsaes_xts_encrypt -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,%function +.globl ossl_bsaes_xts_decrypt +.type ossl_bsaes_xts_decrypt,%function .align 4 -bsaes_xts_decrypt: +ossl_bsaes_xts_decrypt: mov ip, sp stmdb sp!, {r4-r10, lr} @ 0x20 VFP_ABI_PUSH @@ -2472,7 +2472,7 @@ $code.=<<___; VFP_ABI_POP ldmia sp!, {r4-r10, pc} @ return -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt +.size ossl_bsaes_xts_decrypt,.-ossl_bsaes_xts_decrypt ___ } $code.=<<___; diff --git a/crypto/aes/asm/bsaes-x86_64.pl b/crypto/aes/asm/bsaes-x86_64.pl index 2cf8211581..fa249cc3d9 100644 --- a/crypto/aes/asm/bsaes-x86_64.pl +++ b/crypto/aes/asm/bsaes-x86_64.pl @@ -1611,10 +1611,10 @@ ___ } $code.=<<___; .extern asm_AES_cbc_encrypt -.globl bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,\@abi-omnipotent +.globl ossl_bsaes_cbc_encrypt +.type ossl_bsaes_cbc_encrypt,\@abi-omnipotent .align 16 -bsaes_cbc_encrypt: +ossl_bsaes_cbc_encrypt: .cfi_startproc endbranch ___ @@ -1915,12 +1915,12 @@ $code.=<<___; .Lcbc_dec_epilogue: ret .cfi_endproc -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt +.size ossl_bsaes_cbc_encrypt,.-ossl_bsaes_cbc_encrypt -.globl bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,\@abi-omnipotent +.globl ossl_bsaes_ctr32_encrypt_blocks +.type ossl_bsaes_ctr32_encrypt_blocks,\@abi-omnipotent .align 16 -bsaes_ctr32_encrypt_blocks: +ossl_bsaes_ctr32_encrypt_blocks: .cfi_startproc endbranch mov %rsp, %rax @@ -2166,7 +2166,7 @@ $code.=<<___; .Lctr_enc_epilogue: ret .cfi_endproc -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks +.size ossl_bsaes_ctr32_encrypt_blocks,.-ossl_bsaes_ctr32_encrypt_blocks ___ ###################################################################### # void bsaes_xts_[en|de]crypt(const char *inp,char *out,size_t len, @@ -2177,10 +2177,10 @@ my ($twmask,$twres,$twtmp)=@XMM[13..15]; $arg6=~s/d$//; $code.=<<___; -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,\@abi-omnipotent +.globl ossl_bsaes_xts_encrypt +.type ossl_bsaes_xts_encrypt,\@abi-omnipotent .align 16 -bsaes_xts_encrypt: +ossl_bsaes_xts_encrypt: .cfi_startproc mov %rsp, %rax .Lxts_enc_prologue: @@ -2574,12 +2574,12 @@ $code.=<<___; .Lxts_enc_epilogue: ret .cfi_endproc -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt +.size ossl_bsaes_xts_encrypt,.-ossl_bsaes_xts_encrypt -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,\@abi-omnipotent +.globl ossl_bsaes_xts_decrypt +.type ossl_bsaes_xts_decrypt,\@abi-omnipotent .align 16 -bsaes_xts_decrypt: +ossl_bsaes_xts_decrypt: .cfi_startproc mov %rsp, %rax .Lxts_dec_prologue: @@ -2998,7 +2998,7 @@ $code.=<<___; .Lxts_dec_epilogue: ret .cfi_endproc -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt +.size ossl_bsaes_xts_decrypt,.-ossl_bsaes_xts_decrypt ___ } $code.=<<___; -- cgit v1.2.3