Merge branch 'master' of https://github.com/kaleb-himes/cyassl

configure.ac

@@ -1775,11 +1775,11 @@ AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([wolfssl/version.h])
 AC_CONFIG_FILES([wolfssl/options.h])
 #have options.h and version.h for autoconf fips tag and build
-if test "x$ENABLED_FIPS" = "xyes"
-then
-    AC_CONFIG_FILES([cyassl/version.h])
-    AC_CONFIG_FILES([cyassl/options.h])
-fi
+#if test "x$ENABLED_FIPS" = "xyes"
+#then
+#    AC_CONFIG_FILES([cyassl/version.h])
+#    AC_CONFIG_FILES([cyassl/options.h])
+#fi
 AC_CONFIG_FILES([support/wolfssl.pc])
 AC_CONFIG_FILES([rpm/spec])
 
@@ -1846,6 +1846,26 @@ echo "#endif" >> $OPTION_FILE
 echo "" >> $OPTION_FILE 
 echo
 
+#backwards compatability for those who have included options or version
+touch cyassl/options.h
+touch cyassl/version.h
+echo "/* cyassl options.h" > cyassl/options.h
+echo " * generated from wolfssl/options.h" >> cyassl/options.h
+echo " */\n" >> cyassl/options.h
+while read -r line
+do
+    echo "$line" >> cyassl/options.h
+done < $OPTION_FILE
+
+echo "/* cyassl version.h" > cyassl/version.h
+echo " * generated from wolfssl version.h" >> cyassl/version.h
+echo " */\n" >> cyassl/version.h
+while read -r line
+do
+    echo "$line" >> cyassl/version.h
+done < wolfssl/version.h
+#end backwards compatibility
+
 # output config summary
 echo "---"
 echo "Configuration summary for $PACKAGE_NAME version $VERSION"

cyassl/version.h

@@ -1,4 +1,8 @@
-/* cyassl_version.h.in
+/* cyassl version.h
+ * generated from wolfssl version.h
+ */
+
+/* wolfssl_version.h.in
 *
 * Copyright (C) 2006-2014 wolfSSL Inc.
 *
@@ -19,4 +23,17 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
-#include <wolfssl/version.h.in>
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define LIBWOLFSSL_VERSION_STRING "3.3.0"
+#define LIBWOLFSSL_VERSION_HEX 0x03003000
+
+#ifdef __cplusplus
+}
+#endif
+

wolfssl/version.h

@@ -1,4 +1,4 @@
-/* cyassl_version.h.in
+/* wolfssl_version.h.in
  *
  * Copyright (C) 2006-2014 wolfSSL Inc.
  *

wolfssl/version.h.in

@@ -1,4 +1,4 @@
-/* cyassl_version.h.in
+/* wolfssl_version.h.in
  *
  * Copyright (C) 2006-2014 wolfSSL Inc.
  *