diff options
-rw-r--r-- | crypto/CMakeLists.txt | 6 | ||||
-rw-r--r-- | crypto/Makefile.am | 6 | ||||
-rw-r--r-- | ssl/CMakeLists.txt | 1 | ||||
-rw-r--r-- | ssl/Makefile.am | 2 |
4 files changed, 3 insertions, 12 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 4e68731..9b66d9f 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -273,7 +273,6 @@ set( | |||
273 | asn1/asn_moid.c | 273 | asn1/asn_moid.c |
274 | asn1/bio_asn1.c | 274 | asn1/bio_asn1.c |
275 | asn1/bio_ndef.c | 275 | asn1/bio_ndef.c |
276 | asn1/n_pkey.c | ||
277 | asn1/nsseq.c | 276 | asn1/nsseq.c |
278 | asn1/p5_pbe.c | 277 | asn1/p5_pbe.c |
279 | asn1/p5_pbev2.c | 278 | asn1/p5_pbev2.c |
@@ -299,7 +298,6 @@ set( | |||
299 | asn1/x_info.c | 298 | asn1/x_info.c |
300 | asn1/x_long.c | 299 | asn1/x_long.c |
301 | asn1/x_name.c | 300 | asn1/x_name.c |
302 | asn1/x_nx509.c | ||
303 | asn1/x_pkey.c | 301 | asn1/x_pkey.c |
304 | asn1/x_pubkey.c | 302 | asn1/x_pubkey.c |
305 | asn1/x_req.c | 303 | asn1/x_req.c |
@@ -556,9 +554,6 @@ set( | |||
556 | evp/evp_lib.c | 554 | evp/evp_lib.c |
557 | evp/evp_pbe.c | 555 | evp/evp_pbe.c |
558 | evp/evp_pkey.c | 556 | evp/evp_pkey.c |
559 | evp/m_dss.c | ||
560 | evp/m_dss1.c | ||
561 | evp/m_ecdsa.c | ||
562 | evp/m_gost2814789.c | 557 | evp/m_gost2814789.c |
563 | evp/m_gostr341194.c | 558 | evp/m_gostr341194.c |
564 | evp/m_md4.c | 559 | evp/m_md4.c |
@@ -642,7 +637,6 @@ set( | |||
642 | pem/pem_oth.c | 637 | pem/pem_oth.c |
643 | pem/pem_pk8.c | 638 | pem/pem_pk8.c |
644 | pem/pem_pkey.c | 639 | pem/pem_pkey.c |
645 | pem/pem_seal.c | ||
646 | pem/pem_sign.c | 640 | pem/pem_sign.c |
647 | pem/pem_x509.c | 641 | pem/pem_x509.c |
648 | pem/pem_xaux.c | 642 | pem/pem_xaux.c |
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index ced4ed8..0f39753 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
@@ -332,7 +332,6 @@ libcrypto_la_SOURCES += asn1/asn_mime.c | |||
332 | libcrypto_la_SOURCES += asn1/asn_moid.c | 332 | libcrypto_la_SOURCES += asn1/asn_moid.c |
333 | libcrypto_la_SOURCES += asn1/bio_asn1.c | 333 | libcrypto_la_SOURCES += asn1/bio_asn1.c |
334 | libcrypto_la_SOURCES += asn1/bio_ndef.c | 334 | libcrypto_la_SOURCES += asn1/bio_ndef.c |
335 | libcrypto_la_SOURCES += asn1/n_pkey.c | ||
336 | libcrypto_la_SOURCES += asn1/nsseq.c | 335 | libcrypto_la_SOURCES += asn1/nsseq.c |
337 | libcrypto_la_SOURCES += asn1/p5_pbe.c | 336 | libcrypto_la_SOURCES += asn1/p5_pbe.c |
338 | libcrypto_la_SOURCES += asn1/p5_pbev2.c | 337 | libcrypto_la_SOURCES += asn1/p5_pbev2.c |
@@ -358,7 +357,6 @@ libcrypto_la_SOURCES += asn1/x_exten.c | |||
358 | libcrypto_la_SOURCES += asn1/x_info.c | 357 | libcrypto_la_SOURCES += asn1/x_info.c |
359 | libcrypto_la_SOURCES += asn1/x_long.c | 358 | libcrypto_la_SOURCES += asn1/x_long.c |
360 | libcrypto_la_SOURCES += asn1/x_name.c | 359 | libcrypto_la_SOURCES += asn1/x_name.c |
361 | libcrypto_la_SOURCES += asn1/x_nx509.c | ||
362 | libcrypto_la_SOURCES += asn1/x_pkey.c | 360 | libcrypto_la_SOURCES += asn1/x_pkey.c |
363 | libcrypto_la_SOURCES += asn1/x_pubkey.c | 361 | libcrypto_la_SOURCES += asn1/x_pubkey.c |
364 | libcrypto_la_SOURCES += asn1/x_req.c | 362 | libcrypto_la_SOURCES += asn1/x_req.c |
@@ -700,9 +698,6 @@ libcrypto_la_SOURCES += evp/evp_key.c | |||
700 | libcrypto_la_SOURCES += evp/evp_lib.c | 698 | libcrypto_la_SOURCES += evp/evp_lib.c |
701 | libcrypto_la_SOURCES += evp/evp_pbe.c | 699 | libcrypto_la_SOURCES += evp/evp_pbe.c |
702 | libcrypto_la_SOURCES += evp/evp_pkey.c | 700 | libcrypto_la_SOURCES += evp/evp_pkey.c |
703 | libcrypto_la_SOURCES += evp/m_dss.c | ||
704 | libcrypto_la_SOURCES += evp/m_dss1.c | ||
705 | libcrypto_la_SOURCES += evp/m_ecdsa.c | ||
706 | libcrypto_la_SOURCES += evp/m_gost2814789.c | 701 | libcrypto_la_SOURCES += evp/m_gost2814789.c |
707 | libcrypto_la_SOURCES += evp/m_gostr341194.c | 702 | libcrypto_la_SOURCES += evp/m_gostr341194.c |
708 | libcrypto_la_SOURCES += evp/m_md4.c | 703 | libcrypto_la_SOURCES += evp/m_md4.c |
@@ -819,7 +814,6 @@ libcrypto_la_SOURCES += pem/pem_lib.c | |||
819 | libcrypto_la_SOURCES += pem/pem_oth.c | 814 | libcrypto_la_SOURCES += pem/pem_oth.c |
820 | libcrypto_la_SOURCES += pem/pem_pk8.c | 815 | libcrypto_la_SOURCES += pem/pem_pk8.c |
821 | libcrypto_la_SOURCES += pem/pem_pkey.c | 816 | libcrypto_la_SOURCES += pem/pem_pkey.c |
822 | libcrypto_la_SOURCES += pem/pem_seal.c | ||
823 | libcrypto_la_SOURCES += pem/pem_sign.c | 817 | libcrypto_la_SOURCES += pem/pem_sign.c |
824 | libcrypto_la_SOURCES += pem/pem_x509.c | 818 | libcrypto_la_SOURCES += pem/pem_x509.c |
825 | libcrypto_la_SOURCES += pem/pem_xaux.c | 819 | libcrypto_la_SOURCES += pem/pem_xaux.c |
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index a20cb04..cec2417 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
@@ -62,6 +62,7 @@ add_library(ssl_obj OBJECT ${SSL_SRC}) | |||
62 | target_include_directories(ssl_obj | 62 | target_include_directories(ssl_obj |
63 | PRIVATE | 63 | PRIVATE |
64 | . | 64 | . |
65 | ../crypto/bio | ||
65 | ../include/compat | 66 | ../include/compat |
66 | PUBLIC | 67 | PUBLIC |
67 | ../include) | 68 | ../include) |
diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 227dfdf..7eb0ccd 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am | |||
@@ -1,5 +1,7 @@ | |||
1 | include $(top_srcdir)/Makefile.am.common | 1 | include $(top_srcdir)/Makefile.am.common |
2 | 2 | ||
3 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bio | ||
4 | |||
3 | noinst_LTLIBRARIES = libbs.la | 5 | noinst_LTLIBRARIES = libbs.la |
4 | 6 | ||
5 | if ENABLE_LIBTLS_ONLY | 7 | if ENABLE_LIBTLS_ONLY |