Brian Aker commits plus some minor changes like AM_CFLAGS getting AC_…

…SUBST and --enable-xxx #ifdef to new header layout

.gitignore

@@ -8,8 +8,7 @@
 *.user
 config*
 *Debug/
-ctc_config*
-stamp*
+stamp-h
 libtool.m4
 aclocal.m4
 lt*.m4
@@ -21,7 +20,7 @@ missing
 libtool
 tags
 ctaocrypt/benchmark/benchmark
-ctaocrypt/test
+ctaocrypt/test/testctaocrypt
 examples/client/client
 examples/echoclient/echoclient
 examples/echoserver/echoserver
@@ -43,3 +42,10 @@ NTRU_algorithm/
 build-test/
 build/
 cyassl.xcodeproj/
+cyassl*rc*
+autoscan.log
+TAGS
+support/libcyassl.pc
+cyassl/version.h
+cyassl/ctaocrypt/stamp-h1
+stamp-h1

Makefile.am

@@ -1,58 +1,71 @@
-EXTRA_DIST = certs/*.pem certs/*.der certs/*.txt certs/*.raw \
-    lib/dummy *.sln *.vcproj cyassl-iphone.xcodeproj/project.pbxproj \
-    doc/*.txt swig/README swig/*.i swig/cyassl_adds.c swig/*.sh swig/runme.* \
-    swig/python_cyassl.vcproj swig/rsasign.py
+# includes append to these:
+SUFFIXES =
+TESTS =
+CLEANFILES =
+DISTCLEANFILES =
+bin_PROGRAMS =
+noinst_HEADERS =
+lib_LTLIBRARIES =
+man_MANS =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+include_HEADERS =
+nobase_include_HEADERS =
+check_PROGRAMS =
+EXTRA_HEADERS =
+BUILT_SOURCES=
+EXTRA_DIST=
+doc_DATA=
 
-ACLOCAL_AMFLAGS = -I m4
+exampledir = $(docdir)/@PACKAGE@/example
+example_DATA=
+EXTRA_DIST+= $(example_DATA)
+
+certsdir = $(sysconfdir)/ssl/certs
+certs_DATA=
+EXTRA_DIST+= $(certs_DATA)
+
+EXTRA_DIST+= $(doc_DATA)
+
+ACLOCAL_AMFLAGS= -I m4 --install
+
+EXTRA_DIST+= lib/dummy
+
+EXTRA_DIST+= cyassl-ntru.vcproj
+EXTRA_DIST+= cyassl.vcproj
+EXTRA_DIST+= cyassl-iphone.xcodeproj/project.pbxproj
+EXTRA_DIST+= cyassl-ntru.sln
+EXTRA_DIST+= cyassl.sln
+
+include cyassl/include.am
+include certs/include.am
+include doc/include.am
+include swig/include.am
 
 include src/include.am
-include ctaocrypt/test/include.am
 include ctaocrypt/benchmark/include.am
+include ctaocrypt/src/include.am
+include ctaocrypt/test/include.am
 include examples/client/include.am
 include examples/server/include.am
 include examples/echoclient/include.am
 include examples/echoserver/include.am
 include testsuite/include.am
 include sslSniffer/sslSnifferTest/include.am
 
+TESTS += $(check_PROGRAMS)
+test: check
 
 # !!!! first line of rule has to start with a hard (real) tab, not spaces
-basic:
-	$(MAKE) src/libcyassl.la; \
-	$(MAKE) testsuite/testsuite; \
-    cd testsuite; \
-    ./testsuite; \
-    cd ../;
-
-egs:
-	$(MAKE) examples/client/client; \
-	$(MAKE) examples/echoclient/echoclient;\
-	$(MAKE) examples/server/server; \
-	$(MAKE) examples/echoserver/echoserver;
-
-ctc:
-	$(MAKE) ctaocrypt/test/test; \
-	$(MAKE) ctaocrypt/benchmark/benchmark; 
-
-openssl-links:
-	cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
-    ln -s ../src/.libs/libcyassl.a libssl.a; \
-    ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
-
-#  !!! test -e with a .name like .libs then a * like *dylib fails so just
-#      look for the .dylib on OS X, and .so otherwise but copy all parts
-install:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/openssl $(DESTDIR)$(libdir); \
-    cp -fpR include/openssl/* $(DESTDIR)$(includedir)/openssl; \
-    cp -fpR ctaocrypt/include/*.h $(DESTDIR)$(includedir); \
-    rm $(DESTDIR)$(includedir)/ctc_asn.h; \
-    rm $(DESTDIR)$(includedir)/ctc_coding.h; \
-    rm $(DESTDIR)$(includedir)/ctc_error.h; \
-    rm $(DESTDIR)$(includedir)/ctc_misc.h; \
-    cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
-    if test -e src/.libs/libcyassl.a; then \
-    cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
-    if test -e src/.libs/libcyassl.so; then \
-    cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
-    if test -e src/.libs/libcyassl.dylib; then \
-    cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
+
+merge-clean:
+	@find ./ | $(GREP) \.gcda | xargs rm -f
+	@find ./ | $(GREP) \.gcno | xargs rm -f
+	@find ./ | $(GREP) \.gz | xargs rm -f
+	@find ./ | $(GREP) \.orig | xargs rm -f
+	@find ./ | $(GREP) \.rej | xargs rm -f
+	@find ./ | $(GREP) \.rpm | xargs rm -f
+	@find ./ | $(GREP) \.THIS | xargs rm -f
+	@find ./ | $(GREP) \.OTHER | xargs rm -f
+	@find ./ | $(GREP) \.BASE | xargs rm -f
+	@find ./ | $(GREP) \~$$ | xargs rm -f

README

@@ -1,5 +1,21 @@
 *** Note, Please read ***
 
+Note 1)
+CyaSSL now needs all examples and tests to be run from the CyaSSL home
+directory.  This is because it finds certs and keys from ./certs/.  Trying to
+maintain the ability to run each program from its own directory, the testsuite
+directory, the main directory (for make check/test), and for the various
+different project layouts (with or without config) was becoming harder and 
+harder.  Now to run testsuite just do:
+
+./testsuite/testsuite
+
+or 
+
+make test    (when using autoconf)
+
+
+Note 2)
 CyaSSL takes a different approach to certificate verification than OpenSSL does.
 The default policy for the client is to verify the server, this means that if
 you don't load CAs to verify the server you'll get a connect error, unable to 

autogen.sh

@@ -3,10 +3,4 @@
 # Create configure and makefile stuff...
 #
 
-set -e
-
-autoreconf -ivf
-aclocal -I m4
-autoheader
-autoconf
-automake --add-missing --copy
+autoreconf -ivf -Wall

certs/include.am

@@ -0,0 +1,38 @@
+# vim:ft=automake
+# All paths should be given relative to the root
+#
+
+certs_DATA+= \
+	     certs/ca-cert.pem \
+	     certs/ca-key.pem \
+	     certs/client-cert.pem \
+	     certs/client-keyEnc.pem \
+	     certs/client-key.pem \
+	     certs/dsa512.pem \
+	     certs/dsa-cert.pem \
+	     certs/ecc-key.pem \
+	     certs/ntru-cert.pem \
+	     certs/server-cert.pem \
+	     certs/server-ecc.pem \
+	     certs/server-keyEnc.pem \
+	     certs/server-key.pem \
+	     certs/server-keyPkcs8Enc12.pem \
+	     certs/server-keyPkcs8Enc2.pem \
+	     certs/server-keyPkcs8Enc.pem \
+	     certs/server-keyPkcs8.pem
+
+certs_DATA+= \
+	     certs/ca-key.der \
+	     certs/client-cert.der \
+	     certs/client-key.der \
+	     certs/dh1024.der \
+	     certs/rsa1024.der \
+	     certs/dsa512.der \
+	     certs/ecc-key.der
+
+EXTRA_DIST+= ${certs_DATA}
+
+doc_DATA+= certs/taoCert.txt
+
+EXTRA_DIST+= certs/ntru-key.raw
+