Skip to content

Commit b97b77b

Browse files
authored
fix building with the latest aws-lc (#13210)
1 parent b36d3b4 commit b97b77b

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "libressl", VERSION: "4.1.0"}}
4343
# Latest commit on the BoringSSL main branch, as of Jul 22, 2025.
4444
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "boringssl", VERSION: "17164fff9c433e482e51d9d3954d8f4815020a91"}}
45-
# Latest tag of AWS-LC main branch, as of Jul 04, 2025.
46-
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "aws-lc", VERSION: "v1.55.0"}}
45+
# Latest tag of AWS-LC main branch, as of Jul 26, 2025.
46+
- {VERSION: "3.13", NOXSESSION: "rust,tests", OPENSSL: {TYPE: "aws-lc", VERSION: "v1.56.0"}}
4747
# Latest commit on the OpenSSL master branch, as of Jul 22, 2025.
4848
- {VERSION: "3.13", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "b3187ab5a757496e588ea9bdb7fabd12d194e66a"}}
4949
# Builds with various Rust versions. Includes MSRV and next

src/_cffi_src/openssl/ssl.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
static const long Cryptography_HAS_TLS_ST;
1414
static const long Cryptography_HAS_TLSv1_3_FUNCTIONS;
1515
static const long Cryptography_HAS_TLSv1_3_HS_FUNCTIONS;
16+
static const long Cryptography_HAS_SSL_VERIFY_CLIENT_POST_HANDSHAKE;
1617
static const long Cryptography_HAS_SIGALGS;
1718
static const long Cryptography_HAS_PSK;
1819
static const long Cryptography_HAS_PSK_TLSv1_3;
@@ -601,7 +602,6 @@
601602
static const long Cryptography_HAS_TLSv1_3_HS_FUNCTIONS = 0;
602603
static const long SSL_VERIFY_POST_HANDSHAKE = 0;
603604
604-
int (*SSL_verify_client_post_handshake)(SSL *) = NULL;
605605
void (*SSL_CTX_set_post_handshake_auth)(SSL_CTX *, int) = NULL;
606606
void (*SSL_set_post_handshake_auth)(SSL *, int) = NULL;
607607
uint32_t (*SSL_SESSION_get_max_early_data)(const SSL_SESSION *) = NULL;
@@ -612,6 +612,14 @@
612612
static const long Cryptography_HAS_TLSv1_3_HS_FUNCTIONS = 1;
613613
#endif
614614
615+
#if CRYPTOGRAPHY_IS_BORINGSSL
616+
static const long Cryptography_HAS_SSL_VERIFY_CLIENT_POST_HANDSHAKE = 0;
617+
618+
int (*SSL_verify_client_post_handshake)(SSL *) = NULL;
619+
#else
620+
static const long Cryptography_HAS_SSL_VERIFY_CLIENT_POST_HANDSHAKE = 1;
621+
#endif
622+
615623
#if CRYPTOGRAPHY_IS_BORINGSSL || CRYPTOGRAPHY_IS_AWSLC
616624
static const long Cryptography_HAS_SSL_COOKIE = 0;
617625

src/cryptography/hazmat/bindings/openssl/_conditional.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ def cryptography_has_tlsv13_hs_functions() -> list[str]:
8181
]
8282

8383

84+
def cryptography_has_ssl_verify_client_post_handshake() -> list[str]:
85+
return [
86+
"SSL_verify_client_post_handshake",
87+
]
88+
89+
8490
def cryptography_has_engine() -> list[str]:
8591
return [
8692
"ENGINE_by_id",
@@ -172,6 +178,9 @@ def cryptography_has_get_extms_support() -> list[str]:
172178
"Cryptography_HAS_TLSv1_3_HS_FUNCTIONS": (
173179
cryptography_has_tlsv13_hs_functions
174180
),
181+
"Cryptography_HAS_SSL_VERIFY_CLIENT_POST_HANDSHAKE": (
182+
cryptography_has_ssl_verify_client_post_handshake
183+
),
175184
"Cryptography_HAS_ENGINE": cryptography_has_engine,
176185
"Cryptography_HAS_VERIFIED_CHAIN": cryptography_has_verified_chain,
177186
"Cryptography_HAS_SRTP": cryptography_has_srtp,

0 commit comments

Comments
 (0)