move cyassl headers out of openssl dir

ctaocrypt/test/test.c

@@ -118,7 +118,7 @@ void err_sys(const char* msg, int es)
 #endif
 }
 
-/* func_args from cyassl_test.h, so don't have to pull in other junk */
+/* func_args from test.h, so don't have to pull in other junk */
 typedef struct func_args {
     int    argc;
     char** argv;

cyassl/include.am

@@ -12,4 +12,6 @@ nobase_include_HEADERS+= \
                          cyassl/internal.h \
                          cyassl/sniffer_error.h \
                          cyassl/sniffer.h \
+                         cyassl/callbacks.h \
+                         cyassl/test.h \
                          cyassl/version.h

cyassl/openssl/include.am

@@ -7,8 +7,6 @@ nobase_include_HEADERS+= \
                          cyassl/openssl/bn.h \
                          cyassl/openssl/conf.h \
                          cyassl/openssl/crypto.h \
-                         cyassl/openssl/cyassl_callbacks.h \
-                         cyassl/openssl/cyassl_test.h \
                          cyassl/openssl/des.h \
                          cyassl/openssl/dh.h \
                          cyassl/openssl/dsa.h \

cyassl/test.h

@@ -1,4 +1,4 @@
-/* cyassl_test.h */
+/* test.h */
 
 #ifndef CyaSSL_TEST_H
 #define CyaSSL_TEST_H

cyassl/version.h.in

@@ -1,4 +1,4 @@
-/* cyassl_version.h
+/* cyassl_version.h.in
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *

examples/client/client.c

@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 /*
 #define TEST_RESUME 

examples/echoclient/echoclient.c

@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 
 void echoclient_test(void* args)

examples/echoserver/echoserver.c

@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 #ifndef NO_MAIN_DRIVER
     #define ECHO_OUT

examples/server/server.c

@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 
 
 #ifdef CYASSL_CALLBACKS

testsuite/testsuite.c

@@ -24,7 +24,7 @@
 #endif
 
 #include <cyassl/openssl/ssl.h>
-#include <cyassl/openssl/cyassl_test.h>
+#include <cyassl/test.h>
 #include <cyassl/ctaocrypt/md5.h>
 
 #ifdef SINGLE_THREADED