Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use external SSL dependency to provide cast header #1186

Merged
1 commit merged into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ ENV BUILD_DEPS \
meson \
ninja \
openldap-dev \
openssl \
openssl-dev \
pkgconfig \
rpcsvc-proto-dev \
talloc-dev \
Expand Down
2 changes: 0 additions & 2 deletions doc/ja/manual/intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<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>この製品には、Eric Youngが作成した暗号化ソフトウェアが含まれている。</para>
</sect1>

<sect1>
Expand Down
3 changes: 0 additions & 3 deletions doc/manual/intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion etc/uams/uams_dhx_pam.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,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>
Expand Down
2 changes: 1 addition & 1 deletion etc/uams/uams_dhx_passwd.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,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>
Expand Down
2 changes: 1 addition & 1 deletion etc/uams/uams_pgp.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,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>
Expand Down
89 changes: 0 additions & 89 deletions include/atalk/cast.h

This file was deleted.

1 change: 0 additions & 1 deletion include/atalk/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ headers = [
'adouble.h',
'afp.h',
'bstrlib.h',
'cast.h',
'cnid.h',
'dictionary.h',
'ea.h',
Expand Down
204 changes: 0 additions & 204 deletions libatalk/cast/c_enc.c

This file was deleted.

Loading
Loading