feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

cyassl/options.h backwards compatibile

Browse Source
This commit is contained in:
kaleb-himes
2015-01-07 14:30:02 -07:00
parent 02f16b9232
commit 8d98db7593
4 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
configure.ac
View File

@@ -1775,11 +1775,11 @@ AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([wolfssl/version.h]) AC_CONFIG_FILES([wolfssl/version.h])
AC_CONFIG_FILES([wolfssl/options.h]) AC_CONFIG_FILES([wolfssl/options.h])
#have options.h and version.h for autoconf fips tag and build #have options.h and version.h for autoconf fips tag and build
if test "x$ENABLED_FIPS" = "xyes" #if test "x$ENABLED_FIPS" = "xyes"
then #then
AC_CONFIG_FILES([cyassl/version.h]) # AC_CONFIG_FILES([cyassl/version.h])
AC_CONFIG_FILES([cyassl/options.h]) # AC_CONFIG_FILES([cyassl/options.h])
fi #fi
AC_CONFIG_FILES([support/wolfssl.pc]) AC_CONFIG_FILES([support/wolfssl.pc])
AC_CONFIG_FILES([rpm/spec]) AC_CONFIG_FILES([rpm/spec])
@@ -1846,6 +1846,26 @@ echo "#endif" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE
echo 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 # output config summary
echo "---" echo "---"
echo "Configuration summary for $PACKAGE_NAME version $VERSION" echo "Configuration summary for $PACKAGE_NAME version $VERSION"

21
cyassl/version.h
View File

@@ -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. * Copyright (C) 2006-2014 wolfSSL Inc.
* *
@@ -19,4 +23,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 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

2
wolfssl/version.h
View File

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

2
wolfssl/version.h.in
View File

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