Commit 77aae965 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configure, e_aes.c: allow for XTS assembler implementation.

parent ae551760

Configure

+5 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void"; 
my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void";

my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::";

my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";

my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o::aes_ctr.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:";

my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o::aes-s390x.o aes-ctr.o aes-xts.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:";

my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o::void";

my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32";

my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64";
@@ -1558,9 +1558,11 @@ if ($rmd160_obj =~ /\.o$/) 
if ($aes_obj =~ /\.o$/)

	{

	$cflags.=" -DAES_ASM";

	# aes_ctr.o is not a real file, only indication that assembler

	# aes-ctr.o is not a real file, only indication that assembler

	# module implements AES_ctr32_encrypt...

	$cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes_ctr\.o//);

	$cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes\-ctr\.o//);

	# aes-xts.o indicates presense of AES_xts_[en|de]crypt...

	$cflags.=" -DAES_XTS_ASM" if ($aes_obj =~ s/\s*aes\-xts\.o//);

	$aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o//g if ($no_sse2);

	$aes_obj =~ s/\s*(vp|bs)aes-\w*\.o//g if ($fipscanisterinternal eq "y");

	$cflags.=" -DVPAES_ASM" if ($aes_obj =~ m/vpaes/);

TABLE

+2 −2
Original line number Diff line number Diff line
@@ -4301,7 +4301,7 @@ $bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = s390xcap.o s390xcpuid.o

$bn_obj       = bn_asm.o s390x-mont.o s390x-gf2m.o

$des_obj      = 

$aes_obj      = aes_ctr.o aes-s390x.o

$aes_obj      = aes-s390x.o aes-ctr.o aes-xts.o

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = sha1-s390x.o sha256-s390x.o sha512-s390x.o
@@ -4334,7 +4334,7 @@ $bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL 
$cpuid_obj    = s390xcap.o s390xcpuid.o

$bn_obj       = bn-s390x.o s390x-mont.o s390x-gf2m.o

$des_obj      = 

$aes_obj      = aes_ctr.o aes-s390x.o

$aes_obj      = aes-s390x.o aes-ctr.o aes-xts.o

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = sha1-s390x.o sha256-s390x.o sha512-s390x.o

crypto/evp/e_aes.c

+12 −0
Original line number Diff line number Diff line
@@ -145,6 +145,14 @@ void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out, 
			size_t blocks, const AES_KEY *key,

			const unsigned char ivec[AES_BLOCK_SIZE]);

#endif

#ifdef AES_XTS_ASM

void AES_xts_encrypt(const char *inp,char *out,size_t len,

			const AES_KEY *key1, const AES_KEY *key2,

			const unsigned char iv[16]);

void AES_xts_decrypt(const char *inp,char *out,size_t len,

			const AES_KEY *key1, const AES_KEY *key2,

			const unsigned char iv[16]);

#endif



#if	defined(AES_ASM) && !defined(I386_ONLY) &&	(  \

	((defined(__i386)	|| defined(__i386__)	|| \
@@ -1051,7 +1059,11 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 


	if (key) do

		{

#ifdef AES_XTS_ASM

		xctx->stream = enc ? AES_xts_encrypt : AES_xts_decrypt;

#else

		xctx->stream = NULL;

#endif

		/* key_len is two AES keys */

#ifdef BSAES_CAPABLE

		if (BSAES_CAPABLE)