Merge branch 'main' into windows-clang-18

aws · Mar 5, 2025 · b4023e6 · b4023e6
2 parents 6b996f1 + 1d8b807
commit b4023e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/crypto/fipsmodule/modes/xts_test.cc b/crypto/fipsmodule/modes/xts_test.cc
@@ -1018,6 +1018,7 @@ TEST(XTSTest, TestVectors) {
   unsigned test_num = 0;
 #if defined(OPENSSL_LINUX)
   int pagesize = sysconf(_SC_PAGE_SIZE);
+  ASSERT_GE(pagesize, 0);
   uint8_t *in_buffer_end = get_buffer_end(pagesize);
   uint8_t *out_buffer_end = get_buffer_end(pagesize);
 #endif

diff --git a/ssl/ssl_cert.cc b/ssl/ssl_cert.cc
@@ -286,7 +286,12 @@ static int cert_set_chain_and_key(
     return 0;
   }
 
-  switch (check_leaf_cert_and_privkey(sk_CRYPTO_BUFFER_value(certs.get(), 0), privkey)) {
+  CRYPTO_BUFFER *leaf_buf = sk_CRYPTO_BUFFER_value(certs.get(), 0);
+  if (leaf_buf == nullptr) {
+    return 0;
+  }
+
+  switch (check_leaf_cert_and_privkey(leaf_buf, privkey)) {
     case leaf_cert_and_privkey_error:
       return 0;
     case leaf_cert_and_privkey_mismatch: