Sat Mar 3 04:32:46 2018 UTC ()
provide CRYPTO_memcmp for the have-nots.
(christos)
diff -r1.6 -r1.7 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
diff -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libcrypto/libc-memequal.c
diff -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc 2018/02/08 21:57:24 1.6
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc 2018/03/03 04:32:46 1.7
| @@ -1,24 +1,24 @@ | | | @@ -1,24 +1,24 @@ |
| 1 | # $NetBSD: crypto.inc,v 1.6 2018/02/08 21:57:24 christos Exp $ | | 1 | # $NetBSD: crypto.inc,v 1.7 2018/03/03 04:32:46 christos Exp $ |
| 2 | # | | 2 | # |
| 3 | # @(#) Copyright (c) 1995 Simon J. Gerraty | | 3 | # @(#) Copyright (c) 1995 Simon J. Gerraty |
| 4 | # | | 4 | # |
| 5 | # SRCS extracted from src/crypto/dist/openssl/crypto/Makefile | | 5 | # SRCS extracted from src/crypto/dist/openssl/crypto/Makefile |
| 6 | # | | 6 | # |
| 7 | | | 7 | |
| 8 | .PATH: ${OPENSSLSRC}/crypto | | 8 | .PATH: ${OPENSSLSRC}/crypto |
| 9 | | | 9 | |
| 10 | | | 10 | |
| 11 | CRYPTO_SRCS = \ | | 11 | CRYPTO_SRCS += \ |
| 12 | cpt_err.c \ | | 12 | cpt_err.c \ |
| 13 | cryptlib.c \ | | 13 | cryptlib.c \ |
| 14 | cversion.c \ | | 14 | cversion.c \ |
| 15 | ebcdic.c \ | | 15 | ebcdic.c \ |
| 16 | ex_data.c \ | | 16 | ex_data.c \ |
| 17 | init.c \ | | 17 | init.c \ |
| 18 | mem.c \ | | 18 | mem.c \ |
| 19 | mem_dbg.c \ | | 19 | mem_dbg.c \ |
| 20 | mem_sec.c \ | | 20 | mem_sec.c \ |
| 21 | o_dir.c \ | | 21 | o_dir.c \ |
| 22 | o_fips.c \ | | 22 | o_fips.c \ |
| 23 | o_fopen.c \ | | 23 | o_fopen.c \ |
| 24 | o_init.c \ | | 24 | o_init.c \ |
#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);
}
CRYPTO_SRCS += libc-memequal.c
.include "../../crypto.inc"