Latest update.

2020-04-15 18:45:34 +09:00
parent be29e7bcc6
commit 2015c00c43
573 changed files with 22943 additions and 6714 deletions
@@ -50,10 +50,9 @@ IF[{- !$disabled{tests} -}]
          cipherbytes_test \
          asn1_encode_test asn1_decode_test asn1_string_table_test \
          x509_time_test x509_dup_cert_test x509_check_cert_pkey_test \
-          recordlentest drbgtest sslbuffertest \
-          recordlentest drbgtest drbg_cavs_test sslbuffertest \
+          recordlentest drbgtest drbg_cavs_test drbg_extra_test sslbuffertest \
          time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \
-          servername_test ocspapitest rsa_mp_test fatalerrtest tls13ccstest \
+          http_test servername_test ocspapitest rsa_mp_test fatalerrtest tls13ccstest \
          sysdefaulttest errtest ssl_ctx_test gosttest \
          context_internal_test aesgcmtest params_test evp_pkey_dparams_test \
          keymgmt_internal_test
@@ -141,11 +140,11 @@ IF[{- !$disabled{tests} -}]
  ENDIF

  SOURCE[evp_extra_test]=evp_extra_test.c
-  INCLUDE[evp_extra_test]=../include ../apps/include ../crypto/include
+  INCLUDE[evp_extra_test]=../include ../apps/include
  DEPEND[evp_extra_test]=../libcrypto libtestutil.a

  SOURCE[evp_fetch_prov_test]=evp_fetch_prov_test.c
-  INCLUDE[evp_fetch_prov_test]=../include ../apps/include ../crypto/include
+  INCLUDE[evp_fetch_prov_test]=../include ../apps/include
  DEPEND[evp_fetch_prov_test]=../libcrypto libtestutil.a
  IF[{- $disabled{fips} || !$target{dso_scheme} -}]
    DEFINE[evp_extra_test]=NO_FIPS_MODULE
@@ -357,15 +356,19 @@ IF[{- !$disabled{tests} -}]
  DEPEND[recordlentest]=../libcrypto ../libssl libtestutil.a

  SOURCE[drbgtest]=drbgtest.c
-  INCLUDE[drbgtest]=../include ../apps/include ../crypto/include
+  INCLUDE[drbgtest]=../include ../apps/include
  DEPEND[drbgtest]=../libcrypto.a libtestutil.a

  SOURCE[drbg_cavs_test]=drbg_cavs_test.c drbg_cavs_data_ctr.c \
                         drbg_cavs_data_hash.c drbg_cavs_data_hmac.c

-  INCLUDE[drbg_cavs_test]=../include ../apps/include . .. ../crypto/include
+  INCLUDE[drbg_cavs_test]=../include ../apps/include . ..
  DEPEND[drbg_cavs_test]=../libcrypto libtestutil.a

+  SOURCE[drbg_extra_test]=drbg_extra_test.c
+  INCLUDE[drbg_extra_test]=../include . .. ../apps/include
+  DEPEND[drbg_extra_test]=../libcrypto libtestutil.a
+
  SOURCE[x509_dup_cert_test]=x509_dup_cert_test.c
  INCLUDE[x509_dup_cert_test]=../include ../apps/include
  DEPEND[x509_dup_cert_test]=../libcrypto libtestutil.a
@@ -386,6 +389,10 @@ IF[{- !$disabled{tests} -}]
  INCLUDE[ciphername_test]=../include ../apps/include
  DEPEND[ciphername_test]=../libcrypto ../libssl libtestutil.a

+  SOURCE[http_test]=http_test.c
+  INCLUDE[http_test]=../include ../apps/include
+  DEPEND[http_test]=../libcrypto libtestutil.a
+
  SOURCE[servername_test]=servername_test.c ssltestlib.c
  INCLUDE[servername_test]=../include ../apps/include
  DEPEND[servername_test]=../libcrypto ../libssl libtestutil.a
@@ -407,7 +414,7 @@ IF[{- !$disabled{tests} -}]
  IF[{- !$disabled{shared} -}]
    PROGRAMS{noinst}=shlibloadtest
    SOURCE[shlibloadtest]=shlibloadtest.c
-    INCLUDE[shlibloadtest]=../include ../apps/include ../crypto/include
+    INCLUDE[shlibloadtest]=../include ../apps/include
  ENDIF

  # cipher_overhead_test uses internal symbols, so it must be linked with
@@ -447,7 +454,8 @@ IF[{- !$disabled{tests} -}]

  IF[{- !$disabled{cmp} -}]
    PROGRAMS{noinst}=cmp_asn_test cmp_ctx_test cmp_status_test cmp_hdr_test \
-                     cmp_protect_test cmp_msg_test cmp_vfy_test
+                     cmp_protect_test cmp_msg_test cmp_vfy_test \
+                     cmp_server_test cmp_client_test
  ENDIF

  SOURCE[cmp_asn_test]=cmp_asn_test.c cmp_testlib.c
@@ -474,10 +482,18 @@ IF[{- !$disabled{tests} -}]
  INCLUDE[cmp_msg_test]=.. ../include ../apps/include
  DEPEND[cmp_msg_test]=../libcrypto.a libtestutil.a

-  SOURCE[cmp_vfy_test]=cmp_status_test.c cmp_testlib.c
+  SOURCE[cmp_vfy_test]=cmp_vfy_test.c cmp_testlib.c
  INCLUDE[cmp_vfy_test]=.. ../include ../apps/include
  DEPEND[cmp_vfy_test]=../libcrypto.a libtestutil.a

+  SOURCE[cmp_server_test]=cmp_server_test.c cmp_testlib.c
+  INCLUDE[cmp_server_test]=.. ../include ../apps/include
+  DEPEND[cmp_server_test]=../libcrypto.a libtestutil.a
+
+  SOURCE[cmp_client_test]=cmp_client_test.c cmp_testlib.c ../apps/cmp_mock_srv.c
+  INCLUDE[cmp_client_test]=.. ../include ../apps/include
+  DEPEND[cmp_client_test]=../libcrypto.a libtestutil.a
+
  # Internal test programs.  These are essentially a collection of internal
  # test routines.  Some of them need to reach internal symbols that aren't
  # available through the shared library (at least on Linux, Solaris, Windows
@@ -513,19 +529,19 @@ IF[{- !$disabled{tests} -}]
    ENDIF

    SOURCE[poly1305_internal_test]=poly1305_internal_test.c
-    INCLUDE[poly1305_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[poly1305_internal_test]=.. ../include ../apps/include
    DEPEND[poly1305_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[chacha_internal_test]=chacha_internal_test.c
-    INCLUDE[chacha_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[chacha_internal_test]=.. ../include ../apps/include
    DEPEND[chacha_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[asn1_internal_test]=asn1_internal_test.c
-    INCLUDE[asn1_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[asn1_internal_test]=.. ../include ../apps/include
    DEPEND[asn1_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[modes_internal_test]=modes_internal_test.c
-    INCLUDE[modes_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[modes_internal_test]=.. ../include ../apps/include
    DEPEND[modes_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[x509_internal_test]=x509_internal_test.c
@@ -566,7 +582,7 @@ IF[{- !$disabled{tests} -}]
    DEPEND[ctype_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[sparse_array_test]=sparse_array_test.c
-    INCLUDE[sparse_array_test]=../crypto/include ../include ../apps/include
+    INCLUDE[sparse_array_test]=../include ../apps/include
    DEPEND[sparse_array_test]=../libcrypto.a libtestutil.a

    SOURCE[dhtest]=dhtest.c
@@ -578,15 +594,15 @@ IF[{- !$disabled{tests} -}]
    DEPEND[hmactest]=../libcrypto.a libtestutil.a

    SOURCE[siphash_internal_test]=siphash_internal_test.c
-    INCLUDE[siphash_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[siphash_internal_test]=.. ../include ../apps/include
    DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[sm2_internal_test]=sm2_internal_test.c
-    INCLUDE[sm2_internal_test]=../include ../apps/include ../crypto/include
+    INCLUDE[sm2_internal_test]=../include ../apps/include
    DEPEND[sm2_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[sm4_internal_test]=sm4_internal_test.c
-    INCLUDE[sm4_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[sm4_internal_test]=.. ../include ../apps/include
    DEPEND[sm4_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[destest]=destest.c
@@ -606,7 +622,7 @@ IF[{- !$disabled{tests} -}]
    DEPEND[rc5test]=../libcrypto.a libtestutil.a

    SOURCE[ec_internal_test]=ec_internal_test.c
-    INCLUDE[ec_internal_test]=../include ../crypto/ec ../apps/include ../crypto/include
+    INCLUDE[ec_internal_test]=../include ../crypto/ec ../apps/include
    DEPEND[ec_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[curve448_internal_test]=curve448_internal_test.c
@@ -630,7 +646,7 @@ IF[{- !$disabled{tests} -}]
    DEPEND[bn_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[asn1_dsa_internal_test]=asn1_dsa_internal_test.c
-    INCLUDE[asn1_dsa_internal_test]=.. ../include ../apps/include ../crypto/include
+    INCLUDE[asn1_dsa_internal_test]=.. ../include ../apps/include
    DEPEND[asn1_dsa_internal_test]=../libcrypto.a libtestutil.a

    SOURCE[keymgmt_internal_test]=keymgmt_internal_test.c