update openssl to v3.0.7

notjaywu · Nov 8, 2022 · 9e99250 · 9e99250
1 parent 04cb00f
commit 9e99250
Show file tree

Hide file tree

Showing 2,933 changed files with 54,133 additions and 995,313 deletions.
diff --git a/openssl/README.md b/openssl/README.md
@@ -45,15 +45,12 @@ Here is a list of supported architectures for use of ASM in OpenSSL.
 
   | --dest-os | --dest-cpu | OpenSSL target arch  | CI  |
   | --------- | ---------- | -------------------- | --- |
-  | aix       | ppc        | aix-gcc              | o   |
   | aix       | ppc64      | aix64-gcc            | o   |
   | linux     | ia32       | linux-elf            | o   |
   | linux     | x32        | linux-x32            | -   |
   | linux     | x64        | linux-x86_64         | o   |
   | linux     | arm        | linux-armv4          | o   |
   | linux     | arm64      | linux-aarch64        | o   |
-  | linux     | ppc        | linux-ppc            | o   |
-  | linux     | ppc64      | linux-ppc64          | o   |
   | linux     | ppc64(*1)  | linux-ppc64le        | o   |
   | linux     | s390       | linux32-s390x        | o   |
   | linux     | s390x      | linux64-s390x        | o   |
@@ -75,6 +72,18 @@ little)
 These are listed in [config/Makefile](config/Makefile).
 Please refer [config/opensslconf_asm.h](config/opensslconf_asm.h) for details.
 
+To remove or add an architecture the templates need to be updated for which
+there are two:
+* include_asm.h.tmpl
+* include_no-asm.h.tmpl
+
+Remove the architecture in question from these files and then run:
+```console
+$ make generate-headers
+```
+Also remove the architecture from the list of supported ASM architectures in
+[README.md](../README.md#supported-architectures-for-use-of-asm)
+
 ### Upgrading OpenSSL
 
-Please refer to [maintaining-openssl](../../doc/guides/maintaining-openssl.md).
+Please refer to [maintaining-openssl](../../doc/contributing/maintaining-openssl.md).
diff --git a/openssl/config/Dockerfile b/openssl/config/Dockerfile
@@ -7,6 +7,7 @@ RUN buildDeps='binutils build-essential vim nasm git' \
   && apt-get install -y --no-install-recommends --force-yes $buildDeps \
   && apt-get clean \
   && apt-get autoremove -y \
+  && cpan install Text::Template \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 WORKDIR /node
diff --git a/openssl/config/Makefile b/openssl/config/Makefile
@@ -9,10 +9,10 @@ endif
 PERL    = perl
 
 # Supported architecture list
-ASM_ARCHS = aix-gcc aix64-gcc-as BSD-x86 BSD-x86_64 \
+ASM_ARCHS = aix64-gcc-as BSD-x86 BSD-x86_64 \
 darwin64-x86_64-cc darwin-i386-cc darwin64-arm64-cc linux-aarch64 \
-linux-armv4 linux-elf linux-x32 linux-x86_64 linux-ppc \
-linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x linux64-mips64\
+linux-armv4 linux-elf linux-x86_64 \
+linux-ppc64le linux32-s390x linux64-s390x linux64-mips64\
 solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN32
 
 NO_ASM_ARCHS = VC-WIN64-ARM linux64-riscv64

diff --git a/openssl/config/archs/BSD-x86/asm/apps/progs.c b/openssl/config/archs/BSD-x86/asm/apps/progs.c
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy