From 14eaa69eae7b18f44c5106e316642e10829e9457 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Tue, 27 Jan 2015 11:42:25 -0700
Subject: [PATCH] version git diff fix

---
 configure.ac     | 10 ---------
 cyassl/version.h | 57 +++++++++++++++++++-----------------------------
 2 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/configure.ac b/configure.ac
index 656f07c23..50d5ec207 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1848,7 +1848,6 @@ 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
@@ -1857,15 +1856,6 @@ 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"
diff --git a/cyassl/version.h b/cyassl/version.h
index 0e59aa84a..79bcc1793 100644
--- a/cyassl/version.h
+++ b/cyassl/version.h
@@ -1,39 +1,26 @@
-/* cyassl version.h
- * generated from wolfssl version.h
+/* cyassl/version.h
+ *
+ * Copyright (C) 2006-2015 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL. (formerly known as CyaSSL)
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* wolfssl_version.h.in
-*
-* Copyright (C) 2006-2015 wolfSSL Inc.
-*
-* This file is part of wolfSSL. (formerly known as CyaSSL)
-*
-* wolfSSL is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* wolfSSL is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-*/
+#include <wolfssl/version.h>
 
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LIBWOLFSSL_VERSION_STRING "3.3.4"
-#define LIBWOLFSSL_VERSION_HEX 0x03003004
-
-#ifdef __cplusplus
-}
-#endif
+#define LIBCYASSL_VERSION_STRING LIBWOLFSSL_VERSION_STRING
+#define LIBCYASSL_VERSION_HEX LIBWOLFSSL_VERSION_HEX