aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog8
-rw-r--r--apps/nc/Makefile.am11
-rw-r--r--apps/ocspcheck/Makefile.am12
-rw-r--r--apps/openssl/Makefile.am9
-rw-r--r--crypto/Makefile.am66
-rw-r--r--man/links55
-rwxr-xr-xscripts/test8
-rw-r--r--ssl/Makefile.am4
-rw-r--r--tls/Makefile.am2
9 files changed, 92 insertions, 83 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f35e48..fc453d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,16 +31,16 @@ LibreSSL Portable Release Notes:
313.8.0 - Development release 313.8.0 - Development release
32 32
33 * Portable changes 33 * Portable changes
34 - Extended the endian.h compat header with htobe* and betoh* macros. 34 - Extended the endian.h compat header with hto* and *toh macros.
35 - Adapted more tests to the portable framework. 35 - Adapted more tests to the portable framework.
36 * Internal improvements 36 * Internal improvements
37 - Improved sieve of Eratosthenes script used for generating a table 37 - Improved sieve of Eratosthenes script used for generating a table
38 of small primes. 38 of small primes.
39 - Cleaned up and rewrote SHA internals. 39 - Started cleaning up and rewriting SHA internals.
40 - Replace internal use of BN_copy() with bn_copy() for consistency. 40 - Replace internal use of BN_copy() with bn_copy() for consistency.
41 - Rewrote and improved BN_exp() and BN_copy(). 41 - Rewrote and improved BN_exp() and BN_copy().
42 - Add branch target information (BTI) support to arm64 assembly. 42 - Add branch target information (BTI) support to arm64 assembly.
43 - Added a new implementation of BN_mod_sqrt(). 43 - Replaced BN_mod_sqrt() with a new implementation.
44 - Removed incomplete and dangerous BN_RECURSION code. 44 - Removed incomplete and dangerous BN_RECURSION code.
45 - Added endbr64 instructions to amd64 assembly. 45 - Added endbr64 instructions to amd64 assembly.
46 - Imported RFC 5280 policy checking code from BoringSSL and used it 46 - Imported RFC 5280 policy checking code from BoringSSL and used it
@@ -61,7 +61,7 @@ LibreSSL Portable Release Notes:
61 - Removed dangerous, "fast" NIST prime and elliptic curve implementations. 61 - Removed dangerous, "fast" NIST prime and elliptic curve implementations.
62 In particular, EC_GFp_nist_method() is no longer available. 62 In particular, EC_GFp_nist_method() is no longer available.
63 - Removed most public symbols that were deprecated in OpenSSL 0.9.8. 63 - Removed most public symbols that were deprecated in OpenSSL 0.9.8.
64 - The public X9.31 API was removed. RSA_X931_PADDING is still available. 64 - Removed the public X9.31 API (RSA_X931_PADDING is still available).
65 - Removed Cipher Text Stealing mode. 65 - Removed Cipher Text Stealing mode.
66 - Removed SXNET and NETSCAPE_CERT_SEQUENCE support including the 66 - Removed SXNET and NETSCAPE_CERT_SEQUENCE support including the
67 openssl(1) nseq command. 67 openssl(1) nseq command.
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index e9db6e5..aba306e 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -1,6 +1,8 @@
1include $(top_srcdir)/Makefile.am.common 1include $(top_srcdir)/Makefile.am.common
2 2
3-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk 3-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
4-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
5-include $(abs_top_builddir)/tls/libtls_la_objects.mk
4 6
5if BUILD_NC 7if BUILD_NC
6 8
@@ -14,12 +16,13 @@ endif
14EXTRA_DIST = nc.1 16EXTRA_DIST = nc.1
15EXTRA_DIST += CMakeLists.txt 17EXTRA_DIST += CMakeLists.txt
16 18
17nc_LDADD = $(abs_top_builddir)/tls/libtls.la 19nc_LDADD = $(libcrypto_la_objects)
18nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
19
20nc_LDADD += $(libcrypto_la_objects)
21nc_LDADD += $(libcompat_la_objects) 20nc_LDADD += $(libcompat_la_objects)
22nc_LDADD += $(libcompatnoopt_la_objects) 21nc_LDADD += $(libcompatnoopt_la_objects)
22nc_LDADD += $(libssl_la_objects)
23nc_LDADD += $(libtls_la_objects)
24
25nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
23 26
24AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat 27AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat
25 28
diff --git a/apps/ocspcheck/Makefile.am b/apps/ocspcheck/Makefile.am
index 7c7b454..e6f3c54 100644
--- a/apps/ocspcheck/Makefile.am
+++ b/apps/ocspcheck/Makefile.am
@@ -1,5 +1,9 @@
1include $(top_srcdir)/Makefile.am.common 1include $(top_srcdir)/Makefile.am.common
2 2
3-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
4-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
5-include $(abs_top_builddir)/tls/libtls_la_objects.mk
6
3if !ENABLE_LIBTLS_ONLY 7if !ENABLE_LIBTLS_ONLY
4bin_PROGRAMS = ocspcheck 8bin_PROGRAMS = ocspcheck
5dist_man_MANS = ocspcheck.8 9dist_man_MANS = ocspcheck.8
@@ -10,9 +14,11 @@ endif
10EXTRA_DIST = ocspcheck.8 14EXTRA_DIST = ocspcheck.8
11EXTRA_DIST += CMakeLists.txt 15EXTRA_DIST += CMakeLists.txt
12 16
13ocspcheck_LDADD = $(abs_top_builddir)/crypto/libcrypto.la 17ocspcheck_LDADD = $(libcrypto_la_objects)
14ocspcheck_LDADD += $(abs_top_builddir)/ssl/libssl.la 18ocspcheck_LDADD += $(libcompat_la_objects)
15ocspcheck_LDADD += $(abs_top_builddir)/tls/libtls.la 19ocspcheck_LDADD += $(libcompatnoopt_la_objects)
20ocspcheck_LDADD += $(libssl_la_objects)
21ocspcheck_LDADD += $(libtls_la_objects)
16ocspcheck_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) 22ocspcheck_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
17 23
18ocspcheck_SOURCES = http.c 24ocspcheck_SOURCES = http.c
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 064975b..2567ef0 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -1,5 +1,8 @@
1include $(top_srcdir)/Makefile.am.common 1include $(top_srcdir)/Makefile.am.common
2 2
3-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
4-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
5
3if !ENABLE_LIBTLS_ONLY 6if !ENABLE_LIBTLS_ONLY
4bin_PROGRAMS = openssl 7bin_PROGRAMS = openssl
5dist_man_MANS = openssl.1 8dist_man_MANS = openssl.1
@@ -7,8 +10,10 @@ else
7noinst_PROGRAMS = openssl 10noinst_PROGRAMS = openssl
8endif 11endif
9 12
10openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la 13openssl_LDADD = $(libcrypto_la_objects)
11openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la 14openssl_LDADD += $(libcompat_la_objects)
15openssl_LDADD += $(libcompatnoopt_la_objects)
16openssl_LDADD += $(libssl_la_objects)
12openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) 17openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
13 18
14openssl_SOURCES = apps.c 19openssl_SOURCES = apps.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 8fcd4f7..b113850 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -45,73 +45,7 @@ crypto_portable.sym: crypto.sym Makefile
45 -echo "generating crypto_portable.sym ..." 45 -echo "generating crypto_portable.sym ..."
46 -cp $(top_srcdir)/crypto/crypto.sym crypto_portable.sym 46 -cp $(top_srcdir)/crypto/crypto.sym crypto_portable.sym
47 -chmod u+w crypto_portable.sym 47 -chmod u+w crypto_portable.sym
48if !HAVE_ARC4RANDOM_BUF
49 -echo arc4random >> crypto_portable.sym
50 -echo arc4random_buf >> crypto_portable.sym
51 -echo arc4random_uniform >> crypto_portable.sym
52if !HAVE_GETENTROPY
53 -echo getentropy >> crypto_portable.sym
54endif
55endif
56if !HAVE_ASPRINTF
57 -echo asprintf >> crypto_portable.sym
58 -echo vasprintf >> crypto_portable.sym
59endif
60if !HAVE_EXPLICIT_BZERO
61 -echo explicit_bzero >> crypto_portable.sym
62endif
63if !HAVE_FREEZERO
64 -echo freezero >> crypto_portable.sym
65endif
66if !HAVE_REALLOCARRAY
67 -echo reallocarray >> crypto_portable.sym
68endif
69if !HAVE_RECALLOCARRAY
70 -echo recallocarray >> crypto_portable.sym
71endif
72if !HAVE_STRLCAT
73 -echo strlcat >> crypto_portable.sym
74endif
75if !HAVE_STRLCPY
76 -echo strlcpy >> crypto_portable.sym
77endif
78if !HAVE_STRNDUP
79 -echo strndup >> crypto_portable.sym
80endif
81if !HAVE_STRNLEN
82 -echo strnlen >> crypto_portable.sym
83endif
84if !HAVE_STRSEP
85 -echo strsep >> crypto_portable.sym
86endif
87if !HAVE_STRTONUM
88 -echo strtonum >> crypto_portable.sym
89endif
90if !HAVE_TIMEGM
91 -echo timegm >> crypto_portable.sym
92endif
93if !HAVE_TIMINGSAFE_BCMP
94 -echo timingsafe_bcmp >> crypto_portable.sym
95endif
96if !HAVE_TIMINGSAFE_MEMCMP
97 -echo timingsafe_memcmp >> crypto_portable.sym
98endif
99if HOST_CPU_IS_INTEL
100 -echo OPENSSL_ia32cap_P >> crypto_portable.sym
101endif
102if HOST_WIN 48if HOST_WIN
103 -echo posix_perror >> crypto_portable.sym
104 -echo posix_fopen >> crypto_portable.sym
105 -echo posix_fgets >> crypto_portable.sym
106 -echo posix_open >> crypto_portable.sym
107 -echo posix_rename >> crypto_portable.sym
108 -echo posix_connect >> crypto_portable.sym
109 -echo posix_close >> crypto_portable.sym
110 -echo posix_read >> crypto_portable.sym
111 -echo posix_write >> crypto_portable.sym
112 -echo posix_getsockopt >> crypto_portable.sym
113 -echo posix_setsockopt >> crypto_portable.sym
114 -echo getuid >> crypto_portable.sym
115 -grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp 49 -grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp
116 -mv crypto_portable.sym.tmp crypto_portable.sym 50 -mv crypto_portable.sym.tmp crypto_portable.sym
117endif 51endif
diff --git a/man/links b/man/links
index 964a7fb..5733512 100644
--- a/man/links
+++ b/man/links
@@ -372,6 +372,26 @@ BN_BLINDING_new.3,BN_BLINDING_update.3
372BN_CTX_new.3,BN_CTX_free.3 372BN_CTX_new.3,BN_CTX_free.3
373BN_CTX_start.3,BN_CTX_end.3 373BN_CTX_start.3,BN_CTX_end.3
374BN_CTX_start.3,BN_CTX_get.3 374BN_CTX_start.3,BN_CTX_get.3
375BN_GF2m_add.3,BN_GF2m_arr2poly.3
376BN_GF2m_add.3,BN_GF2m_cmp.3
377BN_GF2m_add.3,BN_GF2m_mod.3
378BN_GF2m_add.3,BN_GF2m_mod_arr.3
379BN_GF2m_add.3,BN_GF2m_mod_div.3
380BN_GF2m_add.3,BN_GF2m_mod_div_arr.3
381BN_GF2m_add.3,BN_GF2m_mod_exp.3
382BN_GF2m_add.3,BN_GF2m_mod_exp_arr.3
383BN_GF2m_add.3,BN_GF2m_mod_inv.3
384BN_GF2m_add.3,BN_GF2m_mod_inv_arr.3
385BN_GF2m_add.3,BN_GF2m_mod_mul.3
386BN_GF2m_add.3,BN_GF2m_mod_mul_arr.3
387BN_GF2m_add.3,BN_GF2m_mod_solve_quad.3
388BN_GF2m_add.3,BN_GF2m_mod_solve_quad_arr.3
389BN_GF2m_add.3,BN_GF2m_mod_sqr.3
390BN_GF2m_add.3,BN_GF2m_mod_sqr_arr.3
391BN_GF2m_add.3,BN_GF2m_mod_sqrt.3
392BN_GF2m_add.3,BN_GF2m_mod_sqrt_arr.3
393BN_GF2m_add.3,BN_GF2m_poly2arr.3
394BN_GF2m_add.3,BN_GF2m_sub.3
375BN_add.3,BN_div.3 395BN_add.3,BN_div.3
376BN_add.3,BN_exp.3 396BN_add.3,BN_exp.3
377BN_add.3,BN_gcd.3 397BN_add.3,BN_gcd.3
@@ -427,6 +447,10 @@ BN_generate_prime.3,BN_GENCB_set_old.3
427BN_generate_prime.3,BN_generate_prime_ex.3 447BN_generate_prime.3,BN_generate_prime_ex.3
428BN_generate_prime.3,BN_is_prime_ex.3 448BN_generate_prime.3,BN_is_prime_ex.3
429BN_generate_prime.3,BN_is_prime_fasttest_ex.3 449BN_generate_prime.3,BN_is_prime_fasttest_ex.3
450BN_get0_nist_prime_521.3,BN_get0_nist_prime_192.3
451BN_get0_nist_prime_521.3,BN_get0_nist_prime_224.3
452BN_get0_nist_prime_521.3,BN_get0_nist_prime_256.3
453BN_get0_nist_prime_521.3,BN_get0_nist_prime_384.3
430BN_mod_mul_montgomery.3,BN_MONT_CTX_copy.3 454BN_mod_mul_montgomery.3,BN_MONT_CTX_copy.3
431BN_mod_mul_montgomery.3,BN_MONT_CTX_free.3 455BN_mod_mul_montgomery.3,BN_MONT_CTX_free.3
432BN_mod_mul_montgomery.3,BN_MONT_CTX_new.3 456BN_mod_mul_montgomery.3,BN_MONT_CTX_new.3
@@ -434,9 +458,19 @@ BN_mod_mul_montgomery.3,BN_MONT_CTX_set.3
434BN_mod_mul_montgomery.3,BN_MONT_CTX_set_locked.3 458BN_mod_mul_montgomery.3,BN_MONT_CTX_set_locked.3
435BN_mod_mul_montgomery.3,BN_from_montgomery.3 459BN_mod_mul_montgomery.3,BN_from_montgomery.3
436BN_mod_mul_montgomery.3,BN_to_montgomery.3 460BN_mod_mul_montgomery.3,BN_to_montgomery.3
461BN_mod_mul_reciprocal.3,BN_RECP_CTX_free.3
462BN_mod_mul_reciprocal.3,BN_RECP_CTX_init.3
463BN_mod_mul_reciprocal.3,BN_RECP_CTX_new.3
464BN_mod_mul_reciprocal.3,BN_RECP_CTX_set.3
465BN_mod_mul_reciprocal.3,BN_div_recp.3
466BN_mod_mul_reciprocal.3,BN_reciprocal.3
437BN_new.3,BN_clear.3 467BN_new.3,BN_clear.3
438BN_new.3,BN_clear_free.3 468BN_new.3,BN_clear_free.3
439BN_new.3,BN_free.3 469BN_new.3,BN_free.3
470BN_nist_mod_521.3,BN_nist_mod_192.3
471BN_nist_mod_521.3,BN_nist_mod_224.3
472BN_nist_mod_521.3,BN_nist_mod_256.3
473BN_nist_mod_521.3,BN_nist_mod_384.3
440BN_num_bytes.3,BN_num_bits.3 474BN_num_bytes.3,BN_num_bits.3
441BN_num_bytes.3,BN_num_bits_word.3 475BN_num_bytes.3,BN_num_bits_word.3
442BN_rand.3,BN_pseudo_rand.3 476BN_rand.3,BN_pseudo_rand.3
@@ -1575,6 +1609,9 @@ POLICYINFO_new.3,POLICY_MAPPING_free.3
1575POLICYINFO_new.3,POLICY_MAPPING_new.3 1609POLICYINFO_new.3,POLICY_MAPPING_new.3
1576POLICYINFO_new.3,USERNOTICE_free.3 1610POLICYINFO_new.3,USERNOTICE_free.3
1577POLICYINFO_new.3,USERNOTICE_new.3 1611POLICYINFO_new.3,USERNOTICE_new.3
1612PROXY_POLICY_new.3,PROXY_CERT_INFO_EXTENSION_free.3
1613PROXY_POLICY_new.3,PROXY_CERT_INFO_EXTENSION_new.3
1614PROXY_POLICY_new.3,PROXY_POLICY_free.3
1578RAND_add.3,RAND_cleanup.3 1615RAND_add.3,RAND_cleanup.3
1579RAND_add.3,RAND_poll.3 1616RAND_add.3,RAND_poll.3
1580RAND_add.3,RAND_seed.3 1617RAND_add.3,RAND_seed.3
@@ -2000,6 +2037,13 @@ SSL_want.3,SSL_want_read.3
2000SSL_want.3,SSL_want_write.3 2037SSL_want.3,SSL_want_write.3
2001SSL_want.3,SSL_want_x509_lookup.3 2038SSL_want.3,SSL_want_x509_lookup.3
2002SSL_write.3,SSL_write_ex.3 2039SSL_write.3,SSL_write_ex.3
2040SXNET_new.3,SXNETID_free.3
2041SXNET_new.3,SXNETID_new.3
2042SXNET_new.3,SXNET_free.3
2043SXNET_new.3,d2i_SXNET.3
2044SXNET_new.3,d2i_SXNETID.3
2045SXNET_new.3,i2d_SXNET.3
2046SXNET_new.3,i2d_SXNETID.3
2003TS_REQ_new.3,TS_ACCURACY_free.3 2047TS_REQ_new.3,TS_ACCURACY_free.3
2004TS_REQ_new.3,TS_ACCURACY_new.3 2048TS_REQ_new.3,TS_ACCURACY_new.3
2005TS_REQ_new.3,TS_MSG_IMPRINT_free.3 2049TS_REQ_new.3,TS_MSG_IMPRINT_free.3
@@ -2420,6 +2464,14 @@ X509_new.3,X509_chain_up_ref.3
2420X509_new.3,X509_dup.3 2464X509_new.3,X509_dup.3
2421X509_new.3,X509_free.3 2465X509_new.3,X509_free.3
2422X509_new.3,X509_up_ref.3 2466X509_new.3,X509_up_ref.3
2467X509_policy_check.3,X509_policy_tree_free.3
2468X509_policy_tree_get0_policies.3,X509_policy_tree_get0_user_policies.3
2469X509_policy_tree_level_count.3,X509_policy_level_get0_node.3
2470X509_policy_tree_level_count.3,X509_policy_level_node_count.3
2471X509_policy_tree_level_count.3,X509_policy_node_get0_parent.3
2472X509_policy_tree_level_count.3,X509_policy_node_get0_policy.3
2473X509_policy_tree_level_count.3,X509_policy_node_get0_qualifiers.3
2474X509_policy_tree_level_count.3,X509_policy_tree_get0_level.3
2423X509_print_ex.3,X509_CERT_AUX_print.3 2475X509_print_ex.3,X509_CERT_AUX_print.3
2424X509_print_ex.3,X509_print.3 2476X509_print_ex.3,X509_print.3
2425X509_print_ex.3,X509_print_ex_fp.3 2477X509_print_ex.3,X509_print_ex_fp.3
@@ -2699,6 +2751,9 @@ d2i_POLICYINFO.3,i2d_NOTICEREF.3
2699d2i_POLICYINFO.3,i2d_POLICYINFO.3 2751d2i_POLICYINFO.3,i2d_POLICYINFO.3
2700d2i_POLICYINFO.3,i2d_POLICYQUALINFO.3 2752d2i_POLICYINFO.3,i2d_POLICYQUALINFO.3
2701d2i_POLICYINFO.3,i2d_USERNOTICE.3 2753d2i_POLICYINFO.3,i2d_USERNOTICE.3
2754d2i_PROXY_POLICY.3,d2i_PROXY_CERT_INFO_EXTENSION.3
2755d2i_PROXY_POLICY.3,i2d_PROXY_CERT_INFO_EXTENSION.3
2756d2i_PROXY_POLICY.3,i2d_PROXY_POLICY.3
2702d2i_PrivateKey.3,d2i_AutoPrivateKey.3 2757d2i_PrivateKey.3,d2i_AutoPrivateKey.3
2703d2i_PrivateKey.3,d2i_PrivateKey_bio.3 2758d2i_PrivateKey.3,d2i_PrivateKey_bio.3
2704d2i_PrivateKey.3,d2i_PrivateKey_fp.3 2759d2i_PrivateKey.3,d2i_PrivateKey_fp.3
diff --git a/scripts/test b/scripts/test
index 66c4f54..f1fdd83 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,11 +1,11 @@
1#!/bin/sh 1#!/bin/sh
2set -e 2set -e
3set -x
3 4
4unset CC 5unset CC
5ENABLE_ASM="${ENABLE_ASM:=ON}" 6ENABLE_ASM="${ENABLE_ASM:=ON}"
6 7
7if type apt-get >/dev/null 8if type apt-get >/dev/null 2>&1; then
8then
9 sudo apt-get update 9 sudo apt-get update
10 sudo apt-get install -y cmake ninja-build 10 sudo apt-get install -y cmake ninja-build
11fi 11fi
@@ -53,7 +53,9 @@ elif [ "x$ARCH" = "xmingw32" -o "x$ARCH" = "xmingw64" ]; then
53 CPU=x86_64 53 CPU=x86_64
54 fi 54 fi
55 55
56 sudo apt-get install -y mingw-w64 56 if ! type i686-w64-mingw32-gcc > /dev/null; then
57 sudo apt-get install -y mingw-w64
58 fi
57 59
58 ./configure --host=$CPU-w64-mingw32 60 ./configure --host=$CPU-w64-mingw32
59 make -j 4 61 make -j 4
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index d27e2af..002a266 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -1,5 +1,7 @@
1include $(top_srcdir)/Makefile.am.common 1include $(top_srcdir)/Makefile.am.common
2 2
3-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
4
3AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio 5AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio
4 6
5noinst_LTLIBRARIES = libbs.la 7noinst_LTLIBRARIES = libbs.la
@@ -34,6 +36,8 @@ remove_bs_objects: libssl.la
34libssl_la_CPPFLAGS = -I$(top_srcdir)/ssl/hidden ${AM_CPPFLAGS} 36libssl_la_CPPFLAGS = -I$(top_srcdir)/ssl/hidden ${AM_CPPFLAGS}
35libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym 37libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym
36libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD) 38libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)
39libssl_la_LIBADD += $(libcompat_la_objects)
40libssl_la_LIBADD += $(libcompatnoopt_la_objects)
37libssl_la_LIBADD += libbs.la 41libssl_la_LIBADD += libbs.la
38 42
39libbs_la_SOURCES = bs_ber.c 43libbs_la_SOURCES = bs_ber.c
diff --git a/tls/Makefile.am b/tls/Makefile.am
index 9b62b22..d5725c3 100644
--- a/tls/Makefile.am
+++ b/tls/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_libtls_la_DEPENDENCIES = libtls_la_objects.mk
16 16
17libtls_la_objects.mk: Makefile 17libtls_la_objects.mk: Makefile
18 @echo "libtls_la_objects= $(libtls_la_OBJECTS)" \ 18 @echo "libtls_la_objects= $(libtls_la_OBJECTS)" \
19 | sed 's/ */ $$\(abs_top_builddir\)\/tls\//g' \ 19 | sed -e 's/ *$$//' -e 's/ */ $$\(abs_top_builddir\)\/tls\//g' \
20 > libtls_la_objects.mk 20 > libtls_la_objects.mk
21 21
22libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym 22libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-14 17:38:54 +0000