7 files changed, 115 insertions, 13 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index b1ded85..5733746 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
+
 if(HOST_ASM_ELF_ARMV4)
         set(
                 ASM_ARMV4_ELF_SRC
@@ -231,6 +233,7 @@ set(
         malloc-wrapper.c
         mem_clr.c
         mem_dbg.c
+        o_fips.c
         o_init.c
         o_str.c
         o_time.c
@@ -726,9 +729,11 @@ set(
         x509/pcy_map.c
         x509/pcy_node.c
         x509/pcy_tree.c
+        x509/x509_addr.c
         x509/x509_akey.c
         x509/x509_akeya.c
         x509/x509_alt.c
+        x509/x509_asid.c
         x509/x509_att.c
         x509/x509_bcons.c
         x509/x509_bitst.c
@@ -982,6 +987,7 @@ target_include_directories(crypto_obj
                 ecdsa
                 evp
                 modes
+                x509
                 ../include/compat
         PUBLIC
                 ../include)
@@ -998,6 +1004,7 @@ target_include_directories(crypto
                 ecdsa
                 evp
                 modes
+                x509
                 ../include/compat
         PUBLIC
                 ../include)
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 4030eae..f2ef151 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdh
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdsa
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/x509
 AM_CPPFLAGS += -I$(top_srcdir)/crypto
 
 noinst_LTLIBRARIES = libcompat.la
@@ -264,6 +265,7 @@ libcrypto_la_SOURCES += ex_data.c
 libcrypto_la_SOURCES += malloc-wrapper.c
 libcrypto_la_SOURCES += mem_clr.c
 libcrypto_la_SOURCES += mem_dbg.c
+libcrypto_la_SOURCES += o_fips.c
 libcrypto_la_SOURCES += o_init.c
 libcrypto_la_SOURCES += o_str.c
 libcrypto_la_SOURCES += o_time.c
diff --git a/man/links b/man/links
index 44f6a59..7c5225e 100644
--- a/man/links
+++ b/man/links
@@ -26,6 +26,7 @@ ASN1_STRING_length.3,ASN1_STRING_dup.3
 ASN1_STRING_length.3,ASN1_STRING_get0_data.3
 ASN1_STRING_length.3,ASN1_STRING_length_set.3
 ASN1_STRING_length.3,ASN1_STRING_set.3
+ASN1_STRING_length.3,ASN1_STRING_set0.3
 ASN1_STRING_length.3,ASN1_STRING_to_UTF8.3
 ASN1_STRING_length.3,ASN1_STRING_type.3
 ASN1_STRING_new.3,ASN1_BIT_STRING_free.3
@@ -101,6 +102,12 @@ ASN1_item_d2i.3,ASN1_item_print.3
 ASN1_item_d2i.3,d2i_ASN1_TYPE.3
 ASN1_item_d2i.3,i2d_ASN1_TYPE.3
 ASN1_item_new.3,ASN1_item_free.3
+ASN1_item_sign.3,ASN1_item_sign_ctx.3
+ASN1_mbstring_copy.3,ASN1_STRING_get_default_mask.3
+ASN1_mbstring_copy.3,ASN1_STRING_set_by_NID.3
+ASN1_mbstring_copy.3,ASN1_STRING_set_default_mask.3
+ASN1_mbstring_copy.3,ASN1_STRING_set_default_mask_asc.3
+ASN1_mbstring_copy.3,ASN1_mbstring_ncopy.3
 ASN1_parse_dump.3,ASN1_parse.3
 ASN1_put_object.3,ASN1_put_eoc.3
 ASN1_time_parse.3,ASN1_TIME_set_tm.3
@@ -944,6 +951,7 @@ EVP_EncryptInit.3,EVP_rc2_ecb.3
 EVP_EncryptInit.3,EVP_rc2_ofb.3
 EVP_OpenInit.3,EVP_OpenFinal.3
 EVP_OpenInit.3,EVP_OpenUpdate.3
+EVP_PKCS82PKEY.3,EVP_PKEY2PKCS8.3
 EVP_PKEY_CTX_ctrl.3,EVP_PKEY_CTX_ctrl_str.3
 EVP_PKEY_CTX_ctrl.3,EVP_PKEY_CTX_get0_ecdh_kdf_ukm.3
 EVP_PKEY_CTX_ctrl.3,EVP_PKEY_CTX_get1_id.3
@@ -968,6 +976,14 @@ EVP_PKEY_CTX_ctrl.3,EVP_PKEY_CTX_set_signature_md.3
 EVP_PKEY_CTX_new.3,EVP_PKEY_CTX_dup.3
 EVP_PKEY_CTX_new.3,EVP_PKEY_CTX_free.3
 EVP_PKEY_CTX_new.3,EVP_PKEY_CTX_new_id.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_add1_attr_by_NID.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_add1_attr_by_OBJ.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_add1_attr_by_txt.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_delete_attr.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_get_attr.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_get_attr_by_NID.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_get_attr_by_OBJ.3
+EVP_PKEY_add1_attr.3,EVP_PKEY_get_attr_count.3
 EVP_PKEY_asn1_get_count.3,EVP_PKEY_asn1_find.3
 EVP_PKEY_asn1_get_count.3,EVP_PKEY_asn1_find_str.3
 EVP_PKEY_asn1_get_count.3,EVP_PKEY_asn1_get0.3
@@ -1429,6 +1445,9 @@ PKCS7_set_content.3,PKCS7_content_new.3
 PKCS7_set_type.3,PKCS7_set0_type_other.3
 PKCS7_verify.3,PKCS7_get0_signers.3
 PKCS8_PRIV_KEY_INFO_new.3,PKCS8_PRIV_KEY_INFO_free.3
+PKCS8_pkey_set0.3,PKCS8_pkey_add1_attr_by_NID.3
+PKCS8_pkey_set0.3,PKCS8_pkey_get0.3
+PKCS8_pkey_set0.3,PKCS8_pkey_get0_attrs.3
 PKEY_USAGE_PERIOD_new.3,PKEY_USAGE_PERIOD_free.3
 POLICYINFO_new.3,CERTIFICATEPOLICIES_free.3
 POLICYINFO_new.3,CERTIFICATEPOLICIES_new.3
@@ -1678,6 +1697,8 @@ SSL_CTX_set_generate_session_id.3,SSL_set_generate_session_id.3
 SSL_CTX_set_info_callback.3,SSL_CTX_get_info_callback.3
 SSL_CTX_set_info_callback.3,SSL_get_info_callback.3
 SSL_CTX_set_info_callback.3,SSL_set_info_callback.3
+SSL_CTX_set_keylog_callback.3,SSL_CTX_get_keylog_callback.3
+SSL_CTX_set_keylog_callback.3,SSL_CTX_keylog_cb_func.3
 SSL_CTX_set_max_cert_list.3,SSL_CTX_get_max_cert_list.3
 SSL_CTX_set_max_cert_list.3,SSL_get_max_cert_list.3
 SSL_CTX_set_max_cert_list.3,SSL_set_max_cert_list.3
@@ -1696,6 +1717,9 @@ SSL_CTX_set_mode.3,SSL_set_mode.3
 SSL_CTX_set_msg_callback.3,SSL_CTX_set_msg_callback_arg.3
 SSL_CTX_set_msg_callback.3,SSL_set_msg_callback.3
 SSL_CTX_set_msg_callback.3,SSL_set_msg_callback_arg.3
+SSL_CTX_set_num_tickets.3,SSL_CTX_get_num_tickets.3
+SSL_CTX_set_num_tickets.3,SSL_get_num_tickets.3
+SSL_CTX_set_num_tickets.3,SSL_set_num_tickets.3
 SSL_CTX_set_options.3,SSL_CTX_clear_options.3
 SSL_CTX_set_options.3,SSL_CTX_get_options.3
 SSL_CTX_set_options.3,SSL_clear_options.3
@@ -1816,6 +1840,8 @@ SSL_new.3,SSL_up_ref.3
 SSL_num_renegotiations.3,SSL_clear_num_renegotiations.3
 SSL_num_renegotiations.3,SSL_total_renegotiations.3
 SSL_read.3,SSL_peek.3
+SSL_read.3,SSL_peek_ex.3
+SSL_read.3,SSL_read_ex.3
 SSL_read_early_data.3,SSL_CTX_get_max_early_data.3
 SSL_read_early_data.3,SSL_CTX_set_max_early_data.3
 SSL_read_early_data.3,SSL_SESSION_get_max_early_data.3
@@ -1837,6 +1863,7 @@ SSL_set_connect_state.3,SSL_set_accept_state.3
 SSL_set_fd.3,SSL_set_rfd.3
 SSL_set_fd.3,SSL_set_wfd.3
 SSL_set_max_send_fragment.3,SSL_CTX_set_max_send_fragment.3
+SSL_set_psk_use_session_callback.3,SSL_psk_use_session_cb_func.3
 SSL_set_shutdown.3,SSL_get_shutdown.3
 SSL_set_tmp_ecdh.3,SSL_CTX_set_ecdh_auto.3
 SSL_set_tmp_ecdh.3,SSL_CTX_set_tmp_ecdh.3
@@ -1848,6 +1875,7 @@ SSL_want.3,SSL_want_nothing.3
 SSL_want.3,SSL_want_read.3
 SSL_want.3,SSL_want_write.3
 SSL_want.3,SSL_want_x509_lookup.3
+SSL_write.3,SSL_write_ex.3
 SXNET_new.3,SXNETID_free.3
 SXNET_new.3,SXNETID_new.3
 SXNET_new.3,SXNET_free.3
@@ -1930,12 +1958,25 @@ X509_ALGOR_dup.3,X509_ALGOR_get0.3
 X509_ALGOR_dup.3,X509_ALGOR_new.3
 X509_ALGOR_dup.3,X509_ALGOR_set0.3
 X509_ALGOR_dup.3,X509_ALGOR_set_md.3
+X509_ATTRIBUTE_get0_object.3,X509_ATTRIBUTE_count.3
+X509_ATTRIBUTE_get0_object.3,X509_ATTRIBUTE_get0_data.3
+X509_ATTRIBUTE_get0_object.3,X509_ATTRIBUTE_get0_type.3
+X509_ATTRIBUTE_new.3,X509_ATTRIBUTE_create.3
+X509_ATTRIBUTE_new.3,X509_ATTRIBUTE_dup.3
 X509_ATTRIBUTE_new.3,X509_ATTRIBUTE_free.3
+X509_ATTRIBUTE_set1_object.3,X509_ATTRIBUTE_create_by_NID.3
+X509_ATTRIBUTE_set1_object.3,X509_ATTRIBUTE_create_by_OBJ.3
+X509_ATTRIBUTE_set1_object.3,X509_ATTRIBUTE_create_by_txt.3
+X509_ATTRIBUTE_set1_object.3,X509_ATTRIBUTE_set1_data.3
 X509_CINF_new.3,X509_CERT_AUX_free.3
 X509_CINF_new.3,X509_CERT_AUX_new.3
 X509_CINF_new.3,X509_CINF_free.3
 X509_CINF_new.3,X509_VAL_free.3
 X509_CINF_new.3,X509_VAL_new.3
+X509_CRL_METHOD_new.3,X509_CRL_METHOD_free.3
+X509_CRL_METHOD_new.3,X509_CRL_get_meth_data.3
+X509_CRL_METHOD_new.3,X509_CRL_set_default_method.3
+X509_CRL_METHOD_new.3,X509_CRL_set_meth_data.3
 X509_CRL_get0_by_serial.3,X509_CRL_add0_revoked.3
 X509_CRL_get0_by_serial.3,X509_CRL_get0_by_cert.3
 X509_CRL_get0_by_serial.3,X509_CRL_get_REVOKED.3
@@ -1948,6 +1989,7 @@ X509_CRL_new.3,X509_CRL_up_ref.3
 X509_CRL_print.3,X509_CRL_print_fp.3
 X509_EXTENSION_set_object.3,X509_EXTENSION_create_by_NID.3
 X509_EXTENSION_set_object.3,X509_EXTENSION_create_by_OBJ.3
+X509_EXTENSION_set_object.3,X509_EXTENSION_dup.3
 X509_EXTENSION_set_object.3,X509_EXTENSION_free.3
 X509_EXTENSION_set_object.3,X509_EXTENSION_get_critical.3
 X509_EXTENSION_set_object.3,X509_EXTENSION_get_data.3
@@ -2010,6 +2052,7 @@ X509_OBJECT_get0_X509.3,X509_OBJECT_idx_by_subject.3
 X509_OBJECT_get0_X509.3,X509_OBJECT_retrieve_by_subject.3
 X509_OBJECT_get0_X509.3,X509_OBJECT_retrieve_match.3
 X509_OBJECT_get0_X509.3,X509_OBJECT_up_ref_count.3
+X509_PKEY_new.3,X509_PKEY_free.3
 X509_PUBKEY_new.3,X509_PUBKEY_free.3
 X509_PUBKEY_new.3,X509_PUBKEY_get.3
 X509_PUBKEY_new.3,X509_PUBKEY_get0.3
@@ -2019,9 +2062,11 @@ X509_PUBKEY_new.3,X509_PUBKEY_set0_param.3
 X509_PUBKEY_new.3,d2i_PUBKEY.3
 X509_PUBKEY_new.3,d2i_PUBKEY_bio.3
 X509_PUBKEY_new.3,d2i_PUBKEY_fp.3
+X509_PUBKEY_new.3,d2i_X509_PUBKEY.3
 X509_PUBKEY_new.3,i2d_PUBKEY.3
 X509_PUBKEY_new.3,i2d_PUBKEY_bio.3
 X509_PUBKEY_new.3,i2d_PUBKEY_fp.3
+X509_PUBKEY_new.3,i2d_X509_PUBKEY.3
 X509_PURPOSE_set.3,X509_PURPOSE_add.3
 X509_PURPOSE_set.3,X509_PURPOSE_cleanup.3
 X509_PURPOSE_set.3,X509_PURPOSE_get0.3
@@ -2032,15 +2077,33 @@ X509_PURPOSE_set.3,X509_PURPOSE_get_by_sname.3
 X509_PURPOSE_set.3,X509_PURPOSE_get_count.3
 X509_PURPOSE_set.3,X509_PURPOSE_get_id.3
 X509_PURPOSE_set.3,X509_PURPOSE_get_trust.3
+X509_REQ_add1_attr.3,X509_REQ_add1_attr_by_NID.3
+X509_REQ_add1_attr.3,X509_REQ_add1_attr_by_OBJ.3
+X509_REQ_add1_attr.3,X509_REQ_add1_attr_by_txt.3
+X509_REQ_add1_attr.3,X509_REQ_delete_attr.3
+X509_REQ_add1_attr.3,X509_REQ_get_attr.3
+X509_REQ_add1_attr.3,X509_REQ_get_attr_by_NID.3
+X509_REQ_add1_attr.3,X509_REQ_get_attr_by_OBJ.3
+X509_REQ_add1_attr.3,X509_REQ_get_attr_count.3
+X509_REQ_add_extensions.3,X509_REQ_add_extensions_nid.3
+X509_REQ_add_extensions.3,X509_REQ_extension_nid.3
+X509_REQ_add_extensions.3,X509_REQ_get_extension_nids.3
+X509_REQ_add_extensions.3,X509_REQ_get_extensions.3
+X509_REQ_add_extensions.3,X509_REQ_set_extension_nids.3
 X509_REQ_new.3,X509_REQ_INFO_free.3
 X509_REQ_new.3,X509_REQ_INFO_new.3
+X509_REQ_new.3,X509_REQ_dup.3
 X509_REQ_new.3,X509_REQ_free.3
+X509_REQ_new.3,X509_to_X509_REQ.3
+X509_REQ_print_ex.3,X509_REQ_print.3
+X509_REQ_print_ex.3,X509_REQ_print_fp.3
 X509_REVOKED_new.3,X509_REVOKED_dup.3
 X509_REVOKED_new.3,X509_REVOKED_free.3
 X509_REVOKED_new.3,X509_REVOKED_get0_revocationDate.3
 X509_REVOKED_new.3,X509_REVOKED_get0_serialNumber.3
 X509_REVOKED_new.3,X509_REVOKED_set_revocationDate.3
 X509_REVOKED_new.3,X509_REVOKED_set_serialNumber.3
+X509_SIG_get0.3,X509_SIG_getm.3
 X509_SIG_new.3,X509_SIG_free.3
 X509_STORE_CTX_get_error.3,X509_STORE_CTX_get0_chain.3
 X509_STORE_CTX_get_error.3,X509_STORE_CTX_get0_current_crl.3
@@ -2107,19 +2170,21 @@ X509_TRUST_set.3,X509_TRUST_get_by_id.3
 X509_TRUST_set.3,X509_TRUST_get_count.3
 X509_TRUST_set.3,X509_TRUST_get_flags.3
 X509_TRUST_set.3,X509_TRUST_get_trust.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_add0_table.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_free.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_get0.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_get_count.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_inherit.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_lookup.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_set1.3
+X509_VERIFY_PARAM_new.3,X509_VERIFY_PARAM_table_cleanup.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_add0_policy.3
-X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_add0_table.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_add1_host.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_clear_flags.3
-X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_free.3
-X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_get0.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_get0_name.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_get0_peername.3
-X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_get_count.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_get_depth.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_get_flags.3
-X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_lookup.3
-X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_new.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_set1_email.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_set1_host.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_set1_ip.3
@@ -2131,7 +2196,6 @@ X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_set_hostflags.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_set_purpose.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_set_time.3
 X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_set_trust.3
-X509_VERIFY_PARAM_set_flags.3,X509_VERIFY_PARAM_table_cleanup.3
 X509_add1_trust_object.3,X509_add1_reject_object.3
 X509_add1_trust_object.3,X509_reject_clear.3
 X509_add1_trust_object.3,X509_trust_clear.3
@@ -2139,6 +2203,7 @@ X509_check_host.3,X509_check_email.3
 X509_check_host.3,X509_check_ip.3
 X509_check_host.3,X509_check_ip_asc.3
 X509_check_private_key.3,X509_REQ_check_private_key.3
+X509_check_trust.3,X509_TRUST_set_default.3
 X509_cmp.3,X509_CRL_cmp.3
 X509_cmp.3,X509_CRL_match.3
 X509_cmp.3,X509_NAME_cmp.3
@@ -2180,7 +2245,10 @@ X509_get0_signature.3,X509_get_signature_nid.3
 X509_get0_signature.3,X509_get_signature_type.3
 X509_get1_email.3,X509_email_free.3
 X509_get1_email.3,X509_get1_ocsp.3
+X509_get_extension_flags.3,X509_get_extended_key_usage.3
+X509_get_extension_flags.3,X509_get_key_usage.3
 X509_get_pubkey.3,X509_REQ_extract_key.3
+X509_get_pubkey.3,X509_REQ_get0_pubkey.3
 X509_get_pubkey.3,X509_REQ_get_pubkey.3
 X509_get_pubkey.3,X509_REQ_set_pubkey.3
 X509_get_pubkey.3,X509_extract_key.3
@@ -2205,6 +2273,7 @@ X509_get_version.3,X509_set_version.3
 X509_keyid_set1.3,X509_alias_get0.3
 X509_keyid_set1.3,X509_alias_set1.3
 X509_keyid_set1.3,X509_keyid_get0.3
+X509_new.3,X509_REQ_to_X509.3
 X509_new.3,X509_chain_up_ref.3
 X509_new.3,X509_dup.3
 X509_new.3,X509_free.3
@@ -2229,6 +2298,14 @@ X509_sign.3,X509_REQ_verify.3
 X509_sign.3,X509_sign_ctx.3
 X509_sign.3,X509_verify.3
 X509_signature_dump.3,X509_signature_print.3
+X509at_add1_attr.3,X509at_add1_attr_by_NID.3
+X509at_add1_attr.3,X509at_add1_attr_by_OBJ.3
+X509at_add1_attr.3,X509at_add1_attr_by_txt.3
+X509at_add1_attr.3,X509at_delete_attr.3
+X509at_get_attr.3,X509at_get0_data_by_OBJ.3
+X509at_get_attr.3,X509at_get_attr_by_NID.3
+X509at_get_attr.3,X509at_get_attr_by_OBJ.3
+X509at_get_attr.3,X509at_get_attr_count.3
 X509v3_get_ext_by_NID.3,X509_CRL_add_ext.3
 X509v3_get_ext_by_NID.3,X509_CRL_delete_ext.3
 X509v3_get_ext_by_NID.3,X509_CRL_get_ext.3
@@ -2501,6 +2578,8 @@ d2i_PrivateKey.3,d2i_PublicKey.3
 d2i_PrivateKey.3,i2d_PKCS8PrivateKeyInfo_bio.3
 d2i_PrivateKey.3,i2d_PKCS8PrivateKeyInfo_fp.3
 d2i_PrivateKey.3,i2d_PrivateKey.3
+d2i_PrivateKey.3,i2d_PrivateKey_bio.3
+d2i_PrivateKey.3,i2d_PrivateKey_fp.3
 d2i_PrivateKey.3,i2d_PublicKey.3
 d2i_RSAPublicKey.3,d2i_Netscape_RSA.3
 d2i_RSAPublicKey.3,d2i_RSAPrivateKey.3
@@ -2564,7 +2643,12 @@ d2i_X509.3,i2d_X509_CINF.3
 d2i_X509.3,i2d_X509_VAL.3
 d2i_X509.3,i2d_X509_bio.3
 d2i_X509.3,i2d_X509_fp.3
+d2i_X509.3,i2d_re_X509_CRL_tbs.3
+d2i_X509.3,i2d_re_X509_REQ_tbs.3
+d2i_X509.3,i2d_re_X509_tbs.3
+d2i_X509_ALGOR.3,d2i_X509_ALGORS.3
 d2i_X509_ALGOR.3,i2d_X509_ALGOR.3
+d2i_X509_ALGOR.3,i2d_X509_ALGORS.3
 d2i_X509_ATTRIBUTE.3,i2d_X509_ATTRIBUTE.3
 d2i_X509_CRL.3,d2i_X509_CRL_INFO.3
 d2i_X509_CRL.3,d2i_X509_CRL_bio.3
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index a772d12..a8e0a25 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -36,11 +36,11 @@ set(
         ssl_versions.c
         t1_enc.c
         t1_lib.c
+        tls_buffer.c
         tls_content.c
         tls12_key_schedule.c
         tls12_lib.c
         tls12_record_layer.c
-        tls13_buffer.c
         tls13_client.c
         tls13_error.c
         tls13_handshake.c
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index f266122..d12928e 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -58,11 +58,11 @@ libssl_la_SOURCES += ssl_txt.c
 libssl_la_SOURCES += ssl_versions.c
 libssl_la_SOURCES += t1_enc.c
 libssl_la_SOURCES += t1_lib.c
+libssl_la_SOURCES += tls_buffer.c
 libssl_la_SOURCES += tls_content.c
 libssl_la_SOURCES += tls12_key_schedule.c
 libssl_la_SOURCES += tls12_lib.c
 libssl_la_SOURCES += tls12_record_layer.c
-libssl_la_SOURCES += tls13_buffer.c
 libssl_la_SOURCES += tls13_client.c
 libssl_la_SOURCES += tls13_error.c
 libssl_la_SOURCES += tls13_handshake.c
@@ -82,6 +82,7 @@ noinst_HEADERS += ssl_locl.h
 noinst_HEADERS += ssl_sigalgs.h
 noinst_HEADERS += ssl_tlsext.h
 noinst_HEADERS += tls_content.h
+noinst_HEADERS += tls_internal.h
 noinst_HEADERS += tls13_internal.h
 noinst_HEADERS += tls13_handshake.h
 noinst_HEADERS += tls13_record.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index efe5126..2cdd683 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
         ../crypto/asn1
         ../crypto/x509
         ../ssl
-        ../tls
         ../apps/openssl
         ../apps/openssl/compat
         ../include/compat
@@ -284,6 +283,7 @@ if(NOT BUILD_SHARED_LIBS)
 
         add_executable(keypairtest keypairtest.c)
         target_link_libraries(keypairtest ${LIBTLS_LIBS})
+        target_include_directories(keypairtest BEFORE PUBLIC ../tls)
         add_test(keypairtest keypairtest
                 ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem
                 ${CMAKE_CURRENT_SOURCE_DIR}/server.pem
@@ -586,6 +586,11 @@ add_executable(x509name x509name.c)
 target_link_libraries(x509name ${OPENSSL_LIBS})
 add_test(x509name x509name)
 
+# x509req_ext
+add_executable(x509req_ext x509req_ext.c)
+target_link_libraries(x509req_ext ${OPENSSL_LIBS})
+add_test(x509req_ext x509req_ext)
+
 if(BUILD_SHARED_LIBS)
         add_custom_command(TARGET x25519test POST_BUILD
                 COMMAND "${CMAKE_COMMAND}" -E copy
@@ -595,4 +600,3 @@ if(BUILD_SHARED_LIBS)
                 "${CMAKE_CURRENT_BINARY_DIR}"
                 COMMENT "Copying DLLs for regression tests")
 endif()
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f43bd85..b426ad0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS += -I $(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/asn1
 AM_CPPFLAGS += -I $(top_srcdir)/crypto/x509
 AM_CPPFLAGS += -I $(top_srcdir)/ssl
-AM_CPPFLAGS += -I $(top_srcdir)/tls
 AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl
 AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat
 AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/apps/openssl/cert.pem\"
@@ -101,7 +100,6 @@ bn_to_string_SOURCES = bn_to_string.c
 
 # buffertest
 TESTS += buffertest
-buffertest_CPPFLAGS = $(AM_CPPFLAGS)
 check_PROGRAMS += buffertest
 buffertest_SOURCES = buffertest.c
 
@@ -272,6 +270,7 @@ igetest_SOURCES = igetest.c
 
 # keypairtest
 TESTS += keypairtest.sh
+keypairtest_CPPFLAGS = -I $(top_srcdir)/tls $(AM_CPPFLAGS)
 check_PROGRAMS += keypairtest
 keypairtest_SOURCES = keypairtest.c
 EXTRA_DIST += keypairtest.sh
@@ -521,3 +520,8 @@ x509_info_SOURCES = x509_info.c
 TESTS += x509name
 check_PROGRAMS += x509name
 x509name_SOURCES = x509name.c
+
+# x509req_ext
+TESTS += x509req_ext
+check_PROGRAMS += x509req_ext
+x509req_ext_SOURCES = x509req_ext.c