Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
sftcd committed May 31, 2024
1 parent fc30271 commit 7124b47
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 77 deletions.
1 change: 0 additions & 1 deletion crypto/build.info
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ $UTIL_COMMON=\

SOURCE[../libcrypto]=$UTIL_COMMON \
mem.c mem_sec.c \
hpke.c \
comp_methods.c cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c \
o_dir.c o_fopen.c getenv.c o_init.c init.c trace.c provider.c \
provider_child.c punycode.c passphrase.c sleep.c deterministic_nonce.c \
Expand Down
26 changes: 12 additions & 14 deletions util/libcrypto.num
Original file line number Diff line number Diff line change
Expand Up @@ -5536,20 +5536,18 @@ X509_STORE_CTX_set_get_crl 5663 3_2_0 EXIST::FUNCTION:
X509_STORE_CTX_set_current_reasons 5664 3_2_0 EXIST::FUNCTION:
OSSL_STORE_delete 5665 3_2_0 EXIST::FUNCTION:
BIO_ADDR_copy 5666 3_2_0 EXIST::FUNCTION:SOCK
OSSL_CMP_CTX_get0_geninfo_ITAVs 5667 3_3_0 EXIST::FUNCTION:CMP
OSSL_CMP_HDR_get0_geninfo_ITAVs 5668 3_3_0 EXIST::FUNCTION:CMP
OSSL_CMP_ITAV_new0_certProfile 5669 3_3_0 EXIST::FUNCTION:CMP
OSSL_CMP_ITAV_get0_certProfile 5670 3_3_0 EXIST::FUNCTION:CMP
OSSL_CMP_MSG_get0_certreq_publickey 5671 3_3_0 EXIST::FUNCTION:CMP
OSSL_CMP_SRV_CTX_init_trans 5672 3_3_0 EXIST::FUNCTION:CMP
EVP_DigestSqueeze 5673 3_3_0 EXIST::FUNCTION:
ERR_pop 5674 3_3_0 EXIST::FUNCTION:
X509_STORE_get1_objects 5675 3_3_0 EXIST::FUNCTION:
OPENSSL_LH_set_thunks 5676 3_3_0 EXIST::FUNCTION:
OPENSSL_LH_doall_arg_thunk 5677 3_3_0 EXIST::FUNCTION:
OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines 5678 3_3_0 EXIST::FUNCTION:HTTP
DIST_POINT_NAME_dup ? 3_4_0 EXIST::FUNCTION:
GENERAL_NAME_set1_X509_NAME ? 3_4_0 EXIST::FUNCTION:
OSSL_CMP_CTX_get0_geninfo_ITAVs 5667 3_3_0 NOEXIST::FUNCTION:CMP
OSSL_CMP_HDR_get0_geninfo_ITAVs 5668 3_3_0 NOEXIST::FUNCTION:CMP
OSSL_CMP_ITAV_new0_certProfile 5669 3_3_0 NOEXIST::FUNCTION:CMP
OSSL_CMP_ITAV_get0_certProfile 5670 3_3_0 NOEXIST::FUNCTION:CMP
OSSL_CMP_MSG_get0_certreq_publickey 5671 3_3_0 NOEXIST::FUNCTION:CMP
OSSL_CMP_SRV_CTX_init_trans 5672 3_3_0 NOEXIST::FUNCTION:CMP
EVP_DigestSqueeze 5673 3_3_0 NOEXIST::FUNCTION:
ERR_pop 5674 3_3_0 NOEXIST::FUNCTION:
X509_STORE_get1_objects 5675 3_3_0 NOEXIST::FUNCTION:
OPENSSL_LH_set_thunks 5676 3_3_0 NOEXIST::FUNCTION:
OPENSSL_LH_doall_arg_thunk 5677 3_3_0 NOEXIST::FUNCTION:
OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines 5678 3_3_0 NOEXIST::FUNCTION:HTTP
OSSL_CMP_CRLSTATUS_create ? 3_4_0 EXIST::FUNCTION:CMP
OSSL_CMP_CRLSTATUS_free ? 3_4_0 EXIST::FUNCTION:CMP
OSSL_CMP_CRLSTATUS_get0 ? 3_4_0 EXIST::FUNCTION:CMP
Expand Down
68 changes: 6 additions & 62 deletions util/libssl.num
Original file line number Diff line number Diff line change
Expand Up @@ -577,69 +577,13 @@ SSL_handle_events 577 3_2_0 EXIST::FUNCTION:
SSL_get_event_timeout 578 3_2_0 EXIST::FUNCTION:
SSL_get0_group_name 579 3_2_0 EXIST::FUNCTION:
SSL_is_stream_local 580 3_2_0 EXIST::FUNCTION:
SSL_write_ex2 581 3_3_0 EXIST::FUNCTION:
SSL_get_value_uint 582 3_3_0 EXIST::FUNCTION:
SSL_set_value_uint 583 3_3_0 EXIST::FUNCTION:
SSL_poll 584 3_3_0 EXIST::FUNCTION:
SSL_SESSION_get_time_ex 585 3_3_0 EXIST::FUNCTION:
SSL_SESSION_set_time_ex 586 3_3_0 EXIST::FUNCTION:
SSL_write_ex2 581 3_3_0 NOEXIST::FUNCTION:
SSL_get_value_uint 582 3_3_0 NOEXIST::FUNCTION:
SSL_set_value_uint 583 3_3_0 NOEXIST::FUNCTION:
SSL_poll 584 3_3_0 NOEXIST::FUNCTION:
SSL_SESSION_get_time_ex 585 3_3_0 NOEXIST::FUNCTION:
SSL_SESSION_set_time_ex 586 3_3_0 NOEXIST::FUNCTION:
SSL_CTX_flush_sessions_ex 587 3_4_0 EXIST::FUNCTION:
SSL_ech_set_outer_alpn_protos ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_svcb_add ? 3_1_0 EXIST::FUNCTION:ECH
SSL_svcb_add ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_add ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_add ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_server_name ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_set_outer_server_name ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_query ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ECH_DETS_free ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ECH_DETS_print ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_reduce ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_key_status ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_flush_keys ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_enable ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_print ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_get_status ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_set_callback ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_set_callback ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_set_outer_alpn_protos ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_set_grease_suite ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_readpemdir ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_raw_decrypt ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_set_outer_server_name ? 3_1_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_enable_buffer ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_get_returned ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_set_grease_type ? 3_1_0 EXIST::FUNCTION:ECH
SSL_ech_set_outer_alpn_protos ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set_outer_server_name ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_reduce ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_flush_keys ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_get_status ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set_callback ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_set_callback ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set_grease_suite ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_raw_decrypt ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_enable_buffer ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set_grease_type ? 3_2_0 EXIST::FUNCTION:ECH
ossl_ech_make_echconfig ? 3_2_0 EXIST::FUNCTION:ECH
OSSL_ECH_DETS_free ? 3_2_0 EXIST::FUNCTION:ECH
OSSL_ECH_DETS_print ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set1_svcb ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set1_echconfig ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_set1_echconfig ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set1_svcb ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set1_echconfig ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_set1_echconfig ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_set_server_names ? 3_2_0 EXIST::FUNCTION:ECH
OSSL_ECH_INFO_free ? 3_2_0 EXIST::FUNCTION:ECH
OSSL_ECH_INFO_print ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_get_info ? 3_2_0 EXIST::FUNCTION:ECH
SSL_ech_get_retry_config ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_get_key_status ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_enable_file ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_server_enable_dir ? 3_2_0 EXIST::FUNCTION:ECH
SSL_CTX_ech_set_outer_alpn_protos ? 3_2_0 EXIST::FUNCTION:ECH
ossl_ech_find_echconfigs ? 3_2_0 EXIST::FUNCTION:ECH
SSL_write_ex2 ? 3_3_0 EXIST::FUNCTION:
SSL_get_value_uint ? 3_3_0 EXIST::FUNCTION:
SSL_set_value_uint ? 3_3_0 EXIST::FUNCTION:
Expand Down

0 comments on commit 7124b47

Please sign in to comment.