diff --git a/esnistuff/README.md b/esnistuff/README.md index 06da40437a7d00..2e542250ab3bbe 100644 --- a/esnistuff/README.md +++ b/esnistuff/README.md @@ -22,6 +22,8 @@ Most recent first... DON'T DEPLOY ECH YET!!! It's still work-in-progress code. +- 20240119: rebased openssl again + - 20240113: Rebased curl - 20240110: Rebased nginx again. @@ -66,8 +68,22 @@ quite a bit.) $ git checkout master $ git reset --hard upstream/master $ git push origin master --force - $ git checkout HPKE-PR - $ git rebase -i master HPKE-PR + $ git checkout ECH-draft-13c + $ git rebase -i master ECH-draft-13c + ... fix things... + $ git status + ... see needs an edit... + $ git add + $ git rebase --continue + ... 'till done ... + $ cp ~/code/openssl-master-clean/util/libcrypto.num util + $ cp ~/code/openssl-master-clean/util/libssl.num util + $ ./config -d + ... + $ make update + ... + $ make + ... - 20230511: I'm starting to try out split-mode with nginx, but it's early days (see [nginx.md](nginx.md) for more). diff --git a/util/libcrypto.num b/util/libcrypto.num index ff22664df26c5d..7373b002b7f43f 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5546,134 +5546,3 @@ ERR_pop ? 3_3_0 EXIST::FUNCTION: X509_STORE_get1_objects ? 3_3_0 EXIST::FUNCTION: OPENSSL_LH_set_thunks ? 3_3_0 EXIST::FUNCTION: OPENSSL_LH_doall_arg_thunk ? 3_3_0 EXIST::FUNCTION: -OSSL_HPKE_keygen ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_suite_check ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_get_grease_value ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_str2suite ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_free ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_new ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_authpriv ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_authpub ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_psk ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_ikme ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_get_ciphertext_size ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_get_public_encap_size ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_export ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_encap ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_decap ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_seal ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_open ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_get_seq ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set_seq ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_get_recommended_ikmelen ? 3_2_0 EXIST::FUNCTION: -OSSL_PROVIDER_get0_default_search_path ? 3_2_0 EXIST::FUNCTION: -EVP_RAND_CTX_up_ref ? 3_1_0 EXIST::FUNCTION: -RAND_set0_public ? 3_1_0 EXIST::FUNCTION: -RAND_set0_private ? 3_1_0 EXIST::FUNCTION: -BN_are_coprime ? 3_1_0 EXIST::FUNCTION: -X509_PUBKEY_set0_public_key ? 3_2_0 EXIST::FUNCTION: -OSSL_STACK_OF_X509_free ? 3_2_0 EXIST::FUNCTION: -OSSL_trace_string ? 3_2_0 EXIST::FUNCTION: -EVP_MD_CTX_dup ? 3_2_0 EXIST::FUNCTION: -EVP_CIPHER_CTX_dup ? 3_2_0 EXIST::FUNCTION: -BN_signed_bin2bn ? 3_2_0 EXIST::FUNCTION: -BN_signed_bn2bin ? 3_2_0 EXIST::FUNCTION: -BN_signed_lebin2bn ? 3_2_0 EXIST::FUNCTION: -BN_signed_bn2lebin ? 3_2_0 EXIST::FUNCTION: -BN_signed_native2bn ? 3_2_0 EXIST::FUNCTION: -BN_signed_bn2native ? 3_2_0 EXIST::FUNCTION: -ASYNC_set_mem_functions ? 3_2_0 EXIST::FUNCTION: -ASYNC_get_mem_functions ? 3_2_0 EXIST::FUNCTION: -BIO_ADDR_dup ? 3_2_0 EXIST::FUNCTION:SOCK -OSSL_CMP_ITAV_new_caCerts ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_ITAV_get0_caCerts ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_get1_caCerts ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_ITAV_new_rootCaCert ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_ITAV_get0_rootCaCert ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_ITAV_new_rootCaKeyUpdate ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_ITAV_get0_rootCaKeyUpdate ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_get1_rootCaKeyUpdate ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_CTX_get0_libctx ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_CTX_get0_propq ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_CTX_reset_geninfo_ITAVs ? 3_0_8 EXIST::FUNCTION:CMP -OSSL_CMP_CTX_get0_validatedSrvCert ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_CTX_set1_serialNumber ? 3_2_0 EXIST::FUNCTION:CMP -OSSL_CMP_MSG_update_recipNonce ? 3_0_9 EXIST::FUNCTION:CMP -OSSL_CRMF_CERTTEMPLATE_get0_publicKey ? 3_2_0 EXIST::FUNCTION:CRMF -CMS_final_digest ? 3_2_0 EXIST::FUNCTION:CMS -CMS_EnvelopedData_it ? 3_2_0 EXIST::FUNCTION:CMS -CMS_EnvelopedData_decrypt ? 3_2_0 EXIST::FUNCTION:CMS -CMS_SignedData_free ? 3_2_0 EXIST::FUNCTION:CMS -CMS_SignedData_new ? 3_2_0 EXIST::FUNCTION:CMS -CMS_SignedData_verify ? 3_2_0 EXIST::FUNCTION:CMS -BIO_s_dgram_mem ? 3_2_0 EXIST::FUNCTION:DGRAM -BIO_recvmmsg ? 3_2_0 EXIST::FUNCTION: -BIO_sendmmsg ? 3_2_0 EXIST::FUNCTION: -BIO_meth_set_sendmmsg ? 3_2_0 EXIST::FUNCTION: -BIO_meth_get_sendmmsg ? 3_2_0 EXIST::FUNCTION: -BIO_meth_set_recvmmsg ? 3_2_0 EXIST::FUNCTION: -BIO_meth_get_recvmmsg ? 3_2_0 EXIST::FUNCTION: -BIO_err_is_non_fatal ? 3_2_0 EXIST::FUNCTION:SOCK -BIO_s_dgram_pair ? 3_2_0 EXIST::FUNCTION:DGRAM -BIO_new_bio_dgram_pair ? 3_2_0 EXIST::FUNCTION:DGRAM -EVP_PKEY_auth_encapsulate_init ? 3_2_0 EXIST::FUNCTION: -EVP_PKEY_auth_decapsulate_init ? 3_2_0 EXIST::FUNCTION: -PKCS12_SAFEBAG_set0_attrs ? 3_2_0 EXIST::FUNCTION: -PKCS12_create_ex2 ? 3_2_0 EXIST::FUNCTION: -OSSL_sleep ? 3_2_0 EXIST::FUNCTION: -OSSL_get_thread_support_flags ? 3_2_0 EXIST::FUNCTION: -OSSL_set_max_threads ? 3_2_0 EXIST::FUNCTION: -OSSL_get_max_threads ? 3_2_0 EXIST::FUNCTION: -COMP_brotli ? 3_2_0 EXIST::FUNCTION:COMP -COMP_brotli_oneshot ? 3_2_0 EXIST::FUNCTION:COMP -BIO_f_brotli ? 3_2_0 EXIST::FUNCTION:COMP -COMP_zstd ? 3_2_0 EXIST::FUNCTION:COMP -COMP_zstd_oneshot ? 3_2_0 EXIST::FUNCTION:COMP -BIO_f_zstd ? 3_2_0 EXIST::FUNCTION:COMP -d2i_PUBKEY_ex_fp ? 3_2_0 EXIST::FUNCTION:STDIO -d2i_PUBKEY_ex_bio ? 3_2_0 EXIST::FUNCTION: -COMP_zlib_oneshot ? 3_2_0 EXIST::FUNCTION:COMP -OSSL_HPKE_export ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_encap ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_decap ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_seal ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_open ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_get_seq ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set_seq ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_get_recommended_ikmelen ? 3_2_0 EXIST::FUNCTION: -OSSL_PROVIDER_get0_default_search_path ? 3_2_0 EXIST::FUNCTION: -BIO_get_rpoll_descriptor ? 3_2_0 EXIST::FUNCTION: -BIO_get_wpoll_descriptor ? 3_2_0 EXIST::FUNCTION: -ASN1_item_unpack_ex ? 3_2_0 EXIST::FUNCTION: -PKCS12_SAFEBAG_get1_cert_ex ? 3_2_0 EXIST::FUNCTION: -PKCS12_SAFEBAG_get1_crl_ex ? 3_2_0 EXIST::FUNCTION: -EC_GROUP_to_params ? 3_2_0 EXIST::FUNCTION:EC -X509_STORE_CTX_init_rpk ? 3_2_0 EXIST::FUNCTION: -X509_STORE_CTX_get0_rpk ? 3_2_0 EXIST::FUNCTION: -X509_STORE_CTX_set0_rpk ? 3_2_0 EXIST::FUNCTION: -CRYPTO_atomic_load_int ? 3_2_0 EXIST::FUNCTION: -OSSL_ERR_STATE_new ? 3_2_0 EXIST::FUNCTION: -OSSL_ERR_STATE_save ? 3_2_0 EXIST::FUNCTION: -OSSL_ERR_STATE_restore ? 3_2_0 EXIST::FUNCTION: -OSSL_ERR_STATE_free ? 3_2_0 EXIST::FUNCTION: -ERR_count_to_mark ? 3_2_0 EXIST::FUNCTION: -OSSL_PROVIDER_load_ex ? 3_2_0 EXIST::FUNCTION: -OSSL_PROVIDER_try_load_ex ? 3_2_0 EXIST::FUNCTION: -OSSL_ERR_STATE_save_to_mark ? 3_2_0 EXIST::FUNCTION: -X509_STORE_CTX_set_get_crl ? 3_2_0 EXIST::FUNCTION: -X509_STORE_CTX_set_current_reasons ? 3_2_0 EXIST::FUNCTION: -OSSL_STORE_delete ? 3_2_0 EXIST::FUNCTION: -BIO_ADDR_copy ? 3_2_0 EXIST::FUNCTION:SOCK -OSSL_HPKE_CTX_new ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_free ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_psk ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_authpriv ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_authpub ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_keygen ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_suite_check ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_str2suite ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_CTX_set1_ikme ? 3_1_0 EXIST::FUNCTION: -OSSL_HPKE_get_grease_value ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_get_ciphertext_size ? 3_2_0 EXIST::FUNCTION: -OSSL_HPKE_get_public_encap_size ? 3_2_0 EXIST::FUNCTION: -EVP_DigestSqueeze ? 3_3_0 EXIST::FUNCTION: