Module Name: src
Committed By: joerg
Date: Sat May 16 20:22:15 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: camellia.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: camellia.inc
Log Message:
Use assembler implementation of Camellia on x86_64, switching a boost
for medium to large block sizes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/camellia.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/camellia.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/camellia.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/camellia.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/camellia.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/camellia.inc:1.2 Thu Jul 26 19:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/camellia.inc Sat May 16 20:22:15 2015
@@ -1,9 +1,10 @@
-# $NetBSD: camellia.inc,v 1.2 2012/07/26 19:58:40 christos Exp $
+# $NetBSD: camellia.inc,v 1.3 2015/05/16 20:22:15 joerg Exp $
.PATH: ${OPENSSLSRC}/crypto/camellia
-CAMELLIA_SRCS = camellia.c cmll_misc.c \
- cmll_ecb.c cmll_cbc.c cmll_cfb.c cmll_ofb.c cmll_ctr.c cmll_utl.c
+CAMELLIA_SRCS?= camellia.c cmll_cbc.c
+CAMELLIA_SRCS += cmll_misc.c cmll_ecb.c cmll_cfb.c \
+ cmll_ofb.c cmll_ctr.c cmll_utl.c
SRCS += ${CAMELLIA_SRCS}
.for cryptosrc in ${CAMELLIA_SRCS}
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/camellia.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/camellia.inc:1.1
--- /dev/null Sat May 16 20:22:15 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/camellia.inc Sat May 16 20:22:15 2015
@@ -0,0 +1,3 @@
+.PATH.S: ${.PARSEDIR}
+CAMELLIA_SRCS = cmll-x86_64.S
+.include "../../camellia.inc"
