deps: upgrade openssl sources to 1.1.1f · nodejs/node@3417cc5 · GitHub
Skip to content

Commit 3417cc5

Browse files
hassaanptargos
hassaanp
authored and
targos
committed
deps: upgrade openssl sources to 1.1.1f
This updates all sources in deps/openssl/openssl by: $ cd deps/openssl/ $ rm -rf openssl $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz $ mv openssl-1.1.0h openssl $ git add --all openssl $ git commit openssl PR-URL: #32583 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 28077a0 commit 3417cc5

30 files changed

Lines changed: 367 additions & 345 deletions

‎deps/openssl/openssl/CHANGES‎

Lines changed: 18 additions & 0 deletions

‎deps/openssl/openssl/Configurations/unix-Makefile.tmpl‎

Lines changed: 100 additions & 100 deletions
Large diffs are not rendered by default.

‎deps/openssl/openssl/NEWS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
This file gives a brief overview of the major changes between each OpenSSL
66
release. For more details please read the CHANGES file.
77

8+
Major changes between OpenSSL 1.1.1e and OpenSSL 1.1.1f [31 Mar 2020]
9+
10+
o Revert the unexpected EOF reporting via SSL_ERROR_SSL
11+
812
Major changes between OpenSSL 1.1.1d and OpenSSL 1.1.1e [17 Mar 2020]
913

1014
o Fixed an overflow bug in the x64_64 Montgomery squaring procedure
1115
used in exponentiation with 512-bit moduli (CVE-2019-1551)
16+
o Properly detect unexpected EOF while reading in libssl and report
17+
it via SSL_ERROR_SSL
1218

1319
Major changes between OpenSSL 1.1.1c and OpenSSL 1.1.1d [10 Sep 2019]
1420

‎deps/openssl/openssl/README‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
OpenSSL 1.1.1e 17 Mar 2020
2+
OpenSSL 1.1.1f 31 Mar 2020
33

4-
Copyright (c) 1998-2019 The OpenSSL Project
4+
Copyright (c) 1998-2020 The OpenSSL Project
55
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
66
All rights reserved.
77

‎deps/openssl/openssl/apps/rehash.c‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2013-2014 Timo Teräs <timo.teras@gmail.com>
44
*
55
* Licensed under the OpenSSL license (the "License"). You may not use
@@ -274,11 +274,19 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
274274
if (x->x509 != NULL) {
275275
type = TYPE_CERT;
276276
name = X509_get_subject_name(x->x509);
277-
X509_digest(x->x509, evpmd, digest, NULL);
277+
if (!X509_digest(x->x509, evpmd, digest, NULL)) {
278+
BIO_printf(bio_err, "out of memory\n");
279+
++errs;
280+
goto end;
281+
}
278282
} else if (x->crl != NULL) {
279283
type = TYPE_CRL;
280284
name = X509_CRL_get_issuer(x->crl);
281-
X509_CRL_digest(x->crl, evpmd, digest, NULL);
285+
if (!X509_CRL_digest(x->crl, evpmd, digest, NULL)) {
286+
BIO_printf(bio_err, "out of memory\n");
287+
++errs;
288+
goto end;
289+
}
282290
} else {
283291
++errs;
284292
goto end;

‎deps/openssl/openssl/apps/s_server.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
33
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
44
* Copyright 2005 Nokia. All rights reserved.
55
*
@@ -1904,7 +1904,7 @@ int s_server_main(int argc, char *argv[])
19041904
BIO_printf(bio_s_out, "Setting secondary ctx parameters\n");
19051905

19061906
if (sdebug)
1907-
ssl_ctx_security_debug(ctx, sdebug);
1907+
ssl_ctx_security_debug(ctx2, sdebug);
19081908

19091909
if (session_id_prefix) {
19101910
if (strlen(session_id_prefix) >= 32)

‎deps/openssl/openssl/crypto/bn/bn_local.h‎

Lines changed: 1 addition & 4 deletions

0 commit comments

Comments
 (0)