diff options
Diffstat (limited to '')
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | apps/nc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | apps/ocspcheck/CMakeLists.txt | 1 | ||||
-rw-r--r-- | apps/openssl/CMakeLists.txt | 1 | ||||
-rw-r--r-- | crypto/CMakeLists.txt | 32 | ||||
-rw-r--r-- | crypto/Makefile.am | 15 | ||||
-rw-r--r-- | man/links | 50 | ||||
-rw-r--r-- | ssl/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 377 | ||||
-rw-r--r-- | tests/Makefile.am | 5 | ||||
-rw-r--r-- | tls/CMakeLists.txt | 14 | ||||
-rwxr-xr-x | update.sh | 3 |
12 files changed, 278 insertions, 245 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ef9070b..b24e930 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -296,7 +296,7 @@ if(HAVE_ERR_H) | |||
296 | add_definitions(-DHAVE_ERR_H) | 296 | add_definitions(-DHAVE_ERR_H) |
297 | endif() | 297 | endif() |
298 | 298 | ||
299 | check_include_files(netinet/ip.h HAVE_NETINET_IP_H) | 299 | check_include_files("sys/types.h;arpa/inet.h;netinet/ip.h" HAVE_NETINET_IP_H) |
300 | if(HAVE_NETINET_IP_H) | 300 | if(HAVE_NETINET_IP_H) |
301 | add_definitions(-DHAVE_NETINET_IP_H) | 301 | add_definitions(-DHAVE_NETINET_IP_H) |
302 | endif() | 302 | endif() |
@@ -347,6 +347,15 @@ add_definitions(-DSIZEOF_TIME_T=${SIZEOF_TIME_T}) | |||
347 | set(OPENSSL_LIBS ssl crypto ${PLATFORM_LIBS}) | 347 | set(OPENSSL_LIBS ssl crypto ${PLATFORM_LIBS}) |
348 | set(LIBTLS_LIBS tls ${PLATFORM_LIBS}) | 348 | set(LIBTLS_LIBS tls ${PLATFORM_LIBS}) |
349 | 349 | ||
350 | # libraries for regression test | ||
351 | if(BUILD_SHARED_LIBS) | ||
352 | set(OPENSSL_TEST_LIBS ssl-static crypto-static ${PLATFORM_LIBS}) | ||
353 | set(LIBTLS_TEST_LIBS tls-static ${PLATFORM_LIBS}) | ||
354 | else() | ||
355 | set(OPENSSL_TEST_LIBS ssl crypto ${PLATFORM_LIBS}) | ||
356 | set(LIBTLS_TEST_LIBS tls ${PLATFORM_LIBS}) | ||
357 | endif() | ||
358 | |||
350 | add_subdirectory(crypto) | 359 | add_subdirectory(crypto) |
351 | add_subdirectory(ssl) | 360 | add_subdirectory(ssl) |
352 | if(LIBRESSL_APPS) | 361 | if(LIBRESSL_APPS) |
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt index a241637..e873de8 100644 --- a/apps/nc/CMakeLists.txt +++ b/apps/nc/CMakeLists.txt | |||
@@ -44,6 +44,7 @@ else() | |||
44 | endif() | 44 | endif() |
45 | 45 | ||
46 | add_executable(nc ${NC_SRC}) | 46 | add_executable(nc ${NC_SRC}) |
47 | target_include_directories(nc PUBLIC ../../include) | ||
47 | target_include_directories(nc PRIVATE . ./compat ../../include/compat) | 48 | target_include_directories(nc PRIVATE . ./compat ../../include/compat) |
48 | target_link_libraries(nc ${LIBTLS_LIBS}) | 49 | target_link_libraries(nc ${LIBTLS_LIBS}) |
49 | 50 | ||
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index 43b091a..249f0f4 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt | |||
@@ -28,6 +28,7 @@ else() | |||
28 | endif() | 28 | endif() |
29 | 29 | ||
30 | add_executable(ocspcheck ${OCSPCHECK_SRC}) | 30 | add_executable(ocspcheck ${OCSPCHECK_SRC}) |
31 | target_include_directories(ocspcheck PUBLIC ../../include) | ||
31 | target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat) | 32 | target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat) |
32 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) | 33 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) |
33 | 34 | ||
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index c5cfbe2..bb058e1 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt | |||
@@ -77,6 +77,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin") | |||
77 | endif() | 77 | endif() |
78 | 78 | ||
79 | add_executable(openssl ${OPENSSL_SRC}) | 79 | add_executable(openssl ${OPENSSL_SRC}) |
80 | target_include_directories(openssl PUBLIC ../../include) | ||
80 | target_include_directories(openssl PRIVATE . ../../include/compat) | 81 | target_include_directories(openssl PRIVATE . ../../include/compat) |
81 | target_link_libraries(openssl ${OPENSSL_LIBS}) | 82 | target_link_libraries(openssl ${OPENSSL_LIBS}) |
82 | 83 | ||
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 5733746..75db747 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
@@ -412,6 +412,16 @@ set( | |||
412 | conf/conf_mall.c | 412 | conf/conf_mall.c |
413 | conf/conf_mod.c | 413 | conf/conf_mod.c |
414 | conf/conf_sap.c | 414 | conf/conf_sap.c |
415 | ct/ct_b64.c | ||
416 | ct/ct_err.c | ||
417 | ct/ct_log.c | ||
418 | ct/ct_oct.c | ||
419 | ct/ct_policy.c | ||
420 | ct/ct_prn.c | ||
421 | ct/ct_sct.c | ||
422 | ct/ct_sct_ctx.c | ||
423 | ct/ct_vfy.c | ||
424 | ct/ct_x509v3.c | ||
415 | curve25519/curve25519-generic.c | 425 | curve25519/curve25519-generic.c |
416 | curve25519/curve25519.c | 426 | curve25519/curve25519.c |
417 | des/cbc_cksm.c | 427 | des/cbc_cksm.c |
@@ -993,21 +1003,6 @@ target_include_directories(crypto_obj | |||
993 | ../include) | 1003 | ../include) |
994 | 1004 | ||
995 | add_library(crypto $<TARGET_OBJECTS:crypto_obj>) | 1005 | add_library(crypto $<TARGET_OBJECTS:crypto_obj>) |
996 | target_include_directories(crypto | ||
997 | PRIVATE | ||
998 | . | ||
999 | asn1 | ||
1000 | bn | ||
1001 | dsa | ||
1002 | ec | ||
1003 | ecdh | ||
1004 | ecdsa | ||
1005 | evp | ||
1006 | modes | ||
1007 | x509 | ||
1008 | ../include/compat | ||
1009 | PUBLIC | ||
1010 | ../include) | ||
1011 | 1006 | ||
1012 | export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) | 1007 | export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) |
1013 | target_link_libraries(crypto ${PLATFORM_LIBS}) | 1008 | target_link_libraries(crypto ${PLATFORM_LIBS}) |
@@ -1028,3 +1023,10 @@ if(ENABLE_LIBRESSL_INSTALL) | |||
1028 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 1023 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
1029 | ) | 1024 | ) |
1030 | endif(ENABLE_LIBRESSL_INSTALL) | 1025 | endif(ENABLE_LIBRESSL_INSTALL) |
1026 | |||
1027 | # build static library for regression test | ||
1028 | if(BUILD_SHARED_LIBS) | ||
1029 | add_library(crypto-static STATIC $<TARGET_OBJECTS:crypto_obj>) | ||
1030 | target_link_libraries(crypto-static ${PLATFORM_LIBS}) | ||
1031 | endif() | ||
1032 | |||
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index f2ef151..ceab628 100644 --- a/crypto/Makefile.am +++ b/crypto/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 += -DLIBRESSL_CRYPTO_INTERNAL | ||
4 | |||
3 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 | 5 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 |
4 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn | 6 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn |
5 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/ec | 7 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/ec |
@@ -500,6 +502,19 @@ libcrypto_la_SOURCES += conf/conf_mod.c | |||
500 | libcrypto_la_SOURCES += conf/conf_sap.c | 502 | libcrypto_la_SOURCES += conf/conf_sap.c |
501 | noinst_HEADERS += conf/conf_def.h | 503 | noinst_HEADERS += conf/conf_def.h |
502 | 504 | ||
505 | # ct | ||
506 | libcrypto_la_SOURCES += ct/ct_b64.c | ||
507 | libcrypto_la_SOURCES += ct/ct_err.c | ||
508 | libcrypto_la_SOURCES += ct/ct_log.c | ||
509 | libcrypto_la_SOURCES += ct/ct_oct.c | ||
510 | libcrypto_la_SOURCES += ct/ct_policy.c | ||
511 | libcrypto_la_SOURCES += ct/ct_prn.c | ||
512 | libcrypto_la_SOURCES += ct/ct_sct.c | ||
513 | libcrypto_la_SOURCES += ct/ct_sct_ctx.c | ||
514 | libcrypto_la_SOURCES += ct/ct_vfy.c | ||
515 | libcrypto_la_SOURCES += ct/ct_x509v3.c | ||
516 | noinst_HEADERS += ct/ct_local.h | ||
517 | |||
503 | # curve25519 | 518 | # curve25519 |
504 | libcrypto_la_SOURCES += curve25519/curve25519-generic.c | 519 | libcrypto_la_SOURCES += curve25519/curve25519-generic.c |
505 | libcrypto_la_SOURCES += curve25519/curve25519.c | 520 | libcrypto_la_SOURCES += curve25519/curve25519.c |
@@ -6,14 +6,22 @@ AES_encrypt.3,AES_cbc_encrypt.3 | |||
6 | AES_encrypt.3,AES_decrypt.3 | 6 | AES_encrypt.3,AES_decrypt.3 |
7 | AES_encrypt.3,AES_set_decrypt_key.3 | 7 | AES_encrypt.3,AES_set_decrypt_key.3 |
8 | AES_encrypt.3,AES_set_encrypt_key.3 | 8 | AES_encrypt.3,AES_set_encrypt_key.3 |
9 | ASN1_BIT_STRING_num_asc.3,ASN1_BIT_STRING_name_print.3 | ||
10 | ASN1_BIT_STRING_num_asc.3,ASN1_BIT_STRING_set_asc.3 | ||
11 | ASN1_BIT_STRING_set.3,ASN1_BIT_STRING_check.3 | ||
12 | ASN1_BIT_STRING_set.3,ASN1_BIT_STRING_get_bit.3 | ||
13 | ASN1_BIT_STRING_set.3,ASN1_BIT_STRING_set_bit.3 | ||
9 | ASN1_INTEGER_get.3,ASN1_ENUMERATED_get.3 | 14 | ASN1_INTEGER_get.3,ASN1_ENUMERATED_get.3 |
10 | ASN1_INTEGER_get.3,ASN1_ENUMERATED_set.3 | 15 | ASN1_INTEGER_get.3,ASN1_ENUMERATED_set.3 |
11 | ASN1_INTEGER_get.3,ASN1_ENUMERATED_to_BN.3 | 16 | ASN1_INTEGER_get.3,ASN1_ENUMERATED_to_BN.3 |
17 | ASN1_INTEGER_get.3,ASN1_INTEGER_cmp.3 | ||
18 | ASN1_INTEGER_get.3,ASN1_INTEGER_dup.3 | ||
12 | ASN1_INTEGER_get.3,ASN1_INTEGER_set.3 | 19 | ASN1_INTEGER_get.3,ASN1_INTEGER_set.3 |
13 | ASN1_INTEGER_get.3,ASN1_INTEGER_to_BN.3 | 20 | ASN1_INTEGER_get.3,ASN1_INTEGER_to_BN.3 |
14 | ASN1_INTEGER_get.3,BN_to_ASN1_ENUMERATED.3 | 21 | ASN1_INTEGER_get.3,BN_to_ASN1_ENUMERATED.3 |
15 | ASN1_INTEGER_get.3,BN_to_ASN1_INTEGER.3 | 22 | ASN1_INTEGER_get.3,BN_to_ASN1_INTEGER.3 |
16 | ASN1_INTEGER_get.3,i2a_ASN1_INTEGER.3 | 23 | ASN1_NULL_new.3,ASN1_NULL_free.3 |
24 | ASN1_OBJECT_new.3,ASN1_OBJECT_create.3 | ||
17 | ASN1_OBJECT_new.3,ASN1_OBJECT_free.3 | 25 | ASN1_OBJECT_new.3,ASN1_OBJECT_free.3 |
18 | ASN1_STRING_TABLE_add.3,ASN1_STRING_TABLE_cleanup.3 | 26 | ASN1_STRING_TABLE_add.3,ASN1_STRING_TABLE_cleanup.3 |
19 | ASN1_STRING_TABLE_add.3,ASN1_STRING_TABLE_get.3 | 27 | ASN1_STRING_TABLE_add.3,ASN1_STRING_TABLE_get.3 |
@@ -21,6 +29,7 @@ ASN1_STRING_length.3,ASN1_OCTET_STRING_cmp.3 | |||
21 | ASN1_STRING_length.3,ASN1_OCTET_STRING_dup.3 | 29 | ASN1_STRING_length.3,ASN1_OCTET_STRING_dup.3 |
22 | ASN1_STRING_length.3,ASN1_OCTET_STRING_set.3 | 30 | ASN1_STRING_length.3,ASN1_OCTET_STRING_set.3 |
23 | ASN1_STRING_length.3,ASN1_STRING_cmp.3 | 31 | ASN1_STRING_length.3,ASN1_STRING_cmp.3 |
32 | ASN1_STRING_length.3,ASN1_STRING_copy.3 | ||
24 | ASN1_STRING_length.3,ASN1_STRING_data.3 | 33 | ASN1_STRING_length.3,ASN1_STRING_data.3 |
25 | ASN1_STRING_length.3,ASN1_STRING_dup.3 | 34 | ASN1_STRING_length.3,ASN1_STRING_dup.3 |
26 | ASN1_STRING_length.3,ASN1_STRING_get0_data.3 | 35 | ASN1_STRING_length.3,ASN1_STRING_get0_data.3 |
@@ -77,6 +86,7 @@ ASN1_TIME_set.3,ASN1_GENERALIZEDTIME_set.3 | |||
77 | ASN1_TIME_set.3,ASN1_GENERALIZEDTIME_set_string.3 | 86 | ASN1_TIME_set.3,ASN1_GENERALIZEDTIME_set_string.3 |
78 | ASN1_TIME_set.3,ASN1_TIME_adj.3 | 87 | ASN1_TIME_set.3,ASN1_TIME_adj.3 |
79 | ASN1_TIME_set.3,ASN1_TIME_check.3 | 88 | ASN1_TIME_set.3,ASN1_TIME_check.3 |
89 | ASN1_TIME_set.3,ASN1_TIME_diff.3 | ||
80 | ASN1_TIME_set.3,ASN1_TIME_print.3 | 90 | ASN1_TIME_set.3,ASN1_TIME_print.3 |
81 | ASN1_TIME_set.3,ASN1_TIME_set_string.3 | 91 | ASN1_TIME_set.3,ASN1_TIME_set_string.3 |
82 | ASN1_TIME_set.3,ASN1_TIME_to_generalizedtime.3 | 92 | ASN1_TIME_set.3,ASN1_TIME_to_generalizedtime.3 |
@@ -88,9 +98,13 @@ ASN1_TIME_set.3,ASN1_UTCTIME_set.3 | |||
88 | ASN1_TIME_set.3,ASN1_UTCTIME_set_string.3 | 98 | ASN1_TIME_set.3,ASN1_UTCTIME_set_string.3 |
89 | ASN1_TYPE_get.3,ASN1_TYPE_cmp.3 | 99 | ASN1_TYPE_get.3,ASN1_TYPE_cmp.3 |
90 | ASN1_TYPE_get.3,ASN1_TYPE_free.3 | 100 | ASN1_TYPE_get.3,ASN1_TYPE_free.3 |
101 | ASN1_TYPE_get.3,ASN1_TYPE_get_int_octetstring.3 | ||
102 | ASN1_TYPE_get.3,ASN1_TYPE_get_octetstring.3 | ||
91 | ASN1_TYPE_get.3,ASN1_TYPE_new.3 | 103 | ASN1_TYPE_get.3,ASN1_TYPE_new.3 |
92 | ASN1_TYPE_get.3,ASN1_TYPE_set.3 | 104 | ASN1_TYPE_get.3,ASN1_TYPE_set.3 |
93 | ASN1_TYPE_get.3,ASN1_TYPE_set1.3 | 105 | ASN1_TYPE_get.3,ASN1_TYPE_set1.3 |
106 | ASN1_TYPE_get.3,ASN1_TYPE_set_int_octetstring.3 | ||
107 | ASN1_TYPE_get.3,ASN1_TYPE_set_octetstring.3 | ||
94 | ASN1_generate_nconf.3,ASN1_generate_v3.3 | 108 | ASN1_generate_nconf.3,ASN1_generate_v3.3 |
95 | ASN1_item_d2i.3,ASN1_item_d2i_bio.3 | 109 | ASN1_item_d2i.3,ASN1_item_d2i_bio.3 |
96 | ASN1_item_d2i.3,ASN1_item_d2i_fp.3 | 110 | ASN1_item_d2i.3,ASN1_item_d2i_fp.3 |
@@ -98,17 +112,21 @@ ASN1_item_d2i.3,ASN1_item_dup.3 | |||
98 | ASN1_item_d2i.3,ASN1_item_i2d.3 | 112 | ASN1_item_d2i.3,ASN1_item_i2d.3 |
99 | ASN1_item_d2i.3,ASN1_item_i2d_bio.3 | 113 | ASN1_item_d2i.3,ASN1_item_i2d_bio.3 |
100 | ASN1_item_d2i.3,ASN1_item_i2d_fp.3 | 114 | ASN1_item_d2i.3,ASN1_item_i2d_fp.3 |
115 | ASN1_item_d2i.3,ASN1_item_ndef_i2d.3 | ||
101 | ASN1_item_d2i.3,ASN1_item_print.3 | 116 | ASN1_item_d2i.3,ASN1_item_print.3 |
102 | ASN1_item_d2i.3,d2i_ASN1_TYPE.3 | 117 | ASN1_item_d2i.3,d2i_ASN1_TYPE.3 |
103 | ASN1_item_d2i.3,i2d_ASN1_TYPE.3 | 118 | ASN1_item_d2i.3,i2d_ASN1_TYPE.3 |
104 | ASN1_item_new.3,ASN1_item_free.3 | 119 | ASN1_item_new.3,ASN1_item_free.3 |
120 | ASN1_item_pack.3,ASN1_item_unpack.3 | ||
105 | ASN1_item_sign.3,ASN1_item_sign_ctx.3 | 121 | ASN1_item_sign.3,ASN1_item_sign_ctx.3 |
106 | ASN1_mbstring_copy.3,ASN1_STRING_get_default_mask.3 | 122 | ASN1_mbstring_copy.3,ASN1_STRING_get_default_mask.3 |
107 | ASN1_mbstring_copy.3,ASN1_STRING_set_by_NID.3 | 123 | ASN1_mbstring_copy.3,ASN1_STRING_set_by_NID.3 |
108 | ASN1_mbstring_copy.3,ASN1_STRING_set_default_mask.3 | 124 | ASN1_mbstring_copy.3,ASN1_STRING_set_default_mask.3 |
109 | ASN1_mbstring_copy.3,ASN1_STRING_set_default_mask_asc.3 | 125 | ASN1_mbstring_copy.3,ASN1_STRING_set_default_mask_asc.3 |
110 | ASN1_mbstring_copy.3,ASN1_mbstring_ncopy.3 | 126 | ASN1_mbstring_copy.3,ASN1_mbstring_ncopy.3 |
127 | ASN1_mbstring_copy.3,ASN1_tag2bit.3 | ||
111 | ASN1_parse_dump.3,ASN1_parse.3 | 128 | ASN1_parse_dump.3,ASN1_parse.3 |
129 | ASN1_put_object.3,ASN1_object_size.3 | ||
112 | ASN1_put_object.3,ASN1_put_eoc.3 | 130 | ASN1_put_object.3,ASN1_put_eoc.3 |
113 | ASN1_time_parse.3,ASN1_TIME_set_tm.3 | 131 | ASN1_time_parse.3,ASN1_TIME_set_tm.3 |
114 | ASN1_time_parse.3,ASN1_time_tm_cmp.3 | 132 | ASN1_time_parse.3,ASN1_time_tm_cmp.3 |
@@ -141,6 +159,11 @@ BIO_ctrl.3,bio_info_cb.3 | |||
141 | BIO_dump.3,BIO_dump_fp.3 | 159 | BIO_dump.3,BIO_dump_fp.3 |
142 | BIO_dump.3,BIO_dump_indent.3 | 160 | BIO_dump.3,BIO_dump_indent.3 |
143 | BIO_dump.3,BIO_dump_indent_fp.3 | 161 | BIO_dump.3,BIO_dump_indent_fp.3 |
162 | BIO_f_asn1.3,BIO_asn1_get_prefix.3 | ||
163 | BIO_f_asn1.3,BIO_asn1_get_suffix.3 | ||
164 | BIO_f_asn1.3,BIO_asn1_set_prefix.3 | ||
165 | BIO_f_asn1.3,BIO_asn1_set_suffix.3 | ||
166 | BIO_f_asn1.3,asn1_ps_func.3 | ||
144 | BIO_f_buffer.3,BIO_get_buffer_num_lines.3 | 167 | BIO_f_buffer.3,BIO_get_buffer_num_lines.3 |
145 | BIO_f_buffer.3,BIO_set_buffer_read_data.3 | 168 | BIO_f_buffer.3,BIO_set_buffer_read_data.3 |
146 | BIO_f_buffer.3,BIO_set_buffer_size.3 | 169 | BIO_f_buffer.3,BIO_set_buffer_size.3 |
@@ -164,6 +187,7 @@ BIO_f_ssl.3,BIO_set_ssl_renegotiate_bytes.3 | |||
164 | BIO_f_ssl.3,BIO_set_ssl_renegotiate_timeout.3 | 187 | BIO_f_ssl.3,BIO_set_ssl_renegotiate_timeout.3 |
165 | BIO_f_ssl.3,BIO_ssl_copy_session_id.3 | 188 | BIO_f_ssl.3,BIO_ssl_copy_session_id.3 |
166 | BIO_f_ssl.3,BIO_ssl_shutdown.3 | 189 | BIO_f_ssl.3,BIO_ssl_shutdown.3 |
190 | BIO_find_type.3,BIO_method_name.3 | ||
167 | BIO_find_type.3,BIO_method_type.3 | 191 | BIO_find_type.3,BIO_method_type.3 |
168 | BIO_find_type.3,BIO_next.3 | 192 | BIO_find_type.3,BIO_next.3 |
169 | BIO_get_data.3,BIO_get_shutdown.3 | 193 | BIO_get_data.3,BIO_get_shutdown.3 |
@@ -2000,9 +2024,6 @@ X509_EXTENSION_set_object.3,X509_EXTENSION_set_data.3 | |||
2000 | X509_INFO_new.3,X509_INFO_free.3 | 2024 | X509_INFO_new.3,X509_INFO_free.3 |
2001 | X509_LOOKUP_hash_dir.3,X509_LOOKUP_file.3 | 2025 | X509_LOOKUP_hash_dir.3,X509_LOOKUP_file.3 |
2002 | X509_LOOKUP_hash_dir.3,X509_LOOKUP_mem.3 | 2026 | X509_LOOKUP_hash_dir.3,X509_LOOKUP_mem.3 |
2003 | X509_LOOKUP_hash_dir.3,X509_load_cert_crl_file.3 | ||
2004 | X509_LOOKUP_hash_dir.3,X509_load_cert_file.3 | ||
2005 | X509_LOOKUP_hash_dir.3,X509_load_crl_file.3 | ||
2006 | X509_LOOKUP_new.3,X509_LOOKUP_add_dir.3 | 2027 | X509_LOOKUP_new.3,X509_LOOKUP_add_dir.3 |
2007 | X509_LOOKUP_new.3,X509_LOOKUP_add_mem.3 | 2028 | X509_LOOKUP_new.3,X509_LOOKUP_add_mem.3 |
2008 | X509_LOOKUP_new.3,X509_LOOKUP_by_alias.3 | 2029 | X509_LOOKUP_new.3,X509_LOOKUP_by_alias.3 |
@@ -2045,10 +2066,12 @@ X509_NAME_new.3,X509_NAME_free.3 | |||
2045 | X509_NAME_print_ex.3,X509_NAME_oneline.3 | 2066 | X509_NAME_print_ex.3,X509_NAME_oneline.3 |
2046 | X509_NAME_print_ex.3,X509_NAME_print.3 | 2067 | X509_NAME_print_ex.3,X509_NAME_print.3 |
2047 | X509_NAME_print_ex.3,X509_NAME_print_ex_fp.3 | 2068 | X509_NAME_print_ex.3,X509_NAME_print_ex_fp.3 |
2069 | X509_OBJECT_get0_X509.3,X509_OBJECT_free.3 | ||
2048 | X509_OBJECT_get0_X509.3,X509_OBJECT_free_contents.3 | 2070 | X509_OBJECT_get0_X509.3,X509_OBJECT_free_contents.3 |
2049 | X509_OBJECT_get0_X509.3,X509_OBJECT_get0_X509_CRL.3 | 2071 | X509_OBJECT_get0_X509.3,X509_OBJECT_get0_X509_CRL.3 |
2050 | X509_OBJECT_get0_X509.3,X509_OBJECT_get_type.3 | 2072 | X509_OBJECT_get0_X509.3,X509_OBJECT_get_type.3 |
2051 | X509_OBJECT_get0_X509.3,X509_OBJECT_idx_by_subject.3 | 2073 | X509_OBJECT_get0_X509.3,X509_OBJECT_idx_by_subject.3 |
2074 | X509_OBJECT_get0_X509.3,X509_OBJECT_new.3 | ||
2052 | X509_OBJECT_get0_X509.3,X509_OBJECT_retrieve_by_subject.3 | 2075 | X509_OBJECT_get0_X509.3,X509_OBJECT_retrieve_by_subject.3 |
2053 | X509_OBJECT_get0_X509.3,X509_OBJECT_retrieve_match.3 | 2076 | X509_OBJECT_get0_X509.3,X509_OBJECT_retrieve_match.3 |
2054 | X509_OBJECT_get0_X509.3,X509_OBJECT_up_ref_count.3 | 2077 | X509_OBJECT_get0_X509.3,X509_OBJECT_up_ref_count.3 |
@@ -2115,7 +2138,11 @@ X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_chain.3 | |||
2115 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_current_cert.3 | 2138 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_current_cert.3 |
2116 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_error_depth.3 | 2139 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_error_depth.3 |
2117 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_explicit_policy.3 | 2140 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_explicit_policy.3 |
2141 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_get_num_untrusted.3 | ||
2142 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_set0_verified_chain.3 | ||
2143 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_set_current_cert.3 | ||
2118 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_set_error.3 | 2144 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_set_error.3 |
2145 | X509_STORE_CTX_get_error.3,X509_STORE_CTX_set_error_depth.3 | ||
2119 | X509_STORE_CTX_get_error.3,X509_verify_cert_error_string.3 | 2146 | X509_STORE_CTX_get_error.3,X509_verify_cert_error_string.3 |
2120 | X509_STORE_CTX_get_ex_new_index.3,X509_STORE_CTX_get_app_data.3 | 2147 | X509_STORE_CTX_get_ex_new_index.3,X509_STORE_CTX_get_app_data.3 |
2121 | X509_STORE_CTX_get_ex_new_index.3,X509_STORE_CTX_get_ex_data.3 | 2148 | X509_STORE_CTX_get_ex_new_index.3,X509_STORE_CTX_get_ex_data.3 |
@@ -2141,7 +2168,11 @@ X509_STORE_CTX_set_flags.3,X509_STORE_CTX_set_depth.3 | |||
2141 | X509_STORE_CTX_set_flags.3,X509_STORE_CTX_set_purpose.3 | 2168 | X509_STORE_CTX_set_flags.3,X509_STORE_CTX_set_purpose.3 |
2142 | X509_STORE_CTX_set_flags.3,X509_STORE_CTX_set_time.3 | 2169 | X509_STORE_CTX_set_flags.3,X509_STORE_CTX_set_time.3 |
2143 | X509_STORE_CTX_set_flags.3,X509_STORE_CTX_set_trust.3 | 2170 | X509_STORE_CTX_set_flags.3,X509_STORE_CTX_set_trust.3 |
2171 | X509_STORE_CTX_set_verify.3,X509_STORE_CTX_get_verify.3 | ||
2172 | X509_STORE_CTX_set_verify_cb.3,X509_STORE_CTX_get_verify_cb.3 | ||
2144 | X509_STORE_get_by_subject.3,X509_STORE_CTX_get1_issuer.3 | 2173 | X509_STORE_get_by_subject.3,X509_STORE_CTX_get1_issuer.3 |
2174 | X509_STORE_get_by_subject.3,X509_STORE_CTX_get_by_subject.3 | ||
2175 | X509_STORE_get_by_subject.3,X509_STORE_CTX_get_obj_by_subject.3 | ||
2145 | X509_STORE_get_by_subject.3,X509_STORE_get1_certs.3 | 2176 | X509_STORE_get_by_subject.3,X509_STORE_get1_certs.3 |
2146 | X509_STORE_get_by_subject.3,X509_STORE_get1_crls.3 | 2177 | X509_STORE_get_by_subject.3,X509_STORE_get1_crls.3 |
2147 | X509_STORE_load_locations.3,X509_STORE_add_lookup.3 | 2178 | X509_STORE_load_locations.3,X509_STORE_add_lookup.3 |
@@ -2161,7 +2192,6 @@ X509_STORE_set1_param.3,X509_STORE_set_flags.3 | |||
2161 | X509_STORE_set1_param.3,X509_STORE_set_purpose.3 | 2192 | X509_STORE_set1_param.3,X509_STORE_set_purpose.3 |
2162 | X509_STORE_set1_param.3,X509_STORE_set_trust.3 | 2193 | X509_STORE_set1_param.3,X509_STORE_set_trust.3 |
2163 | X509_STORE_set_verify_cb_func.3,X509_STORE_set_verify_cb.3 | 2194 | X509_STORE_set_verify_cb_func.3,X509_STORE_set_verify_cb.3 |
2164 | X509_STORE_set_verify_cb_func.3,X509_STORE_set_verify_func.3 | ||
2165 | X509_TRUST_set.3,X509_TRUST_add.3 | 2195 | X509_TRUST_set.3,X509_TRUST_add.3 |
2166 | X509_TRUST_set.3,X509_TRUST_cleanup.3 | 2196 | X509_TRUST_set.3,X509_TRUST_cleanup.3 |
2167 | X509_TRUST_set.3,X509_TRUST_get0.3 | 2197 | X509_TRUST_set.3,X509_TRUST_get0.3 |
@@ -2211,6 +2241,7 @@ X509_cmp.3,X509_issuer_and_serial_cmp.3 | |||
2211 | X509_cmp.3,X509_issuer_name_cmp.3 | 2241 | X509_cmp.3,X509_issuer_name_cmp.3 |
2212 | X509_cmp.3,X509_subject_name_cmp.3 | 2242 | X509_cmp.3,X509_subject_name_cmp.3 |
2213 | X509_cmp_time.3,X509_cmp_current_time.3 | 2243 | X509_cmp_time.3,X509_cmp_current_time.3 |
2244 | X509_cmp_time.3,X509_gmtime_adj.3 | ||
2214 | X509_cmp_time.3,X509_time_adj.3 | 2245 | X509_cmp_time.3,X509_time_adj.3 |
2215 | X509_cmp_time.3,X509_time_adj_ex.3 | 2246 | X509_cmp_time.3,X509_time_adj_ex.3 |
2216 | X509_digest.3,PKCS7_ISSUER_AND_SERIAL_digest.3 | 2247 | X509_digest.3,PKCS7_ISSUER_AND_SERIAL_digest.3 |
@@ -2273,12 +2304,15 @@ X509_get_version.3,X509_set_version.3 | |||
2273 | X509_keyid_set1.3,X509_alias_get0.3 | 2304 | X509_keyid_set1.3,X509_alias_get0.3 |
2274 | X509_keyid_set1.3,X509_alias_set1.3 | 2305 | X509_keyid_set1.3,X509_alias_set1.3 |
2275 | X509_keyid_set1.3,X509_keyid_get0.3 | 2306 | X509_keyid_set1.3,X509_keyid_get0.3 |
2307 | X509_load_cert_file.3,X509_load_cert_crl_file.3 | ||
2308 | X509_load_cert_file.3,X509_load_crl_file.3 | ||
2276 | X509_new.3,X509_REQ_to_X509.3 | 2309 | X509_new.3,X509_REQ_to_X509.3 |
2277 | X509_new.3,X509_chain_up_ref.3 | 2310 | X509_new.3,X509_chain_up_ref.3 |
2278 | X509_new.3,X509_dup.3 | 2311 | X509_new.3,X509_dup.3 |
2279 | X509_new.3,X509_free.3 | 2312 | X509_new.3,X509_free.3 |
2280 | X509_new.3,X509_up_ref.3 | 2313 | X509_new.3,X509_up_ref.3 |
2281 | X509_policy_check.3,X509_policy_tree_free.3 | 2314 | X509_policy_check.3,X509_policy_tree_free.3 |
2315 | X509_policy_tree_get0_policies.3,X509_policy_tree_get0_user_policies.3 | ||
2282 | X509_policy_tree_level_count.3,X509_policy_level_get0_node.3 | 2316 | X509_policy_tree_level_count.3,X509_policy_level_get0_node.3 |
2283 | X509_policy_tree_level_count.3,X509_policy_level_node_count.3 | 2317 | X509_policy_tree_level_count.3,X509_policy_level_node_count.3 |
2284 | X509_policy_tree_level_count.3,X509_policy_node_get0_parent.3 | 2318 | X509_policy_tree_level_count.3,X509_policy_node_get0_parent.3 |
@@ -2363,6 +2397,7 @@ bn_dump.3,bn_wexpand.3 | |||
2363 | bn_dump.3,mul.3 | 2397 | bn_dump.3,mul.3 |
2364 | bn_dump.3,mul_add.3 | 2398 | bn_dump.3,mul_add.3 |
2365 | bn_dump.3,sqr.3 | 2399 | bn_dump.3,sqr.3 |
2400 | d2i_ASN1_BOOLEAN.3,i2d_ASN1_BOOLEAN.3 | ||
2366 | d2i_ASN1_NULL.3,i2d_ASN1_NULL.3 | 2401 | d2i_ASN1_NULL.3,i2d_ASN1_NULL.3 |
2367 | d2i_ASN1_OBJECT.3,i2d_ASN1_OBJECT.3 | 2402 | d2i_ASN1_OBJECT.3,i2d_ASN1_OBJECT.3 |
2368 | d2i_ASN1_OCTET_STRING.3,d2i_ASN1_BIT_STRING.3 | 2403 | d2i_ASN1_OCTET_STRING.3,d2i_ASN1_BIT_STRING.3 |
@@ -2699,6 +2734,11 @@ get_rfc3526_prime_8192.3,get_rfc3526_prime_2048.3 | |||
2699 | get_rfc3526_prime_8192.3,get_rfc3526_prime_3072.3 | 2734 | get_rfc3526_prime_8192.3,get_rfc3526_prime_3072.3 |
2700 | get_rfc3526_prime_8192.3,get_rfc3526_prime_4096.3 | 2735 | get_rfc3526_prime_8192.3,get_rfc3526_prime_4096.3 |
2701 | get_rfc3526_prime_8192.3,get_rfc3526_prime_6144.3 | 2736 | get_rfc3526_prime_8192.3,get_rfc3526_prime_6144.3 |
2737 | i2a_ASN1_STRING.3,a2i_ASN1_ENUMERATED.3 | ||
2738 | i2a_ASN1_STRING.3,a2i_ASN1_INTEGER.3 | ||
2739 | i2a_ASN1_STRING.3,a2i_ASN1_STRING.3 | ||
2740 | i2a_ASN1_STRING.3,i2a_ASN1_ENUMERATED.3 | ||
2741 | i2a_ASN1_STRING.3,i2a_ASN1_INTEGER.3 | ||
2702 | lh_new.3,DECLARE_LHASH_OF.3 | 2742 | lh_new.3,DECLARE_LHASH_OF.3 |
2703 | lh_new.3,LHASH_COMP_FN_TYPE.3 | 2743 | lh_new.3,LHASH_COMP_FN_TYPE.3 |
2704 | lh_new.3,LHASH_DOALL_ARG_FN_TYPE.3 | 2744 | lh_new.3,LHASH_DOALL_ARG_FN_TYPE.3 |
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index a8e0a25..039ef68 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
@@ -63,12 +63,6 @@ target_include_directories(ssl_obj | |||
63 | ../include) | 63 | ../include) |
64 | 64 | ||
65 | add_library(ssl $<TARGET_OBJECTS:ssl_obj>) | 65 | add_library(ssl $<TARGET_OBJECTS:ssl_obj>) |
66 | target_include_directories(ssl | ||
67 | PRIVATE | ||
68 | . | ||
69 | ../include/compat | ||
70 | PUBLIC | ||
71 | ../include) | ||
72 | 66 | ||
73 | export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) | 67 | export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) |
74 | target_link_libraries(ssl crypto ${PLATFORM_LIBS}) | 68 | target_link_libraries(ssl crypto ${PLATFORM_LIBS}) |
@@ -89,3 +83,10 @@ if(ENABLE_LIBRESSL_INSTALL) | |||
89 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 83 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
90 | ) | 84 | ) |
91 | endif(ENABLE_LIBRESSL_INSTALL) | 85 | endif(ENABLE_LIBRESSL_INSTALL) |
86 | |||
87 | # build static library for regression test | ||
88 | if(BUILD_SHARED_LIBS) | ||
89 | add_library(ssl-static STATIC $<TARGET_OBJECTS:ssl_obj>) | ||
90 | target_link_libraries(ssl-static crypto-static ${PLATFORM_LIBS}) | ||
91 | endif() | ||
92 | |||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2cdd683..d3725d1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
@@ -6,6 +6,7 @@ include_directories( | |||
6 | ../ssl | 6 | ../ssl |
7 | ../apps/openssl | 7 | ../apps/openssl |
8 | ../apps/openssl/compat | 8 | ../apps/openssl/compat |
9 | ../include | ||
9 | ../include/compat | 10 | ../include/compat |
10 | ) | 11 | ) |
11 | 12 | ||
@@ -15,201 +16,188 @@ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} TEST_SOURCE_DIR) | |||
15 | 16 | ||
16 | # aeadtest | 17 | # aeadtest |
17 | add_executable(aeadtest aeadtest.c) | 18 | add_executable(aeadtest aeadtest.c) |
18 | target_link_libraries(aeadtest ${OPENSSL_LIBS}) | 19 | target_link_libraries(aeadtest ${OPENSSL_TEST_LIBS}) |
19 | add_test(aeadtest aeadtest ${CMAKE_CURRENT_SOURCE_DIR}/aeadtests.txt) | 20 | add_test(aeadtest aeadtest ${CMAKE_CURRENT_SOURCE_DIR}/aeadtests.txt) |
20 | 21 | ||
21 | # aes_wrap | 22 | # aes_wrap |
22 | add_executable(aes_wrap aes_wrap.c) | 23 | add_executable(aes_wrap aes_wrap.c) |
23 | target_link_libraries(aes_wrap ${OPENSSL_LIBS}) | 24 | target_link_libraries(aes_wrap ${OPENSSL_TEST_LIBS}) |
24 | add_test(aes_wrap aes_wrap) | 25 | add_test(aes_wrap aes_wrap) |
25 | 26 | ||
26 | # arc4randomforktest | 27 | # arc4randomforktest |
27 | # Windows/mingw does not have fork, but Cygwin does. | 28 | # Windows/mingw does not have fork, but Cygwin does. |
28 | if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES "MINGW"))) | 29 | if(NOT (WIN32 OR (CMAKE_SYSTEM_NAME MATCHES "MINGW"))) |
29 | add_executable(arc4randomforktest arc4randomforktest.c) | 30 | add_executable(arc4randomforktest arc4randomforktest.c) |
30 | target_link_libraries(arc4randomforktest ${OPENSSL_LIBS}) | 31 | target_link_libraries(arc4randomforktest ${OPENSSL_TEST_LIBS}) |
31 | add_test(arc4randomforktest ${CMAKE_CURRENT_SOURCE_DIR}/arc4randomforktest.sh) | 32 | add_test(arc4randomforktest ${CMAKE_CURRENT_SOURCE_DIR}/arc4randomforktest.sh) |
32 | endif() | 33 | endif() |
33 | 34 | ||
34 | # asn1evp | 35 | # asn1evp |
35 | add_executable(asn1evp asn1evp.c) | 36 | add_executable(asn1evp asn1evp.c) |
36 | target_link_libraries(asn1evp ${OPENSSL_LIBS}) | 37 | target_link_libraries(asn1evp ${OPENSSL_TEST_LIBS}) |
37 | add_test(asn1evp asn1evp) | 38 | add_test(asn1evp asn1evp) |
38 | 39 | ||
39 | # asn1test | 40 | # asn1test |
40 | add_executable(asn1test asn1test.c) | 41 | add_executable(asn1test asn1test.c) |
41 | target_link_libraries(asn1test ${OPENSSL_LIBS}) | 42 | target_link_libraries(asn1test ${OPENSSL_TEST_LIBS}) |
42 | add_test(asn1test asn1test) | 43 | add_test(asn1test asn1test) |
43 | 44 | ||
44 | # asn1time | 45 | # asn1time |
45 | add_executable(asn1time asn1time.c) | 46 | add_executable(asn1time asn1time.c) |
46 | target_link_libraries(asn1time ${OPENSSL_LIBS}) | 47 | target_link_libraries(asn1time ${OPENSSL_TEST_LIBS}) |
47 | add_test(asn1time asn1time) | 48 | add_test(asn1time asn1time) |
48 | 49 | ||
50 | # asn1x509 | ||
51 | add_executable(asn1x509 asn1x509.c) | ||
52 | target_link_libraries(asn1x509 ${OPENSSL_TEST_LIBS}) | ||
53 | add_test(asn1x509 asn1x509) | ||
54 | |||
49 | # base64test | 55 | # base64test |
50 | add_executable(base64test base64test.c) | 56 | add_executable(base64test base64test.c) |
51 | target_link_libraries(base64test ${OPENSSL_LIBS}) | 57 | target_link_libraries(base64test ${OPENSSL_TEST_LIBS}) |
52 | add_test(base64test base64test) | 58 | add_test(base64test base64test) |
53 | 59 | ||
54 | # bftest | 60 | # bftest |
55 | add_executable(bftest bftest.c) | 61 | add_executable(bftest bftest.c) |
56 | target_link_libraries(bftest ${OPENSSL_LIBS}) | 62 | target_link_libraries(bftest ${OPENSSL_TEST_LIBS}) |
57 | add_test(bftest bftest) | 63 | add_test(bftest bftest) |
58 | 64 | ||
59 | # biotest | 65 | # biotest |
60 | # the BIO tests rely on resolver results that are OS and environment-specific | 66 | # the BIO tests rely on resolver results that are OS and environment-specific |
61 | if(ENABLE_EXTRATESTS) | 67 | if(ENABLE_EXTRATESTS) |
62 | add_executable(biotest biotest.c) | 68 | add_executable(biotest biotest.c) |
63 | target_link_libraries(biotest ${OPENSSL_LIBS}) | 69 | target_link_libraries(biotest ${OPENSSL_TEST_LIBS}) |
64 | add_test(biotest biotest) | 70 | add_test(biotest biotest) |
65 | endif() | 71 | endif() |
66 | 72 | ||
67 | # bnaddsub | 73 | # bnaddsub |
68 | add_executable(bnaddsub bnaddsub.c) | 74 | add_executable(bnaddsub bnaddsub.c) |
69 | target_link_libraries(bnaddsub ${OPENSSL_LIBS}) | 75 | target_link_libraries(bnaddsub ${OPENSSL_TEST_LIBS}) |
70 | add_test(bnaddsub bnaddsub) | 76 | add_test(bnaddsub bnaddsub) |
71 | 77 | ||
72 | # bn_rand_interval | 78 | # bn_rand_interval |
73 | if(NOT BUILD_SHARED_LIBS) | 79 | add_executable(bn_rand_interval bn_rand_interval.c) |
74 | add_executable(bn_rand_interval bn_rand_interval.c) | 80 | target_link_libraries(bn_rand_interval ${OPENSSL_TEST_LIBS}) |
75 | target_link_libraries(bn_rand_interval ${OPENSSL_LIBS}) | 81 | add_test(bn_rand_interval bn_rand_interval) |
76 | add_test(bn_rand_interval bn_rand_interval) | ||
77 | endif() | ||
78 | 82 | ||
79 | # bntest | 83 | # bntest |
80 | if(NOT BUILD_SHARED_LIBS) | 84 | add_executable(bntest bntest.c) |
81 | add_executable(bntest bntest.c) | 85 | set_source_files_properties(bntest.c PROPERTIES COMPILE_FLAGS |
82 | set_source_files_properties(bntest.c PROPERTIES COMPILE_FLAGS | 86 | -ULIBRESSL_INTERNAL) |
83 | -ULIBRESSL_INTERNAL) | 87 | target_link_libraries(bntest ${OPENSSL_TEST_LIBS}) |
84 | target_link_libraries(bntest ${OPENSSL_LIBS}) | 88 | add_test(bntest bntest) |
85 | add_test(bntest bntest) | ||
86 | endif() | ||
87 | 89 | ||
88 | # bn_to_string | 90 | # bn_to_string |
89 | if(NOT BUILD_SHARED_LIBS) | 91 | add_executable(bn_to_string bn_to_string.c) |
90 | add_executable(bn_to_string bn_to_string.c) | 92 | target_link_libraries(bn_to_string ${OPENSSL_TEST_LIBS}) |
91 | target_link_libraries(bn_to_string ${OPENSSL_LIBS}) | 93 | add_test(bn_to_string bn_to_string) |
92 | add_test(bn_to_string bn_to_string) | ||
93 | endif() | ||
94 | 94 | ||
95 | # buffertest | 95 | # buffertest |
96 | if(NOT BUILD_SHARED_LIBS) | 96 | add_executable(buffertest buffertest.c) |
97 | add_executable(buffertest buffertest.c) | 97 | target_link_libraries(buffertest ${OPENSSL_TEST_LIBS}) |
98 | target_link_libraries(buffertest ${OPENSSL_LIBS}) | 98 | add_test(buffertest buffertest) |
99 | add_test(buffertest buffertest) | ||
100 | endif() | ||
101 | 99 | ||
102 | # bytestringtest | 100 | # bytestringtest |
103 | if(NOT BUILD_SHARED_LIBS) | 101 | add_executable(bytestringtest bytestringtest.c) |
104 | add_executable(bytestringtest bytestringtest.c) | 102 | target_link_libraries(bytestringtest ${OPENSSL_TEST_LIBS}) |
105 | target_link_libraries(bytestringtest ${OPENSSL_LIBS}) | 103 | add_test(bytestringtest bytestringtest) |
106 | add_test(bytestringtest bytestringtest) | ||
107 | endif() | ||
108 | 104 | ||
109 | # casttest | 105 | # casttest |
110 | add_executable(casttest casttest.c) | 106 | add_executable(casttest casttest.c) |
111 | target_link_libraries(casttest ${OPENSSL_LIBS}) | 107 | target_link_libraries(casttest ${OPENSSL_TEST_LIBS}) |
112 | add_test(casttest casttest) | 108 | add_test(casttest casttest) |
113 | 109 | ||
114 | # chachatest | 110 | # chachatest |
115 | add_executable(chachatest chachatest.c) | 111 | add_executable(chachatest chachatest.c) |
116 | target_link_libraries(chachatest ${OPENSSL_LIBS}) | 112 | target_link_libraries(chachatest ${OPENSSL_TEST_LIBS}) |
117 | add_test(chachatest chachatest) | 113 | add_test(chachatest chachatest) |
118 | 114 | ||
119 | # cipher_list | 115 | # cipher_list |
120 | if(NOT BUILD_SHARED_LIBS) | 116 | add_executable(cipher_list cipher_list.c) |
121 | add_executable(cipher_list cipher_list.c) | 117 | target_link_libraries(cipher_list ${OPENSSL_TEST_LIBS}) |
122 | target_link_libraries(cipher_list ${OPENSSL_LIBS}) | 118 | add_test(cipher_list cipher_list) |
123 | add_test(cipher_list cipher_list) | ||
124 | endif() | ||
125 | 119 | ||
126 | if(NOT BUILD_SHARED_LIBS) | 120 | # cipherstest |
127 | # cipherstest | 121 | add_executable(cipherstest cipherstest.c) |
128 | add_executable(cipherstest cipherstest.c) | 122 | target_link_libraries(cipherstest ${OPENSSL_TEST_LIBS}) |
129 | target_link_libraries(cipherstest ${OPENSSL_LIBS}) | 123 | add_test(cipherstest cipherstest) |
130 | add_test(cipherstest cipherstest) | ||
131 | endif() | ||
132 | 124 | ||
133 | # clienttest | 125 | # clienttest |
134 | add_executable(clienttest clienttest.c) | 126 | add_executable(clienttest clienttest.c) |
135 | target_link_libraries(clienttest ${OPENSSL_LIBS}) | 127 | target_link_libraries(clienttest ${OPENSSL_TEST_LIBS}) |
136 | add_test(clienttest clienttest) | 128 | add_test(clienttest clienttest) |
137 | 129 | ||
138 | # cmstest | 130 | # cmstest |
139 | add_executable(cmstest cmstest.c) | 131 | add_executable(cmstest cmstest.c) |
140 | target_link_libraries(cmstest ${OPENSSL_LIBS}) | 132 | target_link_libraries(cmstest ${OPENSSL_TEST_LIBS}) |
141 | add_test(cmstest cmstest) | 133 | add_test(cmstest cmstest) |
142 | 134 | ||
143 | # configtest | 135 | # configtest |
144 | add_executable(configtest configtest.c) | 136 | add_executable(configtest configtest.c) |
145 | target_link_libraries(configtest ${LIBTLS_LIBS}) | 137 | target_link_libraries(configtest ${LIBTLS_TEST_LIBS}) |
146 | add_test(configtest configtest) | 138 | add_test(configtest configtest) |
147 | 139 | ||
148 | # constraints | 140 | # constraints |
149 | if(NOT BUILD_SHARED_LIBS) | 141 | add_executable(constraints constraints.c) |
150 | add_executable(constraints constraints.c) | 142 | target_link_libraries(constraints ${OPENSSL_TEST_LIBS}) |
151 | target_link_libraries(constraints ${OPENSSL_LIBS}) | 143 | add_test(constraints constraints) |
152 | add_test(constraints constraints) | ||
153 | endif() | ||
154 | 144 | ||
155 | # cts128test | 145 | # cts128test |
156 | add_executable(cts128test cts128test.c) | 146 | add_executable(cts128test cts128test.c) |
157 | target_link_libraries(cts128test ${OPENSSL_LIBS}) | 147 | target_link_libraries(cts128test ${OPENSSL_TEST_LIBS}) |
158 | add_test(cts128test cts128test) | 148 | add_test(cts128test cts128test) |
159 | 149 | ||
160 | # destest | 150 | # destest |
161 | add_executable(destest destest.c) | 151 | add_executable(destest destest.c) |
162 | target_link_libraries(destest ${OPENSSL_LIBS}) | 152 | target_link_libraries(destest ${OPENSSL_TEST_LIBS}) |
163 | add_test(destest destest) | 153 | add_test(destest destest) |
164 | 154 | ||
165 | # dhtest | 155 | # dhtest |
166 | add_executable(dhtest dhtest.c) | 156 | add_executable(dhtest dhtest.c) |
167 | target_link_libraries(dhtest ${OPENSSL_LIBS}) | 157 | target_link_libraries(dhtest ${OPENSSL_TEST_LIBS}) |
168 | add_test(dhtest dhtest) | 158 | add_test(dhtest dhtest) |
169 | 159 | ||
170 | # dsatest | 160 | # dsatest |
171 | add_executable(dsatest dsatest.c) | 161 | add_executable(dsatest dsatest.c) |
172 | target_link_libraries(dsatest ${OPENSSL_LIBS}) | 162 | target_link_libraries(dsatest ${OPENSSL_TEST_LIBS}) |
173 | add_test(dsatest dsatest) | 163 | add_test(dsatest dsatest) |
174 | 164 | ||
175 | # dtlstest | 165 | # dtlstest |
176 | if(NOT BUILD_SHARED_LIBS AND NOT WIN32) | 166 | if(NOT WIN32) |
177 | add_executable(dtlstest dtlstest.c) | 167 | add_executable(dtlstest dtlstest.c) |
178 | target_link_libraries(dtlstest ${OPENSSL_LIBS}) | 168 | target_link_libraries(dtlstest ${OPENSSL_TEST_LIBS}) |
179 | add_test(NAME dtlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dtlstest.sh) | 169 | add_test(NAME dtlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dtlstest.sh) |
180 | set_tests_properties(dtlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | 170 | set_tests_properties(dtlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") |
181 | endif() | 171 | endif() |
182 | 172 | ||
183 | if(NOT BUILD_SHARED_LIBS) | ||
184 | # ec_point_conversion | 173 | # ec_point_conversion |
185 | add_executable(ec_point_conversion ec_point_conversion.c) | 174 | add_executable(ec_point_conversion ec_point_conversion.c) |
186 | target_link_libraries(ec_point_conversion ${OPENSSL_LIBS}) | 175 | target_link_libraries(ec_point_conversion ${OPENSSL_TEST_LIBS}) |
187 | add_test(ec_point_conversion ec_point_conversion) | 176 | add_test(ec_point_conversion ec_point_conversion) |
188 | 177 | ||
189 | # ecdhtest | 178 | # ecdhtest |
190 | add_executable(ecdhtest ecdhtest.c) | 179 | add_executable(ecdhtest ecdhtest.c) |
191 | target_link_libraries(ecdhtest ${OPENSSL_LIBS}) | 180 | target_link_libraries(ecdhtest ${OPENSSL_TEST_LIBS}) |
192 | add_test(ecdhtest ecdhtest) | 181 | add_test(ecdhtest ecdhtest) |
193 | 182 | ||
194 | # ecdsatest | 183 | # ecdsatest |
195 | add_executable(ecdsatest ecdsatest.c) | 184 | add_executable(ecdsatest ecdsatest.c) |
196 | target_link_libraries(ecdsatest ${OPENSSL_LIBS}) | 185 | target_link_libraries(ecdsatest ${OPENSSL_TEST_LIBS}) |
197 | add_test(ecdsatest ecdsatest) | 186 | add_test(ecdsatest ecdsatest) |
198 | 187 | ||
199 | # ectest | 188 | # ectest |
200 | add_executable(ectest ectest.c) | 189 | add_executable(ectest ectest.c) |
201 | target_link_libraries(ectest ${OPENSSL_LIBS}) | 190 | target_link_libraries(ectest ${OPENSSL_TEST_LIBS}) |
202 | add_test(ectest ectest) | 191 | add_test(ectest ectest) |
203 | endif() | ||
204 | 192 | ||
205 | # enginetest | 193 | # enginetest |
206 | add_executable(enginetest enginetest.c) | 194 | add_executable(enginetest enginetest.c) |
207 | target_link_libraries(enginetest ${OPENSSL_LIBS}) | 195 | target_link_libraries(enginetest ${OPENSSL_TEST_LIBS}) |
208 | add_test(enginetest enginetest) | 196 | add_test(enginetest enginetest) |
209 | 197 | ||
210 | # evptest | 198 | # evptest |
211 | add_executable(evptest evptest.c) | 199 | add_executable(evptest evptest.c) |
212 | target_link_libraries(evptest ${OPENSSL_LIBS}) | 200 | target_link_libraries(evptest ${OPENSSL_TEST_LIBS}) |
213 | add_test(evptest evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptests.txt) | 201 | add_test(evptest evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptests.txt) |
214 | 202 | ||
215 | # explicit_bzero | 203 | # explicit_bzero |
@@ -220,95 +208,89 @@ if(NOT WIN32) | |||
220 | else() | 208 | else() |
221 | add_executable(explicit_bzero explicit_bzero.c compat/memmem.c) | 209 | add_executable(explicit_bzero explicit_bzero.c compat/memmem.c) |
222 | endif() | 210 | endif() |
223 | target_link_libraries(explicit_bzero ${OPENSSL_LIBS}) | 211 | target_link_libraries(explicit_bzero ${OPENSSL_TEST_LIBS}) |
224 | add_test(explicit_bzero explicit_bzero) | 212 | add_test(explicit_bzero explicit_bzero) |
225 | endif() | 213 | endif() |
226 | 214 | ||
227 | # exptest | 215 | # exptest |
228 | if(NOT BUILD_SHARED_LIBS) | 216 | add_executable(exptest exptest.c) |
229 | add_executable(exptest exptest.c) | 217 | set_source_files_properties(exptest.c PROPERTIES COMPILE_FLAGS |
230 | set_source_files_properties(exptest.c PROPERTIES COMPILE_FLAGS | 218 | -ULIBRESSL_INTERNAL) |
231 | -ULIBRESSL_INTERNAL) | 219 | target_link_libraries(exptest ${OPENSSL_TEST_LIBS}) |
232 | target_link_libraries(exptest ${OPENSSL_LIBS}) | 220 | add_test(exptest exptest) |
233 | add_test(exptest exptest) | ||
234 | endif() | ||
235 | 221 | ||
236 | # freenull | 222 | # freenull |
237 | add_executable(freenull freenull.c) | 223 | add_executable(freenull freenull.c) |
238 | target_link_libraries(freenull ${OPENSSL_LIBS}) | 224 | target_link_libraries(freenull ${OPENSSL_TEST_LIBS}) |
239 | add_test(freenull freenull) | 225 | add_test(freenull freenull) |
240 | 226 | ||
241 | # gcm128test | 227 | # gcm128test |
242 | add_executable(gcm128test gcm128test.c) | 228 | add_executable(gcm128test gcm128test.c) |
243 | target_link_libraries(gcm128test ${OPENSSL_LIBS}) | 229 | target_link_libraries(gcm128test ${OPENSSL_TEST_LIBS}) |
244 | add_test(gcm128test gcm128test) | 230 | add_test(gcm128test gcm128test) |
245 | 231 | ||
246 | # gost2814789t | 232 | # gost2814789t |
247 | add_executable(gost2814789t gost2814789t.c) | 233 | add_executable(gost2814789t gost2814789t.c) |
248 | target_link_libraries(gost2814789t ${OPENSSL_LIBS}) | 234 | target_link_libraries(gost2814789t ${OPENSSL_TEST_LIBS}) |
249 | add_test(gost2814789t gost2814789t) | 235 | add_test(gost2814789t gost2814789t) |
250 | 236 | ||
251 | # handshake_table | 237 | # handshake_table |
252 | if(NOT BUILD_SHARED_LIBS) | 238 | add_executable(handshake_table handshake_table.c) |
253 | add_executable(handshake_table handshake_table.c) | 239 | target_link_libraries(handshake_table ${OPENSSL_TEST_LIBS}) |
254 | target_link_libraries(handshake_table ${OPENSSL_LIBS}) | 240 | add_test(handshake_table handshake_table) |
255 | add_test(handshake_table handshake_table) | ||
256 | endif() | ||
257 | 241 | ||
258 | # hkdf_test | 242 | # hkdf_test |
259 | add_executable(hkdf_test hkdf_test.c) | 243 | add_executable(hkdf_test hkdf_test.c) |
260 | target_link_libraries(hkdf_test ${OPENSSL_LIBS}) | 244 | target_link_libraries(hkdf_test ${OPENSSL_TEST_LIBS}) |
261 | add_test(hkdf_test hkdf_test) | 245 | add_test(hkdf_test hkdf_test) |
262 | 246 | ||
263 | # hmactest | 247 | # hmactest |
264 | add_executable(hmactest hmactest.c) | 248 | add_executable(hmactest hmactest.c) |
265 | target_link_libraries(hmactest ${OPENSSL_LIBS}) | 249 | target_link_libraries(hmactest ${OPENSSL_TEST_LIBS}) |
266 | add_test(hmactest hmactest) | 250 | add_test(hmactest hmactest) |
267 | 251 | ||
268 | # ideatest | 252 | # ideatest |
269 | add_executable(ideatest ideatest.c) | 253 | add_executable(ideatest ideatest.c) |
270 | target_link_libraries(ideatest ${OPENSSL_LIBS}) | 254 | target_link_libraries(ideatest ${OPENSSL_TEST_LIBS}) |
271 | add_test(ideatest ideatest) | 255 | add_test(ideatest ideatest) |
272 | 256 | ||
273 | # igetest | 257 | # igetest |
274 | add_executable(igetest igetest.c) | 258 | add_executable(igetest igetest.c) |
275 | target_link_libraries(igetest ${OPENSSL_LIBS}) | 259 | target_link_libraries(igetest ${OPENSSL_TEST_LIBS}) |
276 | add_test(igetest igetest) | 260 | add_test(igetest igetest) |
277 | 261 | ||
278 | # keypairtest | 262 | # keypairtest |
279 | if(NOT BUILD_SHARED_LIBS) | 263 | add_executable(key_schedule key_schedule.c) |
280 | add_executable(key_schedule key_schedule.c) | 264 | target_link_libraries(key_schedule ${OPENSSL_TEST_LIBS}) |
281 | target_link_libraries(key_schedule ${OPENSSL_LIBS}) | 265 | add_test(key_schedule key_schedule) |
282 | add_test(key_schedule key_schedule) | 266 | |
283 | 267 | add_executable(keypairtest keypairtest.c) | |
284 | add_executable(keypairtest keypairtest.c) | 268 | target_link_libraries(keypairtest ${LIBTLS_TEST_LIBS}) |
285 | target_link_libraries(keypairtest ${LIBTLS_LIBS}) | 269 | target_include_directories(keypairtest BEFORE PUBLIC ../tls) |
286 | target_include_directories(keypairtest BEFORE PUBLIC ../tls) | 270 | add_test(keypairtest keypairtest |
287 | add_test(keypairtest keypairtest | 271 | ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem |
288 | ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem | 272 | ${CMAKE_CURRENT_SOURCE_DIR}/server.pem |
289 | ${CMAKE_CURRENT_SOURCE_DIR}/server.pem | 273 | ${CMAKE_CURRENT_SOURCE_DIR}/server.pem) |
290 | ${CMAKE_CURRENT_SOURCE_DIR}/server.pem) | ||
291 | endif() | ||
292 | 274 | ||
293 | # md4test | 275 | # md4test |
294 | add_executable(md4test md4test.c) | 276 | add_executable(md4test md4test.c) |
295 | target_link_libraries(md4test ${OPENSSL_LIBS}) | 277 | target_link_libraries(md4test ${OPENSSL_TEST_LIBS}) |
296 | add_test(md4test md4test) | 278 | add_test(md4test md4test) |
297 | 279 | ||
298 | # md5test | 280 | # md5test |
299 | add_executable(md5test md5test.c) | 281 | add_executable(md5test md5test.c) |
300 | target_link_libraries(md5test ${OPENSSL_LIBS}) | 282 | target_link_libraries(md5test ${OPENSSL_TEST_LIBS}) |
301 | add_test(md5test md5test) | 283 | add_test(md5test md5test) |
302 | 284 | ||
303 | # mont | 285 | # mont |
304 | add_executable(mont mont.c) | 286 | add_executable(mont mont.c) |
305 | target_link_libraries(mont ${OPENSSL_LIBS}) | 287 | target_link_libraries(mont ${OPENSSL_TEST_LIBS}) |
306 | add_test(mont mont) | 288 | add_test(mont mont) |
307 | 289 | ||
308 | # ocsp_test | 290 | # ocsp_test |
309 | if(ENABLE_EXTRATESTS) | 291 | if(ENABLE_EXTRATESTS) |
310 | add_executable(ocsp_test ocsp_test.c) | 292 | add_executable(ocsp_test ocsp_test.c) |
311 | target_link_libraries(ocsp_test ${OPENSSL_LIBS}) | 293 | target_link_libraries(ocsp_test ${OPENSSL_TEST_LIBS}) |
312 | if(NOT MSVC) | 294 | if(NOT MSVC) |
313 | add_test(NAME ocsptest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.sh) | 295 | add_test(NAME ocsptest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ocsptest.sh) |
314 | else() | 296 | else() |
@@ -318,12 +300,12 @@ endif() | |||
318 | 300 | ||
319 | # optionstest | 301 | # optionstest |
320 | add_executable(optionstest optionstest.c) | 302 | add_executable(optionstest optionstest.c) |
321 | target_link_libraries(optionstest ${OPENSSL_LIBS}) | 303 | target_link_libraries(optionstest ${OPENSSL_TEST_LIBS}) |
322 | add_test(optionstest optionstest) | 304 | add_test(optionstest optionstest) |
323 | 305 | ||
324 | # pbkdf2 | 306 | # pbkdf2 |
325 | add_executable(pbkdf2 pbkdf2.c) | 307 | add_executable(pbkdf2 pbkdf2.c) |
326 | target_link_libraries(pbkdf2 ${OPENSSL_LIBS}) | 308 | target_link_libraries(pbkdf2 ${OPENSSL_TEST_LIBS}) |
327 | add_test(pbkdf2 pbkdf2) | 309 | add_test(pbkdf2 pbkdf2) |
328 | 310 | ||
329 | # pidwraptest | 311 | # pidwraptest |
@@ -331,68 +313,59 @@ add_test(pbkdf2 pbkdf2) | |||
331 | # awkward on systems with slow fork | 313 | # awkward on systems with slow fork |
332 | if(ENABLE_EXTRATESTS AND NOT MSVC) | 314 | if(ENABLE_EXTRATESTS AND NOT MSVC) |
333 | add_executable(pidwraptest pidwraptest.c) | 315 | add_executable(pidwraptest pidwraptest.c) |
334 | target_link_libraries(pidwraptest ${OPENSSL_LIBS}) | 316 | target_link_libraries(pidwraptest ${OPENSSL_TEST_LIBS}) |
335 | add_test(pidwraptest ${CMAKE_CURRENT_SOURCE_DIR}/pidwraptest.sh) | 317 | add_test(pidwraptest ${CMAKE_CURRENT_SOURCE_DIR}/pidwraptest.sh) |
336 | endif() | 318 | endif() |
337 | 319 | ||
338 | # pkcs7test | 320 | # pkcs7test |
339 | add_executable(pkcs7test pkcs7test.c) | 321 | add_executable(pkcs7test pkcs7test.c) |
340 | target_link_libraries(pkcs7test ${OPENSSL_LIBS}) | 322 | target_link_libraries(pkcs7test ${OPENSSL_TEST_LIBS}) |
341 | add_test(pkcs7test pkcs7test) | 323 | add_test(pkcs7test pkcs7test) |
342 | 324 | ||
343 | # poly1305test | 325 | # poly1305test |
344 | add_executable(poly1305test poly1305test.c) | 326 | add_executable(poly1305test poly1305test.c) |
345 | target_link_libraries(poly1305test ${OPENSSL_LIBS}) | 327 | target_link_libraries(poly1305test ${OPENSSL_TEST_LIBS}) |
346 | add_test(poly1305test poly1305test) | 328 | add_test(poly1305test poly1305test) |
347 | 329 | ||
348 | # pq_test | 330 | # pq_test |
349 | if(NOT BUILD_SHARED_LIBS) | 331 | add_executable(pq_test pq_test.c) |
350 | add_executable(pq_test pq_test.c) | 332 | target_link_libraries(pq_test ${OPENSSL_TEST_LIBS}) |
351 | target_link_libraries(pq_test ${OPENSSL_LIBS}) | 333 | if(NOT MSVC) |
352 | if(NOT MSVC) | 334 | add_test(NAME pq_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh) |
353 | add_test(NAME pq_test COMMAND | 335 | else() |
354 | ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh) | 336 | add_test(NAME pq_test COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.bat |
355 | else() | 337 | $<TARGET_FILE:pq_test>) |
356 | add_test(NAME pq_test COMMAND | ||
357 | ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.bat | ||
358 | $<TARGET_FILE:pq_test>) | ||
359 | endif() | ||
360 | set_tests_properties(pq_test PROPERTIES ENVIRONMENT | ||
361 | "srcdir=${TEST_SOURCE_DIR}") | ||
362 | endif() | 338 | endif() |
339 | set_tests_properties(pq_test PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | ||
363 | 340 | ||
364 | # randtest | 341 | # randtest |
365 | add_executable(randtest randtest.c) | 342 | add_executable(randtest randtest.c) |
366 | target_link_libraries(randtest ${OPENSSL_LIBS}) | 343 | target_link_libraries(randtest ${OPENSSL_TEST_LIBS}) |
367 | add_test(randtest randtest) | 344 | add_test(randtest randtest) |
368 | 345 | ||
369 | # rc2test | 346 | # rc2test |
370 | add_executable(rc2test rc2test.c) | 347 | add_executable(rc2test rc2test.c) |
371 | target_link_libraries(rc2test ${OPENSSL_LIBS}) | 348 | target_link_libraries(rc2test ${OPENSSL_TEST_LIBS}) |
372 | add_test(rc2test rc2test) | 349 | add_test(rc2test rc2test) |
373 | 350 | ||
374 | # rc4test | 351 | # rc4test |
375 | add_executable(rc4test rc4test.c) | 352 | add_executable(rc4test rc4test.c) |
376 | target_link_libraries(rc4test ${OPENSSL_LIBS}) | 353 | target_link_libraries(rc4test ${OPENSSL_TEST_LIBS}) |
377 | add_test(rc4test rc4test) | 354 | add_test(rc4test rc4test) |
378 | 355 | ||
379 | # recordtest | 356 | # recordtest |
380 | if(NOT BUILD_SHARED_LIBS) | 357 | add_executable(recordtest recordtest.c) |
381 | add_executable(recordtest recordtest.c) | 358 | target_link_libraries(recordtest ${OPENSSL_TEST_LIBS}) |
382 | target_link_libraries(recordtest ${OPENSSL_LIBS}) | 359 | add_test(recordtest recordtest) |
383 | add_test(recordtest recordtest) | ||
384 | endif() | ||
385 | 360 | ||
386 | # record_layer_test | 361 | # record_layer_test |
387 | if(NOT BUILD_SHARED_LIBS) | 362 | add_executable(record_layer_test record_layer_test.c) |
388 | add_executable(record_layer_test record_layer_test.c) | 363 | target_link_libraries(record_layer_test ${OPENSSL_TEST_LIBS}) |
389 | target_link_libraries(record_layer_test ${OPENSSL_LIBS}) | 364 | add_test(record_layer_test record_layer_test) |
390 | add_test(record_layer_test record_layer_test) | ||
391 | endif() | ||
392 | 365 | ||
393 | # rfc5280time | 366 | # rfc5280time |
394 | add_executable(rfc5280time rfc5280time.c) | 367 | add_executable(rfc5280time rfc5280time.c) |
395 | target_link_libraries(rfc5280time ${OPENSSL_LIBS}) | 368 | target_link_libraries(rfc5280time ${OPENSSL_TEST_LIBS}) |
396 | if(SMALL_TIME_T) | 369 | if(SMALL_TIME_T) |
397 | add_test(rfc5280time ${CMAKE_CURRENT_SOURCE_DIR}/rfc5280time_small.test) | 370 | add_test(rfc5280time ${CMAKE_CURRENT_SOURCE_DIR}/rfc5280time_small.test) |
398 | else() | 371 | else() |
@@ -401,68 +374,64 @@ endif() | |||
401 | 374 | ||
402 | # rmdtest | 375 | # rmdtest |
403 | add_executable(rmdtest rmdtest.c) | 376 | add_executable(rmdtest rmdtest.c) |
404 | target_link_libraries(rmdtest ${OPENSSL_LIBS}) | 377 | target_link_libraries(rmdtest ${OPENSSL_TEST_LIBS}) |
405 | add_test(rmdtest rmdtest) | 378 | add_test(rmdtest rmdtest) |
406 | 379 | ||
407 | # rsa_test | 380 | # rsa_test |
408 | add_executable(rsa_test rsa_test.c) | 381 | add_executable(rsa_test rsa_test.c) |
409 | target_link_libraries(rsa_test ${OPENSSL_LIBS}) | 382 | target_link_libraries(rsa_test ${OPENSSL_TEST_LIBS}) |
410 | add_test(rsa_test rsa_test) | 383 | add_test(rsa_test rsa_test) |
411 | 384 | ||
412 | # servertest | 385 | # servertest |
413 | if(NOT BUILD_SHARED_LIBS) | 386 | add_executable(servertest servertest.c) |
414 | add_executable(servertest servertest.c) | 387 | target_link_libraries(servertest ${OPENSSL_TEST_LIBS}) |
415 | target_link_libraries(servertest ${OPENSSL_LIBS}) | 388 | if(NOT MSVC) |
416 | if(NOT MSVC) | 389 | add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh) |
417 | add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh) | 390 | else() |
418 | else() | 391 | add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat $<TARGET_FILE:servertest>) |
419 | add_test(NAME servertest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat $<TARGET_FILE:servertest>) | ||
420 | endif() | ||
421 | set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | ||
422 | endif() | 392 | endif() |
393 | set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | ||
423 | 394 | ||
424 | # sha1test | 395 | # sha1test |
425 | add_executable(sha1test sha1test.c) | 396 | add_executable(sha1test sha1test.c) |
426 | target_link_libraries(sha1test ${OPENSSL_LIBS}) | 397 | target_link_libraries(sha1test ${OPENSSL_TEST_LIBS}) |
427 | add_test(sha1test sha1test) | 398 | add_test(sha1test sha1test) |
428 | 399 | ||
429 | # sha256test | 400 | # sha256test |
430 | add_executable(sha256test sha256test.c) | 401 | add_executable(sha256test sha256test.c) |
431 | target_link_libraries(sha256test ${OPENSSL_LIBS}) | 402 | target_link_libraries(sha256test ${OPENSSL_TEST_LIBS}) |
432 | add_test(sha256test sha256test) | 403 | add_test(sha256test sha256test) |
433 | 404 | ||
434 | # sha512test | 405 | # sha512test |
435 | add_executable(sha512test sha512test.c) | 406 | add_executable(sha512test sha512test.c) |
436 | target_link_libraries(sha512test ${OPENSSL_LIBS}) | 407 | target_link_libraries(sha512test ${OPENSSL_TEST_LIBS}) |
437 | add_test(sha512test sha512test) | 408 | add_test(sha512test sha512test) |
438 | 409 | ||
439 | # sm3test | 410 | # sm3test |
440 | add_executable(sm3test sm3test.c) | 411 | add_executable(sm3test sm3test.c) |
441 | target_link_libraries(sm3test ${OPENSSL_LIBS}) | 412 | target_link_libraries(sm3test ${OPENSSL_TEST_LIBS}) |
442 | add_test(sm3test sm3test) | 413 | add_test(sm3test sm3test) |
443 | 414 | ||
444 | # sm4test | 415 | # sm4test |
445 | add_executable(sm4test sm4test.c) | 416 | add_executable(sm4test sm4test.c) |
446 | target_link_libraries(sm4test ${OPENSSL_LIBS}) | 417 | target_link_libraries(sm4test ${OPENSSL_TEST_LIBS}) |
447 | add_test(sm4test sm4test) | 418 | add_test(sm4test sm4test) |
448 | 419 | ||
449 | # ssl_get_shared_ciphers | 420 | # ssl_get_shared_ciphers |
450 | add_executable(ssl_get_shared_ciphers ssl_get_shared_ciphers.c) | 421 | add_executable(ssl_get_shared_ciphers ssl_get_shared_ciphers.c) |
451 | set_source_files_properties(ssl_get_shared_ciphers.c PROPERTIES COMPILE_FLAGS | 422 | set_source_files_properties(ssl_get_shared_ciphers.c PROPERTIES COMPILE_FLAGS |
452 | -DCERTSDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\") | 423 | -DCERTSDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\") |
453 | target_link_libraries(ssl_get_shared_ciphers ${OPENSSL_LIBS}) | 424 | target_link_libraries(ssl_get_shared_ciphers ${OPENSSL_TEST_LIBS}) |
454 | add_test(ssl_get_shared_ciphers ssl_get_shared_ciphers) | 425 | add_test(ssl_get_shared_ciphers ssl_get_shared_ciphers) |
455 | 426 | ||
456 | # ssl_versions | 427 | # ssl_versions |
457 | if(NOT BUILD_SHARED_LIBS) | 428 | add_executable(ssl_versions ssl_versions.c) |
458 | add_executable(ssl_versions ssl_versions.c) | 429 | target_link_libraries(ssl_versions ${OPENSSL_TEST_LIBS}) |
459 | target_link_libraries(ssl_versions ${OPENSSL_LIBS}) | 430 | add_test(ssl_versions ssl_versions) |
460 | add_test(ssl_versions ssl_versions) | ||
461 | endif() | ||
462 | 431 | ||
463 | # ssltest | 432 | # ssltest |
464 | add_executable(ssltest ssltest.c) | 433 | add_executable(ssltest ssltest.c) |
465 | target_link_libraries(ssltest ${OPENSSL_LIBS}) | 434 | target_link_libraries(ssltest ${OPENSSL_TEST_LIBS}) |
466 | if(NOT MSVC) | 435 | if(NOT MSVC) |
467 | add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) | 436 | add_test(NAME ssltest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) |
468 | else() | 437 | else() |
@@ -496,19 +465,17 @@ set_tests_properties(testrsa PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}") | |||
496 | 465 | ||
497 | # timingsafe | 466 | # timingsafe |
498 | add_executable(timingsafe timingsafe.c) | 467 | add_executable(timingsafe timingsafe.c) |
499 | target_link_libraries(timingsafe ${OPENSSL_LIBS}) | 468 | target_link_libraries(timingsafe ${OPENSSL_TEST_LIBS}) |
500 | add_test(timingsafe timingsafe) | 469 | add_test(timingsafe timingsafe) |
501 | 470 | ||
502 | # tlsexttest | 471 | # tlsexttest |
503 | if(NOT BUILD_SHARED_LIBS) | 472 | add_executable(tlsexttest tlsexttest.c) |
504 | add_executable(tlsexttest tlsexttest.c) | 473 | target_link_libraries(tlsexttest ${OPENSSL_TEST_LIBS}) |
505 | target_link_libraries(tlsexttest ${OPENSSL_LIBS}) | 474 | add_test(tlsexttest tlsexttest) |
506 | add_test(tlsexttest tlsexttest) | ||
507 | endif() | ||
508 | 475 | ||
509 | # tlslegacytest | 476 | # tlslegacytest |
510 | add_executable(tlslegacytest tlslegacytest.c) | 477 | add_executable(tlslegacytest tlslegacytest.c) |
511 | target_link_libraries(tlslegacytest ${OPENSSL_LIBS}) | 478 | target_link_libraries(tlslegacytest ${OPENSSL_TEST_LIBS}) |
512 | add_test(tlslegacytest tlslegacytest) | 479 | add_test(tlslegacytest tlslegacytest) |
513 | 480 | ||
514 | # tlstest | 481 | # tlstest |
@@ -522,7 +489,7 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore") | |||
522 | endif() | 489 | endif() |
523 | 490 | ||
524 | add_executable(tlstest ${TLSTEST_SRC}) | 491 | add_executable(tlstest ${TLSTEST_SRC}) |
525 | target_link_libraries(tlstest ${LIBTLS_LIBS}) | 492 | target_link_libraries(tlstest ${LIBTLS_TEST_LIBS}) |
526 | if(NOT MSVC) | 493 | if(NOT MSVC) |
527 | add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh) | 494 | add_test(NAME tlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tlstest.sh) |
528 | else() | 495 | else() |
@@ -532,71 +499,59 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore") | |||
532 | endif() | 499 | endif() |
533 | 500 | ||
534 | # tls_ext_alpn | 501 | # tls_ext_alpn |
535 | if(NOT BUILD_SHARED_LIBS) | 502 | add_executable(tls_ext_alpn tls_ext_alpn.c) |
536 | add_executable(tls_ext_alpn tls_ext_alpn.c) | 503 | target_link_libraries(tls_ext_alpn ${OPENSSL_TEST_LIBS}) |
537 | target_link_libraries(tls_ext_alpn ${OPENSSL_LIBS}) | 504 | add_test(tls_ext_alpn tls_ext_alpn) |
538 | add_test(tls_ext_alpn tls_ext_alpn) | ||
539 | endif() | ||
540 | 505 | ||
541 | # tls_prf | 506 | # tls_prf |
542 | if(NOT BUILD_SHARED_LIBS) | 507 | add_executable(tls_prf tls_prf.c) |
543 | add_executable(tls_prf tls_prf.c) | 508 | target_link_libraries(tls_prf ${OPENSSL_TEST_LIBS}) |
544 | target_link_libraries(tls_prf ${OPENSSL_LIBS}) | 509 | add_test(tls_prf tls_prf) |
545 | add_test(tls_prf tls_prf) | ||
546 | endif() | ||
547 | 510 | ||
548 | # utf8test | 511 | # utf8test |
549 | if(NOT BUILD_SHARED_LIBS) | 512 | add_executable(utf8test utf8test.c) |
550 | add_executable(utf8test utf8test.c) | 513 | target_link_libraries(utf8test ${OPENSSL_TEST_LIBS}) |
551 | target_link_libraries(utf8test ${OPENSSL_LIBS}) | 514 | add_test(utf8test utf8test) |
552 | add_test(utf8test utf8test) | ||
553 | endif() | ||
554 | 515 | ||
555 | # valid_handshakes_terminate | 516 | # valid_handshakes_terminate |
556 | if(NOT BUILD_SHARED_LIBS) | 517 | add_executable(valid_handshakes_terminate valid_handshakes_terminate.c) |
557 | add_executable(valid_handshakes_terminate valid_handshakes_terminate.c) | 518 | target_link_libraries(valid_handshakes_terminate ${OPENSSL_TEST_LIBS}) |
558 | target_link_libraries(valid_handshakes_terminate ${OPENSSL_LIBS}) | 519 | add_test(valid_handshakes_terminate valid_handshakes_terminate) |
559 | add_test(valid_handshakes_terminate valid_handshakes_terminate) | ||
560 | endif() | ||
561 | 520 | ||
562 | # verifytest | 521 | # verifytest |
563 | if(NOT BUILD_SHARED_LIBS) | 522 | add_executable(verifytest verifytest.c) |
564 | add_executable(verifytest verifytest.c) | 523 | target_link_libraries(verifytest ${LIBTLS_TEST_LIBS}) |
565 | target_link_libraries(verifytest ${LIBTLS_LIBS}) | 524 | add_test(verifytest verifytest) |
566 | add_test(verifytest verifytest) | ||
567 | endif() | ||
568 | 525 | ||
569 | # x25519test | 526 | # x25519test |
570 | add_executable(x25519test x25519test.c) | 527 | add_executable(x25519test x25519test.c) |
571 | target_link_libraries(x25519test ${OPENSSL_LIBS}) | 528 | target_link_libraries(x25519test ${OPENSSL_TEST_LIBS}) |
572 | add_test(x25519test x25519test) | 529 | add_test(x25519test x25519test) |
573 | 530 | ||
574 | # x509attribute | 531 | # x509attribute |
575 | add_executable(x509attribute x509attribute.c) | 532 | add_executable(x509attribute x509attribute.c) |
576 | target_link_libraries(x509attribute ${OPENSSL_LIBS}) | 533 | target_link_libraries(x509attribute ${OPENSSL_TEST_LIBS}) |
577 | add_test(x509attribute x509attribute) | 534 | add_test(x509attribute x509attribute) |
578 | 535 | ||
579 | # x509_info | 536 | # x509_info |
580 | add_executable(x509_info x509_info.c) | 537 | add_executable(x509_info x509_info.c) |
581 | target_link_libraries(x509_info ${OPENSSL_LIBS}) | 538 | target_link_libraries(x509_info ${OPENSSL_TEST_LIBS}) |
582 | add_test(x509_info x509_info) | 539 | add_test(x509_info x509_info) |
583 | 540 | ||
584 | # x509name | 541 | # x509name |
585 | add_executable(x509name x509name.c) | 542 | add_executable(x509name x509name.c) |
586 | target_link_libraries(x509name ${OPENSSL_LIBS}) | 543 | target_link_libraries(x509name ${OPENSSL_TEST_LIBS}) |
587 | add_test(x509name x509name) | 544 | add_test(x509name x509name) |
588 | 545 | ||
589 | # x509req_ext | 546 | # x509req_ext |
590 | add_executable(x509req_ext x509req_ext.c) | 547 | add_executable(x509req_ext x509req_ext.c) |
591 | target_link_libraries(x509req_ext ${OPENSSL_LIBS}) | 548 | target_link_libraries(x509req_ext ${OPENSSL_TEST_LIBS}) |
592 | add_test(x509req_ext x509req_ext) | 549 | add_test(x509req_ext x509req_ext) |
593 | 550 | ||
594 | if(BUILD_SHARED_LIBS) | 551 | add_custom_command(TARGET x25519test POST_BUILD |
595 | add_custom_command(TARGET x25519test POST_BUILD | 552 | COMMAND "${CMAKE_COMMAND}" -E copy |
596 | COMMAND "${CMAKE_COMMAND}" -E copy | 553 | "$<TARGET_FILE:tls>" |
597 | "$<TARGET_FILE:tls>" | 554 | "$<TARGET_FILE:ssl>" |
598 | "$<TARGET_FILE:ssl>" | 555 | "$<TARGET_FILE:crypto>" |
599 | "$<TARGET_FILE:crypto>" | 556 | "${CMAKE_CURRENT_BINARY_DIR}" |
600 | "${CMAKE_CURRENT_BINARY_DIR}" | 557 | COMMENT "Copying DLLs for regression tests") |
601 | COMMENT "Copying DLLs for regression tests") | ||
602 | endif() | ||
diff --git a/tests/Makefile.am b/tests/Makefile.am index b426ad0..f4da814 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
@@ -59,6 +59,11 @@ TESTS += asn1time | |||
59 | check_PROGRAMS += asn1time | 59 | check_PROGRAMS += asn1time |
60 | asn1time_SOURCES = asn1time.c | 60 | asn1time_SOURCES = asn1time.c |
61 | 61 | ||
62 | # asn1x509 | ||
63 | TESTS += asn1x509 | ||
64 | check_PROGRAMS += asn1x509 | ||
65 | asn1x509_SOURCES = asn1x509.c | ||
66 | |||
62 | # base64test | 67 | # base64test |
63 | TESTS += base64test | 68 | TESTS += base64test |
64 | check_PROGRAMS += base64test | 69 | check_PROGRAMS += base64test |
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 9aa10e1..15e5127 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
@@ -48,12 +48,6 @@ target_include_directories(tls_obj | |||
48 | 48 | ||
49 | add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj> | 49 | add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj> |
50 | $<TARGET_OBJECTS:crypto_obj>) | 50 | $<TARGET_OBJECTS:crypto_obj>) |
51 | target_include_directories(tls | ||
52 | PRIVATE | ||
53 | . | ||
54 | ../include/compat | ||
55 | PUBLIC | ||
56 | ../include) | ||
57 | 51 | ||
58 | export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym) | 52 | export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym) |
59 | target_link_libraries(tls ${PLATFORM_LIBS}) | 53 | target_link_libraries(tls ${PLATFORM_LIBS}) |
@@ -74,3 +68,11 @@ if(ENABLE_LIBRESSL_INSTALL) | |||
74 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 68 | RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
75 | ) | 69 | ) |
76 | endif(ENABLE_LIBRESSL_INSTALL) | 70 | endif(ENABLE_LIBRESSL_INSTALL) |
71 | |||
72 | # build static library for regression test | ||
73 | if(BUILD_SHARED_LIBS) | ||
74 | add_library(tls-static STATIC $<TARGET_OBJECTS:tls_obj> | ||
75 | $<TARGET_OBJECTS:ssl_obj> $<TARGET_OBJECTS:crypto_obj>) | ||
76 | target_link_libraries(tls-static ${PLATFORM_LIBS}) | ||
77 | endif() | ||
78 | |||
@@ -122,7 +122,8 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h | |||
122 | md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h | 122 | md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h |
123 | rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h | 123 | rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h |
124 | sm3/sm3.h sm4/sm4.h chacha/chacha.h evp/evp.h poly1305/poly1305.h | 124 | sm3/sm3.h sm4/sm4.h chacha/chacha.h evp/evp.h poly1305/poly1305.h |
125 | camellia/camellia.h gost/gost.h curve25519/curve25519.h" | 125 | camellia/camellia.h gost/gost.h curve25519/curve25519.h |
126 | ct/ct.h ct/cterr.h" | ||
126 | 127 | ||
127 | copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" | 128 | copy_hdrs $libssl_src "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" |
128 | 129 | ||