Fixed disabling crypto and SSL

Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 3228798021581387edb58a8a4b473023510eb516..075270fc69367d4e3ffd05f982cae5a651a2acd6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,8 @@ openvpn_SOURCES = \
        common.h \
        config-win32.h \
        crypto.c crypto.h crypto_backend.h \
+       crypto_openssl.c crypto_openssl.h \
+       crypto_polarssl.c crypto_polarssl.h \
        dhcp.c dhcp.h \
        errlevel.h \
        error.c error.h \
@@ -115,6 +117,8 @@ openvpn_SOURCES = \
         ntlm.c ntlm.h \
        occ.c occ.h occ-inline.h \
        pkcs11.c pkcs11.h pkcs11_backend.h \
+       pkcs11_openssl.c \
+       pkcs11_polarssl.c \
        openvpn.c openvpn.h \
        openvpn-plugin.h \
        options.c options.h \
@@ -139,7 +143,11 @@ openvpn_SOURCES = \
        socket.c socket.h \
        socks.c socks.h \
        ssl.c ssl.h  ssl_backend.h \
+       ssl_openssl.c ssl_openssl.h \
+       ssl_polarssl.c ssl_polarssl.h \
        ssl_verify.c ssl_verify.h ssl_verify_backend.h \
+       ssl_verify_openssl.c ssl_verify_openssl.h \
+       ssl_verify_polarssl.c ssl_verify_polarssl.h \
        status.c status.h \
        syshead.h \
        tun.c tun.h \
@@ -153,21 +161,6 @@ configure.h: Makefile
        awk -f $(srcdir)/configure_h.awk config.h > $@
        awk -f $(srcdir)/configure_log.awk config.log >> $@
 
-if USE_OPENSSL
-openvpn_SOURCES += \
-       crypto_openssl.c crypto_openssl.h \
-       pkcs11_openssl.c \
-       ssl_openssl.c ssl_openssl.h \
-       ssl_verify_openssl.c ssl_verify_openssl.h
-endif
-if USE_POLARSSL
-openvpn_SOURCES += \
-       crypto_polarssl.c crypto_polarssl.h \
-       pkcs11_polarssl.c \
-       ssl_polarssl.c ssl_polarssl.h \
-       ssl_verify_polarssl.c ssl_verify_polarssl.h
-endif
-
 dist-hook:
        cd $(distdir) && for i in $(EXTRA_DIST) $(SUBDIRS) ; do find $$i -name .svn -type d -prune -exec rm -rf '{}' ';' ; rm -f `find $$i -type f | grep -E '(^|\/)\.?\#|\~$$|\.s?o$$'` ; done
 

diff --git a/configure.ac b/configure.ac
index a6b3019ffb811b050da1467f9f77db95d8356502..a4d68e68a316b4107102086315090bbb53d8e495 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -299,8 +299,6 @@ AC_ARG_WITH([ssl-type],
    esac],
    [SSL_LIB="openssl"]
 )
-AM_CONDITIONAL([USE_OPENSSL], [test x$SSL_LIB = xopenssl])
-AM_CONDITIONAL([USE_POLARSSL], [test x$SSL_LIB = xpolarssl])
 
 dnl fix search path, to allow compilers to find syshead.h
 CPPFLAGS="$CPPFLAGS -I${srcdir}"

diff --git a/crypto_openssl.c b/crypto_openssl.c
index 7250782c11d44c77d84b924f9c3281cf9f81a085..b1fd145da82c5ce3e205b1356c0bc9e0ed969ee9 100644 (file)
--- a/crypto_openssl.c
+++ b/crypto_openssl.c
@@ -29,6 +29,8 @@
 
 #include "syshead.h"
 
+#if defined(USE_CRYPTO) && defined(USE_OPENSSL)
+
 #include "basic.h"
 #include "buffer.h"
 #include "integer.h"
@@ -789,3 +791,5 @@ hmac_ctx_final (HMAC_CTX *ctx, uint8_t *dst)
 
   HMAC_Final (ctx, dst, &in_hmac_len);
 }
+
+#endif /* USE_CRYPTO && USE_OPENSSL */

diff --git a/crypto_polarssl.c b/crypto_polarssl.c
index 7ae8973045d328eae98f25244dd8aa425525b457..ad246fd1aace8f7bb7305872b69f92ca25425028 100644 (file)
--- a/crypto_polarssl.c
+++ b/crypto_polarssl.c
@@ -29,6 +29,8 @@
 
 #include "syshead.h"
 
+#if defined(USE_CRYPTO) && defined(USE_POLARSSL)
+
 #include "errlevel.h"
 #include "basic.h"
 #include "buffer.h"
@@ -555,3 +557,5 @@ hmac_ctx_final (md_context_t *ctx, uint8_t *dst)
 {
   ASSERT(0 == md_hmac_finish(ctx, dst));
 }
+
+#endif /* USE_CRYPTO && USE_POLARSSL */

diff --git a/options.h b/options.h
index abdddba37ae6f172fe62d0e32903f46309f61921..0f80e7072182638f96029c817326f51e78813ce0 100644 (file)
--- a/options.h
+++ b/options.h
@@ -77,7 +77,7 @@ struct options_pre_pull
 };
 
 #endif
-#if !defined(USE_OPENSSL) && !defined(USE_POLARSSL)
+#if defined(USE_CRYPTO) && !defined(USE_OPENSSL) && !defined(USE_POLARSSL)
 # error "At least one of OpenSSL or PolarSSL needs to be defined."
 #endif
 

diff --git a/pkcs11_openssl.c b/pkcs11_openssl.c
index 5c99bf321d50a0e4b46dc51f8acf79140ac6506c..e3463dc9b9f70052019fcf3b8fb000a37edb683d 100644 (file)
--- a/pkcs11_openssl.c
+++ b/pkcs11_openssl.c
@@ -29,7 +29,7 @@
 
 #include "syshead.h"
 
-#ifdef ENABLE_PKCS11
+#if defined(ENABLE_PKCS11) && defined(USE_OPENSSL)
 
 #include "errlevel.h"
 #include "pkcs11_backend.h"
@@ -185,4 +185,4 @@ cleanup:
     }
   return ret;
 }
-#endif /* ENABLE_PKCS11 */
+#endif /* defined(ENABLE_PKCS11) && defined(ENABLE_OPENSSL) */

diff --git a/pkcs11_polarssl.c b/pkcs11_polarssl.c
index 49d6a6b2f50f987704d64456edf7819c7cfef51b..4f8bf33935835253e17bb8b9805d2d5aa0e13bf0 100644 (file)
--- a/pkcs11_polarssl.c
+++ b/pkcs11_polarssl.c
@@ -29,7 +29,7 @@
 
 #include "syshead.h"
 
-#if defined(ENABLE_PKCS11)
+#if defined(ENABLE_PKCS11) && defined(USE_POLARSSL)
 
 #include "errlevel.h"
 #include "pkcs11_backend.h"
@@ -118,4 +118,4 @@ cleanup:
 
   return ret;
 }
-#endif /* defined(ENABLE_PKCS11) */
+#endif /* defined(ENABLE_PKCS11) && defined(USE_POLARSSL) */

diff --git a/ssl_openssl.c b/ssl_openssl.c
index 7f579d2af7cd4c1345e7da538903770b29805abe..a1e45d90749c8f913f29f7d4652769df68ee9411 100644 (file)
--- a/ssl_openssl.c
+++ b/ssl_openssl.c
@@ -28,6 +28,9 @@
  */
 
 #include "syshead.h"
+
+#if defined(USE_SSL) && defined(USE_OPENSSL)
+
 #include "errlevel.h"
 #include "buffer.h"
 #include "misc.h"
@@ -1286,3 +1289,5 @@ get_highest_preference_tls_cipher (char *buf, int size)
   SSL_free (ssl);
   SSL_CTX_free (ctx);
 }
+
+#endif /* defined(USE_SSL) && defined(USE_OPENSSL) */

diff --git a/ssl_polarssl.c b/ssl_polarssl.c
index c95c0c022cce12b6be5d725be6eef404da054234..9a8c49c4c1aa17decd820860c273dd5f4b39745d 100644 (file)
--- a/ssl_polarssl.c
+++ b/ssl_polarssl.c
@@ -28,6 +28,9 @@
  */
 
 #include "syshead.h"
+
+#if defined(USE_SSL) && defined(USE_POLARSSL)
+
 #include "errlevel.h"
 #include "ssl_backend.h"
 #include "buffer.h"
@@ -857,3 +860,5 @@ get_highest_preference_tls_cipher (char *buf, int size)
   cipher_name = ssl_get_ciphersuite_name(*ciphers);
   strncpynt (buf, cipher_name, size);
 }
+
+#endif /* defined(USE_SSL) && defined(USE_POLARSSL) */

diff --git a/ssl_verify.c b/ssl_verify.c
index f0bc9941123e51c3a01739624ab2287f49669188..326b0052ce79c3040354c23d46d2c0ab642c01e8 100644 (file)
--- a/ssl_verify.c
+++ b/ssl_verify.c
@@ -28,6 +28,9 @@
  */
 
 #include "syshead.h"
+
+#if defined(USE_CRYPTO) && defined(USE_SSL)
+
 #include "misc.h"
 #include "manage.h"
 #include "ssl_verify.h"
@@ -1237,3 +1240,4 @@ verify_final_auth_checks(struct tls_multi *multi, struct tls_session *session)
       gc_free (&gc);
     }
 }
+#endif /* defined(USE_CRYPTO) && defined(USE_SSL) */

diff --git a/ssl_verify_openssl.c b/ssl_verify_openssl.c
index 4f090e6d4a3b6dcf72467e0ef60564d07e421806..13c2f4edab41338b9b7b2fa0d735fd918222a1d6 100644 (file)
--- a/ssl_verify_openssl.c
+++ b/ssl_verify_openssl.c
@@ -27,6 +27,10 @@
  * @file Control Channel Verification Module OpenSSL implementation
  */
 
+#include "syshead.h"
+
+#if defined(USE_SSL) && defined(USE_OPENSSL)
+
 #include "ssl_verify.h"
 #include "ssl_verify_backend.h"
 #include "ssl_openssl.h"
@@ -584,3 +588,5 @@ end:
 
   return retval;
 }
+
+#endif /* defined(USE_SSL) && defined(USE_OPENSSL) */

diff --git a/ssl_verify_polarssl.c b/ssl_verify_polarssl.c
index 4cd63839fb6b61ded38e432158ee1defb324d558..7fdca1feaa42afc70e022421645f21ae492ba22e 100644 (file)
--- a/ssl_verify_polarssl.c
+++ b/ssl_verify_polarssl.c
@@ -27,6 +27,10 @@
  * @file Control Channel Verification Module PolarSSL backend
  */
 
+#include "syshead.h"
+
+#if defined(USE_SSL) && defined(USE_POLARSSL)
+
 #include "ssl_verify.h"
 #include <polarssl/sha1.h>
 
@@ -417,3 +421,5 @@ end:
   x509_crl_free(&crl);
   return retval;
 }
+
+#endif /* #if defined(USE_SSL) && defined(USE_POLARSSL) */