update with latest, add more tests

this adds the new bytestring apis and new regression tests

4 files changed, 11 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index be8b51d..9f95742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ tests/timingsafe*
 tests/*test
 tests/*test.c
 tests/memmem.c
+tests/pbkdf2*
 tests/*.pem
 tests/testssl
 tests/*.txt
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 5dad39f..7d66795 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -9,6 +9,9 @@ libssl_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
 libssl_la_LIBADD = ../crypto/libcrypto.la
 
 libssl_la_SOURCES = bio_ssl.c
+libssl_la_SOURCES += bs_ber.c
+libssl_la_SOURCES += bs_cbb.c
+libssl_la_SOURCES += bs_cbs.c
 libssl_la_SOURCES += d1_both.c
 libssl_la_SOURCES += d1_clnt.c
 libssl_la_SOURCES += d1_enc.c
@@ -51,3 +54,4 @@ libssl_la_SOURCES += t1_srvr.c
 
 noinst_HEADERS = srtp.h
 noinst_HEADERS += ssl_locl.h
+noinst_HEADERS += bytestring.h
diff --git a/tests/Makefile.am.tpl b/tests/Makefile.am.tpl
index b2a4920..26334af 100644
--- a/tests/Makefile.am.tpl
+++ b/tests/Makefile.am.tpl
@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.am.common
 
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
+AM_CPPFLAGS += -I $(top_srcdir)/ssl
 
 LDADD = $(PLATFORM_LDADD) $(PROG_LDADD)
 LDADD += $(top_builddir)/ssl/libssl.la
diff --git a/update.sh b/update.sh
index c8ec876..925c327 100755
--- a/update.sh
+++ b/update.sh
@@ -190,19 +190,8 @@ done
 
 # copy libcrypto tests
 echo "copying tests"
-rm -f tests/biotest.c
-for i in aead/aeadtest.c aeswrap/aes_wrap.c base64/base64test.c bf/bftest.c \
-        bn/general/bntest.c bn/mont/mont.c \
-        cast/casttest.c chacha/chachatest.c cts128/cts128test.c \
-        des/destest.c dh/dhtest.c dsa/dsatest.c ec/ectest.c ecdh/ecdhtest.c \
-        ecdsa/ecdsatest.c engine/enginetest.c evp/evptest.c exp/exptest.c \
-        gcm128/gcm128test.c hmac/hmactest.c idea/ideatest.c ige/igetest.c \
-        md4/md4test.c md5/md5test.c mdc2/mdc2test.c poly1305/poly1305test.c \
-        pkcs7/pkcs7test.c pqueue/pq_test.c rand/randtest.c rc2/rc2test.c \
-        rc4/rc4test.c rmd/rmdtest.c sha/shatest.c sha1/sha1test.c \
-        sha256/sha256test.c sha512/sha512test.c utf8/utf8test.c \
-        gost/gost2814789t.c ; do
-         $CP $libcrypto_regress/$i tests
+for i in `find $libcrypto_regress -name '*.c'`; do
+         $CP "$i" tests
 done
 
 # copy libc tests
@@ -211,9 +200,10 @@ $CP $libc_regress/explicit_bzero/explicit_bzero.c tests
 $CP $libc_regress/timingsafe/timingsafe.c tests
 
 # copy libssl tests
-$CP $libssl_regress/asn1/asn1test.c tests
 $CP $libssl_regress/ssl/testssl tests
-$CP $libssl_regress/ssl/ssltest.c tests
+for i in `find $libssl_regress -name '*.c'`; do
+         $CP "$i" tests
+done
 $CP $libssl_regress/certs/ca.pem tests
 $CP $libssl_regress/certs/server.pem tests