Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1e
Browse files Browse the repository at this point in the history
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: #32328
Fixes: #32210
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
hassaanp authored and codebytere committed Mar 30, 2020
1 parent e96e8af commit 260bd81
Show file tree
Hide file tree
Showing 702 changed files with 9,702 additions and 148,712 deletions.
759 changes: 60 additions & 699 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm

Large diffs are not rendered by default.

3,218 changes: 0 additions & 3,218 deletions deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s

This file was deleted.

19 changes: 10 additions & 9 deletions deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

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

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand All @@ -36,12 +36,13 @@ static const char compiler_flags[] = {
'M',' ','-','D','S','H','A','2','5','6','_','A','S','M',' ','-',
'D','S','H','A','5','1','2','_','A','S','M',' ','-','D','R','C',
'4','_','A','S','M',' ','-','D','M','D','5','_','A','S','M',' ',
'-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','V',
'P','A','E','S','_','A','S','M',' ','-','D','W','H','I','R','L',
'P','O','O','L','_','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','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'
'-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','A',
'E','S','N','I','_','A','S','M',' ','-','D','V','P','A','E','S',
'_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L',
'_','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','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'
};
18 changes: 7 additions & 11 deletions deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s
Original file line number Diff line number Diff line change
Expand Up @@ -4405,19 +4405,15 @@ L009pic:
orl 4(%edi),%eax
orl 8(%edi),%eax
orl 12(%edi),%eax
movl 576(%esp),%ebx
notl %ebx
orl %ebx,%eax
movl 580(%esp),%ebx
notl %ebx
orl %ebx,%eax
orl 584(%esp),%eax
.byte 62
jnz L010add_proceed
movl 576(%esp),%eax
andl 580(%esp),%eax
movl 584(%esp),%ebx
jz L010add_proceed
testl %ebx,%ebx
jz L011add_double
movl 616(%esp),%edi
xorl %eax,%eax
movl $24,%ecx
.byte 252,243,171
jmp L012add_done
.align 4,0x90
L011add_double:
movl 620(%esp),%esi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* WARNING: do not edit! */
/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
/* Generated by Makefile from include/crypto/bn_conf.h.in */
/*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
*
Expand All @@ -9,8 +9,8 @@
* https://www.openssl.org/source/license.html
*/

#ifndef HEADER_BN_CONF_H
# define HEADER_BN_CONF_H
#ifndef OSSL_CRYPTO_BN_CONF_H
# define OSSL_CRYPTO_BN_CONF_H

/*
* The contents of this file are not used in the UEFI build, as
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* WARNING: do not edit! */
/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
/* Generated by Makefile from include/crypto/dso_conf.h.in */
/*
* Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
*
Expand All @@ -9,8 +9,8 @@
* https://www.openssl.org/source/license.html
*/

#ifndef HEADER_DSO_CONF_H
# define HEADER_DSO_CONF_H
#ifndef OSSL_CRYPTO_DSO_CONF_H
# define OSSL_CRYPTO_DSO_CONF_H
# define DSO_DLFCN
# define HAVE_DLFCN_H
# define DSO_EXTENSION ".so"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ extern "C" {
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
# define OPENSSL_NO_DYNAMIC_ENGINE
#endif
#ifndef OPENSSL_NO_AFALGENG
# define OPENSSL_NO_AFALGENG
#endif


/*
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2020 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 Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'RC4_ASM',
'MD5_ASM',
'RMD160_ASM',
'AESNI_ASM',
'VPAES_ASM',
'WHIRLPOOL_ASM',
'GHASH_ASM',
Expand Down
1 change: 1 addition & 0 deletions deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@
'RC4_ASM',
'MD5_ASM',
'RMD160_ASM',
'AESNI_ASM',
'VPAES_ASM',
'WHIRLPOOL_ASM',
'GHASH_ASM',
Expand Down
Loading

0 comments on commit 260bd81

Please sign in to comment.