Skip to content

deps: Revert OpenSSL 1.1.1c update https://github.com/nodejs/node/pull/28211 #28739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasnell wants to merge 3 commits into from
Closed

deps: Revert OpenSSL 1.1.1c update https://github.com/nodejs/node/pull/28211 #28739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da47090
Revert "deps: update archs files for OpenSSL-1.1.1c"
jasnell Jul 17, 2019
aa69bdf
Revert "deps: upgrade openssl sources to 1.1.1c"
jasnell Jul 17, 2019
ef5c8a8
Revert "deps: updated openssl upgrade instructions"
jasnell Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Revert "deps: update archs files for OpenSSL-1.1.1c" 
This reverts commit 7cb8981.
  • Loading branch information
@jasnell
jasnell committed Jul 17, 2019
commit da470909190b8c0ff4b4909239e2f0599f716b71
835 changes: 416 additions & 419 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Jun 12 20:53:27 2019 UTC"
#define DATE "built on: Thu May 2 20:26:30 2019 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down Expand Up @@ -40,8 +40,9 @@ static const char compiler_flags[] = {
'S','A','E','S','_','A','S','M',' ','-','D','G','H','A','S','H',
'_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z',
'2','5','6','_','A','S','M',' ','-','D','X','2','5','5','1','9',
'_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_',
'A','S','M',' ','-','D','_','T','H','R','E','A','D','_','S','A',
'F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ',
'-','D','N','D','E','B','U','G','\0'
'_','A','S','M',' ','-','D','P','A','D','L','O','C','K','_','A',
'S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S',
'M',' ','-','D','_','T','H','R','E','A','D','_','S','A','F','E',
' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D',
'N','D','E','B','U','G','\0'
};
4 changes: 3 additions & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* WARNING: do not edit! */
/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
/*
* Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand All @@ -11,7 +11,9 @@

#ifndef HEADER_DSO_CONF_H
# define HEADER_DSO_CONF_H

# define DSO_DLFCN
# define HAVE_DLFCN_H
# define DSO_EXTENSION ".so"

#endif
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
'GHASH_ASM',
'ECP_NISTZ256_ASM',
'X25519_ASM',
'PADLOCK_ASM',
'POLY1305_ASM',
],
'openssl_cflags_BSD-x86_64': [
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@
'GHASH_ASM',
'ECP_NISTZ256_ASM',
'X25519_ASM',
'PADLOCK_ASM',
'POLY1305_ASM',
],
'openssl_cflags_BSD-x86_64': [
Expand Down
Loading