Module Name: src
Committed By: christos
Date: Sat Mar 3 04:32:46 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto: libc-memequal.c
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3: crypto.inc
Log Message:
provide CRYPTO_memcmp for the have-nots.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-memequal.c
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.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/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.6 Thu Feb 8 16:57:24 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc Fri Mar 2 23:32:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: crypto.inc,v 1.6 2018/02/08 21:57:24 christos Exp $
+# $NetBSD: crypto.inc,v 1.7 2018/03/03 04:32:46 christos Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -8,7 +8,7 @@
.PATH: ${OPENSSLSRC}/crypto
-CRYPTO_SRCS = \
+CRYPTO_SRCS += \
cpt_err.c \
cryptlib.c \
cversion.c \
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/libc-memequal.c
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/libc-memequal.c:1.1
--- /dev/null Fri Mar 2 23:32:46 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/libc-memequal.c Fri Mar 2 23:32:46 2018
@@ -0,0 +1,16 @@
+#include <string.h>
+/*
+ * Special version of CRYPTO_memcmp for platforms with no assembly versions
+ */
+
+#include <string.h>
+#include <openssl/crypto.h>
+
+int
+CRYPTO_memcmp(
+ const volatile void * volatile in_a,
+ const volatile void * volatile in_b,
+ size_t len)
+{
+ return consttime_memequal(__UNVOLATILE(in_a), __UNVOLATILE(in_b), len);
+}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc:1.1
--- /dev/null Fri Mar 2 23:32:46 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc Fri Mar 2 23:32:46 2018
@@ -0,0 +1,3 @@
+
+CRYPTO_SRCS += libc-memequal.c
+.include "../../crypto.inc"