GeezerVison is showing github.com — deps: upgrade openssl sources to openssl-3.5.6 · nodejs/node@d202e2d
File treeExpand file treeCollapse file tree Open diff view settings external/perl/Text-Template-1.56/lib/Text
Some content is hiddenLarge Commits have some content hidden by default. Use the searchbox below for content that may be hidden. Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/CHANGES.md +363-212Lines changed: 363 additions & 212 deletions - Display the source diff
- Display the rich diff
Large diffs are not rendered by default. Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/CONTRIBUTING.md +12Lines changed: 12 additions & 0 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
@@ -27,6 +27,18 @@ communication before submitting many pull requests. In addition, | 27 | 27 | contributors should personally evaluate potential patches generated by | 28 | 28 | automated tools. | 29 | 29 |
| | 30 | +Provide a clear description of the issue or feature being addressed, | | 31 | +including any relevant implementation details and, for performance | | 32 | +improvements, benchmark results. | | 33 | + | | 34 | +Pull requests and commits should be self-contained, enabling readers to | | 35 | +understand what changed and why without needing to reference related | | 36 | +issues or having prior knowledge. Commit messages should include all | | 37 | +relevant details to help future contributors follow the git history, | | 38 | +with clear explanations of what is changing and why. Long descriptions | | 39 | +are encouraged if they aid understanding. Commit message titles (their | | 40 | +first line) should be kept to 50-70 characters if possible. | | 41 | + | 30 | 42 | To make it easier to review and accept your pull request, please follow these | 31 | 43 | guidelines: | 32 | 44 |
| |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/Configurations/10-main.conf +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 5 | 5 | my $vc_win64a_info = {}; | 6 | 6 | sub vc_win64a_info { | 7 | 7 | unless (%$vc_win64a_info) { | 8 | | - if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) { | | 8 | + # Minimum NASM version is 2.09 otherwise SHA3 might be miscompiled | | 9 | + if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+)\.([0-9]+)/ && ($1 > 2 || ($1 == 2 && $2 >= 9))) { | 9 | 10 | $vc_win64a_info = { AS => "nasm", | 10 | 11 | ASFLAGS => "-g", | 11 | 12 | asflags => "-Ox -f win64 -DNEAR", | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/Configurations/unix-Makefile.tmpl +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -72,6 +72,7 @@ OPTIONS={- $config{options} -} | 72 | 72 | CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) | 73 | 73 | SRCDIR={- $config{sourcedir} -} | 74 | 74 | BLDDIR={- $config{builddir} -} | | 75 | +RESULT_D=$(BLDDIR)/test-runs | 75 | 76 | FIPSKEY={- $config{FIPSKEY} -} | 76 | 77 |
| 77 | 78 | VERSION={- "$config{full_version}" -} | @@ -642,7 +643,7 @@ clean: libclean ## Clean the workspace, keep the configuration | 642 | 643 | -find . -name '*{- platform->objext() -}' \! -name '.*' \! -type d -exec $(RM) {} \; | 643 | 644 | $(RM) core | 644 | 645 | $(RM) tags TAGS doc-nits md-nits | 645 | | - $(RM) -r test/test-runs | | 646 | + $(RM) -r $(RESULT_D) | 646 | 647 | $(RM) providers/fips*.new | 647 | 648 | -find . -type l \! -name '.*' -exec $(RM) {} \; | 648 | 649 |
| |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/Configurations/windows-makefile.tmpl +3-2Lines changed: 3 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 38 | 38 | PLATFORM={- $config{target} -} | 39 | 39 | SRCDIR={- $config{sourcedir} -} | 40 | 40 | BLDDIR={- $config{builddir} -} | | 41 | +RESULT_D=$(BLDDIR)\test-runs | 41 | 42 | FIPSKEY={- $config{FIPSKEY} -} | 42 | 43 |
| 43 | 44 | VERSION={- "$config{full_version}" -} | @@ -222,7 +223,7 @@ OPENSSLDIR_dir={- canonpath($openssldir_dir) -} | 222 | 223 | LIBDIR={- our $libdir = $config{libdir} || "lib"; | 223 | 224 | file_name_is_absolute($libdir) ? "" : $libdir -} | 224 | 225 | MODULESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath catpath); | 225 | | - our $modulesprefix = catdir($prefix,$libdir); | | 226 | + our $modulesprefix = file_name_is_absolute($libdir) ? $libdir : catdir($prefix,$libdir); | 226 | 227 | our ($modulesprefix_dev, $modulesprefix_dir, | 227 | 228 | $modulesprefix_file) = | 228 | 229 | splitpath($modulesprefix, 1); | @@ -484,7 +485,7 @@ clean: libclean | 484 | 485 | -del /Q /S /F engines\*.lib engines\*.exp | 485 | 486 | -del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp | 486 | 487 | -del /Q /S /F test\*.exp | 487 | | - -rd /Q /S test\test-runs | | 488 | + -@if exist "$(RESULT_D)" rd /Q /S "$(RESULT_D)" | 488 | 489 |
| 489 | 490 | distclean: clean | 490 | 491 | -del /Q /F include\openssl\configuration.h | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/NEWS.md +232-195Lines changed: 232 additions & 195 deletions - Display the source diff
- Display the rich diff
Large diffs are not rendered by default. Collapse file Copy file name to clipboard +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | MAJOR=3 | 2 | 2 | MINOR=5 | 3 | | -PATCH=5 | | 3 | +PATCH=6 | 4 | 4 | PRE_RELEASE_TAG= | 5 | 5 | BUILD_METADATA= | 6 | | -RELEASE_DATE="27 Jan 2026" | | 6 | +RELEASE_DATE="7 Apr 2026" | 7 | 7 | SHLIB_VERSION=3 |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/cmp.c +13-5Lines changed: 13 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | /* | 2 | | - * Copyright 2007-2025 The OpenSSL Project Authors. All Rights Reserved. | | 2 | + * Copyright 2007-2026 The OpenSSL Project Authors. All Rights Reserved. | 3 | 3 | * Copyright Nokia 2007-2019 | 4 | 4 | * Copyright Siemens AG 2015-2019 | 5 | 5 | * | @@ -1421,7 +1421,10 @@ static int setup_verification_ctx(OSSL_CMP_CTX *ctx) | 1421 | 1421 | out_vpm = X509_STORE_get0_param(out_trusted); | 1422 | 1422 | X509_VERIFY_PARAM_clear_flags(out_vpm, X509_V_FLAG_USE_CHECK_TIME); | 1423 | 1423 |
| 1424 | | - (void)OSSL_CMP_CTX_set_certConf_cb_arg(ctx, out_trusted); | | 1424 | + if (!OSSL_CMP_CTX_set_certConf_cb_arg(ctx, out_trusted)) { | | 1425 | + X509_STORE_free(out_trusted); | | 1426 | + return 0; | | 1427 | + } | 1425 | 1428 | } | 1426 | 1429 |
| 1427 | 1430 | if (opt_disable_confirm) | @@ -3390,6 +3393,12 @@ static void print_keyspec(OSSL_CMP_ATAVS *keySpec) | 3390 | 3393 | int paramtype; | 3391 | 3394 | const void *param; | 3392 | 3395 |
| | 3396 | + /* NULL check to prevent dereferencing a NULL pointer when print_keyspec is called */ | | 3397 | + if (alg == NULL) { | | 3398 | + BIO_puts(mem, "Key algorithm: <absent>\n"); | | 3399 | + break; | | 3400 | + } | | 3401 | + | 3393 | 3402 | X509_ALGOR_get0(&oid, ¶mtype, ¶m, alg); | 3394 | 3403 | BIO_printf(mem, "Key algorithm: "); | 3395 | 3404 | i2a_ASN1_OBJECT(mem, oid); | @@ -3789,8 +3798,7 @@ int cmp_main(int argc, char **argv) | 3789 | 3798 | if (opt_ignore_keyusage) | 3790 | 3799 | (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_IGNORE_KEYUSAGE, 1); | 3791 | 3800 | if (opt_no_cache_extracerts) | 3792 | | - (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_NO_CACHE_EXTRACERTS, | 3793 | | - 1); | | 3801 | + (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_NO_CACHE_EXTRACERTS, 1); | 3794 | 3802 |
| 3795 | 3803 | if (opt_reqout_only == NULL && (opt_use_mock_srv | 3796 | 3804 | #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP) | @@ -3806,7 +3814,7 @@ int cmp_main(int argc, char **argv) | 3806 | 3814 |
| 3807 | 3815 | srv_cmp_ctx = OSSL_CMP_SRV_CTX_get0_cmp_ctx(srv_ctx); | 3808 | 3816 | if (!OSSL_CMP_CTX_set_log_cb(srv_cmp_ctx, print_to_bio_err)) { | 3809 | | - CMP_err1("cannot set up error reporting and logging for %s", prog); | | 3817 | + CMP_err1("cannot set up server-side error reporting and logging for %s", prog); | 3810 | 3818 | goto err; | 3811 | 3819 | } | 3812 | 3820 | OSSL_CMP_CTX_set_log_verbosity(srv_cmp_ctx, opt_verbosity); | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/include/cmp_mock_srv.h +4-1Lines changed: 4 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | /* | 2 | | - * Copyright 2018-2025 The OpenSSL Project Authors. All Rights Reserved. | | 2 | + * Copyright 2018-2026 The OpenSSL Project Authors. All Rights Reserved. | 3 | 3 | * Copyright Siemens AG 2018-2020 | 4 | 4 | * | 5 | 5 | * Licensed under the Apache License 2.0 (the "License"). You may not use | | 19 | 19 | OSSL_CMP_SRV_CTX *ossl_cmp_mock_srv_new(OSSL_LIB_CTX *libctx, | 20 | 20 | const char *propq); | 21 | 21 | void ossl_cmp_mock_srv_free(OSSL_CMP_SRV_CTX *srv_ctx); | | 22 | +OSSL_CMP_MSG *ossl_cmp_mock_server_perform(OSSL_CMP_CTX *ctx, | | 23 | + const OSSL_CMP_MSG *req); | 22 | 24 |
| 23 | 25 | int ossl_cmp_mock_srv_set1_refCert(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert); | 24 | 26 | int ossl_cmp_mock_srv_set1_certOut(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert); | @@ -34,6 +36,7 @@ int ossl_cmp_mock_srv_set1_oldWithNew(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert); | 34 | 36 | int ossl_cmp_mock_srv_set_statusInfo(OSSL_CMP_SRV_CTX *srv_ctx, int status, | 35 | 37 | int fail_info, const char *text); | 36 | 38 | int ossl_cmp_mock_srv_set_sendError(OSSL_CMP_SRV_CTX *srv_ctx, int bodytype); | | 39 | +int ossl_cmp_mock_srv_set_useBadProtection(OSSL_CMP_SRV_CTX *srv_ctx, int bodytype); | 37 | 40 | int ossl_cmp_mock_srv_set_pollCount(OSSL_CMP_SRV_CTX *srv_ctx, int count); | 38 | 41 | int ossl_cmp_mock_srv_set_checkAfterTime(OSSL_CMP_SRV_CTX *srv_ctx, int sec); | 39 | 42 |
| |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/lib/app_provider.c +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | /* | 2 | | - * Copyright 2020-2025 The OpenSSL Project Authors. All Rights Reserved. | | 2 | + * Copyright 2020-2026 The OpenSSL Project Authors. All Rights Reserved. | 3 | 3 | * | 4 | 4 | * Licensed under the Apache License 2.0 (the "License"). You may not use | 5 | 5 | * this file except in compliance with the License. You can obtain a copy | @@ -47,6 +47,7 @@ int app_provider_load(OSSL_LIB_CTX *libctx, const char *provider_name) | 47 | 47 | app_providers = sk_OSSL_PROVIDER_new_null(); | 48 | 48 | if (app_providers == NULL | 49 | 49 | || !sk_OSSL_PROVIDER_push(app_providers, prov)) { | | 50 | + OSSL_PROVIDER_unload(prov); | 50 | 51 | app_providers_cleanup(); | 51 | 52 | return 0; | 52 | 53 | } | |
|