GeezerVison is showing github.com — deps: upgrade openssl sources to 1.1.1s · nodejs/node@11629fe
File treeExpand file treeCollapse file tree Open diff view settings Some content is hiddenLarge Commits have some content hidden by default. Use the searchbox below for content that may be hidden. Dismiss bannerExpand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/CHANGES +46Lines changed: 46 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 7 | 7 | https://github.com/openssl/openssl/commits/ and pick the appropriate | 8 | 8 | release branch. | 9 | 9 |
| | 10 | + Changes between 1.1.1r and 1.1.1s [1 Nov 2022] | | 11 | + | | 12 | + *) Fixed a regression introduced in 1.1.1r version not refreshing the | | 13 | + certificate data to be signed before signing the certificate. | | 14 | + | | 15 | + [Gibeom Gwon] | | 16 | + | | 17 | + Changes between 1.1.1q and 1.1.1r [11 Oct 2022] | | 18 | + | | 19 | + *) Fixed the linux-mips64 Configure target which was missing the | | 20 | + SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that | | 21 | + platform. | | 22 | + [Adam Joseph] | | 23 | + | | 24 | + *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was | | 25 | + causing incorrect results in some cases as a result. | | 26 | + [Paul Dale] | | 27 | + | | 28 | + *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to | | 29 | + report correct results in some cases | | 30 | + [Matt Caswell] | | 31 | + | | 32 | + *) Fixed a regression introduced in 1.1.1o for re-signing certificates with | | 33 | + different key sizes | | 34 | + [Todd Short] | | 35 | + | | 36 | + *) Added the loongarch64 target | | 37 | + [Shi Pujin] | | 38 | + | | 39 | + *) Fixed a DRBG seed propagation thread safety issue | | 40 | + [Bernd Edlinger] | | 41 | + | | 42 | + *) Fixed a memory leak in tls13_generate_secret | | 43 | + [Bernd Edlinger] | | 44 | + | | 45 | + *) Fixed reported performance degradation on aarch64. Restored the | | 46 | + implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid | | 47 | + 32-bit lane assignment in CTR mode") for 64bit targets only, since it is | | 48 | + reportedly 2-17% slower and the silicon errata only affects 32bit targets. | | 49 | + The new algorithm is still used for 32 bit targets. | | 50 | + [Bernd Edlinger] | | 51 | + | | 52 | + *) Added a missing header for memcmp that caused compilation failure on some | | 53 | + platforms | | 54 | + [Gregor Jasny] | | 55 | + | 10 | 56 | Changes between 1.1.1p and 1.1.1q [5 Jul 2022] | 11 | 57 |
| 12 | 58 | *) AES OCB mode for 32-bit x86 platforms using the AES-NI assembly optimised | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/Configurations/10-main.conf +8-1Lines changed: 8 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -742,7 +742,7 @@ my %targets = ( | 742 | 742 | inherit_from => [ "linux-generic32", asm("mips64_asm") ], | 743 | 743 | cflags => add("-mabi=n32"), | 744 | 744 | cxxflags => add("-mabi=n32"), | 745 | | - bn_ops => "RC4_CHAR", | | 745 | + bn_ops => "RC4_CHAR SIXTY_FOUR_BIT", | 746 | 746 | perlasm_scheme => "n32", | 747 | 747 | multilib => "32", | 748 | 748 | }, | @@ -761,6 +761,13 @@ my %targets = ( | 761 | 761 | perlasm_scheme => "linux64", | 762 | 762 | }, | 763 | 763 |
| | 764 | + # loongarch64 below refers to contemporary LoongArch Architecture | | 765 | + # specifications, | | 766 | + "linux64-loongarch64" => { | | 767 | + inherit_from => [ "linux-generic64"], | | 768 | + perlasm_scheme => "linux64", | | 769 | + }, | | 770 | + | 764 | 771 | #### IA-32 targets... | 765 | 772 | #### These two targets are a bit aged and are to be used on older Linux | 766 | 773 | #### machines where gcc doesn't understand -m32 and -m64 | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/NEWS +10Lines changed: 10 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 5 | 5 | This file gives a brief overview of the major changes between each OpenSSL | 6 | 6 | release. For more details please read the CHANGES file. | 7 | 7 |
| | 8 | + Major changes between OpenSSL 1.1.1r and OpenSSL 1.1.1s [1 Nov 2022] | | 9 | + | | 10 | + o Fixed a regression introduced in OpenSSL 1.1.1r not refreshing the | | 11 | + certificate data to be signed before signing the certificate. | | 12 | + | | 13 | + Major changes between OpenSSL 1.1.1q and OpenSSL 1.1.1r [11 Oct 2022] | | 14 | + | | 15 | + o Added a missing header for memcmp that caused compilation failure on | | 16 | + some platforms | | 17 | + | 8 | 18 | Major changes between OpenSSL 1.1.1p and OpenSSL 1.1.1q [5 Jul 2022] | 9 | 19 |
| 10 | 20 | o Fixed AES OCB failure to encrypt some bytes on 32-bit x86 platforms | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/README +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 |
| 2 | | - OpenSSL 1.1.1q 5 Jul 2022 | | 2 | + OpenSSL 1.1.1s 1 Nov 2022 | 3 | 3 |
| 4 | 4 | Copyright (c) 1998-2022 The OpenSSL Project | 5 | 5 | Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/apps.c +13-2Lines changed: 13 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -1376,7 +1376,8 @@ static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING) | 1376 | 1376 | static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING) | 1377 | 1377 | #undef BSIZE | 1378 | 1378 | #define BSIZE 256 | 1379 | | -BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai) | | 1379 | +BIGNUM *load_serial(const char *serialfile, int *exists, int create, | | 1380 | + ASN1_INTEGER **retai) | 1380 | 1381 | { | 1381 | 1382 | BIO *in = NULL; | 1382 | 1383 | BIGNUM *ret = NULL; | @@ -1388,15 +1389,23 @@ BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai) | 1388 | 1389 | goto err; | 1389 | 1390 |
| 1390 | 1391 | in = BIO_new_file(serialfile, "r"); | | 1392 | + if (exists != NULL) | | 1393 | + *exists = in != NULL; | 1391 | 1394 | if (in == NULL) { | 1392 | 1395 | if (!create) { | 1393 | 1396 | perror(serialfile); | 1394 | 1397 | goto err; | 1395 | 1398 | } | 1396 | 1399 | ERR_clear_error(); | 1397 | 1400 | ret = BN_new(); | 1398 | | - if (ret == NULL || !rand_serial(ret, ai)) | | 1401 | + if (ret == NULL) { | 1399 | 1402 | BIO_printf(bio_err, "Out of memory\n"); | | 1403 | + } else if (!rand_serial(ret, ai)) { | | 1404 | + BIO_printf(bio_err, "Error creating random number to store in %s\n", | | 1405 | + serialfile); | | 1406 | + BN_free(ret); | | 1407 | + ret = NULL; | | 1408 | + } | 1400 | 1409 | } else { | 1401 | 1410 | if (!a2i_ASN1_INTEGER(in, ai, buf, 1024)) { | 1402 | 1411 | BIO_printf(bio_err, "unable to load number from %s\n", | @@ -1416,6 +1425,8 @@ BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai) | 1416 | 1425 | ai = NULL; | 1417 | 1426 | } | 1418 | 1427 | err: | | 1428 | + if (ret == NULL) | | 1429 | + ERR_print_errors(bio_err); | 1419 | 1430 | BIO_free(in); | 1420 | 1431 | ASN1_INTEGER_free(ai); | 1421 | 1432 | return ret; | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/apps.h +7-4Lines changed: 7 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | /* | 2 | | - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. | | 2 | + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. | 3 | 3 | * | 4 | 4 | * Licensed under the OpenSSL license (the "License"). You may not use | 5 | 5 | * this file except in compliance with the License. You can obtain a copy | @@ -527,9 +527,12 @@ typedef struct ca_db_st { | 527 | 527 | } CA_DB; | 528 | 528 |
| 529 | 529 | void* app_malloc(int sz, const char *what); | 530 | | -BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai); | 531 | | -int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial, | 532 | | - ASN1_INTEGER **retai); | | 530 | + | | 531 | +/* load_serial, save_serial, and rotate_serial are also used for CRL numbers */ | | 532 | +BIGNUM *load_serial(const char *serialfile, int *exists, int create, | | 533 | + ASN1_INTEGER **retai); | | 534 | +int save_serial(const char *serialfile, const char *suffix, | | 535 | + const BIGNUM *serial, ASN1_INTEGER **retai); | 533 | 536 | int rotate_serial(const char *serialfile, const char *new_suffix, | 534 | 537 | const char *old_suffix); | 535 | 538 | int rand_serial(BIGNUM *b, ASN1_INTEGER *ai); | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/ca.c +5-3Lines changed: 5 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | /* | 2 | | - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. | | 2 | + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. | 3 | 3 | * | 4 | 4 | * Licensed under the OpenSSL license (the "License"). You may not use | 5 | 5 | * this file except in compliance with the License. You can obtain a copy | @@ -842,7 +842,8 @@ int ca_main(int argc, char **argv) | 842 | 842 | goto end; | 843 | 843 | } | 844 | 844 | } else { | 845 | | - if ((serial = load_serial(serialfile, create_ser, NULL)) == NULL) { | | 845 | + serial = load_serial(serialfile, NULL, create_ser, NULL); | | 846 | + if (serial == NULL) { | 846 | 847 | BIO_printf(bio_err, "error while loading serial number\n"); | 847 | 848 | goto end; | 848 | 849 | } | @@ -1078,7 +1079,8 @@ int ca_main(int argc, char **argv) | 1078 | 1079 |
| 1079 | 1080 | if ((crlnumberfile = NCONF_get_string(conf, section, ENV_CRLNUMBER)) | 1080 | 1081 | != NULL) | 1081 | | - if ((crlnumber = load_serial(crlnumberfile, 0, NULL)) == NULL) { | | 1082 | + if ((crlnumber = load_serial(crlnumberfile, NULL, 0, NULL)) | | 1083 | + == NULL) { | 1082 | 1084 | BIO_printf(bio_err, "error while loading CRL number\n"); | 1083 | 1085 | goto end; | 1084 | 1086 | } | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/ocsp.c +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | /* | 2 | | - * Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved. | | 2 | + * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved. | 3 | 3 | * | 4 | 4 | * Licensed under the OpenSSL license (the "License"). You may not use | 5 | 5 | * this file except in compliance with the License. You can obtain a copy | @@ -176,7 +176,7 @@ const OPTIONS ocsp_options[] = { | 176 | 176 | {"no_intern", OPT_NO_INTERN, '-', | 177 | 177 | "Don't search certificates contained in response for signer"}, | 178 | 178 | {"badsig", OPT_BADSIG, '-', | 179 | | - "Corrupt last byte of loaded OSCP response signature (for test)"}, | | 179 | + "Corrupt last byte of loaded OCSP response signature (for test)"}, | 180 | 180 | {"text", OPT_TEXT, '-', "Print text form of request and response"}, | 181 | 181 | {"req_text", OPT_REQ_TEXT, '-', "Print text form of request"}, | 182 | 182 | {"resp_text", OPT_RESP_TEXT, '-', "Print text form of response"}, | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/s_cb.c +17-11Lines changed: 17 additions & 11 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | /* | 2 | | - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. | | 2 | + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. | 3 | 3 | * | 4 | 4 | * Licensed under the OpenSSL license (the "License"). You may not use | 5 | 5 | * this file except in compliance with the License. You can obtain a copy | @@ -74,22 +74,28 @@ int verify_callback(int ok, X509_STORE_CTX *ctx) | 74 | 74 | } | 75 | 75 | switch (err) { | 76 | 76 | case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: | 77 | | - BIO_puts(bio_err, "issuer= "); | 78 | | - X509_NAME_print_ex(bio_err, X509_get_issuer_name(err_cert), | 79 | | - 0, get_nameopt()); | 80 | | - BIO_puts(bio_err, "\n"); | | 77 | + if (err_cert != NULL) { | | 78 | + BIO_puts(bio_err, "issuer= "); | | 79 | + X509_NAME_print_ex(bio_err, X509_get_issuer_name(err_cert), | | 80 | + 0, get_nameopt()); | | 81 | + BIO_puts(bio_err, "\n"); | | 82 | + } | 81 | 83 | break; | 82 | 84 | case X509_V_ERR_CERT_NOT_YET_VALID: | 83 | 85 | case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: | 84 | | - BIO_printf(bio_err, "notBefore="); | 85 | | - ASN1_TIME_print(bio_err, X509_get0_notBefore(err_cert)); | 86 | | - BIO_printf(bio_err, "\n"); | | 86 | + if (err_cert != NULL) { | | 87 | + BIO_printf(bio_err, "notBefore="); | | 88 | + ASN1_TIME_print(bio_err, X509_get0_notBefore(err_cert)); | | 89 | + BIO_printf(bio_err, "\n"); | | 90 | + } | 87 | 91 | break; | 88 | 92 | case X509_V_ERR_CERT_HAS_EXPIRED: | 89 | 93 | case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: | 90 | | - BIO_printf(bio_err, "notAfter="); | 91 | | - ASN1_TIME_print(bio_err, X509_get0_notAfter(err_cert)); | 92 | | - BIO_printf(bio_err, "\n"); | | 94 | + if (err_cert != NULL) { | | 95 | + BIO_printf(bio_err, "notAfter="); | | 96 | + ASN1_TIME_print(bio_err, X509_get0_notAfter(err_cert)); | | 97 | + BIO_printf(bio_err, "\n"); | | 98 | + } | 93 | 99 | break; | 94 | 100 | case X509_V_ERR_NO_EXPLICIT_POLICY: | 95 | 101 | if (!verify_args.quiet) | |
Collapse file Copy file name to clipboardExpand all lines: deps/openssl/openssl/apps/x509.c +11-5Lines changed: 11 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -400,7 +400,7 @@ int x509_main(int argc, char **argv) | 400 | 400 | aliasout = ++num; | 401 | 401 | break; | 402 | 402 | case OPT_CACREATESERIAL: | 403 | | - CA_createserial = ++num; | | 403 | + CA_createserial = 1; | 404 | 404 | break; | 405 | 405 | case OPT_CLREXT: | 406 | 406 | clrext = 1; | @@ -590,7 +590,7 @@ int x509_main(int argc, char **argv) | 590 | 590 | xca = load_cert(CAfile, CAformat, "CA Certificate"); | 591 | 591 | if (xca == NULL) | 592 | 592 | goto end; | 593 | | - if (!X509_set_issuer_name(x, X509_get_subject_name(xca))) | | 593 | + if (reqfile && !X509_set_issuer_name(x, X509_get_subject_name(xca))) | 594 | 594 | goto end; | 595 | 595 | } | 596 | 596 |
| @@ -916,6 +916,7 @@ static ASN1_INTEGER *x509_load_serial(const char *CAfile, | 916 | 916 | char *buf = NULL; | 917 | 917 | ASN1_INTEGER *bs = NULL; | 918 | 918 | BIGNUM *serial = NULL; | | 919 | + int defaultfile = 0, file_exists; | 919 | 920 |
| 920 | 921 | if (serialfile == NULL) { | 921 | 922 | const char *p = strrchr(CAfile, '.'); | @@ -925,9 +926,10 @@ static ASN1_INTEGER *x509_load_serial(const char *CAfile, | 925 | 926 | memcpy(buf, CAfile, len); | 926 | 927 | memcpy(buf + len, POSTFIX, sizeof(POSTFIX)); | 927 | 928 | serialfile = buf; | | 929 | + defaultfile = 1; | 928 | 930 | } | 929 | 931 |
| 930 | | - serial = load_serial(serialfile, create, NULL); | | 932 | + serial = load_serial(serialfile, &file_exists, create || defaultfile, NULL); | 931 | 933 | if (serial == NULL) | 932 | 934 | goto end; | 933 | 935 |
| @@ -936,8 +938,10 @@ static ASN1_INTEGER *x509_load_serial(const char *CAfile, | 936 | 938 | goto end; | 937 | 939 | } | 938 | 940 |
| 939 | | - if (!save_serial(serialfile, NULL, serial, &bs)) | 940 | | - goto end; | | 941 | + if (file_exists || create) | | 942 | + save_serial(serialfile, NULL, serial, &bs); | | 943 | + else | | 944 | + bs = BN_to_ASN1_INTEGER(serial, NULL); | 941 | 945 |
| 942 | 946 | end: | 943 | 947 | OPENSSL_free(buf); | @@ -989,6 +993,8 @@ static int x509_certify(X509_STORE *ctx, const char *CAfile, const EVP_MD *diges | 989 | 993 | goto end; | 990 | 994 | } | 991 | 995 |
| | 996 | + if (!X509_set_issuer_name(x, X509_get_subject_name(xca))) | | 997 | + goto end; | 992 | 998 | if (!X509_set_serialNumber(x, bs)) | 993 | 999 | goto end; | 994 | 1000 |
| |
|