From 1bdaefe86ff8b6a11a875e39506ee34ec0698d7b Mon Sep 17 00:00:00 2001 From: Sean McGrail <549813+skmcgrail@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:21:12 -0700 Subject: [PATCH] Update to aws-lc-sys/aws-lc to v1.17.0 (#264) --- aws-lc-sys/aws-lc | 2 +- .../openssl/boringssl_prefix_symbols.h | 60 +- .../openssl/boringssl_prefix_symbols_asm.h | 60 +- .../openssl/boringssl_prefix_symbols_nasm.inc | 120 ++-- aws-lc-sys/src/linux_aarch64_crypto.rs | 589 ++++++----------- aws-lc-sys/src/linux_aarch64_crypto_ssl.rs | 616 +++++++----------- aws-lc-sys/src/linux_x86_64_crypto.rs | 589 ++++++----------- aws-lc-sys/src/linux_x86_64_crypto_ssl.rs | 616 +++++++----------- aws-lc-sys/src/linux_x86_crypto.rs | 589 ++++++----------- aws-lc-sys/src/linux_x86_crypto_ssl.rs | 616 +++++++----------- aws-lc-sys/src/macos_x86_64_crypto.rs | 589 ++++++----------- aws-lc-sys/src/macos_x86_64_crypto_ssl.rs | 616 +++++++----------- aws-lc-sys/symbols/linux_aarch64.txt | 60 +- aws-lc-sys/symbols/linux_x86.txt | 60 +- aws-lc-sys/symbols/linux_x86_64.txt | 60 +- aws-lc-sys/symbols/macos_x86_64.txt | 60 +- 16 files changed, 2125 insertions(+), 3177 deletions(-) diff --git a/aws-lc-sys/aws-lc b/aws-lc-sys/aws-lc index e42a4ef2270..40f0eb69cfb 160000 --- a/aws-lc-sys/aws-lc +++ b/aws-lc-sys/aws-lc @@ -1 +1 @@ -Subproject commit e42a4ef2270c4873e98101098edd1f0aaece966d +Subproject commit 40f0eb69cfbdb201308c51bf12feffc247fb4186 diff --git a/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols.h b/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols.h index 1dc4e14882c..01a5f5a8c32 100644 --- a/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols.h +++ b/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols.h @@ -149,6 +149,7 @@ #define ASN1_TIME_set BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ASN1_TIME_set) #define ASN1_TIME_set_posix BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ASN1_TIME_set_posix) #define ASN1_TIME_set_string BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ASN1_TIME_set_string) +#define ASN1_TIME_set_string_X509 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ASN1_TIME_set_string_X509) #define ASN1_TIME_to_generalizedtime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ASN1_TIME_to_generalizedtime) #define ASN1_TIME_to_posix BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ASN1_TIME_to_posix) #define ASN1_TIME_to_time_t BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, ASN1_TIME_to_time_t) @@ -1361,7 +1362,10 @@ #define EVP_sha3_384 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha3_384) #define EVP_sha3_512 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha3_512) #define EVP_sha512 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha512) +#define EVP_sha512_224 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha512_224) #define EVP_sha512_256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_sha512_256) +#define EVP_shake128 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_shake128) +#define EVP_shake256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_shake256) #define EVP_tls_cbc_copy_mac BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_tls_cbc_copy_mac) #define EVP_tls_cbc_digest_record BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_tls_cbc_digest_record) #define EVP_tls_cbc_digest_record_sha256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, EVP_tls_cbc_digest_record_sha256) @@ -1600,6 +1604,27 @@ #define OPENSSL_realloc BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_realloc) #define OPENSSL_secure_clear_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_secure_clear_free) #define OPENSSL_secure_malloc BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_secure_malloc) +#define OPENSSL_sk_deep_copy BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_deep_copy) +#define OPENSSL_sk_delete BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_delete) +#define OPENSSL_sk_delete_if BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_delete_if) +#define OPENSSL_sk_delete_ptr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_delete_ptr) +#define OPENSSL_sk_dup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_dup) +#define OPENSSL_sk_find BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_find) +#define OPENSSL_sk_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_free) +#define OPENSSL_sk_insert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_insert) +#define OPENSSL_sk_is_sorted BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_is_sorted) +#define OPENSSL_sk_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_new) +#define OPENSSL_sk_new_null BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_new_null) +#define OPENSSL_sk_num BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_num) +#define OPENSSL_sk_pop BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_pop) +#define OPENSSL_sk_pop_free_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_pop_free_ex) +#define OPENSSL_sk_push BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_push) +#define OPENSSL_sk_set BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_set) +#define OPENSSL_sk_set_cmp_func BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_set_cmp_func) +#define OPENSSL_sk_shift BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_shift) +#define OPENSSL_sk_sort BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_sort) +#define OPENSSL_sk_value BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_value) +#define OPENSSL_sk_zero BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_sk_zero) #define OPENSSL_strcasecmp BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_strcasecmp) #define OPENSSL_strdup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_strdup) #define OPENSSL_strhash BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, OPENSSL_strhash) @@ -1909,6 +1934,10 @@ #define SHA3_Squeeze_hw BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA3_Squeeze_hw) #define SHA3_Update BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA3_Update) #define SHA512 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512) +#define SHA512_224 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_224) +#define SHA512_224_Final BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_224_Final) +#define SHA512_224_Init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_224_Init) +#define SHA512_224_Update BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_224_Update) #define SHA512_256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_256) #define SHA512_256_Final BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_256_Final) #define SHA512_256_Init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_256_Init) @@ -1919,6 +1948,8 @@ #define SHA512_Update BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHA512_Update) #define SHAKE128 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHAKE128) #define SHAKE256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHAKE256) +#define SHAKE_Final BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHAKE_Final) +#define SHAKE_Init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SHAKE_Init) #define SIPHASH_24 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SIPHASH_24) #define SPAKE2_CTX_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SPAKE2_CTX_free) #define SPAKE2_CTX_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SPAKE2_CTX_new) @@ -1930,6 +1961,7 @@ #define SSL_CIPHER_get_bits BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CIPHER_get_bits) #define SSL_CIPHER_get_cipher_nid BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CIPHER_get_cipher_nid) #define SSL_CIPHER_get_digest_nid BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CIPHER_get_digest_nid) +#define SSL_CIPHER_get_handshake_digest BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CIPHER_get_handshake_digest) #define SSL_CIPHER_get_id BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CIPHER_get_id) #define SSL_CIPHER_get_kx_name BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CIPHER_get_kx_name) #define SSL_CIPHER_get_kx_nid BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CIPHER_get_kx_nid) @@ -1956,6 +1988,7 @@ #define SSL_CTX_add_extra_chain_cert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_add_extra_chain_cert) #define SSL_CTX_add_server_custom_ext BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_add_server_custom_ext) #define SSL_CTX_add_session BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_add_session) +#define SSL_CTX_build_cert_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_build_cert_chain) #define SSL_CTX_check_private_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_check_private_key) #define SSL_CTX_cipher_in_group BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_cipher_in_group) #define SSL_CTX_clear_chain_certs BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_CTX_clear_chain_certs) @@ -2177,6 +2210,7 @@ #define SSL_alert_from_verify_result BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_alert_from_verify_result) #define SSL_alert_type_string BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_alert_type_string) #define SSL_alert_type_string_long BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_alert_type_string_long) +#define SSL_build_cert_chain BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_build_cert_chain) #define SSL_cache_hit BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_cache_hit) #define SSL_can_release_private_key BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_can_release_private_key) #define SSL_certs_clear BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_certs_clear) @@ -2231,6 +2265,7 @@ #define SSL_get_cipher_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_get_cipher_list) #define SSL_get_ciphers BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_get_ciphers) #define SSL_get_client_CA_list BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_get_client_CA_list) +#define SSL_get_client_ciphers BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_get_client_ciphers) #define SSL_get_client_random BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_get_client_random) #define SSL_get_current_cipher BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_get_current_cipher) #define SSL_get_current_compression BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, SSL_get_current_compression) @@ -3198,6 +3233,7 @@ #define bio_socket_nbio BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bio_socket_nbio) #define bn_abs_sub_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_abs_sub_consttime) #define bn_add_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_add_words) +#define bn_assert_fits_in_bytes BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_assert_fits_in_bytes) #define bn_big_endian_to_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_big_endian_to_words) #define bn_copy_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_copy_words) #define bn_div_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_div_consttime) @@ -3213,6 +3249,7 @@ #define bn_lcm_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_lcm_consttime) #define bn_less_than_montgomery_R BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_less_than_montgomery_R) #define bn_less_than_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_less_than_words) +#define bn_little_endian_to_words BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_little_endian_to_words) #define bn_miller_rabin_init BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_miller_rabin_init) #define bn_miller_rabin_iteration BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_miller_rabin_iteration) #define bn_minimal_width BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_minimal_width) @@ -3268,6 +3305,7 @@ #define bn_usub_consttime BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_usub_consttime) #define bn_wexpand BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_wexpand) #define bn_words_to_big_endian BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_words_to_big_endian) +#define bn_words_to_little_endian BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, bn_words_to_little_endian) #define boringssl_self_test_hmac_sha256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, boringssl_self_test_hmac_sha256) #define boringssl_self_test_sha256 BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, boringssl_self_test_sha256) #define c2i_ASN1_BIT_STRING BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, c2i_ASN1_BIT_STRING) @@ -3836,31 +3874,11 @@ #define sk_X509_call_free_func BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_X509_call_free_func) #define sk_X509_new_null BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_X509_new_null) #define sk_X509_num BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_X509_num) +#define sk_X509_pop BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_X509_pop) #define sk_X509_pop_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_X509_pop_free) #define sk_X509_shift BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_X509_shift) #define sk_X509_value BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_X509_value) -#define sk_deep_copy BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_deep_copy) -#define sk_delete BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_delete) -#define sk_delete_if BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_delete_if) -#define sk_delete_ptr BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_delete_ptr) -#define sk_dup BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_dup) -#define sk_find BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_find) -#define sk_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_free) -#define sk_insert BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_insert) -#define sk_is_sorted BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_is_sorted) -#define sk_new BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_new) -#define sk_new_null BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_new_null) -#define sk_num BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_num) -#define sk_pop BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_pop) #define sk_pop_free BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_pop_free) -#define sk_pop_free_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_pop_free_ex) -#define sk_push BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_push) -#define sk_set BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_set) -#define sk_set_cmp_func BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_set_cmp_func) -#define sk_shift BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_shift) -#define sk_sort BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_sort) -#define sk_value BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_value) -#define sk_zero BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, sk_zero) #define v2i_GENERAL_NAME BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, v2i_GENERAL_NAME) #define v2i_GENERAL_NAMES BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, v2i_GENERAL_NAMES) #define v2i_GENERAL_NAME_ex BORINGSSL_ADD_PREFIX(BORINGSSL_PREFIX, v2i_GENERAL_NAME_ex) diff --git a/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_asm.h b/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_asm.h index 4739285a59d..60e8ecdbd98 100644 --- a/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_asm.h +++ b/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_asm.h @@ -154,6 +154,7 @@ #define _ASN1_TIME_set BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, ASN1_TIME_set) #define _ASN1_TIME_set_posix BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, ASN1_TIME_set_posix) #define _ASN1_TIME_set_string BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, ASN1_TIME_set_string) +#define _ASN1_TIME_set_string_X509 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, ASN1_TIME_set_string_X509) #define _ASN1_TIME_to_generalizedtime BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, ASN1_TIME_to_generalizedtime) #define _ASN1_TIME_to_posix BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, ASN1_TIME_to_posix) #define _ASN1_TIME_to_time_t BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, ASN1_TIME_to_time_t) @@ -1366,7 +1367,10 @@ #define _EVP_sha3_384 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_sha3_384) #define _EVP_sha3_512 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_sha3_512) #define _EVP_sha512 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_sha512) +#define _EVP_sha512_224 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_sha512_224) #define _EVP_sha512_256 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_sha512_256) +#define _EVP_shake128 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_shake128) +#define _EVP_shake256 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_shake256) #define _EVP_tls_cbc_copy_mac BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_tls_cbc_copy_mac) #define _EVP_tls_cbc_digest_record BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_tls_cbc_digest_record) #define _EVP_tls_cbc_digest_record_sha256 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, EVP_tls_cbc_digest_record_sha256) @@ -1605,6 +1609,27 @@ #define _OPENSSL_realloc BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_realloc) #define _OPENSSL_secure_clear_free BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_secure_clear_free) #define _OPENSSL_secure_malloc BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_secure_malloc) +#define _OPENSSL_sk_deep_copy BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_deep_copy) +#define _OPENSSL_sk_delete BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_delete) +#define _OPENSSL_sk_delete_if BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_delete_if) +#define _OPENSSL_sk_delete_ptr BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_delete_ptr) +#define _OPENSSL_sk_dup BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_dup) +#define _OPENSSL_sk_find BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_find) +#define _OPENSSL_sk_free BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_free) +#define _OPENSSL_sk_insert BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_insert) +#define _OPENSSL_sk_is_sorted BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_is_sorted) +#define _OPENSSL_sk_new BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_new) +#define _OPENSSL_sk_new_null BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_new_null) +#define _OPENSSL_sk_num BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_num) +#define _OPENSSL_sk_pop BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_pop) +#define _OPENSSL_sk_pop_free_ex BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_pop_free_ex) +#define _OPENSSL_sk_push BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_push) +#define _OPENSSL_sk_set BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_set) +#define _OPENSSL_sk_set_cmp_func BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_set_cmp_func) +#define _OPENSSL_sk_shift BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_shift) +#define _OPENSSL_sk_sort BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_sort) +#define _OPENSSL_sk_value BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_value) +#define _OPENSSL_sk_zero BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_sk_zero) #define _OPENSSL_strcasecmp BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_strcasecmp) #define _OPENSSL_strdup BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_strdup) #define _OPENSSL_strhash BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, OPENSSL_strhash) @@ -1914,6 +1939,10 @@ #define _SHA3_Squeeze_hw BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA3_Squeeze_hw) #define _SHA3_Update BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA3_Update) #define _SHA512 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512) +#define _SHA512_224 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_224) +#define _SHA512_224_Final BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_224_Final) +#define _SHA512_224_Init BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_224_Init) +#define _SHA512_224_Update BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_224_Update) #define _SHA512_256 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_256) #define _SHA512_256_Final BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_256_Final) #define _SHA512_256_Init BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_256_Init) @@ -1924,6 +1953,8 @@ #define _SHA512_Update BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHA512_Update) #define _SHAKE128 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHAKE128) #define _SHAKE256 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHAKE256) +#define _SHAKE_Final BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHAKE_Final) +#define _SHAKE_Init BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SHAKE_Init) #define _SIPHASH_24 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SIPHASH_24) #define _SPAKE2_CTX_free BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SPAKE2_CTX_free) #define _SPAKE2_CTX_new BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SPAKE2_CTX_new) @@ -1935,6 +1966,7 @@ #define _SSL_CIPHER_get_bits BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CIPHER_get_bits) #define _SSL_CIPHER_get_cipher_nid BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CIPHER_get_cipher_nid) #define _SSL_CIPHER_get_digest_nid BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CIPHER_get_digest_nid) +#define _SSL_CIPHER_get_handshake_digest BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CIPHER_get_handshake_digest) #define _SSL_CIPHER_get_id BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CIPHER_get_id) #define _SSL_CIPHER_get_kx_name BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CIPHER_get_kx_name) #define _SSL_CIPHER_get_kx_nid BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CIPHER_get_kx_nid) @@ -1961,6 +1993,7 @@ #define _SSL_CTX_add_extra_chain_cert BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CTX_add_extra_chain_cert) #define _SSL_CTX_add_server_custom_ext BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CTX_add_server_custom_ext) #define _SSL_CTX_add_session BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CTX_add_session) +#define _SSL_CTX_build_cert_chain BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CTX_build_cert_chain) #define _SSL_CTX_check_private_key BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CTX_check_private_key) #define _SSL_CTX_cipher_in_group BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CTX_cipher_in_group) #define _SSL_CTX_clear_chain_certs BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_CTX_clear_chain_certs) @@ -2182,6 +2215,7 @@ #define _SSL_alert_from_verify_result BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_alert_from_verify_result) #define _SSL_alert_type_string BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_alert_type_string) #define _SSL_alert_type_string_long BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_alert_type_string_long) +#define _SSL_build_cert_chain BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_build_cert_chain) #define _SSL_cache_hit BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_cache_hit) #define _SSL_can_release_private_key BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_can_release_private_key) #define _SSL_certs_clear BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_certs_clear) @@ -2236,6 +2270,7 @@ #define _SSL_get_cipher_list BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_get_cipher_list) #define _SSL_get_ciphers BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_get_ciphers) #define _SSL_get_client_CA_list BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_get_client_CA_list) +#define _SSL_get_client_ciphers BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_get_client_ciphers) #define _SSL_get_client_random BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_get_client_random) #define _SSL_get_current_cipher BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_get_current_cipher) #define _SSL_get_current_compression BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, SSL_get_current_compression) @@ -3203,6 +3238,7 @@ #define _bio_socket_nbio BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bio_socket_nbio) #define _bn_abs_sub_consttime BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_abs_sub_consttime) #define _bn_add_words BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_add_words) +#define _bn_assert_fits_in_bytes BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_assert_fits_in_bytes) #define _bn_big_endian_to_words BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_big_endian_to_words) #define _bn_copy_words BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_copy_words) #define _bn_div_consttime BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_div_consttime) @@ -3218,6 +3254,7 @@ #define _bn_lcm_consttime BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_lcm_consttime) #define _bn_less_than_montgomery_R BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_less_than_montgomery_R) #define _bn_less_than_words BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_less_than_words) +#define _bn_little_endian_to_words BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_little_endian_to_words) #define _bn_miller_rabin_init BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_miller_rabin_init) #define _bn_miller_rabin_iteration BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_miller_rabin_iteration) #define _bn_minimal_width BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_minimal_width) @@ -3273,6 +3310,7 @@ #define _bn_usub_consttime BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_usub_consttime) #define _bn_wexpand BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_wexpand) #define _bn_words_to_big_endian BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_words_to_big_endian) +#define _bn_words_to_little_endian BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, bn_words_to_little_endian) #define _boringssl_self_test_hmac_sha256 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, boringssl_self_test_hmac_sha256) #define _boringssl_self_test_sha256 BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, boringssl_self_test_sha256) #define _c2i_ASN1_BIT_STRING BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, c2i_ASN1_BIT_STRING) @@ -3841,31 +3879,11 @@ #define _sk_X509_call_free_func BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_X509_call_free_func) #define _sk_X509_new_null BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_X509_new_null) #define _sk_X509_num BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_X509_num) +#define _sk_X509_pop BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_X509_pop) #define _sk_X509_pop_free BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_X509_pop_free) #define _sk_X509_shift BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_X509_shift) #define _sk_X509_value BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_X509_value) -#define _sk_deep_copy BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_deep_copy) -#define _sk_delete BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_delete) -#define _sk_delete_if BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_delete_if) -#define _sk_delete_ptr BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_delete_ptr) -#define _sk_dup BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_dup) -#define _sk_find BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_find) -#define _sk_free BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_free) -#define _sk_insert BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_insert) -#define _sk_is_sorted BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_is_sorted) -#define _sk_new BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_new) -#define _sk_new_null BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_new_null) -#define _sk_num BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_num) -#define _sk_pop BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_pop) #define _sk_pop_free BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_pop_free) -#define _sk_pop_free_ex BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_pop_free_ex) -#define _sk_push BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_push) -#define _sk_set BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_set) -#define _sk_set_cmp_func BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_set_cmp_func) -#define _sk_shift BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_shift) -#define _sk_sort BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_sort) -#define _sk_value BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_value) -#define _sk_zero BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, sk_zero) #define _v2i_GENERAL_NAME BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, v2i_GENERAL_NAME) #define _v2i_GENERAL_NAMES BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, v2i_GENERAL_NAMES) #define _v2i_GENERAL_NAME_ex BORINGSSL_ADD_PREFIX_MAC_ASM(BORINGSSL_PREFIX, v2i_GENERAL_NAME_ex) diff --git a/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_nasm.inc b/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_nasm.inc index 3aac8cd2a38..ba7778382d0 100644 --- a/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_nasm.inc +++ b/aws-lc-sys/generated-include/openssl/boringssl_prefix_symbols_nasm.inc @@ -146,6 +146,7 @@ %xdefine _ASN1_TIME_set _ %+ BORINGSSL_PREFIX %+ _ASN1_TIME_set %xdefine _ASN1_TIME_set_posix _ %+ BORINGSSL_PREFIX %+ _ASN1_TIME_set_posix %xdefine _ASN1_TIME_set_string _ %+ BORINGSSL_PREFIX %+ _ASN1_TIME_set_string +%xdefine _ASN1_TIME_set_string_X509 _ %+ BORINGSSL_PREFIX %+ _ASN1_TIME_set_string_X509 %xdefine _ASN1_TIME_to_generalizedtime _ %+ BORINGSSL_PREFIX %+ _ASN1_TIME_to_generalizedtime %xdefine _ASN1_TIME_to_posix _ %+ BORINGSSL_PREFIX %+ _ASN1_TIME_to_posix %xdefine _ASN1_TIME_to_time_t _ %+ BORINGSSL_PREFIX %+ _ASN1_TIME_to_time_t @@ -1358,7 +1359,10 @@ %xdefine _EVP_sha3_384 _ %+ BORINGSSL_PREFIX %+ _EVP_sha3_384 %xdefine _EVP_sha3_512 _ %+ BORINGSSL_PREFIX %+ _EVP_sha3_512 %xdefine _EVP_sha512 _ %+ BORINGSSL_PREFIX %+ _EVP_sha512 +%xdefine _EVP_sha512_224 _ %+ BORINGSSL_PREFIX %+ _EVP_sha512_224 %xdefine _EVP_sha512_256 _ %+ BORINGSSL_PREFIX %+ _EVP_sha512_256 +%xdefine _EVP_shake128 _ %+ BORINGSSL_PREFIX %+ _EVP_shake128 +%xdefine _EVP_shake256 _ %+ BORINGSSL_PREFIX %+ _EVP_shake256 %xdefine _EVP_tls_cbc_copy_mac _ %+ BORINGSSL_PREFIX %+ _EVP_tls_cbc_copy_mac %xdefine _EVP_tls_cbc_digest_record _ %+ BORINGSSL_PREFIX %+ _EVP_tls_cbc_digest_record %xdefine _EVP_tls_cbc_digest_record_sha256 _ %+ BORINGSSL_PREFIX %+ _EVP_tls_cbc_digest_record_sha256 @@ -1597,6 +1601,27 @@ %xdefine _OPENSSL_realloc _ %+ BORINGSSL_PREFIX %+ _OPENSSL_realloc %xdefine _OPENSSL_secure_clear_free _ %+ BORINGSSL_PREFIX %+ _OPENSSL_secure_clear_free %xdefine _OPENSSL_secure_malloc _ %+ BORINGSSL_PREFIX %+ _OPENSSL_secure_malloc +%xdefine _OPENSSL_sk_deep_copy _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_deep_copy +%xdefine _OPENSSL_sk_delete _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_delete +%xdefine _OPENSSL_sk_delete_if _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_delete_if +%xdefine _OPENSSL_sk_delete_ptr _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_delete_ptr +%xdefine _OPENSSL_sk_dup _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_dup +%xdefine _OPENSSL_sk_find _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_find +%xdefine _OPENSSL_sk_free _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_free +%xdefine _OPENSSL_sk_insert _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_insert +%xdefine _OPENSSL_sk_is_sorted _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_is_sorted +%xdefine _OPENSSL_sk_new _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_new +%xdefine _OPENSSL_sk_new_null _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_new_null +%xdefine _OPENSSL_sk_num _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_num +%xdefine _OPENSSL_sk_pop _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_pop +%xdefine _OPENSSL_sk_pop_free_ex _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_pop_free_ex +%xdefine _OPENSSL_sk_push _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_push +%xdefine _OPENSSL_sk_set _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_set +%xdefine _OPENSSL_sk_set_cmp_func _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_set_cmp_func +%xdefine _OPENSSL_sk_shift _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_shift +%xdefine _OPENSSL_sk_sort _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_sort +%xdefine _OPENSSL_sk_value _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_value +%xdefine _OPENSSL_sk_zero _ %+ BORINGSSL_PREFIX %+ _OPENSSL_sk_zero %xdefine _OPENSSL_strcasecmp _ %+ BORINGSSL_PREFIX %+ _OPENSSL_strcasecmp %xdefine _OPENSSL_strdup _ %+ BORINGSSL_PREFIX %+ _OPENSSL_strdup %xdefine _OPENSSL_strhash _ %+ BORINGSSL_PREFIX %+ _OPENSSL_strhash @@ -1906,6 +1931,10 @@ %xdefine _SHA3_Squeeze_hw _ %+ BORINGSSL_PREFIX %+ _SHA3_Squeeze_hw %xdefine _SHA3_Update _ %+ BORINGSSL_PREFIX %+ _SHA3_Update %xdefine _SHA512 _ %+ BORINGSSL_PREFIX %+ _SHA512 +%xdefine _SHA512_224 _ %+ BORINGSSL_PREFIX %+ _SHA512_224 +%xdefine _SHA512_224_Final _ %+ BORINGSSL_PREFIX %+ _SHA512_224_Final +%xdefine _SHA512_224_Init _ %+ BORINGSSL_PREFIX %+ _SHA512_224_Init +%xdefine _SHA512_224_Update _ %+ BORINGSSL_PREFIX %+ _SHA512_224_Update %xdefine _SHA512_256 _ %+ BORINGSSL_PREFIX %+ _SHA512_256 %xdefine _SHA512_256_Final _ %+ BORINGSSL_PREFIX %+ _SHA512_256_Final %xdefine _SHA512_256_Init _ %+ BORINGSSL_PREFIX %+ _SHA512_256_Init @@ -1916,6 +1945,8 @@ %xdefine _SHA512_Update _ %+ BORINGSSL_PREFIX %+ _SHA512_Update %xdefine _SHAKE128 _ %+ BORINGSSL_PREFIX %+ _SHAKE128 %xdefine _SHAKE256 _ %+ BORINGSSL_PREFIX %+ _SHAKE256 +%xdefine _SHAKE_Final _ %+ BORINGSSL_PREFIX %+ _SHAKE_Final +%xdefine _SHAKE_Init _ %+ BORINGSSL_PREFIX %+ _SHAKE_Init %xdefine _SIPHASH_24 _ %+ BORINGSSL_PREFIX %+ _SIPHASH_24 %xdefine _SPAKE2_CTX_free _ %+ BORINGSSL_PREFIX %+ _SPAKE2_CTX_free %xdefine _SPAKE2_CTX_new _ %+ BORINGSSL_PREFIX %+ _SPAKE2_CTX_new @@ -1927,6 +1958,7 @@ %xdefine _SSL_CIPHER_get_bits _ %+ BORINGSSL_PREFIX %+ _SSL_CIPHER_get_bits %xdefine _SSL_CIPHER_get_cipher_nid _ %+ BORINGSSL_PREFIX %+ _SSL_CIPHER_get_cipher_nid %xdefine _SSL_CIPHER_get_digest_nid _ %+ BORINGSSL_PREFIX %+ _SSL_CIPHER_get_digest_nid +%xdefine _SSL_CIPHER_get_handshake_digest _ %+ BORINGSSL_PREFIX %+ _SSL_CIPHER_get_handshake_digest %xdefine _SSL_CIPHER_get_id _ %+ BORINGSSL_PREFIX %+ _SSL_CIPHER_get_id %xdefine _SSL_CIPHER_get_kx_name _ %+ BORINGSSL_PREFIX %+ _SSL_CIPHER_get_kx_name %xdefine _SSL_CIPHER_get_kx_nid _ %+ BORINGSSL_PREFIX %+ _SSL_CIPHER_get_kx_nid @@ -1953,6 +1985,7 @@ %xdefine _SSL_CTX_add_extra_chain_cert _ %+ BORINGSSL_PREFIX %+ _SSL_CTX_add_extra_chain_cert %xdefine _SSL_CTX_add_server_custom_ext _ %+ BORINGSSL_PREFIX %+ _SSL_CTX_add_server_custom_ext %xdefine _SSL_CTX_add_session _ %+ BORINGSSL_PREFIX %+ _SSL_CTX_add_session +%xdefine _SSL_CTX_build_cert_chain _ %+ BORINGSSL_PREFIX %+ _SSL_CTX_build_cert_chain %xdefine _SSL_CTX_check_private_key _ %+ BORINGSSL_PREFIX %+ _SSL_CTX_check_private_key %xdefine _SSL_CTX_cipher_in_group _ %+ BORINGSSL_PREFIX %+ _SSL_CTX_cipher_in_group %xdefine _SSL_CTX_clear_chain_certs _ %+ BORINGSSL_PREFIX %+ _SSL_CTX_clear_chain_certs @@ -2174,6 +2207,7 @@ %xdefine _SSL_alert_from_verify_result _ %+ BORINGSSL_PREFIX %+ _SSL_alert_from_verify_result %xdefine _SSL_alert_type_string _ %+ BORINGSSL_PREFIX %+ _SSL_alert_type_string %xdefine _SSL_alert_type_string_long _ %+ BORINGSSL_PREFIX %+ _SSL_alert_type_string_long +%xdefine _SSL_build_cert_chain _ %+ BORINGSSL_PREFIX %+ _SSL_build_cert_chain %xdefine _SSL_cache_hit _ %+ BORINGSSL_PREFIX %+ _SSL_cache_hit %xdefine _SSL_can_release_private_key _ %+ BORINGSSL_PREFIX %+ _SSL_can_release_private_key %xdefine _SSL_certs_clear _ %+ BORINGSSL_PREFIX %+ _SSL_certs_clear @@ -2228,6 +2262,7 @@ %xdefine _SSL_get_cipher_list _ %+ BORINGSSL_PREFIX %+ _SSL_get_cipher_list %xdefine _SSL_get_ciphers _ %+ BORINGSSL_PREFIX %+ _SSL_get_ciphers %xdefine _SSL_get_client_CA_list _ %+ BORINGSSL_PREFIX %+ _SSL_get_client_CA_list +%xdefine _SSL_get_client_ciphers _ %+ BORINGSSL_PREFIX %+ _SSL_get_client_ciphers %xdefine _SSL_get_client_random _ %+ BORINGSSL_PREFIX %+ _SSL_get_client_random %xdefine _SSL_get_current_cipher _ %+ BORINGSSL_PREFIX %+ _SSL_get_current_cipher %xdefine _SSL_get_current_compression _ %+ BORINGSSL_PREFIX %+ _SSL_get_current_compression @@ -3195,6 +3230,7 @@ %xdefine _bio_socket_nbio _ %+ BORINGSSL_PREFIX %+ _bio_socket_nbio %xdefine _bn_abs_sub_consttime _ %+ BORINGSSL_PREFIX %+ _bn_abs_sub_consttime %xdefine _bn_add_words _ %+ BORINGSSL_PREFIX %+ _bn_add_words +%xdefine _bn_assert_fits_in_bytes _ %+ BORINGSSL_PREFIX %+ _bn_assert_fits_in_bytes %xdefine _bn_big_endian_to_words _ %+ BORINGSSL_PREFIX %+ _bn_big_endian_to_words %xdefine _bn_copy_words _ %+ BORINGSSL_PREFIX %+ _bn_copy_words %xdefine _bn_div_consttime _ %+ BORINGSSL_PREFIX %+ _bn_div_consttime @@ -3210,6 +3246,7 @@ %xdefine _bn_lcm_consttime _ %+ BORINGSSL_PREFIX %+ _bn_lcm_consttime %xdefine _bn_less_than_montgomery_R _ %+ BORINGSSL_PREFIX %+ _bn_less_than_montgomery_R %xdefine _bn_less_than_words _ %+ BORINGSSL_PREFIX %+ _bn_less_than_words +%xdefine _bn_little_endian_to_words _ %+ BORINGSSL_PREFIX %+ _bn_little_endian_to_words %xdefine _bn_miller_rabin_init _ %+ BORINGSSL_PREFIX %+ _bn_miller_rabin_init %xdefine _bn_miller_rabin_iteration _ %+ BORINGSSL_PREFIX %+ _bn_miller_rabin_iteration %xdefine _bn_minimal_width _ %+ BORINGSSL_PREFIX %+ _bn_minimal_width @@ -3265,6 +3302,7 @@ %xdefine _bn_usub_consttime _ %+ BORINGSSL_PREFIX %+ _bn_usub_consttime %xdefine _bn_wexpand _ %+ BORINGSSL_PREFIX %+ _bn_wexpand %xdefine _bn_words_to_big_endian _ %+ BORINGSSL_PREFIX %+ _bn_words_to_big_endian +%xdefine _bn_words_to_little_endian _ %+ BORINGSSL_PREFIX %+ _bn_words_to_little_endian %xdefine _boringssl_self_test_hmac_sha256 _ %+ BORINGSSL_PREFIX %+ _boringssl_self_test_hmac_sha256 %xdefine _boringssl_self_test_sha256 _ %+ BORINGSSL_PREFIX %+ _boringssl_self_test_sha256 %xdefine _c2i_ASN1_BIT_STRING _ %+ BORINGSSL_PREFIX %+ _c2i_ASN1_BIT_STRING @@ -3833,31 +3871,11 @@ %xdefine _sk_X509_call_free_func _ %+ BORINGSSL_PREFIX %+ _sk_X509_call_free_func %xdefine _sk_X509_new_null _ %+ BORINGSSL_PREFIX %+ _sk_X509_new_null %xdefine _sk_X509_num _ %+ BORINGSSL_PREFIX %+ _sk_X509_num +%xdefine _sk_X509_pop _ %+ BORINGSSL_PREFIX %+ _sk_X509_pop %xdefine _sk_X509_pop_free _ %+ BORINGSSL_PREFIX %+ _sk_X509_pop_free %xdefine _sk_X509_shift _ %+ BORINGSSL_PREFIX %+ _sk_X509_shift %xdefine _sk_X509_value _ %+ BORINGSSL_PREFIX %+ _sk_X509_value -%xdefine _sk_deep_copy _ %+ BORINGSSL_PREFIX %+ _sk_deep_copy -%xdefine _sk_delete _ %+ BORINGSSL_PREFIX %+ _sk_delete -%xdefine _sk_delete_if _ %+ BORINGSSL_PREFIX %+ _sk_delete_if -%xdefine _sk_delete_ptr _ %+ BORINGSSL_PREFIX %+ _sk_delete_ptr -%xdefine _sk_dup _ %+ BORINGSSL_PREFIX %+ _sk_dup -%xdefine _sk_find _ %+ BORINGSSL_PREFIX %+ _sk_find -%xdefine _sk_free _ %+ BORINGSSL_PREFIX %+ _sk_free -%xdefine _sk_insert _ %+ BORINGSSL_PREFIX %+ _sk_insert -%xdefine _sk_is_sorted _ %+ BORINGSSL_PREFIX %+ _sk_is_sorted -%xdefine _sk_new _ %+ BORINGSSL_PREFIX %+ _sk_new -%xdefine _sk_new_null _ %+ BORINGSSL_PREFIX %+ _sk_new_null -%xdefine _sk_num _ %+ BORINGSSL_PREFIX %+ _sk_num -%xdefine _sk_pop _ %+ BORINGSSL_PREFIX %+ _sk_pop %xdefine _sk_pop_free _ %+ BORINGSSL_PREFIX %+ _sk_pop_free -%xdefine _sk_pop_free_ex _ %+ BORINGSSL_PREFIX %+ _sk_pop_free_ex -%xdefine _sk_push _ %+ BORINGSSL_PREFIX %+ _sk_push -%xdefine _sk_set _ %+ BORINGSSL_PREFIX %+ _sk_set -%xdefine _sk_set_cmp_func _ %+ BORINGSSL_PREFIX %+ _sk_set_cmp_func -%xdefine _sk_shift _ %+ BORINGSSL_PREFIX %+ _sk_shift -%xdefine _sk_sort _ %+ BORINGSSL_PREFIX %+ _sk_sort -%xdefine _sk_value _ %+ BORINGSSL_PREFIX %+ _sk_value -%xdefine _sk_zero _ %+ BORINGSSL_PREFIX %+ _sk_zero %xdefine _v2i_GENERAL_NAME _ %+ BORINGSSL_PREFIX %+ _v2i_GENERAL_NAME %xdefine _v2i_GENERAL_NAMES _ %+ BORINGSSL_PREFIX %+ _v2i_GENERAL_NAMES %xdefine _v2i_GENERAL_NAME_ex _ %+ BORINGSSL_PREFIX %+ _v2i_GENERAL_NAME_ex @@ -4066,6 +4084,7 @@ %xdefine ASN1_TIME_set BORINGSSL_PREFIX %+ _ASN1_TIME_set %xdefine ASN1_TIME_set_posix BORINGSSL_PREFIX %+ _ASN1_TIME_set_posix %xdefine ASN1_TIME_set_string BORINGSSL_PREFIX %+ _ASN1_TIME_set_string +%xdefine ASN1_TIME_set_string_X509 BORINGSSL_PREFIX %+ _ASN1_TIME_set_string_X509 %xdefine ASN1_TIME_to_generalizedtime BORINGSSL_PREFIX %+ _ASN1_TIME_to_generalizedtime %xdefine ASN1_TIME_to_posix BORINGSSL_PREFIX %+ _ASN1_TIME_to_posix %xdefine ASN1_TIME_to_time_t BORINGSSL_PREFIX %+ _ASN1_TIME_to_time_t @@ -5278,7 +5297,10 @@ %xdefine EVP_sha3_384 BORINGSSL_PREFIX %+ _EVP_sha3_384 %xdefine EVP_sha3_512 BORINGSSL_PREFIX %+ _EVP_sha3_512 %xdefine EVP_sha512 BORINGSSL_PREFIX %+ _EVP_sha512 +%xdefine EVP_sha512_224 BORINGSSL_PREFIX %+ _EVP_sha512_224 %xdefine EVP_sha512_256 BORINGSSL_PREFIX %+ _EVP_sha512_256 +%xdefine EVP_shake128 BORINGSSL_PREFIX %+ _EVP_shake128 +%xdefine EVP_shake256 BORINGSSL_PREFIX %+ _EVP_shake256 %xdefine EVP_tls_cbc_copy_mac BORINGSSL_PREFIX %+ _EVP_tls_cbc_copy_mac %xdefine EVP_tls_cbc_digest_record BORINGSSL_PREFIX %+ _EVP_tls_cbc_digest_record %xdefine EVP_tls_cbc_digest_record_sha256 BORINGSSL_PREFIX %+ _EVP_tls_cbc_digest_record_sha256 @@ -5517,6 +5539,27 @@ %xdefine OPENSSL_realloc BORINGSSL_PREFIX %+ _OPENSSL_realloc %xdefine OPENSSL_secure_clear_free BORINGSSL_PREFIX %+ _OPENSSL_secure_clear_free %xdefine OPENSSL_secure_malloc BORINGSSL_PREFIX %+ _OPENSSL_secure_malloc +%xdefine OPENSSL_sk_deep_copy BORINGSSL_PREFIX %+ _OPENSSL_sk_deep_copy +%xdefine OPENSSL_sk_delete BORINGSSL_PREFIX %+ _OPENSSL_sk_delete +%xdefine OPENSSL_sk_delete_if BORINGSSL_PREFIX %+ _OPENSSL_sk_delete_if +%xdefine OPENSSL_sk_delete_ptr BORINGSSL_PREFIX %+ _OPENSSL_sk_delete_ptr +%xdefine OPENSSL_sk_dup BORINGSSL_PREFIX %+ _OPENSSL_sk_dup +%xdefine OPENSSL_sk_find BORINGSSL_PREFIX %+ _OPENSSL_sk_find +%xdefine OPENSSL_sk_free BORINGSSL_PREFIX %+ _OPENSSL_sk_free +%xdefine OPENSSL_sk_insert BORINGSSL_PREFIX %+ _OPENSSL_sk_insert +%xdefine OPENSSL_sk_is_sorted BORINGSSL_PREFIX %+ _OPENSSL_sk_is_sorted +%xdefine OPENSSL_sk_new BORINGSSL_PREFIX %+ _OPENSSL_sk_new +%xdefine OPENSSL_sk_new_null BORINGSSL_PREFIX %+ _OPENSSL_sk_new_null +%xdefine OPENSSL_sk_num BORINGSSL_PREFIX %+ _OPENSSL_sk_num +%xdefine OPENSSL_sk_pop BORINGSSL_PREFIX %+ _OPENSSL_sk_pop +%xdefine OPENSSL_sk_pop_free_ex BORINGSSL_PREFIX %+ _OPENSSL_sk_pop_free_ex +%xdefine OPENSSL_sk_push BORINGSSL_PREFIX %+ _OPENSSL_sk_push +%xdefine OPENSSL_sk_set BORINGSSL_PREFIX %+ _OPENSSL_sk_set +%xdefine OPENSSL_sk_set_cmp_func BORINGSSL_PREFIX %+ _OPENSSL_sk_set_cmp_func +%xdefine OPENSSL_sk_shift BORINGSSL_PREFIX %+ _OPENSSL_sk_shift +%xdefine OPENSSL_sk_sort BORINGSSL_PREFIX %+ _OPENSSL_sk_sort +%xdefine OPENSSL_sk_value BORINGSSL_PREFIX %+ _OPENSSL_sk_value +%xdefine OPENSSL_sk_zero BORINGSSL_PREFIX %+ _OPENSSL_sk_zero %xdefine OPENSSL_strcasecmp BORINGSSL_PREFIX %+ _OPENSSL_strcasecmp %xdefine OPENSSL_strdup BORINGSSL_PREFIX %+ _OPENSSL_strdup %xdefine OPENSSL_strhash BORINGSSL_PREFIX %+ _OPENSSL_strhash @@ -5826,6 +5869,10 @@ %xdefine SHA3_Squeeze_hw BORINGSSL_PREFIX %+ _SHA3_Squeeze_hw %xdefine SHA3_Update BORINGSSL_PREFIX %+ _SHA3_Update %xdefine SHA512 BORINGSSL_PREFIX %+ _SHA512 +%xdefine SHA512_224 BORINGSSL_PREFIX %+ _SHA512_224 +%xdefine SHA512_224_Final BORINGSSL_PREFIX %+ _SHA512_224_Final +%xdefine SHA512_224_Init BORINGSSL_PREFIX %+ _SHA512_224_Init +%xdefine SHA512_224_Update BORINGSSL_PREFIX %+ _SHA512_224_Update %xdefine SHA512_256 BORINGSSL_PREFIX %+ _SHA512_256 %xdefine SHA512_256_Final BORINGSSL_PREFIX %+ _SHA512_256_Final %xdefine SHA512_256_Init BORINGSSL_PREFIX %+ _SHA512_256_Init @@ -5836,6 +5883,8 @@ %xdefine SHA512_Update BORINGSSL_PREFIX %+ _SHA512_Update %xdefine SHAKE128 BORINGSSL_PREFIX %+ _SHAKE128 %xdefine SHAKE256 BORINGSSL_PREFIX %+ _SHAKE256 +%xdefine SHAKE_Final BORINGSSL_PREFIX %+ _SHAKE_Final +%xdefine SHAKE_Init BORINGSSL_PREFIX %+ _SHAKE_Init %xdefine SIPHASH_24 BORINGSSL_PREFIX %+ _SIPHASH_24 %xdefine SPAKE2_CTX_free BORINGSSL_PREFIX %+ _SPAKE2_CTX_free %xdefine SPAKE2_CTX_new BORINGSSL_PREFIX %+ _SPAKE2_CTX_new @@ -5847,6 +5896,7 @@ %xdefine SSL_CIPHER_get_bits BORINGSSL_PREFIX %+ _SSL_CIPHER_get_bits %xdefine SSL_CIPHER_get_cipher_nid BORINGSSL_PREFIX %+ _SSL_CIPHER_get_cipher_nid %xdefine SSL_CIPHER_get_digest_nid BORINGSSL_PREFIX %+ _SSL_CIPHER_get_digest_nid +%xdefine SSL_CIPHER_get_handshake_digest BORINGSSL_PREFIX %+ _SSL_CIPHER_get_handshake_digest %xdefine SSL_CIPHER_get_id BORINGSSL_PREFIX %+ _SSL_CIPHER_get_id %xdefine SSL_CIPHER_get_kx_name BORINGSSL_PREFIX %+ _SSL_CIPHER_get_kx_name %xdefine SSL_CIPHER_get_kx_nid BORINGSSL_PREFIX %+ _SSL_CIPHER_get_kx_nid @@ -5873,6 +5923,7 @@ %xdefine SSL_CTX_add_extra_chain_cert BORINGSSL_PREFIX %+ _SSL_CTX_add_extra_chain_cert %xdefine SSL_CTX_add_server_custom_ext BORINGSSL_PREFIX %+ _SSL_CTX_add_server_custom_ext %xdefine SSL_CTX_add_session BORINGSSL_PREFIX %+ _SSL_CTX_add_session +%xdefine SSL_CTX_build_cert_chain BORINGSSL_PREFIX %+ _SSL_CTX_build_cert_chain %xdefine SSL_CTX_check_private_key BORINGSSL_PREFIX %+ _SSL_CTX_check_private_key %xdefine SSL_CTX_cipher_in_group BORINGSSL_PREFIX %+ _SSL_CTX_cipher_in_group %xdefine SSL_CTX_clear_chain_certs BORINGSSL_PREFIX %+ _SSL_CTX_clear_chain_certs @@ -6094,6 +6145,7 @@ %xdefine SSL_alert_from_verify_result BORINGSSL_PREFIX %+ _SSL_alert_from_verify_result %xdefine SSL_alert_type_string BORINGSSL_PREFIX %+ _SSL_alert_type_string %xdefine SSL_alert_type_string_long BORINGSSL_PREFIX %+ _SSL_alert_type_string_long +%xdefine SSL_build_cert_chain BORINGSSL_PREFIX %+ _SSL_build_cert_chain %xdefine SSL_cache_hit BORINGSSL_PREFIX %+ _SSL_cache_hit %xdefine SSL_can_release_private_key BORINGSSL_PREFIX %+ _SSL_can_release_private_key %xdefine SSL_certs_clear BORINGSSL_PREFIX %+ _SSL_certs_clear @@ -6148,6 +6200,7 @@ %xdefine SSL_get_cipher_list BORINGSSL_PREFIX %+ _SSL_get_cipher_list %xdefine SSL_get_ciphers BORINGSSL_PREFIX %+ _SSL_get_ciphers %xdefine SSL_get_client_CA_list BORINGSSL_PREFIX %+ _SSL_get_client_CA_list +%xdefine SSL_get_client_ciphers BORINGSSL_PREFIX %+ _SSL_get_client_ciphers %xdefine SSL_get_client_random BORINGSSL_PREFIX %+ _SSL_get_client_random %xdefine SSL_get_current_cipher BORINGSSL_PREFIX %+ _SSL_get_current_cipher %xdefine SSL_get_current_compression BORINGSSL_PREFIX %+ _SSL_get_current_compression @@ -7115,6 +7168,7 @@ %xdefine bio_socket_nbio BORINGSSL_PREFIX %+ _bio_socket_nbio %xdefine bn_abs_sub_consttime BORINGSSL_PREFIX %+ _bn_abs_sub_consttime %xdefine bn_add_words BORINGSSL_PREFIX %+ _bn_add_words +%xdefine bn_assert_fits_in_bytes BORINGSSL_PREFIX %+ _bn_assert_fits_in_bytes %xdefine bn_big_endian_to_words BORINGSSL_PREFIX %+ _bn_big_endian_to_words %xdefine bn_copy_words BORINGSSL_PREFIX %+ _bn_copy_words %xdefine bn_div_consttime BORINGSSL_PREFIX %+ _bn_div_consttime @@ -7130,6 +7184,7 @@ %xdefine bn_lcm_consttime BORINGSSL_PREFIX %+ _bn_lcm_consttime %xdefine bn_less_than_montgomery_R BORINGSSL_PREFIX %+ _bn_less_than_montgomery_R %xdefine bn_less_than_words BORINGSSL_PREFIX %+ _bn_less_than_words +%xdefine bn_little_endian_to_words BORINGSSL_PREFIX %+ _bn_little_endian_to_words %xdefine bn_miller_rabin_init BORINGSSL_PREFIX %+ _bn_miller_rabin_init %xdefine bn_miller_rabin_iteration BORINGSSL_PREFIX %+ _bn_miller_rabin_iteration %xdefine bn_minimal_width BORINGSSL_PREFIX %+ _bn_minimal_width @@ -7185,6 +7240,7 @@ %xdefine bn_usub_consttime BORINGSSL_PREFIX %+ _bn_usub_consttime %xdefine bn_wexpand BORINGSSL_PREFIX %+ _bn_wexpand %xdefine bn_words_to_big_endian BORINGSSL_PREFIX %+ _bn_words_to_big_endian +%xdefine bn_words_to_little_endian BORINGSSL_PREFIX %+ _bn_words_to_little_endian %xdefine boringssl_self_test_hmac_sha256 BORINGSSL_PREFIX %+ _boringssl_self_test_hmac_sha256 %xdefine boringssl_self_test_sha256 BORINGSSL_PREFIX %+ _boringssl_self_test_sha256 %xdefine c2i_ASN1_BIT_STRING BORINGSSL_PREFIX %+ _c2i_ASN1_BIT_STRING @@ -7753,31 +7809,11 @@ %xdefine sk_X509_call_free_func BORINGSSL_PREFIX %+ _sk_X509_call_free_func %xdefine sk_X509_new_null BORINGSSL_PREFIX %+ _sk_X509_new_null %xdefine sk_X509_num BORINGSSL_PREFIX %+ _sk_X509_num +%xdefine sk_X509_pop BORINGSSL_PREFIX %+ _sk_X509_pop %xdefine sk_X509_pop_free BORINGSSL_PREFIX %+ _sk_X509_pop_free %xdefine sk_X509_shift BORINGSSL_PREFIX %+ _sk_X509_shift %xdefine sk_X509_value BORINGSSL_PREFIX %+ _sk_X509_value -%xdefine sk_deep_copy BORINGSSL_PREFIX %+ _sk_deep_copy -%xdefine sk_delete BORINGSSL_PREFIX %+ _sk_delete -%xdefine sk_delete_if BORINGSSL_PREFIX %+ _sk_delete_if -%xdefine sk_delete_ptr BORINGSSL_PREFIX %+ _sk_delete_ptr -%xdefine sk_dup BORINGSSL_PREFIX %+ _sk_dup -%xdefine sk_find BORINGSSL_PREFIX %+ _sk_find -%xdefine sk_free BORINGSSL_PREFIX %+ _sk_free -%xdefine sk_insert BORINGSSL_PREFIX %+ _sk_insert -%xdefine sk_is_sorted BORINGSSL_PREFIX %+ _sk_is_sorted -%xdefine sk_new BORINGSSL_PREFIX %+ _sk_new -%xdefine sk_new_null BORINGSSL_PREFIX %+ _sk_new_null -%xdefine sk_num BORINGSSL_PREFIX %+ _sk_num -%xdefine sk_pop BORINGSSL_PREFIX %+ _sk_pop %xdefine sk_pop_free BORINGSSL_PREFIX %+ _sk_pop_free -%xdefine sk_pop_free_ex BORINGSSL_PREFIX %+ _sk_pop_free_ex -%xdefine sk_push BORINGSSL_PREFIX %+ _sk_push -%xdefine sk_set BORINGSSL_PREFIX %+ _sk_set -%xdefine sk_set_cmp_func BORINGSSL_PREFIX %+ _sk_set_cmp_func -%xdefine sk_shift BORINGSSL_PREFIX %+ _sk_shift -%xdefine sk_sort BORINGSSL_PREFIX %+ _sk_sort -%xdefine sk_value BORINGSSL_PREFIX %+ _sk_value -%xdefine sk_zero BORINGSSL_PREFIX %+ _sk_zero %xdefine v2i_GENERAL_NAME BORINGSSL_PREFIX %+ _v2i_GENERAL_NAME %xdefine v2i_GENERAL_NAMES BORINGSSL_PREFIX %+ _v2i_GENERAL_NAMES %xdefine v2i_GENERAL_NAME_ex BORINGSSL_PREFIX %+ _v2i_GENERAL_NAME_ex diff --git a/aws-lc-sys/src/linux_aarch64_crypto.rs b/aws-lc-sys/src/linux_aarch64_crypto.rs index 23f436f6190..ca73481e324 100644 --- a/aws-lc-sys/src/linux_aarch64_crypto.rs +++ b/aws-lc-sys/src/linux_aarch64_crypto.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 64; pub const BN_DEC_FMT1: &[u8; 4] = b"%lu\0"; -pub const BN_DEC_FMT2: &[u8; 7] = b"%019lu\0"; pub const BN_HEX_FMT1: &[u8; 4] = b"%lx\0"; pub const BN_HEX_FMT2: &[u8; 7] = b"%016lx\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4257,6 +4267,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -4921,6 +4936,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -6205,8 +6240,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -6217,203 +6252,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 40usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -6690,12 +6655,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -9625,6 +9587,13 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -13481,6 +13450,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -13501,6 +13474,14 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -13594,7 +13575,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -13779,88 +13760,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -14187,151 +14086,6 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Copy, Clone)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 144usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 16usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 24usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 40usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 48usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 56usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 112usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 120usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 128usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 136usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -14714,6 +14468,88 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -22315,7 +22151,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -27678,7 +27514,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -27697,8 +27534,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } diff --git a/aws-lc-sys/src/linux_aarch64_crypto_ssl.rs b/aws-lc-sys/src/linux_aarch64_crypto_ssl.rs index 424e6bf62fe..68610035a54 100644 --- a/aws-lc-sys/src/linux_aarch64_crypto_ssl.rs +++ b/aws-lc-sys/src/linux_aarch64_crypto_ssl.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 64; pub const BN_DEC_FMT1: &[u8; 4] = b"%lu\0"; -pub const BN_DEC_FMT2: &[u8; 7] = b"%019lu\0"; pub const BN_HEX_FMT1: &[u8; 4] = b"%lx\0"; pub const BN_HEX_FMT2: &[u8; 7] = b"%016lx\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4243,6 +4253,11 @@ pub const SSL_MODE_ENABLE_FALSE_START: i32 = 128; pub const SSL_MODE_CBC_RECORD_SPLITTING: i32 = 256; pub const SSL_MODE_NO_SESSION_CREATION: i32 = 512; pub const SSL_MODE_SEND_FALLBACK_SCSV: i32 = 1024; +pub const SSL_BUILD_CHAIN_FLAG_UNTRUSTED: i32 = 1; +pub const SSL_BUILD_CHAIN_FLAG_NO_ROOT: i32 = 2; +pub const SSL_BUILD_CHAIN_FLAG_CHECK: i32 = 4; +pub const SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR: i32 = 8; +pub const SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR: i32 = 16; pub const SSL_SIGN_RSA_PKCS1_SHA1: i32 = 513; pub const SSL_SIGN_RSA_PKCS1_SHA256: i32 = 1025; pub const SSL_SIGN_RSA_PKCS1_SHA384: i32 = 1281; @@ -5283,6 +5298,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -5922,6 +5942,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -7206,8 +7246,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -7218,203 +7258,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 40usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -7691,12 +7661,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -10626,6 +10593,13 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -14482,6 +14456,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -14502,6 +14480,14 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -14595,7 +14581,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -14780,88 +14766,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -15188,151 +15092,6 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Copy, Clone)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 144usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 16usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 24usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 40usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 48usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 56usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 112usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 120usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 128usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 136usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -15715,6 +15474,88 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -23316,7 +23157,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -28679,7 +28520,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -28698,8 +28540,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } @@ -29221,6 +29063,20 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_add1_chain_cert"] pub fn SSL_add1_chain_cert(ssl: *mut SSL, x509: *mut X509) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_CTX_build_cert_chain"] + pub fn SSL_CTX_build_cert_chain( + ctx: *mut SSL_CTX, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_build_cert_chain"] + pub fn SSL_build_cert_chain( + ssl: *mut SSL, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CTX_clear_chain_certs"] pub fn SSL_CTX_clear_chain_certs(ctx: *mut SSL_CTX) -> ::std::os::raw::c_int; @@ -29710,6 +29566,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_auth_nid"] pub fn SSL_CIPHER_get_auth_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_handshake_digest"] + pub fn SSL_CIPHER_get_handshake_digest(cipher: *const SSL_CIPHER) -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_prf_nid"] pub fn SSL_CIPHER_get_prf_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; @@ -29863,6 +29723,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_get_current_cipher"] pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_get_client_ciphers"] + pub fn SSL_get_client_ciphers(ssl: *const SSL) -> *mut stack_st_SSL_CIPHER; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_session_reused"] pub fn SSL_session_reused(ssl: *const SSL) -> ::std::os::raw::c_int; diff --git a/aws-lc-sys/src/linux_x86_64_crypto.rs b/aws-lc-sys/src/linux_x86_64_crypto.rs index 8bafedaf5ce..02b8975d9a4 100644 --- a/aws-lc-sys/src/linux_x86_64_crypto.rs +++ b/aws-lc-sys/src/linux_x86_64_crypto.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 64; pub const BN_DEC_FMT1: &[u8; 4] = b"%lu\0"; -pub const BN_DEC_FMT2: &[u8; 7] = b"%019lu\0"; pub const BN_HEX_FMT1: &[u8; 4] = b"%lx\0"; pub const BN_HEX_FMT2: &[u8; 7] = b"%016lx\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4257,6 +4267,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -4921,6 +4936,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -6205,8 +6240,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -6217,203 +6252,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 40usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -6690,12 +6655,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -9625,6 +9587,13 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -13481,6 +13450,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -13501,6 +13474,14 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -13594,7 +13575,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -13779,88 +13760,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -14187,151 +14086,6 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Copy, Clone)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 144usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 16usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 24usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 40usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 48usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 56usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 112usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 120usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 128usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 136usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -14714,6 +14468,88 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -22315,7 +22151,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -27678,7 +27514,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -27697,8 +27534,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } diff --git a/aws-lc-sys/src/linux_x86_64_crypto_ssl.rs b/aws-lc-sys/src/linux_x86_64_crypto_ssl.rs index 4c5eb791dfa..5dca0b3e715 100644 --- a/aws-lc-sys/src/linux_x86_64_crypto_ssl.rs +++ b/aws-lc-sys/src/linux_x86_64_crypto_ssl.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 64; pub const BN_DEC_FMT1: &[u8; 4] = b"%lu\0"; -pub const BN_DEC_FMT2: &[u8; 7] = b"%019lu\0"; pub const BN_HEX_FMT1: &[u8; 4] = b"%lx\0"; pub const BN_HEX_FMT2: &[u8; 7] = b"%016lx\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4243,6 +4253,11 @@ pub const SSL_MODE_ENABLE_FALSE_START: i32 = 128; pub const SSL_MODE_CBC_RECORD_SPLITTING: i32 = 256; pub const SSL_MODE_NO_SESSION_CREATION: i32 = 512; pub const SSL_MODE_SEND_FALLBACK_SCSV: i32 = 1024; +pub const SSL_BUILD_CHAIN_FLAG_UNTRUSTED: i32 = 1; +pub const SSL_BUILD_CHAIN_FLAG_NO_ROOT: i32 = 2; +pub const SSL_BUILD_CHAIN_FLAG_CHECK: i32 = 4; +pub const SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR: i32 = 8; +pub const SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR: i32 = 16; pub const SSL_SIGN_RSA_PKCS1_SHA1: i32 = 513; pub const SSL_SIGN_RSA_PKCS1_SHA256: i32 = 1025; pub const SSL_SIGN_RSA_PKCS1_SHA384: i32 = 1281; @@ -5283,6 +5298,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -5922,6 +5942,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -7206,8 +7246,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -7218,203 +7258,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 40usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -7691,12 +7661,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -10626,6 +10593,13 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -14482,6 +14456,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -14502,6 +14480,14 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -14595,7 +14581,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -14780,88 +14766,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -15188,151 +15092,6 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Copy, Clone)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 144usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 16usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 24usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 40usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 48usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 56usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 112usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 120usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 128usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 136usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -15715,6 +15474,88 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -23316,7 +23157,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -28679,7 +28520,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -28698,8 +28540,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } @@ -29221,6 +29063,20 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_add1_chain_cert"] pub fn SSL_add1_chain_cert(ssl: *mut SSL, x509: *mut X509) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_CTX_build_cert_chain"] + pub fn SSL_CTX_build_cert_chain( + ctx: *mut SSL_CTX, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_build_cert_chain"] + pub fn SSL_build_cert_chain( + ssl: *mut SSL, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CTX_clear_chain_certs"] pub fn SSL_CTX_clear_chain_certs(ctx: *mut SSL_CTX) -> ::std::os::raw::c_int; @@ -29710,6 +29566,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_auth_nid"] pub fn SSL_CIPHER_get_auth_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_handshake_digest"] + pub fn SSL_CIPHER_get_handshake_digest(cipher: *const SSL_CIPHER) -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_prf_nid"] pub fn SSL_CIPHER_get_prf_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; @@ -29863,6 +29723,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_get_current_cipher"] pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_get_client_ciphers"] + pub fn SSL_get_client_ciphers(ssl: *const SSL) -> *mut stack_st_SSL_CIPHER; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_session_reused"] pub fn SSL_session_reused(ssl: *const SSL) -> ::std::os::raw::c_int; diff --git a/aws-lc-sys/src/linux_x86_crypto.rs b/aws-lc-sys/src/linux_x86_crypto.rs index 7fc0f25b199..c554bf41359 100644 --- a/aws-lc-sys/src/linux_x86_crypto.rs +++ b/aws-lc-sys/src/linux_x86_crypto.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 32; pub const BN_DEC_FMT1: &[u8; 3] = b"%u\0"; -pub const BN_DEC_FMT2: &[u8; 5] = b"%09u\0"; pub const BN_HEX_FMT1: &[u8; 3] = b"%x\0"; pub const BN_HEX_FMT2: &[u8; 5] = b"%08x\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4258,6 +4268,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -4922,6 +4937,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -6206,8 +6241,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -6218,203 +6253,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 20usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 12usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -6691,12 +6656,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -9626,6 +9588,13 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -13482,6 +13451,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -13502,6 +13475,14 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -13595,7 +13576,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -13780,88 +13761,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -14188,151 +14087,6 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Copy, Clone)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 100usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 4usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 12usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 20usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 28usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 84usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 88usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 92usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 96usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -14715,6 +14469,88 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -22316,7 +22152,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -27679,7 +27515,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -27698,8 +27535,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } diff --git a/aws-lc-sys/src/linux_x86_crypto_ssl.rs b/aws-lc-sys/src/linux_x86_crypto_ssl.rs index 685883844bf..ec0ad311275 100644 --- a/aws-lc-sys/src/linux_x86_crypto_ssl.rs +++ b/aws-lc-sys/src/linux_x86_crypto_ssl.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 32; pub const BN_DEC_FMT1: &[u8; 3] = b"%u\0"; -pub const BN_DEC_FMT2: &[u8; 5] = b"%09u\0"; pub const BN_HEX_FMT1: &[u8; 3] = b"%x\0"; pub const BN_HEX_FMT2: &[u8; 5] = b"%08x\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4243,6 +4253,11 @@ pub const SSL_MODE_ENABLE_FALSE_START: i32 = 128; pub const SSL_MODE_CBC_RECORD_SPLITTING: i32 = 256; pub const SSL_MODE_NO_SESSION_CREATION: i32 = 512; pub const SSL_MODE_SEND_FALLBACK_SCSV: i32 = 1024; +pub const SSL_BUILD_CHAIN_FLAG_UNTRUSTED: i32 = 1; +pub const SSL_BUILD_CHAIN_FLAG_NO_ROOT: i32 = 2; +pub const SSL_BUILD_CHAIN_FLAG_CHECK: i32 = 4; +pub const SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR: i32 = 8; +pub const SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR: i32 = 16; pub const SSL_SIGN_RSA_PKCS1_SHA1: i32 = 513; pub const SSL_SIGN_RSA_PKCS1_SHA256: i32 = 1025; pub const SSL_SIGN_RSA_PKCS1_SHA384: i32 = 1281; @@ -5284,6 +5299,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -5923,6 +5943,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -7207,8 +7247,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -7219,203 +7259,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 20usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 12usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -7692,12 +7662,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -10627,6 +10594,13 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -14483,6 +14457,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -14503,6 +14481,14 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -14596,7 +14582,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -14781,88 +14767,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -15189,151 +15093,6 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Copy, Clone)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 100usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 4usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 12usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 20usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 28usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 84usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 88usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 92usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 96usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -15716,6 +15475,88 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -23317,7 +23158,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -28680,7 +28521,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -28699,8 +28541,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } @@ -29222,6 +29064,20 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_add1_chain_cert"] pub fn SSL_add1_chain_cert(ssl: *mut SSL, x509: *mut X509) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_CTX_build_cert_chain"] + pub fn SSL_CTX_build_cert_chain( + ctx: *mut SSL_CTX, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_build_cert_chain"] + pub fn SSL_build_cert_chain( + ssl: *mut SSL, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CTX_clear_chain_certs"] pub fn SSL_CTX_clear_chain_certs(ctx: *mut SSL_CTX) -> ::std::os::raw::c_int; @@ -29711,6 +29567,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_auth_nid"] pub fn SSL_CIPHER_get_auth_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_handshake_digest"] + pub fn SSL_CIPHER_get_handshake_digest(cipher: *const SSL_CIPHER) -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_CIPHER_get_prf_nid"] pub fn SSL_CIPHER_get_prf_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; @@ -29864,6 +29724,10 @@ extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_get_current_cipher"] pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER; } +extern "C" { + #[link_name = "\u{1}aws_lc_0_11_0_SSL_get_client_ciphers"] + pub fn SSL_get_client_ciphers(ssl: *const SSL) -> *mut stack_st_SSL_CIPHER; +} extern "C" { #[link_name = "\u{1}aws_lc_0_11_0_SSL_session_reused"] pub fn SSL_session_reused(ssl: *const SSL) -> ::std::os::raw::c_int; diff --git a/aws-lc-sys/src/macos_x86_64_crypto.rs b/aws-lc-sys/src/macos_x86_64_crypto.rs index f0acfea987d..ffe7910a310 100644 --- a/aws-lc-sys/src/macos_x86_64_crypto.rs +++ b/aws-lc-sys/src/macos_x86_64_crypto.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 64; pub const BN_DEC_FMT1: &[u8; 5] = b"%llu\0"; -pub const BN_DEC_FMT2: &[u8; 8] = b"%019llu\0"; pub const BN_HEX_FMT1: &[u8; 5] = b"%llx\0"; pub const BN_HEX_FMT2: &[u8; 8] = b"%016llx\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4272,6 +4282,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -4936,6 +4951,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -6170,8 +6205,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -6182,203 +6217,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 40usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -6655,12 +6620,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -9590,6 +9552,13 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -13446,6 +13415,10 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -13466,6 +13439,14 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -13559,7 +13540,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -13744,88 +13725,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -14152,151 +14051,6 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 288usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 16usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 24usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 40usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 48usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 56usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 256usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 264usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 272usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 280usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -14679,6 +14433,88 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -22280,7 +22116,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -27643,7 +27479,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -27662,8 +27499,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } diff --git a/aws-lc-sys/src/macos_x86_64_crypto_ssl.rs b/aws-lc-sys/src/macos_x86_64_crypto_ssl.rs index b2385b4fd4a..ed9e35c0db7 100644 --- a/aws-lc-sys/src/macos_x86_64_crypto_ssl.rs +++ b/aws-lc-sys/src/macos_x86_64_crypto_ssl.rs @@ -108,8 +108,8 @@ where pub const AWSLC_VERSION_NAME: &[u8; 7] = b"AWS-LC\0"; pub const OPENSSL_VERSION_NUMBER: i32 = 269488255; pub const SSLEAY_VERSION_NUMBER: i32 = 269488255; -pub const AWSLC_API_VERSION: i32 = 22; -pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.16.0\0"; +pub const AWSLC_API_VERSION: i32 = 23; +pub const AWSLC_VERSION_NUMBER_STRING: &[u8; 7] = b"1.17.0\0"; pub const SHA_CBLOCK: i32 = 64; pub const SHA_DIGEST_LENGTH: i32 = 20; pub const SHA224_CBLOCK: i32 = 64; @@ -120,12 +120,13 @@ pub const SHA384_CBLOCK: i32 = 128; pub const SHA384_DIGEST_LENGTH: i32 = 48; pub const SHA512_CBLOCK: i32 = 128; pub const SHA512_DIGEST_LENGTH: i32 = 64; +pub const SHA512_224_DIGEST_LENGTH: i32 = 28; pub const SHA512_256_DIGEST_LENGTH: i32 = 32; pub const CRYPTO_LOCK: i32 = 1; pub const CRYPTO_UNLOCK: i32 = 2; pub const CRYPTO_READ: i32 = 4; pub const CRYPTO_WRITE: i32 = 8; -pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.16.0)\0"; +pub const OPENSSL_VERSION_TEXT: &[u8; 42] = b"OpenSSL 1.1.1 (compatible; AWS-LC 1.17.0)\0"; pub const OPENSSL_VERSION: i32 = 0; pub const OPENSSL_CFLAGS: i32 = 1; pub const OPENSSL_BUILT_ON: i32 = 2; @@ -172,6 +173,7 @@ pub const BIO_CB_CTRL: i32 = 6; pub const BIO_CB_RETURN: i32 = 128; pub const BIO_NOCLOSE: i32 = 0; pub const BIO_CLOSE: i32 = 1; +pub const BIO_FP_TEXT: i32 = 16; pub const BIO_CTRL_DGRAM_QUERY_MTU: i32 = 40; pub const BIO_CTRL_DGRAM_SET_MTU: i32 = 42; pub const BIO_CTRL_DGRAM_MTU_EXCEEDED: i32 = 43; @@ -294,7 +296,6 @@ pub const BIO_R_UNSUPPORTED_METHOD: i32 = 115; pub const BIO_R_WRITE_TO_READ_ONLY_BIO: i32 = 116; pub const BN_BITS2: i32 = 64; pub const BN_DEC_FMT1: &[u8; 5] = b"%llu\0"; -pub const BN_DEC_FMT2: &[u8; 8] = b"%019llu\0"; pub const BN_HEX_FMT1: &[u8; 5] = b"%llx\0"; pub const BN_HEX_FMT2: &[u8; 8] = b"%016llx\0"; pub const BN_RAND_TOP_ANY: i32 = -1; @@ -720,7 +721,6 @@ pub const EVP_MD_CTX_FLAG_NON_FIPS_ALLOW: i32 = 0; pub const DIGEST_R_INPUT_NOT_INITIALIZED: i32 = 100; pub const DIGEST_R_DECODE_ERROR: i32 = 101; pub const DIGEST_R_UNKNOWN_HASH: i32 = 102; -pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const DSA_R_BAD_Q_VALUE: i32 = 100; pub const DSA_R_MISSING_PARAMETERS: i32 = 101; pub const DSA_R_MODULUS_TOO_LARGE: i32 = 102; @@ -732,6 +732,7 @@ pub const DSA_R_INVALID_PARAMETERS: i32 = 107; pub const DSA_R_TOO_MANY_ITERATIONS: i32 = 108; pub const OPENSSL_EC_EXPLICIT_CURVE: i32 = 0; pub const OPENSSL_EC_NAMED_CURVE: i32 = 1; +pub const ENGINE_R_OPERATION_NOT_SUPPORTED: i32 = 100; pub const EC_PKEY_NO_PARAMETERS: i32 = 1; pub const EC_PKEY_NO_PUBKEY: i32 = 2; pub const ECDSA_FLAG_OPAQUE: i32 = 1; @@ -3148,6 +3149,15 @@ pub const SN_ffdhe2048: &[u8; 10] = b"ffdhe2048\0"; pub const NID_ffdhe2048: i32 = 976; pub const SN_ffdhe4096: &[u8; 10] = b"ffdhe4096\0"; pub const NID_ffdhe4096: i32 = 977; +pub const SN_sha512_224: &[u8; 11] = b"SHA512-224\0"; +pub const LN_sha512_224: &[u8; 11] = b"sha512-224\0"; +pub const NID_sha512_224: i32 = 978; +pub const SN_shake128: &[u8; 9] = b"SHAKE128\0"; +pub const LN_shake128: &[u8; 9] = b"shake128\0"; +pub const NID_shake128: i32 = 979; +pub const SN_shake256: &[u8; 9] = b"SHAKE256\0"; +pub const LN_shake256: &[u8; 9] = b"shake256\0"; +pub const NID_shake256: i32 = 980; pub const EVP_PKEY_NONE: i32 = 0; pub const EVP_PKEY_RSA: i32 = 6; pub const EVP_PKEY_RSA_PSS: i32 = 912; @@ -4243,6 +4253,11 @@ pub const SSL_MODE_ENABLE_FALSE_START: i32 = 128; pub const SSL_MODE_CBC_RECORD_SPLITTING: i32 = 256; pub const SSL_MODE_NO_SESSION_CREATION: i32 = 512; pub const SSL_MODE_SEND_FALLBACK_SCSV: i32 = 1024; +pub const SSL_BUILD_CHAIN_FLAG_UNTRUSTED: i32 = 1; +pub const SSL_BUILD_CHAIN_FLAG_NO_ROOT: i32 = 2; +pub const SSL_BUILD_CHAIN_FLAG_CHECK: i32 = 4; +pub const SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR: i32 = 8; +pub const SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR: i32 = 16; pub const SSL_SIGN_RSA_PKCS1_SHA1: i32 = 513; pub const SSL_SIGN_RSA_PKCS1_SHA256: i32 = 1025; pub const SSL_SIGN_RSA_PKCS1_SHA384: i32 = 1281; @@ -5258,6 +5273,11 @@ pub struct dh_st { _unused: [u8; 0], } pub type DH = dh_st; +#[repr(C)] +#[derive(Debug, Copy, Clone)] +pub struct dsa_st { + _unused: [u8; 0], +} pub type DSA = dsa_st; #[repr(C)] #[derive(Debug, Copy, Clone)] @@ -5897,6 +5917,26 @@ impl Default for sha512_state_st { } } } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224_Init"] + pub fn SHA512_224_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224_Update"] + pub fn SHA512_224_Update( + sha: *mut SHA512_CTX, + data: *const ::std::os::raw::c_void, + len: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224_Final"] + pub fn SHA512_224_Final(out: *mut u8, sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_224"] + pub fn SHA512_224(data: *const u8, len: usize, out: *mut u8) -> *mut u8; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SHA512_256_Init"] pub fn SHA512_256_Init(sha: *mut SHA512_CTX) -> ::std::os::raw::c_int; @@ -7172,8 +7212,8 @@ pub type OPENSSL_sk_call_copy_func = ::std::option::Option< pub type OPENSSL_sk_call_cmp_func = ::std::option::Option< unsafe extern "C" fn( arg1: OPENSSL_sk_cmp_func, - arg2: *const *const ::std::os::raw::c_void, - arg3: *const *const ::std::os::raw::c_void, + arg2: *const ::std::os::raw::c_void, + arg3: *const ::std::os::raw::c_void, ) -> ::std::os::raw::c_int, >; pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< @@ -7184,203 +7224,133 @@ pub type OPENSSL_sk_call_delete_if_func = ::std::option::Option< ) -> ::std::os::raw::c_int, >; #[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] +#[derive(Debug, Copy, Clone)] pub struct stack_st { - pub num: usize, - pub data: *mut *mut ::std::os::raw::c_void, - pub sorted: ::std::os::raw::c_int, - pub num_alloc: usize, - pub comp: OPENSSL_sk_cmp_func, -} -#[test] -fn bindgen_test_layout_stack_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 40usize, - concat!("Size of: ", stringify!(stack_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(stack_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).data) as usize - ptr as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(data) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).sorted) as usize - ptr as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(sorted) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).num_alloc) as usize - ptr as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(num_alloc) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).comp) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(stack_st), - "::", - stringify!(comp) - ) - ); -} -impl Default for stack_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } + _unused: [u8; 0], } -pub type _STACK = stack_st; +pub type OPENSSL_STACK = stack_st; extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_new"] - pub fn sk_new(comp: OPENSSL_sk_cmp_func) -> *mut _STACK; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_new"] + pub fn OPENSSL_sk_new(comp: OPENSSL_sk_cmp_func) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_new_null"] - pub fn sk_new_null() -> *mut _STACK; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_new_null"] + pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_num"] - pub fn sk_num(sk: *const _STACK) -> usize; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_num"] + pub fn OPENSSL_sk_num(sk: *const OPENSSL_STACK) -> usize; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_zero"] - pub fn sk_zero(sk: *mut _STACK); + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_zero"] + pub fn OPENSSL_sk_zero(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_value"] - pub fn sk_value(sk: *const _STACK, i: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_value"] + pub fn OPENSSL_sk_value(sk: *const OPENSSL_STACK, i: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_set"] - pub fn sk_set( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_set"] + pub fn OPENSSL_sk_set( + sk: *mut OPENSSL_STACK, i: usize, p: *mut ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_free"] - pub fn sk_free(sk: *mut _STACK); + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_free"] + pub fn OPENSSL_sk_free(sk: *mut OPENSSL_STACK); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_pop_free_ex"] - pub fn sk_pop_free_ex( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_pop_free_ex"] + pub fn OPENSSL_sk_pop_free_ex( + sk: *mut OPENSSL_STACK, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, ); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_insert"] - pub fn sk_insert(sk: *mut _STACK, p: *mut ::std::os::raw::c_void, where_: usize) -> usize; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_insert"] + pub fn OPENSSL_sk_insert( + sk: *mut OPENSSL_STACK, + p: *mut ::std::os::raw::c_void, + where_: usize, + ) -> usize; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_delete"] - pub fn sk_delete(sk: *mut _STACK, where_: usize) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_delete"] + pub fn OPENSSL_sk_delete(sk: *mut OPENSSL_STACK, where_: usize) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_delete_ptr"] - pub fn sk_delete_ptr( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_delete_ptr"] + pub fn OPENSSL_sk_delete_ptr( + sk: *mut OPENSSL_STACK, p: *const ::std::os::raw::c_void, ) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_delete_if"] - pub fn sk_delete_if( - sk: *mut _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_delete_if"] + pub fn OPENSSL_sk_delete_if( + sk: *mut OPENSSL_STACK, call_func: OPENSSL_sk_call_delete_if_func, func: OPENSSL_sk_delete_if_func, data: *mut ::std::os::raw::c_void, ); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_find"] - pub fn sk_find( - sk: *const _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_find"] + pub fn OPENSSL_sk_find( + sk: *const OPENSSL_STACK, out_index: *mut usize, p: *const ::std::os::raw::c_void, call_cmp_func: OPENSSL_sk_call_cmp_func, ) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_shift"] - pub fn sk_shift(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_shift"] + pub fn OPENSSL_sk_shift(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_push"] - pub fn sk_push(sk: *mut _STACK, p: *mut ::std::os::raw::c_void) -> usize; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_push"] + pub fn OPENSSL_sk_push(sk: *mut OPENSSL_STACK, p: *mut ::std::os::raw::c_void) -> usize; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_pop"] - pub fn sk_pop(sk: *mut _STACK) -> *mut ::std::os::raw::c_void; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_pop"] + pub fn OPENSSL_sk_pop(sk: *mut OPENSSL_STACK) -> *mut ::std::os::raw::c_void; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_dup"] - pub fn sk_dup(sk: *const _STACK) -> *mut _STACK; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_dup"] + pub fn OPENSSL_sk_dup(sk: *const OPENSSL_STACK) -> *mut OPENSSL_STACK; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_sort"] - pub fn sk_sort(sk: *mut _STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_sort"] + pub fn OPENSSL_sk_sort(sk: *mut OPENSSL_STACK, call_cmp_func: OPENSSL_sk_call_cmp_func); } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_is_sorted"] - pub fn sk_is_sorted(sk: *const _STACK) -> ::std::os::raw::c_int; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_is_sorted"] + pub fn OPENSSL_sk_is_sorted(sk: *const OPENSSL_STACK) -> ::std::os::raw::c_int; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_set_cmp_func"] - pub fn sk_set_cmp_func(sk: *mut _STACK, comp: OPENSSL_sk_cmp_func) -> OPENSSL_sk_cmp_func; + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_set_cmp_func"] + pub fn OPENSSL_sk_set_cmp_func( + sk: *mut OPENSSL_STACK, + comp: OPENSSL_sk_cmp_func, + ) -> OPENSSL_sk_cmp_func; } extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_sk_deep_copy"] - pub fn sk_deep_copy( - sk: *const _STACK, + #[link_name = "\u{1}_aws_lc_0_11_0_OPENSSL_sk_deep_copy"] + pub fn OPENSSL_sk_deep_copy( + sk: *const OPENSSL_STACK, call_copy_func: OPENSSL_sk_call_copy_func, copy_func: OPENSSL_sk_copy_func, call_free_func: OPENSSL_sk_call_free_func, free_func: OPENSSL_sk_free_func, - ) -> *mut _STACK; + ) -> *mut OPENSSL_STACK; } +pub type _STACK = OPENSSL_STACK; extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_sk_pop_free"] - pub fn sk_pop_free(sk: *mut _STACK, free_func: OPENSSL_sk_free_func); + pub fn sk_pop_free(sk: *mut OPENSSL_STACK, free_func: OPENSSL_sk_free_func); } pub type OPENSSL_STRING = *mut ::std::os::raw::c_char; #[repr(C)] @@ -7657,12 +7627,9 @@ extern "C" { } pub type bio_info_cb = ::std::option::Option< unsafe extern "C" fn( - bio: *mut BIO, - event: ::std::os::raw::c_int, - parg: *const ::std::os::raw::c_char, - cmd: ::std::os::raw::c_int, - larg: ::std::os::raw::c_long, - return_value: ::std::os::raw::c_long, + b: *mut BIO, + state: ::std::os::raw::c_int, + res: ::std::os::raw::c_int, ) -> ::std::os::raw::c_long, >; pub type BIO_callback_fn_ex = ::std::option::Option< @@ -10592,6 +10559,13 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_ASN1_TIME_to_tm"] pub fn ASN1_TIME_to_tm(t: *const ASN1_TIME, out: *mut tm) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ASN1_TIME_set_string_X509"] + pub fn ASN1_TIME_set_string_X509( + s: *mut ASN1_TIME, + str_: *const ::std::os::raw::c_char, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_ASN1_TIME_to_time_t"] pub fn ASN1_TIME_to_time_t(t: *const ASN1_TIME, out: *mut time_t) -> ::std::os::raw::c_int; @@ -14448,6 +14422,10 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha512"] pub fn EVP_sha512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha512_224"] + pub fn EVP_sha512_224() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha512_256"] pub fn EVP_sha512_256() -> *const EVP_MD; @@ -14468,6 +14446,14 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_sha3_512"] pub fn EVP_sha3_512() -> *const EVP_MD; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_EVP_shake128"] + pub fn EVP_shake128() -> *const EVP_MD; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_EVP_shake256"] + pub fn EVP_shake256() -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EVP_blake2b256"] pub fn EVP_blake2b256() -> *const EVP_MD; @@ -14561,7 +14547,7 @@ extern "C" { data: *const ::std::os::raw::c_void, len: usize, md_out: *mut u8, - md_out_size: *mut ::std::os::raw::c_uint, + out_size: *mut ::std::os::raw::c_uint, type_: *const EVP_MD, impl_: *mut ENGINE, ) -> ::std::os::raw::c_int; @@ -14746,88 +14732,6 @@ impl Default for env_md_ctx_st { } } } -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_new"] - pub fn ENGINE_new() -> *mut ENGINE; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_free"] - pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_RSA_method"] - pub fn ENGINE_set_RSA_method( - engine: *mut ENGINE, - method: *const RSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_RSA_method"] - pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_ECDSA_method"] - pub fn ENGINE_set_ECDSA_method( - engine: *mut ENGINE, - method: *const ECDSA_METHOD, - method_size: usize, - ) -> ::std::os::raw::c_int; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_ECDSA_method"] - pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_ref"] - pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); -} -extern "C" { - #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_unref"] - pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] -pub struct openssl_method_common_st { - pub references: ::std::os::raw::c_int, - pub is_static: ::std::os::raw::c_char, -} -#[test] -fn bindgen_test_layout_openssl_method_common_st() { - const UNINIT: ::std::mem::MaybeUninit = - ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(openssl_method_common_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(openssl_method_common_st), - "::", - stringify!(is_static) - ) - ); -} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_DSA_new"] pub fn DSA_new() -> *mut DSA; @@ -15154,151 +15058,6 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_i2d_DSAparams"] pub fn i2d_DSAparams(in_: *const DSA, outp: *mut *mut u8) -> ::std::os::raw::c_int; } -#[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq, Eq)] -pub struct dsa_st { - pub version: ::std::os::raw::c_long, - pub p: *mut BIGNUM, - pub q: *mut BIGNUM, - pub g: *mut BIGNUM, - pub pub_key: *mut BIGNUM, - pub priv_key: *mut BIGNUM, - pub flags: ::std::os::raw::c_int, - pub method_mont_lock: CRYPTO_MUTEX, - pub method_mont_p: *mut BN_MONT_CTX, - pub method_mont_q: *mut BN_MONT_CTX, - pub references: CRYPTO_refcount_t, - pub ex_data: CRYPTO_EX_DATA, -} -#[test] -fn bindgen_test_layout_dsa_st() { - const UNINIT: ::std::mem::MaybeUninit = ::std::mem::MaybeUninit::uninit(); - let ptr = UNINIT.as_ptr(); - assert_eq!( - ::std::mem::size_of::(), - 288usize, - concat!("Size of: ", stringify!(dsa_st)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(dsa_st)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(version) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).p) as usize - ptr as usize }, - 8usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(p)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).q) as usize - ptr as usize }, - 16usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(q)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).g) as usize - ptr as usize }, - 24usize, - concat!("Offset of field: ", stringify!(dsa_st), "::", stringify!(g)) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).pub_key) as usize - ptr as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(pub_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).priv_key) as usize - ptr as usize }, - 40usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(priv_key) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).flags) as usize - ptr as usize }, - 48usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_lock) as usize - ptr as usize }, - 56usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_lock) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_p) as usize - ptr as usize }, - 256usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_p) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).method_mont_q) as usize - ptr as usize }, - 264usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(method_mont_q) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, - 272usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(references) - ) - ); - assert_eq!( - unsafe { ::std::ptr::addr_of!((*ptr).ex_data) as usize - ptr as usize }, - 280usize, - concat!( - "Offset of field: ", - stringify!(dsa_st), - "::", - stringify!(ex_data) - ) - ); -} -impl Default for dsa_st { - fn default() -> Self { - let mut s = ::std::mem::MaybeUninit::::uninit(); - unsafe { - ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); - s.assume_init() - } - } -} #[repr(u32)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] pub enum point_conversion_form_t { @@ -15681,6 +15440,88 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EC_POINT_clear_free"] pub fn EC_POINT_clear_free(point: *mut EC_POINT); } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_new"] + pub fn ENGINE_new() -> *mut ENGINE; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_free"] + pub fn ENGINE_free(engine: *mut ENGINE) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_RSA_method"] + pub fn ENGINE_set_RSA_method( + engine: *mut ENGINE, + method: *const RSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_RSA_method"] + pub fn ENGINE_get_RSA_method(engine: *const ENGINE) -> *mut RSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_set_ECDSA_method"] + pub fn ENGINE_set_ECDSA_method( + engine: *mut ENGINE, + method: *const ECDSA_METHOD, + method_size: usize, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_ENGINE_get_ECDSA_method"] + pub fn ENGINE_get_ECDSA_method(engine: *const ENGINE) -> *mut ECDSA_METHOD; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_ref"] + pub fn METHOD_ref(method: *mut ::std::os::raw::c_void); +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_METHOD_unref"] + pub fn METHOD_unref(method: *mut ::std::os::raw::c_void); +} +#[repr(C)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub struct openssl_method_common_st { + pub references: ::std::os::raw::c_int, + pub is_static: ::std::os::raw::c_char, +} +#[test] +fn bindgen_test_layout_openssl_method_common_st() { + const UNINIT: ::std::mem::MaybeUninit = + ::std::mem::MaybeUninit::uninit(); + let ptr = UNINIT.as_ptr(); + assert_eq!( + ::std::mem::size_of::(), + 8usize, + concat!("Size of: ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + ::std::mem::align_of::(), + 4usize, + concat!("Alignment of ", stringify!(openssl_method_common_st)) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).references) as usize - ptr as usize }, + 0usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(references) + ) + ); + assert_eq!( + unsafe { ::std::ptr::addr_of!((*ptr).is_static) as usize - ptr as usize }, + 4usize, + concat!( + "Offset of field: ", + stringify!(openssl_method_common_st), + "::", + stringify!(is_static) + ) + ); +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_EC_KEY_new"] pub fn EC_KEY_new() -> *mut EC_KEY; @@ -23282,7 +23123,7 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, arg1: ::std::os::raw::c_int, arg2: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; @@ -28645,7 +28486,8 @@ extern "C" { } extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_X509_PURPOSE_get_by_sname"] - pub fn X509_PURPOSE_get_by_sname(sname: *mut ::std::os::raw::c_char) -> ::std::os::raw::c_int; + pub fn X509_PURPOSE_get_by_sname(sname: *const ::std::os::raw::c_char) + -> ::std::os::raw::c_int; } extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_X509_PURPOSE_get_by_id"] @@ -28664,8 +28506,8 @@ extern "C" { arg3: ::std::os::raw::c_int, ) -> ::std::os::raw::c_int, >, - name: *mut ::std::os::raw::c_char, - sname: *mut ::std::os::raw::c_char, + name: *const ::std::os::raw::c_char, + sname: *const ::std::os::raw::c_char, arg: *mut ::std::os::raw::c_void, ) -> ::std::os::raw::c_int; } @@ -29187,6 +29029,20 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SSL_add1_chain_cert"] pub fn SSL_add1_chain_cert(ssl: *mut SSL, x509: *mut X509) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SSL_CTX_build_cert_chain"] + pub fn SSL_CTX_build_cert_chain( + ctx: *mut SSL_CTX, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SSL_build_cert_chain"] + pub fn SSL_build_cert_chain( + ssl: *mut SSL, + flags: ::std::os::raw::c_int, + ) -> ::std::os::raw::c_int; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SSL_CTX_clear_chain_certs"] pub fn SSL_CTX_clear_chain_certs(ctx: *mut SSL_CTX) -> ::std::os::raw::c_int; @@ -29676,6 +29532,10 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SSL_CIPHER_get_auth_nid"] pub fn SSL_CIPHER_get_auth_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SSL_CIPHER_get_handshake_digest"] + pub fn SSL_CIPHER_get_handshake_digest(cipher: *const SSL_CIPHER) -> *const EVP_MD; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SSL_CIPHER_get_prf_nid"] pub fn SSL_CIPHER_get_prf_nid(cipher: *const SSL_CIPHER) -> ::std::os::raw::c_int; @@ -29829,6 +29689,10 @@ extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SSL_get_current_cipher"] pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER; } +extern "C" { + #[link_name = "\u{1}_aws_lc_0_11_0_SSL_get_client_ciphers"] + pub fn SSL_get_client_ciphers(ssl: *const SSL) -> *mut stack_st_SSL_CIPHER; +} extern "C" { #[link_name = "\u{1}_aws_lc_0_11_0_SSL_session_reused"] pub fn SSL_session_reused(ssl: *const SSL) -> ::std::os::raw::c_int; diff --git a/aws-lc-sys/symbols/linux_aarch64.txt b/aws-lc-sys/symbols/linux_aarch64.txt index ac8316a86ad..1257221b383 100644 --- a/aws-lc-sys/symbols/linux_aarch64.txt +++ b/aws-lc-sys/symbols/linux_aarch64.txt @@ -126,6 +126,7 @@ ASN1_TIME_print ASN1_TIME_set ASN1_TIME_set_posix ASN1_TIME_set_string +ASN1_TIME_set_string_X509 ASN1_TIME_to_generalizedtime ASN1_TIME_to_posix ASN1_TIME_to_time_t @@ -1335,7 +1336,10 @@ EVP_sha3_256 EVP_sha3_384 EVP_sha3_512 EVP_sha512 +EVP_sha512_224 EVP_sha512_256 +EVP_shake128 +EVP_shake256 EVP_tls_cbc_copy_mac EVP_tls_cbc_digest_record EVP_tls_cbc_digest_record_sha256 @@ -1573,6 +1577,27 @@ OPENSSL_posix_to_tm OPENSSL_realloc OPENSSL_secure_clear_free OPENSSL_secure_malloc +OPENSSL_sk_deep_copy +OPENSSL_sk_delete +OPENSSL_sk_delete_if +OPENSSL_sk_delete_ptr +OPENSSL_sk_dup +OPENSSL_sk_find +OPENSSL_sk_free +OPENSSL_sk_insert +OPENSSL_sk_is_sorted +OPENSSL_sk_new +OPENSSL_sk_new_null +OPENSSL_sk_num +OPENSSL_sk_pop +OPENSSL_sk_pop_free_ex +OPENSSL_sk_push +OPENSSL_sk_set +OPENSSL_sk_set_cmp_func +OPENSSL_sk_shift +OPENSSL_sk_sort +OPENSSL_sk_value +OPENSSL_sk_zero OPENSSL_strcasecmp OPENSSL_strdup OPENSSL_strhash @@ -1881,6 +1906,10 @@ SHA3_Squeeze_cext SHA3_Squeeze_hw SHA3_Update SHA512 +SHA512_224 +SHA512_224_Final +SHA512_224_Init +SHA512_224_Update SHA512_256 SHA512_256_Final SHA512_256_Init @@ -1891,6 +1920,8 @@ SHA512_Transform SHA512_Update SHAKE128 SHAKE256 +SHAKE_Final +SHAKE_Init SIPHASH_24 SPAKE2_CTX_free SPAKE2_CTX_new @@ -1902,6 +1933,7 @@ SSL_CIPHER_get_auth_nid SSL_CIPHER_get_bits SSL_CIPHER_get_cipher_nid SSL_CIPHER_get_digest_nid +SSL_CIPHER_get_handshake_digest SSL_CIPHER_get_id SSL_CIPHER_get_kx_name SSL_CIPHER_get_kx_nid @@ -1928,6 +1960,7 @@ SSL_CTX_add_client_custom_ext SSL_CTX_add_extra_chain_cert SSL_CTX_add_server_custom_ext SSL_CTX_add_session +SSL_CTX_build_cert_chain SSL_CTX_check_private_key SSL_CTX_cipher_in_group SSL_CTX_clear_chain_certs @@ -2149,6 +2182,7 @@ SSL_alert_desc_string_long SSL_alert_from_verify_result SSL_alert_type_string SSL_alert_type_string_long +SSL_build_cert_chain SSL_cache_hit SSL_can_release_private_key SSL_certs_clear @@ -2203,6 +2237,7 @@ SSL_get_cipher_by_value SSL_get_cipher_list SSL_get_ciphers SSL_get_client_CA_list +SSL_get_client_ciphers SSL_get_client_random SSL_get_current_cipher SSL_get_current_compression @@ -3096,6 +3131,7 @@ bio_sock_error bio_socket_nbio bn_abs_sub_consttime bn_add_words +bn_assert_fits_in_bytes bn_big_endian_to_words bn_copy_words bn_div_consttime @@ -3109,6 +3145,7 @@ bn_jacobi bn_lcm_consttime bn_less_than_montgomery_R bn_less_than_words +bn_little_endian_to_words bn_miller_rabin_init bn_miller_rabin_iteration bn_minimal_width @@ -3159,6 +3196,7 @@ bn_uadd_consttime bn_usub_consttime bn_wexpand bn_words_to_big_endian +bn_words_to_little_endian boringssl_self_test_hmac_sha256 boringssl_self_test_sha256 c2i_ASN1_BIT_STRING @@ -3704,31 +3742,11 @@ sk_X509_NAME_value sk_X509_call_free_func sk_X509_new_null sk_X509_num +sk_X509_pop sk_X509_pop_free sk_X509_shift sk_X509_value -sk_deep_copy -sk_delete -sk_delete_if -sk_delete_ptr -sk_dup -sk_find -sk_free -sk_insert -sk_is_sorted -sk_new -sk_new_null -sk_num -sk_pop sk_pop_free -sk_pop_free_ex -sk_push -sk_set -sk_set_cmp_func -sk_shift -sk_sort -sk_value -sk_zero v2i_GENERAL_NAME v2i_GENERAL_NAMES v2i_GENERAL_NAME_ex diff --git a/aws-lc-sys/symbols/linux_x86.txt b/aws-lc-sys/symbols/linux_x86.txt index d42d78ad9da..83356ba50b1 100644 --- a/aws-lc-sys/symbols/linux_x86.txt +++ b/aws-lc-sys/symbols/linux_x86.txt @@ -126,6 +126,7 @@ ASN1_TIME_print ASN1_TIME_set ASN1_TIME_set_posix ASN1_TIME_set_string +ASN1_TIME_set_string_X509 ASN1_TIME_to_generalizedtime ASN1_TIME_to_posix ASN1_TIME_to_time_t @@ -1334,7 +1335,10 @@ EVP_sha3_256 EVP_sha3_384 EVP_sha3_512 EVP_sha512 +EVP_sha512_224 EVP_sha512_256 +EVP_shake128 +EVP_shake256 EVP_tls_cbc_copy_mac EVP_tls_cbc_digest_record EVP_tls_cbc_digest_record_sha256 @@ -1572,6 +1576,27 @@ OPENSSL_posix_to_tm OPENSSL_realloc OPENSSL_secure_clear_free OPENSSL_secure_malloc +OPENSSL_sk_deep_copy +OPENSSL_sk_delete +OPENSSL_sk_delete_if +OPENSSL_sk_delete_ptr +OPENSSL_sk_dup +OPENSSL_sk_find +OPENSSL_sk_free +OPENSSL_sk_insert +OPENSSL_sk_is_sorted +OPENSSL_sk_new +OPENSSL_sk_new_null +OPENSSL_sk_num +OPENSSL_sk_pop +OPENSSL_sk_pop_free_ex +OPENSSL_sk_push +OPENSSL_sk_set +OPENSSL_sk_set_cmp_func +OPENSSL_sk_shift +OPENSSL_sk_sort +OPENSSL_sk_value +OPENSSL_sk_zero OPENSSL_strcasecmp OPENSSL_strdup OPENSSL_strhash @@ -1876,6 +1901,10 @@ SHA3_Reset SHA3_Squeeze SHA3_Update SHA512 +SHA512_224 +SHA512_224_Final +SHA512_224_Init +SHA512_224_Update SHA512_256 SHA512_256_Final SHA512_256_Init @@ -1886,6 +1915,8 @@ SHA512_Transform SHA512_Update SHAKE128 SHAKE256 +SHAKE_Final +SHAKE_Init SIPHASH_24 SPAKE2_CTX_free SPAKE2_CTX_new @@ -1897,6 +1928,7 @@ SSL_CIPHER_get_auth_nid SSL_CIPHER_get_bits SSL_CIPHER_get_cipher_nid SSL_CIPHER_get_digest_nid +SSL_CIPHER_get_handshake_digest SSL_CIPHER_get_id SSL_CIPHER_get_kx_name SSL_CIPHER_get_kx_nid @@ -1923,6 +1955,7 @@ SSL_CTX_add_client_custom_ext SSL_CTX_add_extra_chain_cert SSL_CTX_add_server_custom_ext SSL_CTX_add_session +SSL_CTX_build_cert_chain SSL_CTX_check_private_key SSL_CTX_cipher_in_group SSL_CTX_clear_chain_certs @@ -2144,6 +2177,7 @@ SSL_alert_desc_string_long SSL_alert_from_verify_result SSL_alert_type_string SSL_alert_type_string_long +SSL_build_cert_chain SSL_cache_hit SSL_can_release_private_key SSL_certs_clear @@ -2198,6 +2232,7 @@ SSL_get_cipher_by_value SSL_get_cipher_list SSL_get_ciphers SSL_get_client_CA_list +SSL_get_client_ciphers SSL_get_client_random SSL_get_current_cipher SSL_get_current_compression @@ -3032,6 +3067,7 @@ bio_sock_error bio_socket_nbio bn_abs_sub_consttime bn_add_words +bn_assert_fits_in_bytes bn_big_endian_to_words bn_copy_words bn_div_consttime @@ -3046,6 +3082,7 @@ bn_jacobi bn_lcm_consttime bn_less_than_montgomery_R bn_less_than_words +bn_little_endian_to_words bn_miller_rabin_init bn_miller_rabin_iteration bn_minimal_width @@ -3096,6 +3133,7 @@ bn_uadd_consttime bn_usub_consttime bn_wexpand bn_words_to_big_endian +bn_words_to_little_endian boringssl_self_test_hmac_sha256 boringssl_self_test_sha256 c2i_ASN1_BIT_STRING @@ -3626,31 +3664,11 @@ sk_X509_NAME_value sk_X509_call_free_func sk_X509_new_null sk_X509_num +sk_X509_pop sk_X509_pop_free sk_X509_shift sk_X509_value -sk_deep_copy -sk_delete -sk_delete_if -sk_delete_ptr -sk_dup -sk_find -sk_free -sk_insert -sk_is_sorted -sk_new -sk_new_null -sk_num -sk_pop sk_pop_free -sk_pop_free_ex -sk_push -sk_set -sk_set_cmp_func -sk_shift -sk_sort -sk_value -sk_zero v2i_GENERAL_NAME v2i_GENERAL_NAMES v2i_GENERAL_NAME_ex diff --git a/aws-lc-sys/symbols/linux_x86_64.txt b/aws-lc-sys/symbols/linux_x86_64.txt index f19445c559f..5dc8def51ef 100644 --- a/aws-lc-sys/symbols/linux_x86_64.txt +++ b/aws-lc-sys/symbols/linux_x86_64.txt @@ -126,6 +126,7 @@ ASN1_TIME_print ASN1_TIME_set ASN1_TIME_set_posix ASN1_TIME_set_string +ASN1_TIME_set_string_X509 ASN1_TIME_to_generalizedtime ASN1_TIME_to_posix ASN1_TIME_to_time_t @@ -1337,7 +1338,10 @@ EVP_sha3_256 EVP_sha3_384 EVP_sha3_512 EVP_sha512 +EVP_sha512_224 EVP_sha512_256 +EVP_shake128 +EVP_shake256 EVP_tls_cbc_copy_mac EVP_tls_cbc_digest_record EVP_tls_cbc_digest_record_sha256 @@ -1575,6 +1579,27 @@ OPENSSL_posix_to_tm OPENSSL_realloc OPENSSL_secure_clear_free OPENSSL_secure_malloc +OPENSSL_sk_deep_copy +OPENSSL_sk_delete +OPENSSL_sk_delete_if +OPENSSL_sk_delete_ptr +OPENSSL_sk_dup +OPENSSL_sk_find +OPENSSL_sk_free +OPENSSL_sk_insert +OPENSSL_sk_is_sorted +OPENSSL_sk_new +OPENSSL_sk_new_null +OPENSSL_sk_num +OPENSSL_sk_pop +OPENSSL_sk_pop_free_ex +OPENSSL_sk_push +OPENSSL_sk_set +OPENSSL_sk_set_cmp_func +OPENSSL_sk_shift +OPENSSL_sk_sort +OPENSSL_sk_value +OPENSSL_sk_zero OPENSSL_strcasecmp OPENSSL_strdup OPENSSL_strhash @@ -1880,6 +1905,10 @@ SHA3_Reset SHA3_Squeeze SHA3_Update SHA512 +SHA512_224 +SHA512_224_Final +SHA512_224_Init +SHA512_224_Update SHA512_256 SHA512_256_Final SHA512_256_Init @@ -1890,6 +1919,8 @@ SHA512_Transform SHA512_Update SHAKE128 SHAKE256 +SHAKE_Final +SHAKE_Init SIPHASH_24 SPAKE2_CTX_free SPAKE2_CTX_new @@ -1901,6 +1932,7 @@ SSL_CIPHER_get_auth_nid SSL_CIPHER_get_bits SSL_CIPHER_get_cipher_nid SSL_CIPHER_get_digest_nid +SSL_CIPHER_get_handshake_digest SSL_CIPHER_get_id SSL_CIPHER_get_kx_name SSL_CIPHER_get_kx_nid @@ -1927,6 +1959,7 @@ SSL_CTX_add_client_custom_ext SSL_CTX_add_extra_chain_cert SSL_CTX_add_server_custom_ext SSL_CTX_add_session +SSL_CTX_build_cert_chain SSL_CTX_check_private_key SSL_CTX_cipher_in_group SSL_CTX_clear_chain_certs @@ -2148,6 +2181,7 @@ SSL_alert_desc_string_long SSL_alert_from_verify_result SSL_alert_type_string SSL_alert_type_string_long +SSL_build_cert_chain SSL_cache_hit SSL_can_release_private_key SSL_certs_clear @@ -2202,6 +2236,7 @@ SSL_get_cipher_by_value SSL_get_cipher_list SSL_get_ciphers SSL_get_client_CA_list +SSL_get_client_ciphers SSL_get_client_random SSL_get_current_cipher SSL_get_current_compression @@ -3083,6 +3118,7 @@ bio_sock_error bio_socket_nbio bn_abs_sub_consttime bn_add_words +bn_assert_fits_in_bytes bn_big_endian_to_words bn_copy_words bn_div_consttime @@ -3097,6 +3133,7 @@ bn_jacobi bn_lcm_consttime bn_less_than_montgomery_R bn_less_than_words +bn_little_endian_to_words bn_miller_rabin_init bn_miller_rabin_iteration bn_minimal_width @@ -3152,6 +3189,7 @@ bn_uadd_consttime bn_usub_consttime bn_wexpand bn_words_to_big_endian +bn_words_to_little_endian boringssl_self_test_hmac_sha256 boringssl_self_test_sha256 c2i_ASN1_BIT_STRING @@ -3709,31 +3747,11 @@ sk_X509_NAME_value sk_X509_call_free_func sk_X509_new_null sk_X509_num +sk_X509_pop sk_X509_pop_free sk_X509_shift sk_X509_value -sk_deep_copy -sk_delete -sk_delete_if -sk_delete_ptr -sk_dup -sk_find -sk_free -sk_insert -sk_is_sorted -sk_new -sk_new_null -sk_num -sk_pop sk_pop_free -sk_pop_free_ex -sk_push -sk_set -sk_set_cmp_func -sk_shift -sk_sort -sk_value -sk_zero v2i_GENERAL_NAME v2i_GENERAL_NAMES v2i_GENERAL_NAME_ex diff --git a/aws-lc-sys/symbols/macos_x86_64.txt b/aws-lc-sys/symbols/macos_x86_64.txt index 0d858c8109e..aafd4547c81 100644 --- a/aws-lc-sys/symbols/macos_x86_64.txt +++ b/aws-lc-sys/symbols/macos_x86_64.txt @@ -126,6 +126,7 @@ ASN1_TIME_print ASN1_TIME_set ASN1_TIME_set_posix ASN1_TIME_set_string +ASN1_TIME_set_string_X509 ASN1_TIME_to_generalizedtime ASN1_TIME_to_posix ASN1_TIME_to_time_t @@ -1336,7 +1337,10 @@ EVP_sha3_256 EVP_sha3_384 EVP_sha3_512 EVP_sha512 +EVP_sha512_224 EVP_sha512_256 +EVP_shake128 +EVP_shake256 EVP_tls_cbc_copy_mac EVP_tls_cbc_digest_record EVP_tls_cbc_digest_record_sha256 @@ -1574,6 +1578,27 @@ OPENSSL_posix_to_tm OPENSSL_realloc OPENSSL_secure_clear_free OPENSSL_secure_malloc +OPENSSL_sk_deep_copy +OPENSSL_sk_delete +OPENSSL_sk_delete_if +OPENSSL_sk_delete_ptr +OPENSSL_sk_dup +OPENSSL_sk_find +OPENSSL_sk_free +OPENSSL_sk_insert +OPENSSL_sk_is_sorted +OPENSSL_sk_new +OPENSSL_sk_new_null +OPENSSL_sk_num +OPENSSL_sk_pop +OPENSSL_sk_pop_free_ex +OPENSSL_sk_push +OPENSSL_sk_set +OPENSSL_sk_set_cmp_func +OPENSSL_sk_shift +OPENSSL_sk_sort +OPENSSL_sk_value +OPENSSL_sk_zero OPENSSL_strcasecmp OPENSSL_strdup OPENSSL_strhash @@ -1879,6 +1904,10 @@ SHA3_Reset SHA3_Squeeze SHA3_Update SHA512 +SHA512_224 +SHA512_224_Final +SHA512_224_Init +SHA512_224_Update SHA512_256 SHA512_256_Final SHA512_256_Init @@ -1889,6 +1918,8 @@ SHA512_Transform SHA512_Update SHAKE128 SHAKE256 +SHAKE_Final +SHAKE_Init SIPHASH_24 SPAKE2_CTX_free SPAKE2_CTX_new @@ -1900,6 +1931,7 @@ SSL_CIPHER_get_auth_nid SSL_CIPHER_get_bits SSL_CIPHER_get_cipher_nid SSL_CIPHER_get_digest_nid +SSL_CIPHER_get_handshake_digest SSL_CIPHER_get_id SSL_CIPHER_get_kx_name SSL_CIPHER_get_kx_nid @@ -1926,6 +1958,7 @@ SSL_CTX_add_client_custom_ext SSL_CTX_add_extra_chain_cert SSL_CTX_add_server_custom_ext SSL_CTX_add_session +SSL_CTX_build_cert_chain SSL_CTX_check_private_key SSL_CTX_cipher_in_group SSL_CTX_clear_chain_certs @@ -2147,6 +2180,7 @@ SSL_alert_desc_string_long SSL_alert_from_verify_result SSL_alert_type_string SSL_alert_type_string_long +SSL_build_cert_chain SSL_cache_hit SSL_can_release_private_key SSL_certs_clear @@ -2201,6 +2235,7 @@ SSL_get_cipher_by_value SSL_get_cipher_list SSL_get_ciphers SSL_get_client_CA_list +SSL_get_client_ciphers SSL_get_client_random SSL_get_current_cipher SSL_get_current_compression @@ -3082,6 +3117,7 @@ bio_sock_error bio_socket_nbio bn_abs_sub_consttime bn_add_words +bn_assert_fits_in_bytes bn_big_endian_to_words bn_copy_words bn_div_consttime @@ -3096,6 +3132,7 @@ bn_jacobi bn_lcm_consttime bn_less_than_montgomery_R bn_less_than_words +bn_little_endian_to_words bn_miller_rabin_init bn_miller_rabin_iteration bn_minimal_width @@ -3151,6 +3188,7 @@ bn_uadd_consttime bn_usub_consttime bn_wexpand bn_words_to_big_endian +bn_words_to_little_endian boringssl_self_test_hmac_sha256 boringssl_self_test_sha256 c2i_ASN1_BIT_STRING @@ -3707,31 +3745,11 @@ sk_X509_NAME_value sk_X509_call_free_func sk_X509_new_null sk_X509_num +sk_X509_pop sk_X509_pop_free sk_X509_shift sk_X509_value -sk_deep_copy -sk_delete -sk_delete_if -sk_delete_ptr -sk_dup -sk_find -sk_free -sk_insert -sk_is_sorted -sk_new -sk_new_null -sk_num -sk_pop sk_pop_free -sk_pop_free_ex -sk_push -sk_set -sk_set_cmp_func -sk_shift -sk_sort -sk_value -sk_zero v2i_GENERAL_NAME v2i_GENERAL_NAMES v2i_GENERAL_NAME_ex