From 58eb645fdba229c1b214a0ac14f7365df171b62f Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sat, 28 Jan 2017 03:40:38 +0900 Subject: Copy libc compat files rather than adding into the repository - remove the CP_LIBC files from repo - move tests/memmem.c to tests/compat/ --- update.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'update.sh') diff --git a/update.sh b/update.sh index 19e8954..dbb9b60 100755 --- a/update.sh +++ b/update.sh @@ -76,8 +76,9 @@ for i in crypto/compat libtls-standalone/compat; do for j in $libc_src/crypt/arc4random.c \ $libc_src/crypt/arc4random_uniform.c \ $libc_src/crypt/chacha_private.h \ - $libc_src/string/explicit_bzero.c \ + $libc_src/net/inet_pton.c \ $libc_src/stdlib/reallocarray.c \ + $libc_src/string/explicit_bzero.c \ $libc_src/string/strcasecmp.c \ $libc_src/string/strlcpy.c \ $libc_src/string/strlcat.c \ @@ -217,6 +218,7 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \ echo "copying nc(1) source" $CP $bin_src/nc/nc.1 apps/nc rm -f apps/nc/*.c apps/nc/*.h +$CP_LIBC $libc_src/net/base64.c apps/nc/compat $CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do if [ -e $bin_src/nc/$i ]; then @@ -269,7 +271,7 @@ $CP $libcrypto_regress/aead/aeadtests.txt tests # copy libc tests $CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c $CP $libc_regress/explicit_bzero/explicit_bzero.c tests -$CP_LIBC $libc_src/string/memmem.c tests +$CP_LIBC $libc_src/string/memmem.c tests/compat $CP $libc_regress/timingsafe/timingsafe.c tests # copy libssl tests -- cgit v1.2.3-55-g6feb