yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge BoringSSL b8e2d63: es/asm/{aes-armv4|bsaes-armv7}.pl: make it work with binutils-2.29.

Browse Source
This commit is contained in:
Brian Smith 2018-04-30 14:01:12 -10:00
commit fb6694eb46
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/fipsmodule/aes/asm/aes-armv4.pl
View File

@ -200,7 +200,7 @@ GFp_asm_AES_encrypt:
#ifndef __thumb2__ #ifndef __thumb2__
sub r3,pc,#8 @ GFp_asm_AES_encrypt sub r3,pc,#8 @ GFp_asm_AES_encrypt
#else #else
adr r3,GFp_asm_AES_encrypt adr r3,.
#endif #endif
stmdb sp!,{r1,r4-r12,lr} stmdb sp!,{r1,r4-r12,lr}
#ifdef __APPLE__ #ifdef __APPLE__
@ -450,7 +450,7 @@ _armv4_AES_set_encrypt_key:
#ifndef __thumb2__ #ifndef __thumb2__
sub r3,pc,#8 @ GFp_asm_AES_set_encrypt_key sub r3,pc,#8 @ GFp_asm_AES_set_encrypt_key
#else #else
adr r3,GFp_asm_AES_set_encrypt_key adr r3,.
#endif #endif
teq r0,#0 teq r0,#0
#ifdef __thumb2__ #ifdef __thumb2__

13
crypto/fipsmodule/aes/asm/bsaes-armv7.pl
View File

@ -1,4 +1,11 @@
#!/usr/bin/env perl #! /usr/bin/env perl
# Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
# ==================================================================== # ====================================================================
# Written by Andy Polyakov <appro@openssl.org> for the OpenSSL # Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@ -759,7 +766,7 @@ _bsaes_const:
.type _bsaes_encrypt8,%function .type _bsaes_encrypt8,%function
.align 4 .align 4
_bsaes_encrypt8: _bsaes_encrypt8:
adr $const,_bsaes_encrypt8 adr $const,.
vldmia $key!, {@XMM[9]} @ round 0 key vldmia $key!, {@XMM[9]} @ round 0 key
#ifdef __APPLE__ #ifdef __APPLE__
adr $const,.LM0SR adr $const,.LM0SR
@ -867,7 +874,7 @@ $code.=<<___;
.type _bsaes_key_convert,%function .type _bsaes_key_convert,%function
.align 4 .align 4
_bsaes_key_convert: _bsaes_key_convert:
adr $const,_bsaes_key_convert adr $const,.
vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key
#ifdef __APPLE__ #ifdef __APPLE__
adr $const,.LM0 adr $const,.LM0