Enable optimized crypto operations for x86_64

This adds initial support for assembly crypto acceleration on x86_64 for ELF (Linux, *BSD, Solaris) and Mach-O (OS-X) systems. The build method is a little different than OpenSSL and OpenBSD. All the .s files are generated ahead of time when the tarball is generated, so there are no complicated makefile rules at configure/build time. This also means the builds are faster and perl is not required on the build system. Thanks to Wouter Clarie for providing the initial cleanup and patch that this is based on.
author: Brent Cook <bcook@openbsd.org> 2014-12-06 18:43:58 -0600
committer: Brent Cook <bcook@openbsd.org> 2014-12-07 16:26:28 -0600
commit: 03cd45e2c78b0298ab006fb64a4cda4fe6ab5657 (patch)
tree: b6169d60691749d3a8a27c366646f7ad34d5c7d1 /update.sh
parent: e57d5d8be3fbab0aa2ffa87f79d5fb079a0af2e9 (diff)
download: portable-03cd45e2c78b0298ab006fb64a4cda4fe6ab5657.tar.gz
portable-03cd45e2c78b0298ab006fb64a4cda4fe6ab5657.tar.bz2
portable-03cd45e2c78b0298ab006fb64a4cda4fe6ab5657.zip
1 files changed, 33 insertions, 1 deletions
diff --git a/update.sh b/update.sh
index 47e2e22..348616f 100755
--- a/update.sh
+++ b/update.sh
@@ -5,6 +5,7 @@ openbsd_branch=`cat OPENBSD_BRANCH`
 libressl_version=`cat VERSION`
 # pull in latest upstream code
+echo "pulling upstream openbsd source"
 if [ ! -d openbsd ]; then
        if [ -z "$LIBRESSL_GIT" ]; then
                git clone https://github.com/libressl-portable/openbsd.git
@@ -16,7 +17,7 @@ fi
 git checkout $openbsd_branch
 git pull --rebase)
-# setup source paths 
+# setup source paths
 dir=`pwd`
 libc_src=$dir/openbsd/src/lib/libc
 libc_regress=$dir/openbsd/src/regress/lib/libc
@@ -93,6 +94,7 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h opensslv.h
 copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
 # copy libcrypto source
+echo copying libcrypto source
 rm -f crypto/*.c crypto/*.h
 for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
        dir=`dirname $i`
@@ -106,13 +108,40 @@ done
 $CP crypto/compat/b_win.c crypto/bio
 $CP crypto/compat/ui_openssl_win.c crypto/ui
+# generate assembly crypto algorithms
+asm_src=$libssl_src/src/crypto
+for abi in elf macosx; do
+        echo generating ASM source for $abi
+        perl $asm_src/aes/asm/aes-x86_64.pl $abi        > crypto/aes/aes-${abi}-x86_64.s
+        perl $asm_src/aes/asm/vpaes-x86_64.pl $abi      > crypto/aes/vpaes-${abi}-x86_64.s
+        perl $asm_src/aes/asm/bsaes-x86_64.pl $abi      > crypto/aes/bsaes-${abi}-x86_64.s
+        perl $asm_src/aes/asm/aesni-x86_64.pl $abi      > crypto/aes/aesni-${abi}-x86_64.s
+        perl $asm_src/aes/asm/aesni-sha1-x86_64.pl $abi > crypto/aes/aesni-sha1-${abi}-x86_64.s
+        perl $asm_src/bn/asm/modexp512-x86_64.pl $abi   > crypto/bn/modexp512-${abi}-x86_64.s
+        perl $asm_src/bn/asm/x86_64-mont.pl $abi        > crypto/bn/mont-${abi}-x86_64.s
+        perl $asm_src/bn/asm/x86_64-mont5.pl $abi       > crypto/bn/mont5-${abi}-x86_64.s
+        perl $asm_src/bn/asm/x86_64-gf2m.pl $abi        > crypto/bn/gf2m-${abi}-x86_64.s
+        perl $asm_src/camellia/asm/cmll-x86_64.pl $abi  > crypto/camellia/cmll-${abi}-x86_64.s
+        perl $asm_src/md5/asm/md5-x86_64.pl $abi        > crypto/md5/md5-${abi}-x86_64.s
+        perl $asm_src/modes/asm/ghash-x86_64.pl $abi    > crypto/modes/ghash-${abi}-x86_64.s
+        perl $asm_src/rc4/asm/rc4-x86_64.pl $abi        > crypto/rc4/rc4-${abi}-x86_64.s
+        perl $asm_src/rc4/asm/rc4-md5-x86_64.pl $abi    > crypto/rc4/rc4-md5-${abi}-x86_64.s
+        perl $asm_src/sha/asm/sha1-x86_64.pl $abi       > crypto/sha/sha1-${abi}-x86_64.s
+        perl $asm_src/sha/asm/sha512-x86_64.pl $abi     crypto/sha/sha256-${abi}-x86_64.S
+        perl $asm_src/sha/asm/sha512-x86_64.pl $abi     crypto/sha/sha512-${abi}-x86_64.S
+        perl $asm_src/whrlpool/asm/wp-x86_64.pl $abi    > crypto/whrlpool/wp-${abi}-x86_64.s
+        perl $asm_src/x86_64cpuid.pl $abi               crypto/cpuid-${abi}-x86_64.S
+done
 # copy libtls source
+echo copying libtls source
 rm -f tls/*.c tls/*.h
 for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
        cp $libtls_src/$i tls
 done
 # copy openssl(1) source
+echo "copying openssl(1) source"
 $CP $libc_src/stdlib/strtonum.c apps
 $CP $libcrypto_src/openssl.cnf apps
 for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do
@@ -122,12 +151,14 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do
 done
 # copy libssl source
+echo "copying libssl source"
 rm -f ssl/*.c ssl/*.h
 for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
        cp $libssl_src/src/ssl/$i ssl
 done
 # copy libcrypto tests
+echo "copying tests"
 rm -f tests/biotest.c
 for i in aead/aeadtest.c aeswrap/aes_wrap.c base64/base64test.c bf/bftest.c \
        bn/general/bntest.c bn/mont/mont.c \
@@ -223,6 +254,7 @@ echo "EXTRA_DIST += testssl ca.pem server.pem" >> tests/Makefile.am
        done
 )
+echo "copying manpages"
 # copy manpages
 (cd man
        $CP Makefile.am.tpl Makefile.am
author	Brent Cook <bcook@openbsd.org>	2014-12-06 18:43:58 -0600
committer	Brent Cook <bcook@openbsd.org>	2014-12-07 16:26:28 -0600
commit	03cd45e2c78b0298ab006fb64a4cda4fe6ab5657 (patch)
tree	b6169d60691749d3a8a27c366646f7ad34d5c7d1 /update.sh
parent	e57d5d8be3fbab0aa2ffa87f79d5fb079a0af2e9 (diff)
download	portable-03cd45e2c78b0298ab006fb64a4cda4fe6ab5657.tar.gz portable-03cd45e2c78b0298ab006fb64a4cda4fe6ab5657.tar.bz2 portable-03cd45e2c78b0298ab006fb64a4cda4fe6ab5657.zip