Use external SSL dependency to provide cast header (#1186)

Netatalk · Jul 2, 2024 · 6d87119 · 6d87119
1 parent 3f393db
commit 6d87119
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 1,235 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,6 +26,8 @@ ENV BUILD_DEPS \
     meson \
     ninja \
     openldap-dev \
+    openssl \
+    openssl-dev \
     pkgconfig \
     rpcsvc-proto-dev
 

diff --git a/doc/manual/intro.xml b/doc/manual/intro.xml
@@ -10,9 +10,6 @@
     of the license is included in this documentation, as well as within the
     Netatalk source distribution. An on-line copy can be found at <ulink
     url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</ulink></para>
-
-    <para>This product includes cryptographic software written by Eric Young
-    (eay@cryptsoft.com)</para>
   </sect1>
 
   <sect1>

diff --git a/etc/uams/uams_dhx_pam.c b/etc/uams/uams_dhx_pam.c
@@ -27,11 +27,11 @@
 #if defined(WOLFSSL_DHX)
 #include <wolfssl/options.h>
 #endif
+#include <openssl/cast.h>
 #include <wolfssl/openssl/bn.h>
 #include <wolfssl/openssl/dh.h>
 #include <wolfssl/openssl/err.h>
 #include <wolfssl/openssl/ssl.h>
-#include <atalk/cast.h>
 #elif defined(OPENSSL_DHX)
 #include <openssl/bn.h>
 #include <openssl/dh.h>

diff --git a/etc/uams/uams_dhx_passwd.c b/etc/uams/uams_dhx_passwd.c
@@ -32,11 +32,11 @@
 #if defined(WOLFSSL_DHX)
 #include <wolfssl/options.h>
 #endif
+#include <openssl/cast.h>
 #include <wolfssl/openssl/bn.h>
 #include <wolfssl/openssl/dh.h>
 #include <wolfssl/openssl/err.h>
 #include <wolfssl/openssl/ssl.h>
-#include <atalk/cast.h>
 #elif defined(OPENSSL_DHX)
 #include <openssl/bn.h>
 #include <openssl/dh.h>

diff --git a/etc/uams/uams_pgp.c b/etc/uams/uams_pgp.c
@@ -26,11 +26,11 @@
 #if defined(WOLFSSL_DHX)
 #include <wolfssl/options.h>
 #endif
+#include <openssl/cast.h>
 #include <wolfssl/openssl/bn.h>
 #include <wolfssl/openssl/dh.h>
 #include <wolfssl/openssl/err.h>
 #include <wolfssl/openssl/ssl.h>
-#include <atalk/cast.h>
 #elif defined(OPENSSL_DHX)
 #include <openssl/bn.h>
 #include <openssl/dh.h>

diff --git a/include/atalk/cast.h b/include/atalk/cast.h
diff --git a/include/atalk/meson.build b/include/atalk/meson.build
@@ -6,6 +6,7 @@ headers = [
     'asp.h',
     'atp.h',
     'cast.h',
+    'bstrlib.h',
     'cnid.h',
     'compat.h',
     'ddp.h',

diff --git a/libatalk/cast/c_enc.c b/libatalk/cast/c_enc.c