config: Include some extra files in the tarball

[ppp.git] / pppd / eap-tls.c

diff --git a/pppd/eap-tls.c b/pppd/eap-tls.c
index 69e34a1d7cc9023f37f9b0f18474b89bd80df438..4c0b99b33125af1c4f9176964bb562722744121e 100644 (file)
--- a/pppd/eap-tls.c
+++ b/pppd/eap-tls.c
@@ -51,7 +51,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/pkcs12.h>
 
-#include "pppd.h"
+#include "pppd-private.h"
 #include "tls.h"
 #include "eap.h"
 #include "eap-tls.h"
@@ -158,10 +158,10 @@ CONF *eaptls_ssl_load_config( void )
 
     config = NCONF_new( NULL );
     dbglog( "Loading OpenSSL config file" );
-    ret_code = NCONF_load( config, _PATH_OPENSSLCONFFILE, &error_line );
+    ret_code = NCONF_load( config, PPP_PATH_OPENSSLCONFFILE, &error_line );
     if (ret_code == 0)
     {
-        warn( "EAP-TLS: Error in OpenSSL config file %s at line %d", _PATH_OPENSSLCONFFILE, error_line );
+        warn( "EAP-TLS: Error in OpenSSL config file %s at line %d", PPP_PATH_OPENSSLCONFFILE, error_line );
         NCONF_free( config );
         config = NULL;
         ERR_clear_error();
@@ -171,7 +171,9 @@ CONF *eaptls_ssl_load_config( void )
 #ifndef OPENSSL_NO_ENGINE
     ENGINE_load_builtin_engines();
 #endif
+#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x4000000fL)
     OPENSSL_load_builtin_modules();
+#endif
    
     dbglog( "Loading OpenSSL configured modules" );
     if (CONF_modules_load( config, NULL, 0 ) <= 0 )