Module Name: src
Committed By: joerg
Date: Sat May 16 19:33:59 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: whrlpool.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: whrlpool.inc
Log Message:
Use x86_64 assembler version of whirlpool. It has a small but consistent
performance advantage over the clang output on my E3v2.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.1 Thu Jul 26 19:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc Sat May 16 19:33:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: whrlpool.inc,v 1.1 2012/07/26 19:58:40 christos Exp $
+# $NetBSD: whrlpool.inc,v 1.2 2015/05/16 19:33:59 joerg Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,11 +7,14 @@
.PATH: ${OPENSSLSRC}/crypto/whrlpool
-WHRLPOOL_SRCS = wp_block.c wp_dgst.c # wp_test.c
+.if empty(WHRLPOOL_SRCS)
+WHRLPOOL_SRCS += wp_block.c
+.endif
+WHRLPOOL_SRCS += wp_dgst.c # wp_test.c
SRCS += ${WHRLPOOL_SRCS}
.for cryptosrc in ${WHRLPOOL_SRCS}
-CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/whrlpool
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/whrlpool ${WHRLPOOLCPPFLAGS}
.endfor
CPPFLAGS.m_wp.c += -I${OPENSSLSRC}/crypto/whrlpool
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc:1.1
--- /dev/null Sat May 16 19:33:59 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.inc Sat May 16 19:33:59 2015
@@ -0,0 +1,4 @@
+.PATH.S: ${.PARSEDIR}
+WHRLPOOL_SRCS = wp-x86_64.S
+WHRLPOOLCPPFLAGS+= -DWHIRLPOOL_ASM
+.include "../../whrlpool.inc"
