deps: upgrade openssl sources to openssl-3.5.2

PR-URL: #59371
Reviewed-By: Richard Lau <richard.lau@ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>

Author: nodejs-github-bot

deps/openssl/openssl/CHANGES.md

@@ -28,6 +28,13 @@ OpenSSL Releases
 OpenSSL 3.5
 -----------
 
+### Changes between 3.5.1 and 3.5.2 [5 Aug 2025]
+
+ * The FIPS provider now performs a PCT on key import for RSA, EC and ECX.
+ This is mandated by FIPS 140-3 IG 10.3.A additional comment 1.
+
+ *Dr Paul Dale*
+
 ### Changes between 3.5.0 and 3.5.1 [1 Jul 2025]
 
  * Fix x509 application adds trusted use instead of rejected use.

deps/openssl/openssl/NEWS.md

@@ -23,6 +23,10 @@ OpenSSL Releases
 OpenSSL 3.5
 -----------
 
+### Major changes between OpenSSL 3.5.1 and OpenSSL 3.5.2 [5 Aug 2025]
+
+* none
+
 ### Major changes between OpenSSL 3.5.0 and OpenSSL 3.5.1 [1 Jul 2025]
 
 OpenSSL 3.5.1 is a security patch release. The most severe CVE fixed in this

deps/openssl/openssl/VERSION.dat

@@ -1,7 +1,7 @@
 MAJOR=3
 MINOR=5
-PATCH=1
+PATCH=2
 PRE_RELEASE_TAG=
 BUILD_METADATA=
-RELEASE_DATE="1 Jul 2025"
+RELEASE_DATE="5 Aug 2025"
 SHLIB_VERSION=3

deps/openssl/openssl/apps/asn1parse.c

@@ -40,8 +40,8 @@ const OPTIONS asn1parse_options[] = {
  {"length", OPT_LENGTH, 'p', "length of section in file"},
  {"strparse", OPT_STRPARSE, 'p',
 "offset; a series of these can be used to 'dig'"},
- {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"},
  {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"},
+ {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"},
  {"genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from"},
  {"strictpem", OPT_STRICTPEM, 0,
 "equivalent to '-inform pem' (obsolete)"},

deps/openssl/openssl/apps/rand.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2025 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License"). You may not use
  * this file except in compliance with the License. You can obtain a copy
@@ -199,7 +199,7 @@ int rand_main(int argc, char **argv)
 intchunk;
 
 chunk=scaled_num>buflen ? (int)buflen : (int)scaled_num;
-r=RAND_bytes(buf, chunk);
+r=RAND_bytes_ex(app_get0_libctx(), buf, chunk, 0);
 if (r <= 0)
  goto end;
 if (format!=FORMAT_TEXT) {

deps/openssl/openssl/crypto/dh/dh_check.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License"). You may not use
  * this file except in compliance with the License. You can obtain a copy
@@ -16,6 +16,7 @@
 #include<stdio.h>
 #include"internal/cryptlib.h"
 #include<openssl/bn.h>
+#include<openssl/self_test.h>
 #include"dh_local.h"
 #include"crypto/dh.h"
 
@@ -329,17 +330,27 @@ int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret)
  * FFC pairwise check from SP800-56A R3.
  * Section 5.6.2.1.4 Owner Assurance of Pair-wise Consistency
  */
-intossl_dh_check_pairwise(constDH*dh)
+intossl_dh_check_pairwise(constDH*dh, intreturn_on_null_numbers)
 {
 intret=0;
 BN_CTX*ctx=NULL;
 BIGNUM*pub_key=NULL;
+OSSL_SELF_TEST*st=NULL;
+OSSL_CALLBACK*stcb=NULL;
+void*stcbarg=NULL;
 
 if (dh->params.p==NULL
 ||dh->params.g==NULL
 ||dh->priv_key==NULL
 ||dh->pub_key==NULL)
-return0;
+returnreturn_on_null_numbers;
+
+OSSL_SELF_TEST_get_callback(dh->libctx, &stcb, &stcbarg);
+st=OSSL_SELF_TEST_new(stcb, stcbarg);
+if (st==NULL)
+ goto err;
+OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
+OSSL_SELF_TEST_DESC_PCT_DH);
 
 ctx=BN_CTX_new_ex(dh->libctx);
 if (ctx==NULL)
@@ -351,10 +362,27 @@ int ossl_dh_check_pairwise(const DH *dh)
 /* recalculate the public key = (g ^ priv) mod p */
 if (!ossl_dh_generate_public_key(ctx, dh, dh->priv_key, pub_key))
  goto err;
+
+#ifdefFIPS_MODULE
+ {
+intlen;
+unsigned charbytes[1024] = {0}; /* Max key size of 8192 bits */
+
+if (BN_num_bytes(pub_key) > (int)sizeof(bytes))
+ goto err;
+len=BN_bn2bin(pub_key, bytes);
+OSSL_SELF_TEST_oncorrupt_byte(st, bytes);
+if (BN_bin2bn(bytes, len, pub_key) ==NULL)
+ goto err;
+ }
+#endif
 /* check it matches the existing public_key */
 ret=BN_cmp(pub_key, dh->pub_key) ==0;
-err:
+err:
 BN_free(pub_key);
 BN_CTX_free(ctx);
+
+OSSL_SELF_TEST_onend(st, ret);
+OSSL_SELF_TEST_free(st);
 returnret;
 }

deps/openssl/openssl/crypto/encode_decode/decoder_lib.c

@@ -537,6 +537,14 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
  }
 }
 
+staticintdecoder_sk_cmp(constOSSL_DECODER_INSTANCE*const*a,
+constOSSL_DECODER_INSTANCE*const*b)
+{
+if ((*a)->score== (*b)->score)
+return (*a)->order- (*b)->order;
+return (*a)->score- (*b)->score;
+}
+
 intOSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX*ctx,
 OSSL_LIB_CTX*libctx, constchar*propq)
 {
@@ -595,6 +603,26 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
 OSSL_DECODER_do_all_provided(libctx, collect_all_decoders, skdecoders);
 numdecoders=sk_OSSL_DECODER_num(skdecoders);
 
+/*
+ * If there are provided or default properties, sort the initial decoder list
+ * by property matching score so that the highest scored provider is selected
+ * first.
+ */
+if (propq!=NULL||ossl_ctx_global_properties(libctx, 0) !=NULL) {
+intnum_decoder_insts=sk_OSSL_DECODER_INSTANCE_num(ctx->decoder_insts);
+inti;
+OSSL_DECODER_INSTANCE*di;
+sk_OSSL_DECODER_INSTANCE_compfuncold_cmp=
+sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, decoder_sk_cmp);
+
+for (i=0; i<num_decoder_insts; i++) {
+di=sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+di->order=i;
+ }
+sk_OSSL_DECODER_INSTANCE_sort(ctx->decoder_insts);
+sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, old_cmp);
+ }
+
 memset(&data, 0, sizeof(data));
 data.ctx=ctx;
 data.w_prev_start=0;

deps/openssl/openssl/crypto/encode_decode/decoder_pkey.c

@@ -222,15 +222,21 @@ struct collect_data_st {
 inttotal; /* number of matching results */
 charerror_occurred;
 charkeytype_resolved;
+OSSL_PROPERTY_LIST*pq;
 
 STACK_OF(EVP_KEYMGMT) *keymgmts;
 };
 
-staticvoidcollect_decoder_keymgmt(EVP_KEYMGMT*keymgmt, OSSL_DECODER*decoder,
-void*provctx, structcollect_data_st*data)
+/*
+ * Add decoder instance to the decoder context if it is compatible. Returns 1
+ * if a decoder was added, 0 otherwise.
+ */
+staticintcollect_decoder_keymgmt(EVP_KEYMGMT*keymgmt, OSSL_DECODER*decoder,
+void*provctx, structcollect_data_st*data)
 {
 void*decoderctx=NULL;
 OSSL_DECODER_INSTANCE*di=NULL;
+constOSSL_PROPERTY_LIST*props;
 
 /*
  * We already checked the EVP_KEYMGMT is applicable in check_keymgmt so we
@@ -239,17 +245,17 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
 
 if (keymgmt->name_id!=decoder->base.id)
 /* Mismatch is not an error, continue. */
-return;
+return0;
 
 if ((decoderctx=decoder->newctx(provctx)) ==NULL) {
 data->error_occurred=1;
-return;
+return0;
  }
 
 if ((di=ossl_decoder_instance_new(decoder, decoderctx)) ==NULL) {
 decoder->freectx(decoderctx);
 data->error_occurred=1;
-return;
+return0;
  }
 
 /*
@@ -263,7 +269,7 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
 ||OPENSSL_strcasecmp(data->ctx->start_input_type, "PEM") !=0)) {
 /* Mismatch is not an error, continue. */
 ossl_decoder_instance_free(di);
-return;
+return0;
  }
 
 OSSL_TRACE_BEGIN(DECODER) {
@@ -275,13 +281,30 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
 OSSL_DECODER_get0_properties(decoder));
  } OSSL_TRACE_END(DECODER);
 
+/*
+ * Get the property match score so the decoders can be prioritized later.
+ */
+props=ossl_decoder_parsed_properties(decoder);
+if (data->pq!=NULL&&props!=NULL) {
+di->score=ossl_property_match_count(data->pq, props);
+/*
+ * Mismatch of mandatory properties is not an error, the decoder is just
+ * ignored, continue.
+ */
+if (di->score<0) {
+ossl_decoder_instance_free(di);
+return0;
+ }
+ }
+
 if (!ossl_decoder_ctx_add_decoder_inst(data->ctx, di)) {
 ossl_decoder_instance_free(di);
 data->error_occurred=1;
-return;
+return0;
  }
 
 ++data->total;
+return1;
 }
 
 staticvoidcollect_decoder(OSSL_DECODER*decoder, void*arg)
@@ -321,7 +344,9 @@ static void collect_decoder(OSSL_DECODER *decoder, void *arg)
 for (i=0; i<end_i; ++i) {
 keymgmt=sk_EVP_KEYMGMT_value(keymgmts, i);
 
-collect_decoder_keymgmt(keymgmt, decoder, provctx, data);
+/* Only add this decoder once */
+if (collect_decoder_keymgmt(keymgmt, decoder, provctx, data))
+break;
 if (data->error_occurred)
 return;
  }
@@ -407,6 +432,8 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
 structdecoder_pkey_data_st*process_data=NULL;
 structcollect_data_stcollect_data= { NULL };
 STACK_OF(EVP_KEYMGMT) *keymgmts=NULL;
+OSSL_PROPERTY_LIST**plp;
+OSSL_PROPERTY_LIST*pq=NULL, *p2=NULL;
 
 OSSL_TRACE_BEGIN(DECODER) {
 constchar*input_type=ctx->start_input_type;
@@ -442,6 +469,25 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
 process_data->selection=ctx->selection;
 process_data->keymgmts=keymgmts;
 
+/*
+ * Collect passed and default properties to prioritize the decoders.
+ */
+if (propquery!=NULL)
+p2=pq=ossl_parse_query(libctx, propquery, 1);
+
+plp=ossl_ctx_global_properties(libctx, 0);
+if (plp!=NULL&&*plp!=NULL) {
+if (pq==NULL) {
+pq=*plp;
+ } else {
+p2=ossl_property_merge(pq, *plp);
+ossl_property_free(pq);
+if (p2==NULL)
+ goto err;
+pq=p2;
+ }
+ }
+
 /*
  * Enumerate all keymgmts into a stack.
  *
@@ -457,10 +503,11 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
  * upfront, as this ensures that the names for all loaded providers have
  * been registered by the time we try to resolve the keytype string.
  */
-collect_data.ctx=ctx;
-collect_data.libctx=libctx;
-collect_data.keymgmts=keymgmts;
-collect_data.keytype=keytype;
+collect_data.ctx=ctx;
+collect_data.libctx=libctx;
+collect_data.keymgmts=keymgmts;
+collect_data.keytype=keytype;
+collect_data.pq=pq;
 EVP_KEYMGMT_do_all_provided(libctx, collect_keymgmt, &collect_data);
 
 if (collect_data.error_occurred)
@@ -496,6 +543,7 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
 ok=1;
 err:
 decoder_clean_pkey_construct_arg(process_data);
+ossl_property_free(p2);
 returnok;
 }
 

deps/openssl/openssl/crypto/encode_decode/encoder_local.h

@@ -109,6 +109,8 @@ struct ossl_decoder_instance_st {
 constchar*input_type; /* Never NULL */
 constchar*input_structure; /* May be NULL */
 intinput_type_id;
+intorder; /* For stable ordering of decoders wrt proqs */
+intscore; /* For ordering decoders wrt proqs */
 
 unsigned intflag_input_structure_was_set : 1;
 };

deps/openssl/openssl/crypto/evp/asymcipher.c

@@ -261,10 +261,12 @@ int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
 
 cipher=ctx->op.ciph.cipher;
 desc=cipher->description!=NULL ? cipher->description : "";
+ERR_set_mark();
 ret=cipher->encrypt(ctx->op.ciph.algctx, out, outlen, (out==NULL ? 0 : *outlen), in, inlen);
-if (ret <= 0)
+if (ret <= 0&&ERR_count_to_mark() ==0)
 ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE,
 "%s encrypt:%s", cipher->type_name, desc);
+ERR_clear_last_mark();
 returnret;
 
 legacy:
@@ -309,10 +311,12 @@ int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
 
 cipher=ctx->op.ciph.cipher;
 desc=cipher->description!=NULL ? cipher->description : "";
+ERR_set_mark();
 ret=cipher->decrypt(ctx->op.ciph.algctx, out, outlen, (out==NULL ? 0 : *outlen), in, inlen);
-if (ret <= 0)
+if (ret <= 0&&ERR_count_to_mark() ==0)
 ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE,
 "%s decrypt:%s", cipher->type_name, desc);
+ERR_clear_last_mark();
 
 returnret;