wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

throw error when opensslcoexist configured with opensslall or opensslextra

Browse Source
This commit is contained in:
Tesfa Mael
2019-10-23 15:51:19 -07:00
parent 400dcfebba
commit 0b93109b3a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@@ -498,7 +498,7 @@ AC_ARG_ENABLE([signal],
[ ENABLED_SIGNAL=no ] [ ENABLED_SIGNAL=no ]
) )
# OpenSSL Coexist # OpenSSL Coexist
AC_ARG_ENABLE([opensslcoexist], AC_ARG_ENABLE([opensslcoexist],
[AS_HELP_STRING([--enable-opensslcoexist],[Enable coexistence of wolfssl/openssl (default: disabled)])], [AS_HELP_STRING([--enable-opensslcoexist],[Enable coexistence of wolfssl/openssl (default: disabled)])],
[ ENABLED_OPENSSLCOEXIST=$enableval ], [ ENABLED_OPENSSLCOEXIST=$enableval ],
@@ -1050,7 +1050,7 @@ then
fi fi
# Linux af_alg # Linux af_alg
AC_ARG_ENABLE([afalg], AC_ARG_ENABLE([afalg],
[AS_HELP_STRING([--enable-afalg],[Enable Linux af_alg use for crypto (default: disabled)])], [AS_HELP_STRING([--enable-afalg],[Enable Linux af_alg use for crypto (default: disabled)])],
[ ENABLED_AFALG=$enableval ], [ ENABLED_AFALG=$enableval ],
@@ -3517,14 +3517,14 @@ then
AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR" AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"
fi fi
fi fi
# Requires wolfSSL_OBJ_txt2nid # Requires wolfSSL_OBJ_txt2nid
if test "x$ENABLED_CERTEXT" = "xno" if test "x$ENABLED_CERTEXT" = "xno"
then then
ENABLED_CERTEXT="yes" ENABLED_CERTEXT="yes"
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_EXT" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_EXT"
fi fi
# Requires certgen # Requires certgen
if test "x$ENABLED_CERTGEN" = "xno" if test "x$ENABLED_CERTGEN" = "xno"
then then
@@ -4741,6 +4741,14 @@ AS_IF([test "x$ENABLED_WOLFSSH" = "xyes"],
AS_IF([test "x$ENABLED_SHA512" = "xno"],[AC_MSG_ERROR([cannot enable wolfSSH with SHA-512/384 disabled])]) AS_IF([test "x$ENABLED_SHA512" = "xno"],[AC_MSG_ERROR([cannot enable wolfSSH with SHA-512/384 disabled])])
]) ])
if test "x$ENABLED_OPENSSLCOEXIST" = "xyes"; then
if test "x$ENABLED_OPENSSLALL" = "xyes"; then
AC_MSG_ERROR([Cannot use --enable-opensslcoexist with --enable-opensslall])
fi
if test "x$ENABLED_OPENSSLEXTRA" = "xyes"; then
AC_MSG_ERROR([Cannot use --enable-opensslcoexist with --enable-opensslextra])
fi
fi
################################################################################ ################################################################################
# USER SETTINGS # USER SETTINGS