Skip to content

Commit ec144d5

Browse files
hassaanpjasnell
hassaanp
authored and
jasnell
committed
deps: update archs files for OpenSSL-1.1.1e
After an OpenSSL source update, all the config files need to be regenerated and comitted by: $ cd deps/openssl/config $ make $ git add deps/openssl/config/archs $ git add deps/openssl/include PR-URL: nodejs#32328 Fixes: nodejs#32210 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 425b962 commit ec144d5

702 files changed

Lines changed: 9702 additions & 148712 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deps/openssl/config/archs/BSD-x86/asm/configdata.pm‎

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

‎deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s‎

Lines changed: 0 additions & 3218 deletions
This file was deleted.

‎deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Fri Sep 13 15:57:16 2019 UTC"
14+
#define DATE "built on: Wed Mar 18 21:04:48 2020 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a
@@ -36,12 +36,13 @@ static const char compiler_flags[] = {
3636
'M',' ','-','D','S','H','A','2','5','6','_','A','S','M',' ','-',
3737
'D','S','H','A','5','1','2','_','A','S','M',' ','-','D','R','C',
3838
'4','_','A','S','M',' ','-','D','M','D','5','_','A','S','M',' ',
39-
'-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','V',
40-
'P','A','E','S','_','A','S','M',' ','-','D','W','H','I','R','L',
41-
'P','O','O','L','_','A','S','M',' ','-','D','G','H','A','S','H',
42-
'_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z',
43-
'2','5','6','_','A','S','M',' ','-','D','P','O','L','Y','1','3',
44-
'0','5','_','A','S','M',' ','-','D','_','T','H','R','E','A','D',
45-
'_','S','A','F','E',' ','-','D','_','R','E','E','N','T','R','A',
46-
'N','T',' ','-','D','N','D','E','B','U','G','\0'
39+
'-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','A',
40+
'E','S','N','I','_','A','S','M',' ','-','D','V','P','A','E','S',
41+
'_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L',
42+
'_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
43+
' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
44+
'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A',
45+
'S','M',' ','-','D','_','T','H','R','E','A','D','_','S','A','F',
46+
'E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-',
47+
'D','N','D','E','B','U','G','\0'
4748
};

‎deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4405,19 +4405,15 @@ L009pic:
44054405
orl 4(%edi),%eax
44064406
orl 8(%edi),%eax
44074407
orl 12(%edi),%eax
4408+
movl 576(%esp),%ebx
4409+
notl %ebx
4410+
orl %ebx,%eax
4411+
movl 580(%esp),%ebx
4412+
notl %ebx
4413+
orl %ebx,%eax
4414+
orl 584(%esp),%eax
44084415
.byte 62
44094416
jnz L010add_proceed
4410-
movl 576(%esp),%eax
4411-
andl 580(%esp),%eax
4412-
movl 584(%esp),%ebx
4413-
jz L010add_proceed
4414-
testl %ebx,%ebx
4415-
jz L011add_double
4416-
movl 616(%esp),%edi
4417-
xorl %eax,%eax
4418-
movl $24,%ecx
4419-
.byte 252,243,171
4420-
jmp L012add_done
44214417
.align 4,0x90
44224418
L011add_double:
44234419
movl 620(%esp),%esi

‎deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* WARNING: do not edit! */
2-
/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
2+
/* Generated by Makefile from include/crypto/bn_conf.h.in */
33
/*
44
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
55
*
@@ -9,8 +9,8 @@
99
* https://www.openssl.org/source/license.html
1010
*/
1111

12-
#ifndef HEADER_BN_CONF_H
13-
# define HEADER_BN_CONF_H
12+
#ifndef OSSL_CRYPTO_BN_CONF_H
13+
# define OSSL_CRYPTO_BN_CONF_H
1414

1515
/*
1616
* The contents of this file are not used in the UEFI build, as

‎deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* WARNING: do not edit! */
2-
/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
2+
/* Generated by Makefile from include/crypto/dso_conf.h.in */
33
/*
44
* Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
55
*
@@ -9,8 +9,8 @@
99
* https://www.openssl.org/source/license.html
1010
*/
1111

12-
#ifndef HEADER_DSO_CONF_H
13-
# define HEADER_DSO_CONF_H
12+
#ifndef OSSL_CRYPTO_DSO_CONF_H
13+
# define OSSL_CRYPTO_DSO_CONF_H
1414
# define DSO_DLFCN
1515
# define HAVE_DLFCN_H
1616
# define DSO_EXTENSION ".so"

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ extern "C" {
9393
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
9494
# define OPENSSL_NO_DYNAMIC_ENGINE
9595
#endif
96-
#ifndef OPENSSL_NO_AFALGENG
97-
# define OPENSSL_NO_AFALGENG
98-
#endif
9996

10097

10198
/*

‎deps/openssl/config/archs/BSD-x86/asm/include/progs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

‎deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
'RC4_ASM',
1616
'MD5_ASM',
1717
'RMD160_ASM',
18+
'AESNI_ASM',
1819
'VPAES_ASM',
1920
'WHIRLPOOL_ASM',
2021
'GHASH_ASM',

‎deps/openssl/config/archs/BSD-x86/asm/openssl.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@
713713
'RC4_ASM',
714714
'MD5_ASM',
715715
'RMD160_ASM',
716+
'AESNI_ASM',
716717
'VPAES_ASM',
717718
'WHIRLPOOL_ASM',
718719
'GHASH_ASM',

0 commit comments

Comments
 (0)