Add assembly support for 32-bit iOS. (313e6ec1) · Commits · CYBER - Cyber Security / TS 103 523 MSP / ETS / ETS OpenSSL

Configurations/10-main.conf

+9 −0

Original line number	Diff line number	Diff line
		@@ -1391,6 +1391,15 @@
		cflags => "-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
		sys_id => "iOS",
		},
		"ios-cross" => {
		inherit_from => [ "darwin-common", asm("armv4_asm") ],
		# It should be possible to go below iOS 6 and even add -arch armv6,
		# thus targeting iPhone pre-3GS, but it's assumed to be irrelevant
		# at this point (and impossible to download SDK for).
		cflags => "-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",
		sys_id => "iOS",
		perlasm_scheme => "ios32",
		},
		"ios64-cross" => {
		inherit_from => [ "darwin-common", asm("aarch64_asm") ],
		cflags => "-arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common",

crypto/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ alphacpuid.s: alphacpuid.pl
		$(PERL) alphacpuid.pl > $$preproc && \
		$(CC) -E -P $$preproc > $@ && rm $$preproc)
		arm64cpuid.S: arm64cpuid.pl; $(PERL) arm64cpuid.pl $(PERLASM_SCHEME) > $@
		armv4cpuid.S: armv4cpuid.pl; $(PERL) armv4cpuid.pl $(PERLASM_SCHEME) > $@

		subdirs:
		@target=all; $(RECURSIVE_MAKE)

crypto/aes/asm/aes-armv4.pl

+31 −7

Original line number	Diff line number	Diff line
		@@ -32,8 +32,20 @@
		# Profiler-assisted and platform-specific optimization resulted in 16%
		# improvement on Cortex A8 core and ~21.5 cycles per byte.

		while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
		$flavour = shift;
		if ($flavour=~/^\w[\w\-]*\.\w+$/) { $output=$flavour; undef $flavour; }
		else { while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} }

		if ($flavour && $flavour ne "void") {
		$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
		( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
		( $xlate="${dir}../../perlasm/arm-xlate.pl" and -f $xlate) or
		die "can't locate arm-xlate.pl";

		open STDOUT,"\| \"$^X\" $xlate $flavour $output";
		} else {
		open STDOUT,">$output";
		}

		$s0="r0";
		$s1="r1";
		@@ -62,7 +74,7 @@ $code=<<___;
		.code 32
		#else
		.syntax unified
		# ifdef __thumb2__
		# if defined(__thumb2__) && !defined(__APPLE__)
		.thumb
		# else
		.code 32
		@@ -187,9 +199,13 @@ AES_encrypt:
		adr r3,AES_encrypt
		#endif
		stmdb sp!,{r1,r4-r12,lr}
		#ifdef __APPLE__
		adr $tbl,AES_Te
		#else
		sub $tbl,r3,#AES_encrypt-AES_Te @ Te
		#endif
		mov $rounds,r0 @ inp
		mov $key,r2
		sub $tbl,r3,#AES_encrypt-AES_Te @ Te
		#if __ARM_ARCH__<7
		ldrb $s0,[$rounds,#3] @ load input data in endian-neutral
		ldrb $t1,[$rounds,#2] @ manner...
		@@ -457,12 +473,16 @@ _armv4_AES_set_encrypt_key:
		bne .Labrt

		.Lok: stmdb sp!,{r4-r12,lr}
		sub $tbl,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024 @ Te4

		mov $rounds,r0 @ inp
		mov lr,r1 @ bits
		mov $key,r2 @ key

		#ifdef __APPLE__
		adr $tbl,AES_Te+1024 @ Te4
		#else
		sub $tbl,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024 @ Te4
		#endif

		#if __ARM_ARCH__<7
		ldrb $s0,[$rounds,#3] @ load input data in endian-neutral
		ldrb $t1,[$rounds,#2] @ manner...
		@@ -955,9 +975,13 @@ AES_decrypt:
		adr r3,AES_decrypt
		#endif
		stmdb sp!,{r1,r4-r12,lr}
		#ifdef __APPLE__
		adr $tbl,AES_Td
		#else
		sub $tbl,r3,#AES_decrypt-AES_Td @ Td
		#endif
		mov $rounds,r0 @ inp
		mov $key,r2
		sub $tbl,r3,#AES_decrypt-AES_Td @ Td
		#if __ARM_ARCH__<7
		ldrb $s0,[$rounds,#3] @ load input data in endian-neutral
		ldrb $t1,[$rounds,#2] @ manner...

crypto/aes/asm/bsaes-armv7.pl

+39 −5

Original line number	Diff line number	Diff line
		@@ -47,8 +47,20 @@
		#
		# <ard.biesheuvel@linaro.org>

		while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
		$flavour = shift;
		if ($flavour=~/^\w[\w\-]*\.\w+$/) { $output=$flavour; undef $flavour; }
		else { while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} }

		if ($flavour && $flavour ne "void") {
		$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
		( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or
		( $xlate="${dir}../../perlasm/arm-xlate.pl" and -f $xlate) or
		die "can't locate arm-xlate.pl";

		open STDOUT,"\| \"$^X\" $xlate $flavour $output";
		} else {
		open STDOUT,">$output";
		}

		my ($inp,$out,$len,$key)=("r0","r1","r2","r3");
		my @XMM=map("q$_",(0..15));
		@@ -715,7 +727,7 @@ $code.=<<___;

		.text
		.syntax unified @ ARMv7-capable assembler is expected to handle this
		#ifdef __thumb2__
		#if defined(__thumb2__) && !defined(__APPLE__)
		.thumb
		#else
		.code 32
		@@ -726,7 +738,11 @@ $code.=<<___;
		_bsaes_decrypt8:
		adr $const,_bsaes_decrypt8
		vldmia $key!, {@XMM[9]} @ round 0 key
		#ifdef __APPLE__
		adr $const,.LM0ISR
		#else
		add $const,$const,#.LM0ISR-_bsaes_decrypt8
		#endif

		vldmia $const!, {@XMM[8]} @ .LM0ISR
		veor @XMM[10], @XMM[0], @XMM[9] @ xor with round0 key
		@@ -821,7 +837,11 @@ _bsaes_const:
		_bsaes_encrypt8:
		adr $const,_bsaes_encrypt8
		vldmia $key!, {@XMM[9]} @ round 0 key
		#ifdef __APPLE__
		adr $const,.LM0SR
		#else
		sub $const,$const,#_bsaes_encrypt8-.LM0SR
		#endif

		vldmia $const!, {@XMM[8]} @ .LM0SR
		_bsaes_encrypt8_alt:
		@@ -925,7 +945,11 @@ $code.=<<___;
		_bsaes_key_convert:
		adr $const,_bsaes_key_convert
		vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key
		#ifdef __APPLE__
		adr $const,.LM0
		#else
		sub $const,$const,#_bsaes_key_convert-.LM0
		#endif
		vld1.8 {@XMM[15]}, [$inp]! @ load round 1 key

		vmov.i8 @XMM[8], #0x01 @ bit masks
		@@ -1392,7 +1416,12 @@ bsaes_ctr32_encrypt_blocks:
		vstmia r12, {@XMM[7]} @ save last round key

		vld1.8 {@XMM[0]}, [$ctr] @ load counter
		#ifdef __APPLE__
		mov $ctr, #.LREVM0SR-.LM0
		add $ctr, $const, $ctr
		#else
		add $ctr, $const, #.LREVM0SR-.LM0 @ borrow $ctr
		#endif
		vldmia $keysched, {@XMM[4]} @ load round0 key
		#else
		ldr r12, [$key, #244]
		@@ -1449,7 +1478,12 @@ bsaes_ctr32_encrypt_blocks:
		vldmia $ctr, {@XMM[8]} @ .LREVM0SR
		mov r5, $rounds @ pass rounds
		vstmia $fp, {@XMM[10]} @ save next counter
		#ifdef __APPLE__
		mov $const, #.LREVM0SR-.LSR
		sub $const, $ctr, $const
		#else
		sub $const, $ctr, #.LREVM0SR-.LSR @ pass constants
		#endif

		bl _bsaes_encrypt8_alt

		@@ -1550,7 +1584,7 @@ bsaes_ctr32_encrypt_blocks:
		rev r8, r8
		#endif
		sub sp, sp, #0x10
		vst1.8 {@XMM[1]}, [sp,:64] @ copy counter value
		vst1.8 {@XMM[1]}, [sp] @ copy counter value
		sub sp, sp, #0x10

		.Lctr_enc_short_loop:
		@@ -1561,7 +1595,7 @@ bsaes_ctr32_encrypt_blocks:
		bl AES_encrypt

		vld1.8 {@XMM[0]}, [r4]! @ load input
		vld1.8 {@XMM[1]}, [sp,:64] @ load encrypted counter
		vld1.8 {@XMM[1]}, [sp] @ load encrypted counter
		add r8, r8, #1
		#ifdef __ARMEL__
		rev r0, r8

crypto/armcap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		#include <string.h>
		#include <setjmp.h>
		#include <signal.h>
		#include <crypto.h>
		#include <openssl/crypto.h>

		#include "arm_arch.h"