Commit aacfb2a2 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Add AES-NI GCM stich and take it into build loop [from master].

parent 0ba304dd

Configure

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:des-586.o crypt5 


my $x86_elf_asm="$x86_asm:elf";



my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:";

my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o aesni-gcm-x86_64.o:";

my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";

my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void";

my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";

TABLE

+16 −16
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -813,7 +813,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = auto

$dso_scheme   = win32
@@ -1506,7 +1506,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = macosx

$dso_scheme   = dlfcn
@@ -1671,7 +1671,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = auto

$dso_scheme   = win32
@@ -1770,7 +1770,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = macosx

$dso_scheme   = dlfcn
@@ -1836,7 +1836,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -2067,7 +2067,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -2595,7 +2595,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -2793,7 +2793,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -2859,7 +2859,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -4476,7 +4476,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -4509,7 +4509,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -4542,7 +4542,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -4740,7 +4740,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = mingw64

$dso_scheme   = win32
@@ -5730,7 +5730,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn
@@ -5763,7 +5763,7 @@ $rmd160_obj = 
$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$modes_obj    = ghash-x86_64.o

$modes_obj    = ghash-x86_64.o aesni-gcm-x86_64.o

$engines_obj  = 

$perlasm_scheme = elf

$dso_scheme   = dlfcn

crypto/modes/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ ghash-x86.s: asm/ghash-x86.pl 
	$(PERL) asm/ghash-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

ghash-x86_64.s:	asm/ghash-x86_64.pl

	$(PERL) asm/ghash-x86_64.pl $(PERLASM_SCHEME) > $@

aesni-gcm-x86_64.s:	asm/aesni-gcm-x86_64.pl

	$(PERL) asm/aesni-gcm-x86_64.pl $(PERLASM_SCHEME) > $@

ghash-sparcv9.s:	asm/ghash-sparcv9.pl

	$(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)

ghash-alpha.s:	asm/ghash-alpha.pl

crypto/modes/asm/aesni-gcm-x86_64.pl

0 → 100644
+1028 −0

File added.

Preview size limit exceeded, changes collapsed.