diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e467f79dd7089853d8f69b3a316495442922db3c..596a82a560a72c9440906d911bc71525577d0a68 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -29,7 +29,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install unifdef
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: config
@@ -44,7 +44,7 @@ jobs:
   check_docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: config
       run: ./config --banner=Configured --strict-warnings enable-fips && perl configdata.pm --dump
     - name: make build_generated
@@ -64,7 +64,7 @@ jobs:
   check-ansi:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: config
       run: CPPFLAGS=-ansi ./config --banner=Configured no-asm no-makedepend enable-buildtest-c++ enable-fips --strict-warnings -D_DEFAULT_SOURCE && perl configdata.pm --dump
     - name: make
@@ -73,7 +73,7 @@ jobs:
   basic_gcc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: localegen
@@ -89,7 +89,7 @@ jobs:
   basic_clang:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -102,7 +102,7 @@ jobs:
   minimal:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -115,7 +115,7 @@ jobs:
   no-deprecated:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -131,7 +131,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -144,7 +144,7 @@ jobs:
   non-caching:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -157,7 +157,7 @@ jobs:
   address_ub_sanitizer:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -170,7 +170,7 @@ jobs:
   memory_sanitizer:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -184,7 +184,7 @@ jobs:
   threads_sanitizer:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -197,7 +197,7 @@ jobs:
   enable_non-default_options:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: modprobe tls
@@ -212,7 +212,7 @@ jobs:
   fips_and_ktls:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: modprobe tls
@@ -232,7 +232,7 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install brotli libbrotli1 libbrotli-dev
     - name: checkout openssl
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -250,7 +250,7 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install zstd libzstd1 libzstd-dev
     - name: checkout openssl
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -269,7 +269,7 @@ jobs:
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install brotli libbrotli1 libbrotli-dev
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install zstd libzstd1 libzstd-dev
     - name: checkout openssl
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -287,7 +287,7 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install brotli libbrotli1 libbrotli-dev
     - name: checkout openssl
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -305,7 +305,7 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install zstd libzstd1 libzstd-dev
     - name: checkout openssl
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -318,7 +318,7 @@ jobs:
   no-legacy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -331,7 +331,7 @@ jobs:
   legacy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -347,7 +347,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -360,7 +360,7 @@ jobs:
   buildtest:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -376,7 +376,7 @@ jobs:
         os: [ubuntu-latest, macos-latest ]
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: extra preparations
@@ -399,7 +399,7 @@ jobs:
   external-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: package installs
@@ -434,7 +434,7 @@ jobs:
         PYTHON:
           - 3.9
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Configure OpenSSL
@@ -457,7 +457,7 @@ jobs:
   external-test-cf-quiche:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Configure OpenSSL
diff --git a/.github/workflows/compiler-zoo.yml b/.github/workflows/compiler-zoo.yml
index f055cf04e4541a9bf2006fb9ba16e603a7f338a4..658d33f082a45da070a3ea9d93168f5477ff0dda 100644
--- a/.github/workflows/compiler-zoo.yml
+++ b/.github/workflows/compiler-zoo.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -114,7 +114,7 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install ${{ matrix.zoo.cc }}
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
 
diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
index abd097cc3c7c7e6d50ed44a7f742afd398f1516e..7771f5fd38f76570ab9121ff2cf9ab6ac31cd448 100644
--- a/.github/workflows/coveralls.yml
+++ b/.github/workflows/coveralls.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -39,7 +39,7 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         ref: ${{ matrix.branches.branch }}
@@ -68,7 +68,7 @@ jobs:
     - name: generate coverage info
       run: lcov -d . -c -o ./lcov.info
     - name: Coveralls upload
-      uses: coverallsapp/github-action@v2.2.1
+      uses: coverallsapp/github-action@v2.2.3
       with:
         github-token: ${{ secrets.github_token }}
         git-branch: ${{ matrix.branches.branch }}
diff --git a/.github/workflows/cross-compiles.yml b/.github/workflows/cross-compiles.yml
index 08f5930c1888dc6d650ee1f7dc0c535170092341..e2cd6cbb003a91f8602e2d043a54cc3993dcf40c 100644
--- a/.github/workflows/cross-compiles.yml
+++ b/.github/workflows/cross-compiles.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -160,7 +160,7 @@ jobs:
         sudo apt-get -yq --force-yes install \
             gcc-${{ matrix.platform.arch }} \
             ${{ matrix.platform.libs }}
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
 
diff --git a/.github/workflows/fips-checksums.yml b/.github/workflows/fips-checksums.yml
index 4efad31455e98f89d9adc2d261f5fc6c2c697a62..1b56755bfbb176882b0fe31839240f06bffe5d11 100644
--- a/.github/workflows/fips-checksums.yml
+++ b/.github/workflows/fips-checksums.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -26,7 +26,7 @@ jobs:
           mkdir ./build
           mkdir ./source
           mkdir ./artifact
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.pull_request.base.repo.full_name }}
           ref: ${{ github.event.pull_request.base.ref }}
@@ -43,7 +43,7 @@ jobs:
       - name: make fips-checksums pristine
         run: make fips-checksums
         working-directory: ./build-pristine
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: source
       - name: config
diff --git a/.github/workflows/fuzz-checker.yml b/.github/workflows/fuzz-checker.yml
index bd17791707e575a61fd35915a974a441d3df1b60..3e84fdbac6fc641b71587cb98af83564ffb6092c 100644
--- a/.github/workflows/fuzz-checker.yml
+++ b/.github/workflows/fuzz-checker.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -48,7 +48,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -yq --force-yes install ${{ matrix.fuzzy.install }}
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: config
       run: |
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 09a24995565478751c2a6aa5ed5e39c685dd15d6..ee327f4c1bfe295973291a908b1472399e58e51f 100644
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -31,7 +31,7 @@ jobs:
       run: |
         apk --no-cache add build-base perl linux-headers git ${{ matrix.cc }}
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: config
       run: |
@@ -65,7 +65,7 @@ jobs:
         ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -88,7 +88,7 @@ jobs:
         ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - uses: ilammy/msvc-dev-cmd@v1
diff --git a/.github/workflows/provider-compatibility.yml b/.github/workflows/provider-compatibility.yml
index c16199f9bd4bc919ac7712f2f98820c428cfb159..b675e426c173da1850145c1ac6082e1a4b82a203 100644
--- a/.github/workflows/provider-compatibility.yml
+++ b/.github/workflows/provider-compatibility.yml
@@ -45,9 +45,9 @@ jobs:
             url: "https://www.openssl.org/source/openssl-3.0.9.tar.gz",
           },
           {
-            dir: openssl-3.1.1,
-            tgz: openssl-3.1.1.tar.gz,
-            url: "https://www.openssl.org/source/openssl-3.1.1.tar.gz",
+            dir: openssl-3.1.2,
+            tgz: openssl-3.1.2.tar.gz,
+            url: "https://www.openssl.org/source/openssl-3.1.2.tar.gz",
           },
         ]
 
@@ -122,7 +122,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           path: ${{ matrix.branch.dir }}
           repository: openssl/openssl
diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 88cd79662b6fe7b4e54342f49c77b054bad07720..b4a20bcedd9361bbc40b9884cdc08b20ab7d793e 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -41,7 +41,7 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
diff --git a/.github/workflows/run-checker-daily-sctp.yml b/.github/workflows/run-checker-daily-sctp.yml
index a04e79339f4854a06c6fceb3c0247ab0595e1395..d258847e7e5f60b9910b44505001e558ff485311 100644
--- a/.github/workflows/run-checker-daily-sctp.yml
+++ b/.github/workflows/run-checker-daily-sctp.yml
@@ -1,4 +1,4 @@
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
@@ -16,7 +16,7 @@ jobs:
   run-checker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Install Dependencies for sctp option
diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index e2bf91cddc6ea658b5972daa28cd6967b3913c4b..fe8a3a8e66c7948d9c1da406794a2df9bde05a46 100644
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -135,7 +135,7 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
diff --git a/.github/workflows/run-checker-merge.yml b/.github/workflows/run-checker-merge.yml
index f79a59e0a6aa4a585148007624a13893d860606e..31148bf0b82d5cf7d324e1c9d423b3663215059a 100644
--- a/.github/workflows/run-checker-merge.yml
+++ b/.github/workflows/run-checker-merge.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -37,7 +37,7 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 737fec3bcb7c0037d779070b257a7041f1ef1ae2..11d1b03abda52299fc8125b086a692b94726531d 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -19,7 +19,7 @@ jobs:
   coverity:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: tool download
       run: |
         wget https://scan.coverity.com/download/linux64 \
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index b2b969dddf0466a1309134362a9c5029f2e0d39e..9c32d2689bd2e0b2ac8fa6092e0b02f4478dc718 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
@@ -27,7 +27,7 @@ jobs:
             config: --strict-warnings no-fips
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - uses: ilammy/msvc-dev-cmd@v1
@@ -65,7 +65,7 @@ jobs:
           - windows-2022
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - uses: ilammy/msvc-dev-cmd@v1
@@ -91,7 +91,7 @@ jobs:
           - windows-2022
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - uses: ilammy/msvc-dev-cmd@v1
@@ -131,7 +131,7 @@ jobs:
       MAKE_PARAMS: -j 4
     steps:
 # Checkout before cygwin can mess with PATH...
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: cygwin/cygwin-install-action@master
       with:
          packages: perl git make gcc-core
diff --git a/.github/workflows/windows_comp.yml b/.github/workflows/windows_comp.yml
index bf797e57b6167a0a1ddcfef64a1f46440d4df0bb..8f19b812a735027a75c34974c352210ed01ff213 100644
--- a/.github/workflows/windows_comp.yml
+++ b/.github/workflows/windows_comp.yml
@@ -1,4 +1,4 @@
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
@@ -22,7 +22,7 @@ jobs:
   zstd:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - uses: ilammy/msvc-dev-cmd@v1
@@ -49,7 +49,7 @@ jobs:
   brotli:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - uses: ilammy/msvc-dev-cmd@v1
diff --git a/CHANGES.md b/CHANGES.md
index 974e5494860177be4b5a723c593975016684b1e7..f0b6898511ce189d72f48dccaf4c4d03d8ce3205 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -455,6 +455,30 @@ OpenSSL 3.2
 OpenSSL 3.1
 -----------
 
+### Changes between 3.1.2 and 3.1.3 [xx XXX xxxx]
+
+ * Fix POLY1305 MAC implementation corrupting XMM registers on Windows.
+
+   The POLY1305 MAC (message authentication code) implementation in OpenSSL
+   does not save the contents of non-volatile XMM registers on Windows 64
+   platform when calculating the MAC of data larger than 64 bytes. Before
+   returning to the caller all the XMM registers are set to zero rather than
+   restoring their previous content. The vulnerable code is used only on newer
+   x86_64 processors supporting the AVX512-IFMA instructions.
+
+   The consequences of this kind of internal application state corruption can
+   be various - from no consequences, if the calling application does not
+   depend on the contents of non-volatile XMM registers at all, to the worst
+   consequences, where the attacker could get complete control of the
+   application process. However given the contents of the registers are just
+   zeroized so the attacker cannot put arbitrary values inside, the most likely
+   consequence, if any, would be an incorrect result of some application
+   dependent calculations or a crash leading to a denial of service.
+
+   ([CVE-2023-4807])
+
+   *Bernd Edlinger*
+
 ### Changes between 3.1.1 and 3.1.2 [1 Aug 2023]
 
  * Fix excessive time spent checking DH q parameter value.
@@ -20249,6 +20273,7 @@ ndif
 
 <!-- Links -->
 
+[CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807
 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817
 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446
 [CVE-2023-2975]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2975
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf
index 3264bc9b8599bce25766f5069a31a43e7df2f0f3..53081576cc68c0ac8547cd22b3d0c6aa204ce8b4 100644
--- a/Configurations/50-nonstop.conf
+++ b/Configurations/50-nonstop.conf
@@ -14,6 +14,7 @@
                                 '_XOPEN_SOURCE',
                                 '_XOPEN_SOURCE_EXTENDED=1',
                                 '_TANDEM_SOURCE',
+                                '__NSK_OPTIONAL_TYPES__',
                                 'B_ENDIAN'),
         perl             => '/usr/bin/perl',
         shared_target    => 'nonstop-shared',
diff --git a/Configurations/50-win-hybridcrt.conf b/Configurations/50-win-hybridcrt.conf
index 2ddd25a42a469474c4ae9c6757381db141728792..242583c72817166df3b640397048fa6aea4bfd42 100644
--- a/Configurations/50-win-hybridcrt.conf
+++ b/Configurations/50-win-hybridcrt.conf
@@ -11,7 +11,8 @@
 sub remove_from_flags {
     my ($toRemove, $flags) = @_;
     
-    return $flags =~ s/$toRemove//r;
+    $flags =~ s/$toRemove//;
+    return $flags;
 }
 
 my %targets = (
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index b6e6eb4d6054a3e14a43cddce0d0fc0f7493cd0e..828e1e91fbb26b348d8e6d40af79770308d67935 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -211,7 +211,10 @@
   # format, relative to the directory where the .c file is located.  The logic
   # is that any inclusion, merged with one of these relative directories, will
   # find the requested inclusion file.
-  foreach (grep /\[\.crypto\.async\.arch\].*\.o$/, keys %{$unified_info{sources}}) {
+  # In the regexps, it's advisable to always start the file name with .*?, as
+  # the C source to OBJ file translation adds stuff at the beginning of the,
+  # name, such as [.ssl]bio_ssl.c -> [.ssl]libssl-shlib-bio_ssl.OBJ
+  foreach (grep /\[\.crypto\.async\.arch\].*?\.o$/, keys %{$unified_info{sources}}) {
       my $obj = platform->obj($_);
       push @{$unified_info{includes_extra}->{$obj}}, qw(../);
   }
@@ -229,15 +232,14 @@
       # like "record/record.h".  Adding "./" as an inclusion directory helps
       # making this sort of header from these directories.
       push @{$unified_info{includes_extra}->{$obj}}, qw(./);
-  }
-  foreach (grep /\[\.ssl\].*?ssl_lib\.o$/, keys %{$unified_info{sources}}) {
-      my $obj = platform->obj($_);
-      # Some files in [.ssl] include "quic/quic_local.h", which in turn
-      # includes "../ssl_local.h".  Adding "./quic" as an inclusion directory
-      # helps making this sort of header from these directories.
+
+      # Additionally, an increasing amount of files in [.ssl] include
+      # "quic/quic_local.h", which in turn includes "../ssl_local.h".  Adding
+      # "./quic" as an inclusion directory helps making this sort of header
+      # from these directories.
       push @{$unified_info{includes_extra}->{$obj}}, qw(./quic);
   }
-  foreach (grep /\[\.ssl\.(?:record|statem)\].*?\.o$/, keys %{$unified_info{sources}}) {
+  foreach (grep /\[\.ssl\.(?:quic|record|statem)\].*?\.o$/, keys %{$unified_info{sources}}) {
       my $obj = platform->obj($_);
       # Most of the files in [.ssl.record] and [.ssl.statem] include
       # "../ssl_local.h", which includes things like "record/record.h".
@@ -251,8 +253,10 @@
       # Most of the files in [.ssl.record.methods] include "../../ssl_local.h"
       # which includes things like "record/record.h".  Adding "../../" as an
       # inclusion directory helps making this sort of header from these
-      # directories.
-      push @{$unified_info{includes_extra}->{$obj}}, qw(../../);
+      # directories.  But this gets worse; through a series of inclusions,
+      # all of them based on the relative directory of the object file, there's
+      # a need to deal with an inclusion of "../ssl_local.h" as well.
+      push @{$unified_info{includes_extra}->{$obj}}, qw(../../), qw(../);
   }
   foreach (grep /\[\.test\].*?\.o$/, keys %{$unified_info{sources}}) {
       my $obj = platform->obj($_);
@@ -264,10 +268,15 @@
       # directly, but that would end up with more whack-a-mole of this sort, so
       # nah, we do it broadly.
       push @{$unified_info{includes_extra}->{$obj}}, qw(../ssl/record/methods);
+      # Similarly, some include "../ssl/ssl_local.h", and somewhere down the
+      # line, "quic/quic_local.h" gets included, which includes "../ssl_local.h"
+      # The problem is fixed by adding ../ssl/quic too.
+      push @{$unified_info{includes_extra}->{$obj}}, qw(../ssl/quic);
   }
   foreach (grep /\[\.test\.helpers\].*?\.o$/, keys %{$unified_info{sources}}) {
       my $obj = platform->obj($_);
-      push @{$unified_info{includes_extra}->{$obj}}, qw(../../ssl);
+      push @{$unified_info{includes_extra}->{$obj}},
+          qw(../../ssl ../../ssl/quic);
   }
 
   # This makes sure things get built in the order they need
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index 0bded76d89bdf85ea49acd8e36a118af02302676..caf6f901261f74d217984366a98df9d8128cc9c6 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl
 # -*- mode: perl; -*-
-# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/Configure b/Configure
index cb11a55b7a1fb317b22546f4f96264f0d5b1161a..d7f5ef8ce3316b616c1ee2c9e68ec947e4ff1edf 100755
--- a/Configure
+++ b/Configure
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl
 # -*- mode: perl; -*-
-# Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/NEWS.md b/NEWS.md
index 8a1ca6b97305cee978a9e31267b19b5bd3e065a3..6c440b68eb8172769a36fa1f46acc60b1cfab264 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -52,7 +52,12 @@ OpenSSL 3.2
 OpenSSL 3.1
 -----------
 
-### Major changes between OpenSSL 3.1.1 and OpenSSL 3.1.2 [under development]
+### Major changes between OpenSSL 3.1.2 and OpenSSL 3.1.3 [under development]
+
+  * Fix POLY1305 MAC implementation corrupting XMM registers on Windows
+    ([CVE-2023-4807])
+
+### Major changes between OpenSSL 3.1.1 and OpenSSL 3.1.2 [1 Aug 2023]
 
   * Fix excessive time spent checking DH q parameter value ([CVE-2023-3817])
   * Fix DH_check() excessive time with over sized modulus ([CVE-2023-3446])
@@ -1497,6 +1502,7 @@ OpenSSL 0.9.x
 
 <!-- Links -->
 
+[CVE-2023-4807]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-4807
 [CVE-2023-3817]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3817
 [CVE-2023-3446]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-3446
 [CVE-2023-2975]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-2975
diff --git a/VERSION.dat b/VERSION.dat
index 848915b9a2861805be3cd85bea36ac23b82d2dec..584de32867eb52bd18b1ce8a43bb6013c9d71a1f 100644
--- a/VERSION.dat
+++ b/VERSION.dat
@@ -1,7 +1,7 @@
 MAJOR=3
 MINOR=2
 PATCH=0
-PRE_RELEASE_TAG=dev
+PRE_RELEASE_TAG=alpha2-dev
 BUILD_METADATA=
 RELEASE_DATE=""
 SHLIB_VERSION=3
diff --git a/apps/asn1parse.c b/apps/asn1parse.c
index 6c436d2f766f434ad0a7491a81b9ca3c39af74d1..097b0cc1eddfb49274ffe16a9e115aa0b34f2892 100644
--- a/apps/asn1parse.c
+++ b/apps/asn1parse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/ca.c b/apps/ca.c
index e51352aacbc9467faa63a6bf4925955f28f5cc1e..e12a8c2370cd431bfd7aef64cb3f3d9231113114 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/cmp.c b/apps/cmp.c
index dbc609a2e00375ad2cedf87ae390aa626d3a913a..e38f0010a095c7304d7ab4ff5e56b9338d8c2890 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
@@ -1571,7 +1571,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
             if (opt_csr != NULL) {
                 CMP_err1("no -newkey option given with private key for POPO, -csr option only provides public key%s",
                         opt_key == NULL ? "" :
-                        ", and -key option superseded by by -csr");
+                        ", and -key option superseded by -csr");
                 return 0;
             }
             if (opt_key == NULL) {
@@ -2648,7 +2648,7 @@ static int get_opts(int argc, char **argv)
             }
             break;
         case OPT_CSR:
-            opt_csr = opt_arg();
+            opt_csr = opt_str();
             break;
         case OPT_OUT_TRUSTED:
             opt_out_trusted = opt_str();
@@ -2681,7 +2681,7 @@ static int get_opts(int argc, char **argv)
             opt_issuer = opt_str();
             break;
         case OPT_SERIAL:
-            opt_serial = opt_arg();
+            opt_serial = opt_str();
             break;
         case OPT_CERTFORM:
             opt_certform_s = opt_str();
diff --git a/apps/cms.c b/apps/cms.c
index b22848299ea6695792415aeb532e5712c4095d88..9c4e4ee5e0553aa81ac3436d1bf6316f09f99fd2 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/apps/dgst.c b/apps/dgst.c
index 9d00c064721423b79c0fe5d6222fbea3b59fc27b..fe05b312d7b2dae4ec2a8a6da5535c3a5683a7fa 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -513,7 +513,7 @@ static void show_digests(const OBJ_NAME *name, void *arg)
  * in the '*sum' checksum programs. This aims to preserve backward
  * compatibility.
  */
-static const char *newline_escape_filename(const char *file, int * backslash)
+static const char *newline_escape_filename(const char *file, int *backslash)
 {
     size_t i, e = 0, length = strlen(file), newline_count = 0, mem_len = 0;
     char *file_cpy = NULL;
diff --git a/apps/dsa.c b/apps/dsa.c
index d6030c44f647ce73f981afdf38c454d2e0531380..9ba8c252dafe6885b2b094503dedba6d920cabfc 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index ca98fe58c454650773a73c49b720a03378bc108d..4eb157042e562ac2a0fc5595115a3cc7cb118da9 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/ec.c b/apps/ec.c
index 30d651a89eb62dac1ce36006338f80520f29bcdd..677876ccc90e309d107e555fd497570283cf25c8 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 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
diff --git a/apps/enc.c b/apps/enc.c
index a3b17da08d652f07026cff841c8cfee7020960d7..26e009e43791cd8431b11d3009e801fe81735769 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c
index 0f6cf5f3ac05f6ea9c7c6f582715da57f1ef3e86..6d86bb44e2b0648d1ab10d23507b9b526a569980 100644
--- a/apps/fipsinstall.c
+++ b/apps/fipsinstall.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/apps/genpkey.c b/apps/genpkey.c
index 52d1b44edbb9587da8150ee845b9e79784fac5fa..5a59dae6811d6adac0b773dc7c03e3233396d322 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/apps/include/apps.h b/apps/include/apps.h
index 62b4d19ae3e7fabc87905c34466f1607fe6eaab9..a1b2cbbdc3d6ee4142e0c8a6da8528da271378fb 100644
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/include/cmp_mock_srv.h b/apps/include/cmp_mock_srv.h
index 6308ab93dac31b47084cfdf213034c00f3ba4c80..fcc1ef7bb4f0b3a079248d1b61039cbaa2a7b0e2 100644
--- a/apps/include/cmp_mock_srv.h
+++ b/apps/include/cmp_mock_srv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Siemens AG 2018-2020
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/apps/include/opt.h b/apps/include/opt.h
index 26d40eb436777c9a15b4b48964127e9743aa4266..5a2faa150b4095b38f7e084afd50bdd2c1b21d4e 100644
--- a/apps/include/opt.h
+++ b/apps/include/opt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
@@ -387,11 +387,11 @@ typedef struct string_int_pair_st {
 #define OPT_PARAMETERS() { OPT_PARAM_STR, 1, '-', "Parameters:\n" }
 
 const char *opt_path_end(const char *filename);
-char *opt_init(int ac, char **av, const OPTIONS * o);
+char *opt_init(int ac, char **av, const OPTIONS *o);
 char *opt_progname(const char *argv0);
 char *opt_appname(const char *argv0);
 char *opt_getprog(void);
-void opt_help(const OPTIONS * list);
+void opt_help(const OPTIONS *list);
 
 void opt_begin(void);
 int opt_next(void);
@@ -419,7 +419,7 @@ int opt_format(const char *s, unsigned long flags, int *result);
 void print_format_error(int format, unsigned long flags);
 int opt_printf_stderr(const char *fmt, ...);
 int opt_string(const char *name, const char **options);
-int opt_pair(const char *arg, const OPT_PAIR * pairs, int *result);
+int opt_pair(const char *arg, const OPT_PAIR *pairs, int *result);
 
 int opt_verify(int i, X509_VERIFY_PARAM *vpm);
 int opt_rand(int i);
diff --git a/apps/include/s_apps.h b/apps/include/s_apps.h
index bc8f4bf27bd79ab0a618333856c907d1c34eec91..33c3b6278c823faf93dcff3487092358bed5b4c7 100644
--- a/apps/include/s_apps.h
+++ b/apps/include/s_apps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/lib/app_rand.c b/apps/lib/app_rand.c
index 9691e71d7c7220621fa077afad0ac01762007cfb..9ca605656382320c677817f4242d3f112648d47f 100644
--- a/apps/lib/app_rand.c
+++ b/apps/lib/app_rand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 1acc991bb821e73257ff624dccb0795593c4e25e..8aad9a1ef7cf92f0e7d84423d5132c4a89674e80 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -75,9 +75,9 @@ typedef struct {
 } NAME_EX_TBL;
 
 static int set_table_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL * in_tbl);
+                          const NAME_EX_TBL *in_tbl);
 static int set_multi_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL * in_tbl);
+                          const NAME_EX_TBL *in_tbl);
 int app_init(long mesgwin);
 
 int chopup_args(ARGS *arg, char *buf)
@@ -987,7 +987,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
 
         if (!maybe_stdin) {
             if (!quiet)
-                BIO_printf(bio_err, "No filename or uri specified for loading");
+                BIO_printf(bio_err, "No filename or uri specified for loading\n");
             goto end;
         }
         uri = "<stdin>";
@@ -1003,11 +1003,8 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
         ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata,
                                  params, NULL, NULL);
     }
-    if (ctx == NULL) {
-        if (!quiet)
-            BIO_printf(bio_err, "Could not open file or uri for loading");
+    if (ctx == NULL)
         goto end;
-    }
     if (expect > 0 && !OSSL_STORE_expect(ctx, expect))
         goto end;
 
@@ -1273,7 +1270,7 @@ int copy_extensions(X509 *x, X509_REQ *req, int copy_type)
 }
 
 static int set_multi_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL * in_tbl)
+                          const NAME_EX_TBL *in_tbl)
 {
     STACK_OF(CONF_VALUE) *vals;
     CONF_VALUE *val;
@@ -1292,7 +1289,7 @@ static int set_multi_opts(unsigned long *flags, const char *arg,
 }
 
 static int set_table_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL * in_tbl)
+                          const NAME_EX_TBL *in_tbl)
 {
     char c;
     const NAME_EX_TBL *ptbl;
@@ -1980,16 +1977,17 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
         nid = OBJ_txt2nid(typestr);
         if (nid == NID_undef) {
             BIO_printf(bio_err,
-                       "%s: Skipping unknown %s name attribute \"%s\"\n",
+                       "%s warning: Skipping unknown %s name attribute \"%s\"\n",
                        opt_getprog(), desc, typestr);
             if (ismulti)
                 BIO_printf(bio_err,
-                           "Hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n");
+                           "%s hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n",
+                           opt_getprog());
             continue;
         }
         if (*valstr == '\0') {
             BIO_printf(bio_err,
-                       "%s: No value provided for %s name attribute \"%s\", skipped\n",
+                       "%s warning: No value provided for %s name attribute \"%s\", skipped\n",
                        opt_getprog(), desc, typestr);
             continue;
         }
diff --git a/apps/lib/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c
index f0ef2317db8a4c5f001033f8355c20400877f156..a0450446c1ca631cbe25d8879374a1dfb91ea441 100644
--- a/apps/lib/cmp_mock_srv.c
+++ b/apps/lib/cmp_mock_srv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Siemens AG 2018-2020
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 93f06626fba8c67ffec801710666b52139aaf0cb..bca2e7110d4570d0f06f6710aab51e3e81652250 100644
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -200,7 +200,7 @@ BIO *http_server_init(const char *prog, const char *port, int verb)
     int port_num;
     char name[40];
 
-    snprintf(name, sizeof(name), "[::]:%s", port); /* port may be "0" */
+    snprintf(name, sizeof(name), "*:%s", port); /* port may be "0" */
     if (verb >= 0 && !log_set_verbosity(prog, verb))
         return NULL;
     bufbio = BIO_new(BIO_f_buffer());
diff --git a/apps/lib/log.c b/apps/lib/log.c
index b2e356261f166a5aea1316c4fd96b74cff664f86..a5e2f5507afdf7d4e17a725e040645ce16299ab9 100644
--- a/apps/lib/log.c
+++ b/apps/lib/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index 509a4aae346269f88b31563205dad1e9760cb0fd..2d61ac9a7865ec4f155c2810554e3bdb4703e5f9 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index 5ae689a4db9de62947b90ae13028d64a42782920..014c1c0bc0eceba70c5b1cc00acdd8292246b672 100644
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/lib/tlssrp_depr.c b/apps/lib/tlssrp_depr.c
index 9a0d2ddb7db7ef8fc2040c719e05b31b2ddbcea4..f03b013428f7ebc28220689008a43010e595e1ff 100644
--- a/apps/lib/tlssrp_depr.c
+++ b/apps/lib/tlssrp_depr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/apps/list.c b/apps/list.c
index 56b0917d11b262b63b0ca6fb3fff6b11694d4cd9..7cbef787196440760cf2a477525d3784ae53b42d 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 83142c07d8033e3d98db29d6d152c95aeaa91d72..17313520cf858630b817bb543951b6d21d9bfbb3 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/apps/openssl.c b/apps/openssl.c
index 87f004d320721fab1553a13219bd1c6f12ef9aeb..dd41ac3a84e443a7a4341509249ab043ddabaedc 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -446,12 +446,12 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
     return 1;
 }
 
-static int function_cmp(const FUNCTION * a, const FUNCTION * b)
+static int function_cmp(const FUNCTION *a, const FUNCTION *b)
 {
     return strncmp(a->name, b->name, 8);
 }
 
-static unsigned long function_hash(const FUNCTION * a)
+static unsigned long function_hash(const FUNCTION *a)
 {
     return OPENSSL_LH_strhash(a->name);
 }
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 857a2a10c09a090684a4e67b6d7a1b1160305cc9..8e8c771819a345272600f49d18bf8a302b299c5a 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/apps/pkey.c b/apps/pkey.c
index f280846fa952f97eb5024841ea3b34109c8521e3..3e4c09b362552e546dfa99ae365fa07daf6b748f 100644
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index efd98684cb46b4e3b1f1967d905786abacbcacc9..b5390c64c2a81fcbb5884bca08925563c88f3fd2 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/apps/rehash.c b/apps/rehash.c
index 5b979288b0e94082ec93e0c3c64cb119977fb188..dbd1389acdf4feddbe9d1395f6569a8d975733f1 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2013-2014 Timo Teräs <timo.teras@gmail.com>
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/apps/req.c b/apps/req.c
index 711bdff8bfe159b0547309cbfecf9be2b6604bd8..c4c9ba292cb057a78c9b159e714daed148350575 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -90,7 +90,7 @@ typedef enum OPTION_choice {
     OPT_MULTIVALUE_RDN, OPT_DAYS, OPT_SET_SERIAL,
     OPT_COPY_EXTENSIONS, OPT_EXTENSIONS, OPT_REQEXTS, OPT_ADDEXT,
     OPT_PRECERT, OPT_MD,
-    OPT_SECTION,
+    OPT_SECTION, OPT_QUIET,
     OPT_R_ENUM, OPT_PROV_ENUM
 } OPTION_CHOICE;
 
@@ -158,6 +158,7 @@ const OPTIONS req_options[] = {
     {"batch", OPT_BATCH, '-',
      "Do not ask anything during request generation"},
     {"verbose", OPT_VERBOSE, '-', "Verbose output"},
+    {"quiet", OPT_QUIET, '-', "Terse output"},
     {"noenc", OPT_NOENC, '-', "Don't encrypt private keys"},
     {"nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated"},
     {"noout", OPT_NOOUT, '-', "Do not output REQ"},
@@ -259,7 +260,7 @@ int req_main(int argc, char **argv)
     const char *keyalg = NULL;
     OPTION_CHOICE o;
     int days = UNSET_DAYS;
-    int ret = 1, gen_x509 = 0, i = 0, newreq = 0, verbose = 0;
+    int ret = 1, gen_x509 = 0, i = 0, newreq = 0, verbose = 0, progress = 1;
     int informat = FORMAT_UNDEF, outformat = FORMAT_PEM, keyform = FORMAT_UNDEF;
     int modulus = 0, multirdn = 1, verify = 0, noout = 0, text = 0;
     int noenc = 0, newhdr = 0, subject = 0, pubkey = 0, precert = 0, x509v1 = 0;
@@ -389,6 +390,11 @@ int req_main(int argc, char **argv)
             break;
         case OPT_VERBOSE:
             verbose = 1;
+            progress = 1;
+            break;
+        case OPT_QUIET:
+            verbose = 0;
+            progress = 0;
             break;
         case OPT_UTF8:
             chtype = MBSTRING_UTF8;
@@ -652,8 +658,9 @@ int req_main(int argc, char **argv)
             }
         }
 
-        EVP_PKEY_CTX_set_cb(genctx, progress_cb);
         EVP_PKEY_CTX_set_app_data(genctx, bio_err);
+        if (progress)
+            EVP_PKEY_CTX_set_cb(genctx, progress_cb);
 
         pkey = app_keygen(genctx, keyalgstr, newkey_len, verbose);
 
@@ -966,10 +973,10 @@ int req_main(int argc, char **argv)
         else
             tpubkey = X509_REQ_get0_pubkey(req);
         if (tpubkey == NULL) {
-            fprintf(stdout, "Modulus is unavailable\n");
+            BIO_puts(bio_err, "Modulus is unavailable\n");
             goto end;
         }
-        fprintf(stdout, "Modulus=");
+        BIO_puts(out, "Modulus=");
         if (EVP_PKEY_is_a(tpubkey, "RSA") || EVP_PKEY_is_a(tpubkey, "RSA-PSS")) {
             BIGNUM *n = NULL;
 
@@ -978,9 +985,9 @@ int req_main(int argc, char **argv)
             BN_print(out, n);
             BN_free(n);
         } else {
-            fprintf(stdout, "Wrong Algorithm type");
+            BIO_puts(out, "Wrong Algorithm type");
         }
-        fprintf(stdout, "\n");
+        BIO_puts(out, "\n");
     }
 
     if (!noout && !gen_x509) {
diff --git a/apps/rsa.c b/apps/rsa.c
index 09ab81d5aeb133ff301a1d230e8a040f9f0dd5ec..9a4d16cbb01c8c0ce5440d98a20db2bfa1be6180 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/apps/rsautl.c b/apps/rsautl.c
index ad5df2e36ae20e42ff42505d88cc89195e1b28e6..3ee8224f48d873efe4ad80dfc782f6136f79a2e1 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/apps/s_server.c b/apps/s_server.c
index 7f5ab35b766adb77eadaeab0a82d98ffd6438af8..93f6cb2983f7df1a80c3e3b9ca4b77260f87896c 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -266,7 +266,7 @@ typedef struct {
     char buff[1];
 } EBCDIC_OUTBUFF;
 
-static const BIO_METHOD *BIO_f_ebcdic_filter()
+static const BIO_METHOD *BIO_f_ebcdic_filter(void)
 {
     if (methods_ebcdic == NULL) {
         methods_ebcdic = BIO_meth_new(BIO_TYPE_EBCDIC_FILTER,
@@ -799,7 +799,7 @@ const OPTIONS s_server_options[] = {
      "second server certificate chain file in PEM format"},
     {"dkey", OPT_DKEY, '<',
      "Second private key file to use (usually for DSA)"},
-    {"dkeyform", OPT_DKEYFORM, 'F',
+    {"dkeyform", OPT_DKEYFORM, 'f',
      "Second key file format (ENGINE, other values ignored)"},
     {"dpass", OPT_DPASS, 's',
      "Second private key and cert file pass phrase source"},
diff --git a/apps/smime.c b/apps/smime.c
index 59e96dcaec4b32ca20b3b8d7cf30c662d1ae1493..88b0475d2d4fd03c242c09a544406934dca1a5ab 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/apps/speed.c b/apps/speed.c
index 114854f4d066ace8f852feb987726cc83f6fe9a5..88d389523b3780a18b17a6afddd2d7c39f223b5f 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -566,7 +566,7 @@ typedef struct loopargs_st {
     unsigned char *sig_sig[MAX_KEM_NUM];
 } loopargs_t;
 static int run_benchmark(int async_jobs, int (*loop_function) (void *),
-                         loopargs_t * loopargs);
+                         loopargs_t *loopargs);
 
 static unsigned int testnum;
 
@@ -1363,7 +1363,7 @@ static int SIG_verify_loop(void *args)
 }
 
 static int run_benchmark(int async_jobs,
-                         int (*loop_function) (void *), loopargs_t * loopargs)
+                         int (*loop_function) (void *), loopargs_t *loopargs)
 {
     int job_op_count = 0;
     int total_op_count = 0;
diff --git a/apps/spkac.c b/apps/spkac.c
index f8fa24e99a54f4816a03f0176ce08812468023d5..5a129a7fa775a81c68e1e1ed264347111129a46f 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/apps/ts.c b/apps/ts.c
index a4218c9bf2fef4fcd93e510127144955c1f3ba1e..65e941d263bd65d1f7975afc8d584cee8ed00b57 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/apps/x509.c b/apps/x509.c
index bd19cbd551cae49b185bcf2f9601aaaeb96f8038..578af2364fc12c82ac570906d439440154e69564 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 9bb6f04e0a44cb0df6c81e4bc373fb61f7cc69ac..0000000000000000000000000000000000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-image:
-    - Visual Studio 2017
-
-platform:
-    - x64
-    - x86
-
-environment:
-    fast_finish: true
-    matrix:
-        - VSVER: 15
-
-configuration:
-    - shared
-    - minimal
-
-for:
-    -
-        branches:
-            only:
-                - master
-        configuration:
-            - shared
-            - plain
-            - minimal
-
-before_build:
-    - ps: >-
-        Install-Module VSSetup -Scope CurrentUser
-    - ps: >-
-        Get-VSSetupInstance -All
-    - ps: >-
-        If ($env:Platform -Match "x86") {
-            $env:VCVARS_PLATFORM="x86"
-            $env:TARGET="VC-WIN32 no-asm --strict-warnings"
-        } Else {
-            $env:VCVARS_PLATFORM="amd64"
-            $env:TARGET="VC-WIN64A-masm"
-        }
-    - ps: >-
-        If ($env:Configuration -Match "shared") {
-            $env:CONFIG_OPTS="enable-fips"
-        } ElseIf ($env:Configuration -Match "minimal") {
-            $env:CONFIG_OPTS="no-bulk no-asm -DOPENSSL_SMALL_FOOTPRINT"
-        } Else {
-            $env:CONFIG_OPTS="no-fips no-shared"
-        }
-    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM%
-    - mkdir _build
-    - cd _build
-    - perl ..\Configure %TARGET% no-makedepend %CONFIG_OPTS%
-    - perl configdata.pm --dump
-    - cd ..
-    - ps: >-
-        If ($env:BUILDONLY -or $env:MAKEVERBOSE) {
-            $env:NMAKE="nmake"
-        } Else {
-            $env:NMAKE="nmake /S"
-        }
-    - ps: >-
-        gci env:* | sort-object name
-
-build_script:
-    - cd _build
-    - "%NMAKE% build_all_generated"
-    - "%NMAKE% PERL=no-perl"
-    - cd ..
-
-test_script:
-    - cd _build
-    - ps: >-
-        if ($env:Configuration -Match "plain") {
-            cmd /c "%NMAKE% test VERBOSE_FAILURE=yes 2>&1"
-        } Else {
-            cmd /c "%NMAKE% test VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1"
-        }
-    - ps: >-
-        if ($env:Configuration -Match "shared") {
-            mkdir ..\_install
-            cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1"
-        }
-    - cd ..
diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c
index aa266c5979298291be4595f55a8792c19002858d..b6dda7bce2eca4d98da74abab12058bdae436a3b 100644
--- a/crypto/LPdir_unix.c
+++ b/crypto/LPdir_unix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/crypto/aes/asm/aes-riscv32-zkn.pl b/crypto/aes/asm/aes-riscv32-zkn.pl
index 67ec63230e5dc1a17cbd73221a6c26ec24e810a3..6fac45184620f30f6d38ba382e1b7555843845b7 100644
--- a/crypto/aes/asm/aes-riscv32-zkn.pl
+++ b/crypto/aes/asm/aes-riscv32-zkn.pl
@@ -2,7 +2,7 @@
 # This file is dual-licensed, meaning that you can use it under your
 # choice of either of the following two licenses:
 #
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License"). You can obtain
 # a copy in the file LICENSE in the source distribution or at
diff --git a/crypto/aes/asm/aes-riscv64-zkn.pl b/crypto/aes/asm/aes-riscv64-zkn.pl
index a0689ae645eb1db27e366d52d73810d7b853c203..0e8a1540c43824a8b972eb616818d6a82a3d0a8c 100644
--- a/crypto/aes/asm/aes-riscv64-zkn.pl
+++ b/crypto/aes/asm/aes-riscv64-zkn.pl
@@ -2,7 +2,7 @@
 # This file is dual-licensed, meaning that you can use it under your
 # choice of either of the following two licenses:
 #
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License"). You can obtain
 # a copy in the file LICENSE in the source distribution or at
diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
index a2adbe2951edc0abba125e507f07008e6d3aa83d..dd2c7038e47126eff47a1d99a110b01f7498c275 100755
--- a/crypto/aes/asm/aesv8-armx.pl
+++ b/crypto/aes/asm/aesv8-armx.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2014-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2014-2023 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
diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
index ff0b62287b83c43b6dc0a901b5e090ff5b03f3ef..6cbd00e2c6721fdc4664fac864cc4f7a3d1615f8 100644
--- a/crypto/aes/asm/bsaes-armv7.pl
+++ b/crypto/aes/asm/bsaes-armv7.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2012-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2012-2023 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
diff --git a/crypto/aes/asm/bsaes-armv8.pl b/crypto/aes/asm/bsaes-armv8.pl
index 16a6850d7adbaf9fafd16f2c557055f3772a2a1b..b3c97e439fb0fdc92853876d19081bf1b621e5b3 100644
--- a/crypto/aes/asm/bsaes-armv8.pl
+++ b/crypto/aes/asm/bsaes-armv8.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
@@ -32,7 +32,7 @@ sub data
 }
 
 __END__
-// Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2021-2023 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
diff --git a/crypto/aes/asm/vpaes-loongarch64.pl b/crypto/aes/asm/vpaes-loongarch64.pl
index 2f6abba1b7436f2827d13213cc44d93f279cf769..c85ec40db2de53a37ab883344671d2b549749f9d 100644
--- a/crypto/aes/asm/vpaes-loongarch64.pl
+++ b/crypto/aes/asm/vpaes-loongarch64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index ffa619bf49c29a79e7eb81ef6e398c80162fe4ec..43aa6b97c5eed7f6b22d3e98e0b7c64c9d276344 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
index 78dc90c5202fcf71f77b50e17ed34334c2fbd478..04b342551c260cd5deefc2116830245aeeeef786 100644
--- a/crypto/armv4cpuid.pl
+++ b/crypto/armv4cpuid.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index bd5fcaaa34fb4639096087bedb27d8990263f74c..d3940706322412f406f36ebcf5da63b6eaf939ec 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index 59bbd1a039ece41e4cfb579a3019fdc37d4eb0a6..99ac2aed11a831f71288e80ff8c8345260945fc0 100644
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 3bce55c01ad3f90c5773dba895e95818866a1c08..f1702f262ef8a9b92a95b0a1e1a20e6dcd10e34a 100644
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index 8aae75ac134c7b7eae696a7a0f7aae99e8fef1e4..94d29e7c2736c599038c1b309d13bef4b1c52fd2 100644
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 1ed9d2afcffbfb0a7ca51d35b7f82fc91a620f61..2b27624d8ae8562df081cadef4e896440a0b1189 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 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
diff --git a/crypto/asn1/asn1_parse.c b/crypto/asn1/asn1_parse.c
index b565a166475145e7119e7ad5c88817f370cfb33a..6a4618d253d54cc802d97fe7ca0c8e1e7306564d 100644
--- a/crypto/asn1/asn1_parse.c
+++ b/crypto/asn1/asn1_parse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index b228b29ed7d1421e0b5f4fe61bc336e19fbbd278..3a7386f163975536f686b433f133b62631927e77 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
index d22925510dd3b030e61d03091bf665c28e119e0c..54f4ae3a67b2e99790d57d1bb62255368ae816d8 100644
--- a/crypto/asn1/asn_pack.c
+++ b/crypto/asn1/asn_pack.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index 96625afa2873558fad1c49f38e0800fbfeb6ae8f..279609e603549dc939d7adc98324824f3d5b29f9 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index c49f22b3e090817abaf0a61f145242ec133a4c10..44e685c4965e67c85bb153baea9cc1970d463f4f 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/asn1/i2d_evp.c b/crypto/asn1/i2d_evp.c
index e75a8b0152394a84864b86bf313ff82c83f21595..106ea152733c504e95b0075f4781215ab91ae302 100644
--- a/crypto/asn1/i2d_evp.c
+++ b/crypto/asn1/i2d_evp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index c595973fe5166f3c0f8824d1eb9093887bfa619f..a90c200d42a5e377c7d94d9be1e19bb982838d1f 100644
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index c188a08a6eb236103e33f46c574d1c4bcede2b05..8575d05bf6d5a83bee135acc812fde05171e9a48 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/asn1/p5_scrypt.c b/crypto/asn1/p5_scrypt.c
index d6ec2445fa1b6aad521dc9b847d9819f2bf80f1d..4f3dcecd41ab8b4bf784592d132fa167f2539fbe 100644
--- a/crypto/asn1/p5_scrypt.c
+++ b/crypto/asn1/p5_scrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/crypto/asn1/standard_methods.h b/crypto/asn1/standard_methods.h
index 0e2cdbd50e92f9e3789296d7b67ccd67f9a70a18..6b73d9a771ff3e3ada8589fe3e18e2cf7e03088c 100644
--- a/crypto/asn1/standard_methods.h
+++ b/crypto/asn1/standard_methods.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 7bd57dc03038d12c4766fe914ac583f13a8f6b73..67a9ccde62db4aba0fa310c891f6c13980eac3af 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
index bad465c07290f6601bd53b8b2ac0a72947a2b052..737910cc7514bd58c752e305bbe082ce891178a9 100644
--- a/crypto/bio/bf_buff.c
+++ b/crypto/bio/bf_buff.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index 170e375e7f8d9642460776d8a77eb201268e14ba..eed3dc4633e05aeec32705773d1dcc51a37628f6 100644
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index c0dfc6cc44c1ad6f447d2ff47b44917b2665ad12..dc7f1b7b9eb89c3488267e9e45a53f698e088185 100644
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h
index e3dd38612d3edf60065156e99a497881e58c08c7..05954f85bb2f44ed346656d64a8355b803a56af4 100644
--- a/crypto/bio/bio_local.h
+++ b/crypto/bio/bio_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index ca03b5c423a04f3e849e7fa28bf55c131f7d88b4..30b1db5aa8d46006f8fbc4d03b35a4fb2e1074b5 100644
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/bio/bio_print.c b/crypto/bio/bio_print.c
index 1d8fa1c44df4f97e32c3177431a4039a9828e7b7..e5397c8b7a071d14945d0ef545d7e86f50fca88e 100644
--- a/crypto/bio/bio_print.c
+++ b/crypto/bio/bio_print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 9514727cdf67136dedd3023f16e7e7e5fc238322..4ccdca18ec5c23afa119112b285620618709a43f 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index f09160b3c0c98ae0801d1ab8ef6501b273c831c7..fb3c4d2ba3019dc4936899cd2b5fa242d87712ba 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index cc947943e5e25958b7b619692b6c8ced852b7a4a..3f57de539f4516fc3450316b2d888edf0a900ca5 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
@@ -50,6 +50,17 @@
 # define M_METHOD_RECVFROM   3
 # define M_METHOD_WSARECVMSG 4
 
+# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#  if !(__GLIBC_PREREQ(2, 14))
+#   undef NO_RECVMMSG
+    /*
+     * Some old glibc versions may have recvmmsg and MSG_WAITFORONE flag, but
+     * not sendmmsg. We need both so force this to be disabled on these old
+     * versions
+     */
+#   define NO_RECVMMSG
+#  endif
+# endif
 # if !defined(M_METHOD)
 #  if defined(OPENSSL_SYS_WINDOWS) && defined(BIO_HAVE_WSAMSG) && !defined(NO_WSARECVMSG)
 #   define M_METHOD  M_METHOD_WSARECVMSG
diff --git a/crypto/bio/bss_dgram_pair.c b/crypto/bio/bss_dgram_pair.c
index 3d7987833692b6ec28695b66c69ce600d6feec50..534a2216aa42a9c8df8f31217d4d7bfc014470a9 100644
--- a/crypto/bio/bss_dgram_pair.c
+++ b/crypto/bio/bss_dgram_pair.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index a90aebe0b48662ece155144082f8db35cf7b1689..c22e603b04fc540a6ac027b787c0749cec33299c 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index 9153c1f1cd8163e0c48036a21260ef660b467cd3..6deacba42db7121c65c5f3e140a33600effc0c57 100644
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bio/ossl_core_bio.c b/crypto/bio/ossl_core_bio.c
index 3e6a90abeb980351b5e3f8fa83e867099c504199..8d21115b652deb9754883d16bbfb39284c4ca7dc 100644
--- a/crypto/bio/ossl_core_bio.c
+++ b/crypto/bio/ossl_core_bio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl
index b0b87ef611c135f80a261ce08d8247f87c45add4..17af0e07741a4661ef5972685c1eede7a749095f 100644
--- a/crypto/bn/asm/armv4-gf2m.pl
+++ b/crypto/bn/asm/armv4-gf2m.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2011-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2011-2023 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
diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl
index ab69c2186bc966ec50b4ff51a8685e4cde063683..d85da9240679915313444223e7f3fa028203137e 100644
--- a/crypto/bn/asm/armv4-mont.pl
+++ b/crypto/bn/asm/armv4-mont.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2007-2023 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
diff --git a/crypto/bn/asm/rsaz-2k-avx512.pl b/crypto/bn/asm/rsaz-2k-avx512.pl
index 1f7e21ec38d0d1b9160a30af60ca3e1f0a3932cf..7ee02778df5553c725517dac226ea04d08756865 100644
--- a/crypto/bn/asm/rsaz-2k-avx512.pl
+++ b/crypto/bn/asm/rsaz-2k-avx512.pl
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright (c) 2020, Intel Corporation. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/bn/asm/rsaz-3k-avx512.pl b/crypto/bn/asm/rsaz-3k-avx512.pl
index c2ec9073aea11ba571a8a540df558453671a5b36..8ed5496479b2243295bc825e0f28dce06c186978 100644
--- a/crypto/bn/asm/rsaz-3k-avx512.pl
+++ b/crypto/bn/asm/rsaz-3k-avx512.pl
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright (c) 2021, Intel Corporation. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/bn/asm/rsaz-4k-avx512.pl b/crypto/bn/asm/rsaz-4k-avx512.pl
index aa1143b43beebb0be88a6adf7db38791dd092b8e..8c59b77f7787ccf64eba8d102dc9c1d2c111e695 100644
--- a/crypto/bn/asm/rsaz-4k-avx512.pl
+++ b/crypto/bn/asm/rsaz-4k-avx512.pl
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright (c) 2021, Intel Corporation. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c
index 5d9c58bd867a16dcb7ea38e9f71d25a52677abc1..c39907a7dfd369cfa8691aad28c215fc5c2c91cf 100644
--- a/crypto/bn/bn_asm.c
+++ b/crypto/bn/bn_asm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
index a2936344854301753b5fcfc3e2814f718d973b71..6c6de1a30f54569376177bec0cf0039beb7020e9 100644
--- a/crypto/bn/bn_blind.c
+++ b/crypto/bn/bn_blind.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2023 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
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 0d68bd0f3fecc50bb8d6da1892330797764b5938..cb6d19229fe6f9e01a924d6f0d2cb93b199f6b8d 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 1b8d47a28166d3465b5d2164c7d0e640004840ca..9070647b35ea24a426d862d60e2ee4d7c6d39df6 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bn/bn_local.h b/crypto/bn/bn_local.h
index 0f2de0dd3bec55eaf4cebeb098ec0270818c6478..b5be37ba973e392a3ed85ccd8178e56c0b2f836b 100644
--- a/crypto/bn/bn_local.h
+++ b/crypto/bn/bn_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index 35565426af95020f540887942c3a259c506b18d1..8b4c7900ad47fa7ac1c072faa25203b2c6c9b2fc 100644
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index 71efc596c27f1f25311a27a69d689e67c4cf84b9..c1dbed05984fc241bd7829b705bdfa0cb9ee56e2 100644
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 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
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 3b213d46c5c626fb06ce0ebbecca3ca436da3b1a..a94dfcecdf2079b6bce5c5cd672f38a7b03f8e66 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index aa548d62eaef51a724c9806af7155f676b58a91a..83fd175c437f5ad9e1819ae9a6058566f3cdc97a 100644
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/bn/bn_rsa_fips186_4.c b/crypto/bn/bn_rsa_fips186_4.c
index 1af30190059be62374d22aca01d50a6d037f5420..c967ca962978a9968b61cc0684b504d6dd99b7ad 100644
--- a/crypto/bn/bn_rsa_fips186_4.c
+++ b/crypto/bn/bn_rsa_fips186_4.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2018-2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/bn/bn_s390x.c b/crypto/bn/bn_s390x.c
index da69b02d902db7256de3086e029c084649256d6e..5449143f4f040918a59d37b02dd883767fb802d4 100644
--- a/crypto/bn/bn_s390x.c
+++ b/crypto/bn/bn_s390x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2023 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
diff --git a/crypto/bn/rsaz_exp.c b/crypto/bn/rsaz_exp.c
index 844140720ccb14e0096ce06366d1520305538c65..80b583f35ae850a134ff154ee5642f6290bf8a54 100644
--- a/crypto/bn/rsaz_exp.c
+++ b/crypto/bn/rsaz_exp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2012, Intel Corporation. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/bn/rsaz_exp_x2.c b/crypto/bn/rsaz_exp_x2.c
index 6ef49ae129686e9de6162869661c57fa99cecfda..70705486a154fba2d572975641360fad13500c7e 100644
--- a/crypto/bn/rsaz_exp_x2.c
+++ b/crypto/bn/rsaz_exp_x2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2020-2021, Intel Corporation. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/cast/cast_local.h b/crypto/cast/cast_local.h
index 4105f9fb62a335c5b5413848a4f16d62c9259396..e99fe0882ae73c19149713dfb63686f0c721da51 100644
--- a/crypto/cast/cast_local.h
+++ b/crypto/cast/cast_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
index 3fdecf2d2832cfc103223f9bfe916cba41a2bf79..ac32d5bda76f18b1fb986011033b34a0b76d683a 100755
--- a/crypto/chacha/asm/chacha-armv4.pl
+++ b/crypto/chacha/asm/chacha-armv4.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/crypto/chacha/asm/chacha-armv8-sve.pl b/crypto/chacha/asm/chacha-armv8-sve.pl
index 6afc629368581ff4908ac9426b26c48b3f3f6cfd..0e19bffc4de27f8ae695c06558c67e249c842a83 100755
--- a/crypto/chacha/asm/chacha-armv8-sve.pl
+++ b/crypto/chacha/asm/chacha-armv8-sve.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022  The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023  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
diff --git a/crypto/chacha/asm/chacha-loongarch64.pl b/crypto/chacha/asm/chacha-loongarch64.pl
new file mode 100644
index 0000000000000000000000000000000000000000..ea9cc7ecce237bfe92534e8a5deaf45816180d4a
--- /dev/null
+++ b/crypto/chacha/asm/chacha-loongarch64.pl
@@ -0,0 +1,1413 @@
+#! /usr/bin/env perl
+# Author: Min Zhou <zhoumin@loongson.cn>
+# Copyright 2023 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
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+use strict;
+
+my $code;
+
+# Here is the scalar register layout for LoongArch.
+my ($zero,$ra,$tp,$sp,$fp)=map("\$r$_",(0..3,22));
+my ($a0,$a1,$a2,$a3,$a4,$a5,$a6,$a7)=map("\$r$_",(4..11));
+my ($t0,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$x)=map("\$r$_",(12..21));
+my ($s0,$s1,$s2,$s3,$s4,$s5,$s6,$s7,$s8)=map("\$r$_",(23..31));
+
+# Here is the 128-bit vector register layout for LSX extension.
+my ($vr0,$vr1,$vr2,$vr3,$vr4,$vr5,$vr6,$vr7,$vr8,$vr9,$vr10,
+    $vr11,$vr12,$vr13,$vr14,$vr15,$vr16,$vr17,$vr18,$vr19,
+    $vr20,$vr21,$vr22,$vr23,$vr24,$vr25,$vr26,$vr27,$vr28,
+    $vr29,$vr30,$vr31)=map("\$vr$_",(0..31));
+
+# Here is the 256-bit vector register layout for LASX extension.
+my ($xr0,$xr1,$xr2,$xr3,$xr4,$xr5,$xr6,$xr7,$xr8,$xr9,$xr10,
+    $xr11,$xr12,$xr13,$xr14,$xr15,$xr16,$xr17,$xr18,$xr19,
+    $xr20,$xr21,$xr22,$xr23,$xr24,$xr25,$xr26,$xr27,$xr28,
+    $xr29,$xr30,$xr31)=map("\$xr$_",(0..31));
+
+my $output;
+for (@ARGV) {	$output=$_ if (/\w[\w\-]*\.\w+$/);	}
+open STDOUT,">$output";
+
+# Input parameter block
+my ($out, $inp, $len, $key, $counter) = ($a0, $a1, $a2, $a3, $a4);
+
+$code .= <<EOF;
+#include "loongarch_arch.h"
+
+.text
+
+.extern OPENSSL_loongarch_hwcap_P
+
+.align 6
+.Lsigma:
+.ascii	"expand 32-byte k"
+.Linc8x:
+.long	0,1,2,3,4,5,6,7
+.Linc4x:
+.long	0,1,2,3
+
+.globl	ChaCha20_ctr32
+.type	ChaCha20_ctr32 function
+
+.align 6
+ChaCha20_ctr32:
+	# $a0 = arg #1 (out pointer)
+	# $a1 = arg #2 (inp pointer)
+	# $a2 = arg #3 (len)
+	# $a3 = arg #4 (key array)
+	# $a4 = arg #5 (counter array)
+
+	beqz		$len,.Lno_data
+	la.pcrel	$t0,OPENSSL_loongarch_hwcap_P
+	ld.w		$t0,$t0,0
+
+	andi		$t1,$t0,LOONGARCH_HWCAP_LASX
+	bnez		$t1,.LChaCha20_8x
+
+	andi		$t2,$t0,LOONGARCH_HWCAP_LSX
+	bnez		$t2,.LChaCha20_4x
+
+	b			.LChaCha20_1x
+
+EOF
+
+########################################################################
+# Scalar code path that handles all lengths.
+{
+# Load the initial states in array @x[*] and update directly
+my @x = ($t0, $t1, $t2, $t3, $t4, $t5, $t6, $t7,
+         $s0, $s1, $s2, $s3, $s4, $s5, $s6, $s7);
+
+sub ROUND {
+	my ($a0,$b0,$c0,$d0) = @_;
+	my ($a1,$b1,$c1,$d1) = map(($_&~3)+(($_+1)&3),($a0,$b0,$c0,$d0));
+	my ($a2,$b2,$c2,$d2) = map(($_&~3)+(($_+1)&3),($a1,$b1,$c1,$d1));
+	my ($a3,$b3,$c3,$d3) = map(($_&~3)+(($_+1)&3),($a2,$b2,$c2,$d2));
+
+$code .= <<EOF;
+	add.w		@x[$a0],@x[$a0],@x[$b0]
+	xor			@x[$d0],@x[$d0],@x[$a0]
+	rotri.w		@x[$d0],@x[$d0],16      # rotate left 16 bits
+	add.w		@x[$a1],@x[$a1],@x[$b1]
+	xor			@x[$d1],@x[$d1],@x[$a1]
+	rotri.w		@x[$d1],@x[$d1],16
+
+	add.w		@x[$c0],@x[$c0],@x[$d0]
+	xor			@x[$b0],@x[$b0],@x[$c0]
+	rotri.w		@x[$b0],@x[$b0],20      # rotate left 12 bits
+	add.w		@x[$c1],@x[$c1],@x[$d1]
+	xor			@x[$b1],@x[$b1],@x[$c1]
+	rotri.w		@x[$b1],@x[$b1],20
+
+	add.w		@x[$a0],@x[$a0],@x[$b0]
+	xor			@x[$d0],@x[$d0],@x[$a0]
+	rotri.w		@x[$d0],@x[$d0],24      # rotate left 8 bits
+	add.w		@x[$a1],@x[$a1],@x[$b1]
+	xor			@x[$d1],@x[$d1],@x[$a1]
+	rotri.w		@x[$d1],@x[$d1],24
+
+	add.w		@x[$c0],@x[$c0],@x[$d0]
+	xor			@x[$b0],@x[$b0],@x[$c0]
+	rotri.w		@x[$b0],@x[$b0],25      # rotate left 7 bits
+	add.w		@x[$c1],@x[$c1],@x[$d1]
+	xor			@x[$b1],@x[$b1],@x[$c1]
+	rotri.w		@x[$b1],@x[$b1],25
+
+	add.w		@x[$a2],@x[$a2],@x[$b2]
+	xor			@x[$d2],@x[$d2],@x[$a2]
+	rotri.w		@x[$d2],@x[$d2],16
+	add.w		@x[$a3],@x[$a3],@x[$b3]
+	xor			@x[$d3],@x[$d3],@x[$a3]
+	rotri.w		@x[$d3],@x[$d3],16
+
+	add.w		@x[$c2],@x[$c2],@x[$d2]
+	xor			@x[$b2],@x[$b2],@x[$c2]
+	rotri.w		@x[$b2],@x[$b2],20
+	add.w		@x[$c3],@x[$c3],@x[$d3]
+	xor			@x[$b3],@x[$b3],@x[$c3]
+	rotri.w		@x[$b3],@x[$b3],20
+
+	add.w		@x[$a2],@x[$a2],@x[$b2]
+	xor			@x[$d2],@x[$d2],@x[$a2]
+	rotri.w		@x[$d2],@x[$d2],24
+	add.w		@x[$a3],@x[$a3],@x[$b3]
+	xor			@x[$d3],@x[$d3],@x[$a3]
+	rotri.w		@x[$d3],@x[$d3],24
+
+	add.w		@x[$c2],@x[$c2],@x[$d2]
+	xor			@x[$b2],@x[$b2],@x[$c2]
+	rotri.w		@x[$b2],@x[$b2],25
+	add.w		@x[$c3],@x[$c3],@x[$d3]
+	xor			@x[$b3],@x[$b3],@x[$c3]
+	rotri.w		@x[$b3],@x[$b3],25
+
+EOF
+}
+
+$code .= <<EOF;
+.align 6
+.LChaCha20_1x:
+	addi.d		$sp,$sp,-256
+	st.d		$s0,$sp,0
+	st.d		$s1,$sp,8
+	st.d		$s2,$sp,16
+	st.d		$s3,$sp,24
+	st.d		$s4,$sp,32
+	st.d		$s5,$sp,40
+	st.d		$s6,$sp,48
+	st.d		$s7,$sp,56
+	st.d		$s8,$sp,64
+
+	# Save the initial block counter in $s8
+	ld.w		$s8,$counter,0
+	b			.Loop_outer_1x
+
+.align 5
+.Loop_outer_1x:
+	# Load constants
+	la.local	$t8,.Lsigma
+	ld.w		@x[0],$t8,0		  # 'expa'
+	ld.w		@x[1],$t8,4		  # 'nd 3'
+	ld.w		@x[2],$t8,8		  # '2-by'
+	ld.w		@x[3],$t8,12	  # 'te k'
+
+	# Load key
+	ld.w		@x[4],$key,4*0
+	ld.w		@x[5],$key,4*1
+	ld.w		@x[6],$key,4*2
+	ld.w		@x[7],$key,4*3
+	ld.w		@x[8],$key,4*4
+	ld.w		@x[9],$key,4*5
+	ld.w		@x[10],$key,4*6
+	ld.w		@x[11],$key,4*7
+
+	# Load block counter
+	move		@x[12],$s8
+
+	# Load nonce
+	ld.w		@x[13],$counter,4*1
+	ld.w		@x[14],$counter,4*2
+	ld.w		@x[15],$counter,4*3
+
+	# Update states in \@x[*] for 20 rounds
+	ori			$t8,$zero,10
+	b			.Loop_1x
+
+.align 5
+.Loop_1x:
+EOF
+
+&ROUND (0, 4, 8, 12);
+&ROUND (0, 5, 10, 15);
+
+$code .= <<EOF;
+	addi.w		$t8,$t8,-1
+	bnez		$t8,.Loop_1x
+
+	# Get the final states by adding the initial states
+	la.local	$t8,.Lsigma
+	ld.w		$a7,$t8,4*0
+	ld.w		$a6,$t8,4*1
+	ld.w		$a5,$t8,4*2
+	add.w		@x[0],@x[0],$a7
+	add.w		@x[1],@x[1],$a6
+	add.w		@x[2],@x[2],$a5
+	ld.w		$a7,$t8,4*3
+	add.w		@x[3],@x[3],$a7
+
+	ld.w		$t8,$key,4*0
+	ld.w		$a7,$key,4*1
+	ld.w		$a6,$key,4*2
+	ld.w		$a5,$key,4*3
+	add.w		@x[4],@x[4],$t8
+	add.w		@x[5],@x[5],$a7
+	add.w		@x[6],@x[6],$a6
+	add.w		@x[7],@x[7],$a5
+
+	ld.w		$t8,$key,4*4
+	ld.w		$a7,$key,4*5
+	ld.w		$a6,$key,4*6
+	ld.w		$a5,$key,4*7
+	add.w		@x[8],@x[8],$t8
+	add.w		@x[9],@x[9],$a7
+	add.w		@x[10],@x[10],$a6
+	add.w		@x[11],@x[11],$a5
+
+	add.w		@x[12],@x[12],$s8
+
+	ld.w		$t8,$counter,4*1
+	ld.w		$a7,$counter,4*2
+	ld.w		$a6,$counter,4*3
+	add.w		@x[13],@x[13],$t8
+	add.w		@x[14],@x[14],$a7
+	add.w		@x[15],@x[15],$a6
+
+	ori			$t8,$zero,64
+	bltu		$len,$t8,.Ltail_1x
+
+	# Get the encrypted message by xor states with plaintext
+	ld.w		$t8,$inp,4*0
+	ld.w		$a7,$inp,4*1
+	ld.w		$a6,$inp,4*2
+	ld.w		$a5,$inp,4*3
+	xor			$t8,$t8,@x[0]
+	xor			$a7,$a7,@x[1]
+	xor			$a6,$a6,@x[2]
+	xor			$a5,$a5,@x[3]
+	st.w		$t8,$out,4*0
+	st.w		$a7,$out,4*1
+	st.w		$a6,$out,4*2
+	st.w		$a5,$out,4*3
+
+	ld.w		$t8,$inp,4*4
+	ld.w		$a7,$inp,4*5
+	ld.w		$a6,$inp,4*6
+	ld.w		$a5,$inp,4*7
+	xor			$t8,$t8,@x[4]
+	xor			$a7,$a7,@x[5]
+	xor			$a6,$a6,@x[6]
+	xor			$a5,$a5,@x[7]
+	st.w		$t8,$out,4*4
+	st.w		$a7,$out,4*5
+	st.w		$a6,$out,4*6
+	st.w		$a5,$out,4*7
+
+	ld.w		$t8,$inp,4*8
+	ld.w		$a7,$inp,4*9
+	ld.w		$a6,$inp,4*10
+	ld.w		$a5,$inp,4*11
+	xor			$t8,$t8,@x[8]
+	xor			$a7,$a7,@x[9]
+	xor			$a6,$a6,@x[10]
+	xor			$a5,$a5,@x[11]
+	st.w		$t8,$out,4*8
+	st.w		$a7,$out,4*9
+	st.w		$a6,$out,4*10
+	st.w		$a5,$out,4*11
+
+	ld.w		$t8,$inp,4*12
+	ld.w		$a7,$inp,4*13
+	ld.w		$a6,$inp,4*14
+	ld.w		$a5,$inp,4*15
+	xor			$t8,$t8,@x[12]
+	xor			$a7,$a7,@x[13]
+	xor			$a6,$a6,@x[14]
+	xor			$a5,$a5,@x[15]
+	st.w		$t8,$out,4*12
+	st.w		$a7,$out,4*13
+	st.w		$a6,$out,4*14
+	st.w		$a5,$out,4*15
+
+	addi.d		$len,$len,-64
+	beqz		$len,.Ldone_1x
+	addi.d		$inp,$inp,64
+	addi.d		$out,$out,64
+	addi.w		$s8,$s8,1
+	b			.Loop_outer_1x
+
+.align 4
+.Ltail_1x:
+	# Handle the tail for 1x (1 <= tail_len <= 63)
+	addi.d		$a7,$sp,72
+	st.w		@x[0],$a7,4*0
+	st.w		@x[1],$a7,4*1
+	st.w		@x[2],$a7,4*2
+	st.w		@x[3],$a7,4*3
+	st.w		@x[4],$a7,4*4
+	st.w		@x[5],$a7,4*5
+	st.w		@x[6],$a7,4*6
+	st.w		@x[7],$a7,4*7
+	st.w		@x[8],$a7,4*8
+	st.w		@x[9],$a7,4*9
+	st.w		@x[10],$a7,4*10
+	st.w		@x[11],$a7,4*11
+	st.w		@x[12],$a7,4*12
+	st.w		@x[13],$a7,4*13
+	st.w		@x[14],$a7,4*14
+	st.w		@x[15],$a7,4*15
+
+	move		$t8,$zero
+
+.Loop_tail_1x:
+	# Xor input with states byte by byte
+	ldx.bu		$a6,$inp,$t8
+	ldx.bu		$a5,$a7,$t8
+	xor			$a6,$a6,$a5
+	stx.b		$a6,$out,$t8
+	addi.w		$t8,$t8,1
+	addi.d		$len,$len,-1
+	bnez		$len,.Loop_tail_1x
+	b			.Ldone_1x
+
+.Ldone_1x:
+	ld.d		$s0,$sp,0
+	ld.d		$s1,$sp,8
+	ld.d		$s2,$sp,16
+	ld.d		$s3,$sp,24
+	ld.d		$s4,$sp,32
+	ld.d		$s5,$sp,40
+	ld.d		$s6,$sp,48
+	ld.d		$s7,$sp,56
+	ld.d		$s8,$sp,64
+	addi.d		$sp,$sp,256
+
+	b			.Lend
+
+EOF
+}
+
+########################################################################
+# 128-bit LSX code path that handles all lengths.
+{
+# Load the initial states in array @x[*] and update directly.
+my @x = ($vr0, $vr1, $vr2, $vr3, $vr4, $vr5, $vr6, $vr7,
+         $vr8, $vr9, $vr10, $vr11, $vr12, $vr13, $vr14, $vr15);
+
+# Save the initial states in array @y[*]
+my @y = ($vr16, $vr17, $vr18, $vr19, $vr20, $vr21, $vr22, $vr23,
+         $vr24, $vr25, $vr26, $vr27, $vr28, $vr29, $vr30, $vr31);
+
+sub ROUND_4x {
+	my ($a0,$b0,$c0,$d0) = @_;
+	my ($a1,$b1,$c1,$d1) = map(($_&~3)+(($_+1)&3),($a0,$b0,$c0,$d0));
+	my ($a2,$b2,$c2,$d2) = map(($_&~3)+(($_+1)&3),($a1,$b1,$c1,$d1));
+	my ($a3,$b3,$c3,$d3) = map(($_&~3)+(($_+1)&3),($a2,$b2,$c2,$d2));
+
+$code .= <<EOF;
+	vadd.w		@x[$a0],@x[$a0],@x[$b0]
+	vxor.v		@x[$d0],@x[$d0],@x[$a0]
+	vrotri.w	@x[$d0],@x[$d0],16      # rotate left 16 bits
+	vadd.w		@x[$a1],@x[$a1],@x[$b1]
+	vxor.v		@x[$d1],@x[$d1],@x[$a1]
+	vrotri.w	@x[$d1],@x[$d1],16
+
+	vadd.w		@x[$c0],@x[$c0],@x[$d0]
+	vxor.v		@x[$b0],@x[$b0],@x[$c0]
+	vrotri.w	@x[$b0],@x[$b0],20      # rotate left 12 bits
+	vadd.w		@x[$c1],@x[$c1],@x[$d1]
+	vxor.v		@x[$b1],@x[$b1],@x[$c1]
+	vrotri.w	@x[$b1],@x[$b1],20
+
+	vadd.w		@x[$a0],@x[$a0],@x[$b0]
+	vxor.v		@x[$d0],@x[$d0],@x[$a0]
+	vrotri.w	@x[$d0],@x[$d0],24      # rotate left 8 bits
+	vadd.w		@x[$a1],@x[$a1],@x[$b1]
+	vxor.v		@x[$d1],@x[$d1],@x[$a1]
+	vrotri.w	@x[$d1],@x[$d1],24
+
+	vadd.w		@x[$c0],@x[$c0],@x[$d0]
+	vxor.v		@x[$b0],@x[$b0],@x[$c0]
+	vrotri.w	@x[$b0],@x[$b0],25      # rotate left 7 bits
+	vadd.w		@x[$c1],@x[$c1],@x[$d1]
+	vxor.v		@x[$b1],@x[$b1],@x[$c1]
+	vrotri.w	@x[$b1],@x[$b1],25
+
+	vadd.w		@x[$a2],@x[$a2],@x[$b2]
+	vxor.v		@x[$d2],@x[$d2],@x[$a2]
+	vrotri.w	@x[$d2],@x[$d2],16
+	vadd.w		@x[$a3],@x[$a3],@x[$b3]
+	vxor.v		@x[$d3],@x[$d3],@x[$a3]
+	vrotri.w	@x[$d3],@x[$d3],16
+
+	vadd.w		@x[$c2],@x[$c2],@x[$d2]
+	vxor.v		@x[$b2],@x[$b2],@x[$c2]
+	vrotri.w	@x[$b2],@x[$b2],20
+	vadd.w		@x[$c3],@x[$c3],@x[$d3]
+	vxor.v		@x[$b3],@x[$b3],@x[$c3]
+	vrotri.w	@x[$b3],@x[$b3],20
+
+	vadd.w		@x[$a2],@x[$a2],@x[$b2]
+	vxor.v		@x[$d2],@x[$d2],@x[$a2]
+	vrotri.w	@x[$d2],@x[$d2],24
+	vadd.w		@x[$a3],@x[$a3],@x[$b3]
+	vxor.v		@x[$d3],@x[$d3],@x[$a3]
+	vrotri.w	@x[$d3],@x[$d3],24
+
+	vadd.w		@x[$c2],@x[$c2],@x[$d2]
+	vxor.v		@x[$b2],@x[$b2],@x[$c2]
+	vrotri.w	@x[$b2],@x[$b2],25
+	vadd.w		@x[$c3],@x[$c3],@x[$d3]
+	vxor.v		@x[$b3],@x[$b3],@x[$c3]
+	vrotri.w	@x[$b3],@x[$b3],25
+
+EOF
+}
+
+$code .= <<EOF;
+.align 6
+.LChaCha20_4x:
+	ori			$t3,$zero,64
+	bleu		$len,$t3,.LChaCha20_1x  # goto 1x when len <= 64
+
+	addi.d		$sp,$sp,-128
+
+	# Save the initial block counter in $t4
+	ld.w		$t4,$counter,0
+	b			.Loop_outer_4x
+
+.align 5
+.Loop_outer_4x:
+	# Load constant
+	la.local		$t8,.Lsigma
+	vldrepl.w		@x[0],$t8,4*0		# 'expa'
+	vldrepl.w		@x[1],$t8,4*1		# 'nd 3'
+	vldrepl.w		@x[2],$t8,4*2		# '2-by'
+	vldrepl.w		@x[3],$t8,4*3		# 'te k'
+
+	# Load key
+	vldrepl.w		@x[4],$key,4*0
+	vldrepl.w		@x[5],$key,4*1
+	vldrepl.w		@x[6],$key,4*2
+	vldrepl.w		@x[7],$key,4*3
+	vldrepl.w		@x[8],$key,4*4
+	vldrepl.w		@x[9],$key,4*5
+	vldrepl.w		@x[10],$key,4*6
+	vldrepl.w		@x[11],$key,4*7
+
+	# Load block counter
+	vreplgr2vr.w	@x[12],$t4
+
+	# Load nonce
+	vldrepl.w		@x[13],$counter,4*1
+	vldrepl.w		@x[14],$counter,4*2
+	vldrepl.w		@x[15],$counter,4*3
+
+	# Get the correct block counter for each block
+	la.local		$t8,.Linc4x
+	vld				@y[0],$t8,0
+	vadd.w			@x[12],@x[12],@y[0]
+
+	# Copy the initial states from \@x[*] to \@y[*]
+	vori.b			@y[0],@x[0],0
+	vori.b			@y[1],@x[1],0
+	vori.b			@y[2],@x[2],0
+	vori.b			@y[3],@x[3],0
+	vori.b			@y[4],@x[4],0
+	vori.b			@y[5],@x[5],0
+	vori.b			@y[6],@x[6],0
+	vori.b			@y[7],@x[7],0
+	vori.b			@y[8],@x[8],0
+	vori.b			@y[9],@x[9],0
+	vori.b			@y[10],@x[10],0
+	vori.b			@y[11],@x[11],0
+	vori.b			@y[12],@x[12],0
+	vori.b			@y[13],@x[13],0
+	vori.b			@y[14],@x[14],0
+	vori.b			@y[15],@x[15],0
+
+	# Update states in \@x[*] for 20 rounds
+	ori				$t8,$zero,10
+	b				.Loop_4x
+
+.align 5
+.Loop_4x:
+EOF
+
+&ROUND_4x (0, 4, 8, 12);
+&ROUND_4x (0, 5, 10, 15);
+
+$code .= <<EOF;
+	addi.w		$t8,$t8,-1
+	bnez		$t8,.Loop_4x
+
+	# Get the final states by adding the initial states
+	vadd.w		@x[0],@x[0],@y[0]
+	vadd.w		@x[1],@x[1],@y[1]
+	vadd.w		@x[2],@x[2],@y[2]
+	vadd.w		@x[3],@x[3],@y[3]
+	vadd.w		@x[4],@x[4],@y[4]
+	vadd.w		@x[5],@x[5],@y[5]
+	vadd.w		@x[6],@x[6],@y[6]
+	vadd.w		@x[7],@x[7],@y[7]
+	vadd.w		@x[8],@x[8],@y[8]
+	vadd.w		@x[9],@x[9],@y[9]
+	vadd.w		@x[10],@x[10],@y[10]
+	vadd.w		@x[11],@x[11],@y[11]
+	vadd.w		@x[12],@x[12],@y[12]
+	vadd.w		@x[13],@x[13],@y[13]
+	vadd.w		@x[14],@x[14],@y[14]
+	vadd.w		@x[15],@x[15],@y[15]
+
+	# Get the transpose of \@x[*] and save them in \@x[*]
+	vilvl.w		@y[0],@x[1],@x[0]
+	vilvh.w		@y[1],@x[1],@x[0]
+	vilvl.w		@y[2],@x[3],@x[2]
+	vilvh.w		@y[3],@x[3],@x[2]
+	vilvl.w		@y[4],@x[5],@x[4]
+	vilvh.w		@y[5],@x[5],@x[4]
+	vilvl.w		@y[6],@x[7],@x[6]
+	vilvh.w		@y[7],@x[7],@x[6]
+	vilvl.w		@y[8],@x[9],@x[8]
+	vilvh.w		@y[9],@x[9],@x[8]
+	vilvl.w		@y[10],@x[11],@x[10]
+	vilvh.w		@y[11],@x[11],@x[10]
+	vilvl.w		@y[12],@x[13],@x[12]
+	vilvh.w		@y[13],@x[13],@x[12]
+	vilvl.w		@y[14],@x[15],@x[14]
+	vilvh.w		@y[15],@x[15],@x[14]
+
+	vilvl.d		@x[0],@y[2],@y[0]
+	vilvh.d		@x[1],@y[2],@y[0]
+	vilvl.d		@x[2],@y[3],@y[1]
+	vilvh.d		@x[3],@y[3],@y[1]
+	vilvl.d		@x[4],@y[6],@y[4]
+	vilvh.d		@x[5],@y[6],@y[4]
+	vilvl.d		@x[6],@y[7],@y[5]
+	vilvh.d		@x[7],@y[7],@y[5]
+	vilvl.d		@x[8],@y[10],@y[8]
+	vilvh.d		@x[9],@y[10],@y[8]
+	vilvl.d		@x[10],@y[11],@y[9]
+	vilvh.d		@x[11],@y[11],@y[9]
+	vilvl.d		@x[12],@y[14],@y[12]
+	vilvh.d		@x[13],@y[14],@y[12]
+	vilvl.d		@x[14],@y[15],@y[13]
+	vilvh.d		@x[15],@y[15],@y[13]
+EOF
+
+# Adjust the order of elements in @x[*] for ease of use.
+@x = (@x[0],@x[4],@x[8],@x[12],@x[1],@x[5],@x[9],@x[13],
+      @x[2],@x[6],@x[10],@x[14],@x[3],@x[7],@x[11],@x[15]);
+
+$code .= <<EOF;
+	ori			$t8,$zero,64*4
+	bltu		$len,$t8,.Ltail_4x
+
+	# Get the encrypted message by xor states with plaintext
+	vld			@y[0],$inp,16*0
+	vld			@y[1],$inp,16*1
+	vld			@y[2],$inp,16*2
+	vld			@y[3],$inp,16*3
+	vxor.v		@y[0],@y[0],@x[0]
+	vxor.v		@y[1],@y[1],@x[1]
+	vxor.v		@y[2],@y[2],@x[2]
+	vxor.v		@y[3],@y[3],@x[3]
+	vst			@y[0],$out,16*0
+	vst			@y[1],$out,16*1
+	vst			@y[2],$out,16*2
+	vst			@y[3],$out,16*3
+
+	vld			@y[0],$inp,16*4
+	vld			@y[1],$inp,16*5
+	vld			@y[2],$inp,16*6
+	vld			@y[3],$inp,16*7
+	vxor.v		@y[0],@y[0],@x[4]
+	vxor.v		@y[1],@y[1],@x[5]
+	vxor.v		@y[2],@y[2],@x[6]
+	vxor.v		@y[3],@y[3],@x[7]
+	vst			@y[0],$out,16*4
+	vst			@y[1],$out,16*5
+	vst			@y[2],$out,16*6
+	vst			@y[3],$out,16*7
+
+	vld			@y[0],$inp,16*8
+	vld			@y[1],$inp,16*9
+	vld			@y[2],$inp,16*10
+	vld			@y[3],$inp,16*11
+	vxor.v		@y[0],@y[0],@x[8]
+	vxor.v		@y[1],@y[1],@x[9]
+	vxor.v		@y[2],@y[2],@x[10]
+	vxor.v		@y[3],@y[3],@x[11]
+	vst			@y[0],$out,16*8
+	vst			@y[1],$out,16*9
+	vst			@y[2],$out,16*10
+	vst			@y[3],$out,16*11
+
+	vld			@y[0],$inp,16*12
+	vld			@y[1],$inp,16*13
+	vld			@y[2],$inp,16*14
+	vld			@y[3],$inp,16*15
+	vxor.v		@y[0],@y[0],@x[12]
+	vxor.v		@y[1],@y[1],@x[13]
+	vxor.v		@y[2],@y[2],@x[14]
+	vxor.v		@y[3],@y[3],@x[15]
+	vst			@y[0],$out,16*12
+	vst			@y[1],$out,16*13
+	vst			@y[2],$out,16*14
+	vst			@y[3],$out,16*15
+
+	addi.d		$len,$len,-64*4
+	beqz		$len,.Ldone_4x
+	addi.d		$inp,$inp,64*4
+	addi.d		$out,$out,64*4
+	addi.w		$t4,$t4,4
+	b			.Loop_outer_4x
+
+.Ltail_4x:
+	# Handle the tail for 4x (1 <= tail_len <= 255)
+	ori			$t8,$zero,192
+	bgeu		$len,$t8,.L192_or_more4x
+	ori			$t8,$zero,128
+	bgeu		$len,$t8,.L128_or_more4x
+	ori			$t8,$zero,64
+	bgeu		$len,$t8,.L64_or_more4x
+
+	vst			@x[0],$sp,16*0
+	vst			@x[1],$sp,16*1
+	vst			@x[2],$sp,16*2
+	vst			@x[3],$sp,16*3
+	move		$t8,$zero
+	b			.Loop_tail_4x
+
+.align 5
+.L64_or_more4x:
+	vld			@y[0],$inp,16*0
+	vld			@y[1],$inp,16*1
+	vld			@y[2],$inp,16*2
+	vld			@y[3],$inp,16*3
+	vxor.v		@y[0],@y[0],@x[0]
+	vxor.v		@y[1],@y[1],@x[1]
+	vxor.v		@y[2],@y[2],@x[2]
+	vxor.v		@y[3],@y[3],@x[3]
+	vst			@y[0],$out,16*0
+	vst			@y[1],$out,16*1
+	vst			@y[2],$out,16*2
+	vst			@y[3],$out,16*3
+
+	addi.d		$len,$len,-64
+	beqz		$len,.Ldone_4x
+	addi.d		$inp,$inp,64
+	addi.d		$out,$out,64
+	vst			@x[4],$sp,16*0
+	vst			@x[5],$sp,16*1
+	vst			@x[6],$sp,16*2
+	vst			@x[7],$sp,16*3
+	move		$t8,$zero
+	b			.Loop_tail_4x
+
+.align 5
+.L128_or_more4x:
+	vld			@y[0],$inp,16*0
+	vld			@y[1],$inp,16*1
+	vld			@y[2],$inp,16*2
+	vld			@y[3],$inp,16*3
+	vxor.v		@y[0],@y[0],@x[0]
+	vxor.v		@y[1],@y[1],@x[1]
+	vxor.v		@y[2],@y[2],@x[2]
+	vxor.v		@y[3],@y[3],@x[3]
+	vst			@y[0],$out,16*0
+	vst			@y[1],$out,16*1
+	vst			@y[2],$out,16*2
+	vst			@y[3],$out,16*3
+
+	vld			@y[0],$inp,16*4
+	vld			@y[1],$inp,16*5
+	vld			@y[2],$inp,16*6
+	vld			@y[3],$inp,16*7
+	vxor.v		@y[0],@y[0],@x[4]
+	vxor.v		@y[1],@y[1],@x[5]
+	vxor.v		@y[2],@y[2],@x[6]
+	vxor.v		@y[3],@y[3],@x[7]
+	vst			@y[0],$out,16*4
+	vst			@y[1],$out,16*5
+	vst			@y[2],$out,16*6
+	vst			@y[3],$out,16*7
+
+	addi.d		$len,$len,-128
+	beqz		$len,.Ldone_4x
+	addi.d		$inp,$inp,128
+	addi.d		$out,$out,128
+	vst			@x[8],$sp,16*0
+	vst			@x[9],$sp,16*1
+	vst			@x[10],$sp,16*2
+	vst			@x[11],$sp,16*3
+	move		$t8,$zero
+	b			.Loop_tail_4x
+
+.align 5
+.L192_or_more4x:
+	vld			@y[0],$inp,16*0
+	vld			@y[1],$inp,16*1
+	vld			@y[2],$inp,16*2
+	vld			@y[3],$inp,16*3
+	vxor.v		@y[0],@y[0],@x[0]
+	vxor.v		@y[1],@y[1],@x[1]
+	vxor.v		@y[2],@y[2],@x[2]
+	vxor.v		@y[3],@y[3],@x[3]
+	vst			@y[0],$out,16*0
+	vst			@y[1],$out,16*1
+	vst			@y[2],$out,16*2
+	vst			@y[3],$out,16*3
+
+	vld			@y[0],$inp,16*4
+	vld			@y[1],$inp,16*5
+	vld			@y[2],$inp,16*6
+	vld			@y[3],$inp,16*7
+	vxor.v		@y[0],@y[0],@x[4]
+	vxor.v		@y[1],@y[1],@x[5]
+	vxor.v		@y[2],@y[2],@x[6]
+	vxor.v		@y[3],@y[3],@x[7]
+	vst			@y[0],$out,16*4
+	vst			@y[1],$out,16*5
+	vst			@y[2],$out,16*6
+	vst			@y[3],$out,16*7
+
+	vld			@y[0],$inp,16*8
+	vld			@y[1],$inp,16*9
+	vld			@y[2],$inp,16*10
+	vld			@y[3],$inp,16*11
+	vxor.v		@y[0],@y[0],@x[8]
+	vxor.v		@y[1],@y[1],@x[9]
+	vxor.v		@y[2],@y[2],@x[10]
+	vxor.v		@y[3],@y[3],@x[11]
+	vst			@y[0],$out,16*8
+	vst			@y[1],$out,16*9
+	vst			@y[2],$out,16*10
+	vst			@y[3],$out,16*11
+
+	addi.d		$len,$len,-192
+	beqz		$len,.Ldone_4x
+	addi.d		$inp,$inp,192
+	addi.d		$out,$out,192
+	vst			@x[12],$sp,16*0
+	vst			@x[13],$sp,16*1
+	vst			@x[14],$sp,16*2
+	vst			@x[15],$sp,16*3
+	move		$t8,$zero
+	b			.Loop_tail_4x
+
+.Loop_tail_4x:
+	# Xor input with states byte by byte
+	ldx.bu		$t5,$inp,$t8
+	ldx.bu		$t6,$sp,$t8
+	xor			$t5,$t5,$t6
+	stx.b		$t5,$out,$t8
+	addi.w		$t8,$t8,1
+	addi.d		$len,$len,-1
+	bnez		$len,.Loop_tail_4x
+	b			.Ldone_4x
+
+.Ldone_4x:
+	addi.d		$sp,$sp,128
+	b			.Lend
+
+EOF
+}
+
+########################################################################
+# 256-bit LASX code path that handles all lengths.
+{
+# Load the initial states in array @x[*] and update directly.
+my @x = ($xr0, $xr1, $xr2, $xr3, $xr4, $xr5, $xr6, $xr7,
+         $xr8, $xr9, $xr10, $xr11, $xr12, $xr13, $xr14, $xr15);
+
+# Save the initial states in array @y[*]
+my @y = ($xr16, $xr17, $xr18, $xr19, $xr20, $xr21, $xr22, $xr23,
+         $xr24, $xr25, $xr26, $xr27, $xr28, $xr29, $xr30, $xr31);
+
+sub ROUND_8x {
+	my ($a0,$b0,$c0,$d0) = @_;
+	my ($a1,$b1,$c1,$d1) = map(($_&~3)+(($_+1)&3),($a0,$b0,$c0,$d0));
+	my ($a2,$b2,$c2,$d2) = map(($_&~3)+(($_+1)&3),($a1,$b1,$c1,$d1));
+	my ($a3,$b3,$c3,$d3) = map(($_&~3)+(($_+1)&3),($a2,$b2,$c2,$d2));
+
+$code .= <<EOF;
+	xvadd.w		@x[$a0],@x[$a0],@x[$b0]
+	xvxor.v		@x[$d0],@x[$d0],@x[$a0]
+	xvrotri.w	@x[$d0],@x[$d0],16      # rotate left 16 bits
+	xvadd.w		@x[$a1],@x[$a1],@x[$b1]
+	xvxor.v		@x[$d1],@x[$d1],@x[$a1]
+	xvrotri.w	@x[$d1],@x[$d1],16
+
+	xvadd.w		@x[$c0],@x[$c0],@x[$d0]
+	xvxor.v		@x[$b0],@x[$b0],@x[$c0]
+	xvrotri.w	@x[$b0],@x[$b0],20      # rotate left 12 bits
+	xvadd.w		@x[$c1],@x[$c1],@x[$d1]
+	xvxor.v		@x[$b1],@x[$b1],@x[$c1]
+	xvrotri.w	@x[$b1],@x[$b1],20
+
+	xvadd.w		@x[$a0],@x[$a0],@x[$b0]
+	xvxor.v		@x[$d0],@x[$d0],@x[$a0]
+	xvrotri.w	@x[$d0],@x[$d0],24      # rotate left 8 bits
+	xvadd.w		@x[$a1],@x[$a1],@x[$b1]
+	xvxor.v		@x[$d1],@x[$d1],@x[$a1]
+	xvrotri.w	@x[$d1],@x[$d1],24
+
+	xvadd.w		@x[$c0],@x[$c0],@x[$d0]
+	xvxor.v		@x[$b0],@x[$b0],@x[$c0]
+	xvrotri.w	@x[$b0],@x[$b0],25      # rotate left 7 bits
+	xvadd.w		@x[$c1],@x[$c1],@x[$d1]
+	xvxor.v		@x[$b1],@x[$b1],@x[$c1]
+	xvrotri.w	@x[$b1],@x[$b1],25
+
+	xvadd.w		@x[$a2],@x[$a2],@x[$b2]
+	xvxor.v		@x[$d2],@x[$d2],@x[$a2]
+	xvrotri.w	@x[$d2],@x[$d2],16
+	xvadd.w		@x[$a3],@x[$a3],@x[$b3]
+	xvxor.v		@x[$d3],@x[$d3],@x[$a3]
+	xvrotri.w	@x[$d3],@x[$d3],16
+
+	xvadd.w		@x[$c2],@x[$c2],@x[$d2]
+	xvxor.v		@x[$b2],@x[$b2],@x[$c2]
+	xvrotri.w	@x[$b2],@x[$b2],20
+	xvadd.w		@x[$c3],@x[$c3],@x[$d3]
+	xvxor.v		@x[$b3],@x[$b3],@x[$c3]
+	xvrotri.w	@x[$b3],@x[$b3],20
+
+	xvadd.w		@x[$a2],@x[$a2],@x[$b2]
+	xvxor.v		@x[$d2],@x[$d2],@x[$a2]
+	xvrotri.w	@x[$d2],@x[$d2],24
+	xvadd.w		@x[$a3],@x[$a3],@x[$b3]
+	xvxor.v		@x[$d3],@x[$d3],@x[$a3]
+	xvrotri.w	@x[$d3],@x[$d3],24
+
+	xvadd.w		@x[$c2],@x[$c2],@x[$d2]
+	xvxor.v		@x[$b2],@x[$b2],@x[$c2]
+	xvrotri.w	@x[$b2],@x[$b2],25
+	xvadd.w		@x[$c3],@x[$c3],@x[$d3]
+	xvxor.v		@x[$b3],@x[$b3],@x[$c3]
+	xvrotri.w	@x[$b3],@x[$b3],25
+
+EOF
+}
+
+$code .= <<EOF;
+.align 6
+.LChaCha20_8x:
+	ori			$t3,$zero,64
+	bleu		$len,$t3,.LChaCha20_1x  # goto 1x when len <= 64
+
+	addi.d		$sp,$sp,-128
+
+	# Save the initial block counter in $t4
+	ld.w		$t4,$counter,0
+	b			.Loop_outer_8x
+
+.align 5
+.Loop_outer_8x:
+	# Load constant
+	la.local		$t8,.Lsigma
+	xvldrepl.w		@x[0],$t8,4*0		# 'expa'
+	xvldrepl.w		@x[1],$t8,4*1		# 'nd 3'
+	xvldrepl.w		@x[2],$t8,4*2		# '2-by'
+	xvldrepl.w		@x[3],$t8,4*3		# 'te k'
+
+	# Load key
+	xvldrepl.w		@x[4],$key,4*0
+	xvldrepl.w		@x[5],$key,4*1
+	xvldrepl.w		@x[6],$key,4*2
+	xvldrepl.w		@x[7],$key,4*3
+	xvldrepl.w		@x[8],$key,4*4
+	xvldrepl.w		@x[9],$key,4*5
+	xvldrepl.w		@x[10],$key,4*6
+	xvldrepl.w		@x[11],$key,4*7
+
+	# Load block counter
+	xvreplgr2vr.w	@x[12],$t4
+
+	# Load nonce
+	xvldrepl.w		@x[13],$counter,4*1
+	xvldrepl.w		@x[14],$counter,4*2
+	xvldrepl.w		@x[15],$counter,4*3
+
+	# Get the correct block counter for each block
+	la.local		$t8,.Linc8x
+	xvld			@y[0],$t8,0
+	xvadd.w			@x[12],@x[12],@y[0]
+
+	# Copy the initial states from \@x[*] to \@y[*]
+	xvori.b			@y[0],@x[0],0
+	xvori.b			@y[1],@x[1],0
+	xvori.b			@y[2],@x[2],0
+	xvori.b			@y[3],@x[3],0
+	xvori.b			@y[4],@x[4],0
+	xvori.b			@y[5],@x[5],0
+	xvori.b			@y[6],@x[6],0
+	xvori.b			@y[7],@x[7],0
+	xvori.b			@y[8],@x[8],0
+	xvori.b			@y[9],@x[9],0
+	xvori.b			@y[10],@x[10],0
+	xvori.b			@y[11],@x[11],0
+	xvori.b			@y[12],@x[12],0
+	xvori.b			@y[13],@x[13],0
+	xvori.b			@y[14],@x[14],0
+	xvori.b			@y[15],@x[15],0
+
+	# Update states in \@x[*] for 20 rounds
+	ori				$t8,$zero,10
+	b				.Loop_8x
+
+.align 5
+.Loop_8x:
+EOF
+
+&ROUND_8x (0, 4, 8, 12);
+&ROUND_8x (0, 5, 10, 15);
+
+$code .= <<EOF;
+	addi.w		$t8,$t8,-1
+	bnez		$t8,.Loop_8x
+
+	# Get the final states by adding the initial states
+	xvadd.w		@x[0],@x[0],@y[0]
+	xvadd.w		@x[1],@x[1],@y[1]
+	xvadd.w		@x[2],@x[2],@y[2]
+	xvadd.w		@x[3],@x[3],@y[3]
+	xvadd.w		@x[4],@x[4],@y[4]
+	xvadd.w		@x[5],@x[5],@y[5]
+	xvadd.w		@x[6],@x[6],@y[6]
+	xvadd.w		@x[7],@x[7],@y[7]
+	xvadd.w		@x[8],@x[8],@y[8]
+	xvadd.w		@x[9],@x[9],@y[9]
+	xvadd.w		@x[10],@x[10],@y[10]
+	xvadd.w		@x[11],@x[11],@y[11]
+	xvadd.w		@x[12],@x[12],@y[12]
+	xvadd.w		@x[13],@x[13],@y[13]
+	xvadd.w		@x[14],@x[14],@y[14]
+	xvadd.w		@x[15],@x[15],@y[15]
+
+	# Get the transpose of \@x[*] and save them in \@y[*]
+	xvilvl.w	@y[0],@x[1],@x[0]
+	xvilvh.w	@y[1],@x[1],@x[0]
+	xvilvl.w	@y[2],@x[3],@x[2]
+	xvilvh.w	@y[3],@x[3],@x[2]
+	xvilvl.w	@y[4],@x[5],@x[4]
+	xvilvh.w	@y[5],@x[5],@x[4]
+	xvilvl.w	@y[6],@x[7],@x[6]
+	xvilvh.w	@y[7],@x[7],@x[6]
+	xvilvl.w	@y[8],@x[9],@x[8]
+	xvilvh.w	@y[9],@x[9],@x[8]
+	xvilvl.w	@y[10],@x[11],@x[10]
+	xvilvh.w	@y[11],@x[11],@x[10]
+	xvilvl.w	@y[12],@x[13],@x[12]
+	xvilvh.w	@y[13],@x[13],@x[12]
+	xvilvl.w	@y[14],@x[15],@x[14]
+	xvilvh.w	@y[15],@x[15],@x[14]
+
+	xvilvl.d	@x[0],@y[2],@y[0]
+	xvilvh.d	@x[1],@y[2],@y[0]
+	xvilvl.d	@x[2],@y[3],@y[1]
+	xvilvh.d	@x[3],@y[3],@y[1]
+	xvilvl.d	@x[4],@y[6],@y[4]
+	xvilvh.d	@x[5],@y[6],@y[4]
+	xvilvl.d	@x[6],@y[7],@y[5]
+	xvilvh.d	@x[7],@y[7],@y[5]
+	xvilvl.d	@x[8],@y[10],@y[8]
+	xvilvh.d	@x[9],@y[10],@y[8]
+	xvilvl.d	@x[10],@y[11],@y[9]
+	xvilvh.d	@x[11],@y[11],@y[9]
+	xvilvl.d	@x[12],@y[14],@y[12]
+	xvilvh.d	@x[13],@y[14],@y[12]
+	xvilvl.d	@x[14],@y[15],@y[13]
+	xvilvh.d	@x[15],@y[15],@y[13]
+
+	xvori.b		@y[0],@x[4],0
+	xvpermi.q	@y[0],@x[0],0x20
+	xvori.b		@y[1],@x[5],0
+	xvpermi.q	@y[1],@x[1],0x20
+	xvori.b		@y[2],@x[6],0
+	xvpermi.q	@y[2],@x[2],0x20
+	xvori.b		@y[3],@x[7],0
+	xvpermi.q	@y[3],@x[3],0x20
+	xvori.b		@y[4],@x[4],0
+	xvpermi.q	@y[4],@x[0],0x31
+	xvori.b		@y[5],@x[5],0
+	xvpermi.q	@y[5],@x[1],0x31
+	xvori.b		@y[6],@x[6],0
+	xvpermi.q	@y[6],@x[2],0x31
+	xvori.b		@y[7],@x[7],0
+	xvpermi.q	@y[7],@x[3],0x31
+	xvori.b		@y[8],@x[12],0
+	xvpermi.q	@y[8],@x[8],0x20
+	xvori.b		@y[9],@x[13],0
+	xvpermi.q	@y[9],@x[9],0x20
+	xvori.b		@y[10],@x[14],0
+	xvpermi.q	@y[10],@x[10],0x20
+	xvori.b		@y[11],@x[15],0
+	xvpermi.q	@y[11],@x[11],0x20
+	xvori.b		@y[12],@x[12],0
+	xvpermi.q	@y[12],@x[8],0x31
+	xvori.b		@y[13],@x[13],0
+	xvpermi.q	@y[13],@x[9],0x31
+	xvori.b		@y[14],@x[14],0
+	xvpermi.q	@y[14],@x[10],0x31
+	xvori.b		@y[15],@x[15],0
+	xvpermi.q	@y[15],@x[11],0x31
+
+EOF
+
+# Adjust the order of elements in @y[*] for ease of use.
+@y = (@y[0],@y[8],@y[1],@y[9],@y[2],@y[10],@y[3],@y[11],
+      @y[4],@y[12],@y[5],@y[13],@y[6],@y[14],@y[7],@y[15]);
+
+$code .= <<EOF;
+	ori			$t8,$zero,64*8
+	bltu		$len,$t8,.Ltail_8x
+
+	# Get the encrypted message by xor states with plaintext
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvld		@x[2],$inp,32*2
+	xvld		@x[3],$inp,32*3
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvxor.v		@x[2],@x[2],@y[2]
+	xvxor.v		@x[3],@x[3],@y[3]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+	xvst		@x[2],$out,32*2
+	xvst		@x[3],$out,32*3
+
+	xvld		@x[0],$inp,32*4
+	xvld		@x[1],$inp,32*5
+	xvld		@x[2],$inp,32*6
+	xvld		@x[3],$inp,32*7
+	xvxor.v		@x[0],@x[0],@y[4]
+	xvxor.v		@x[1],@x[1],@y[5]
+	xvxor.v		@x[2],@x[2],@y[6]
+	xvxor.v		@x[3],@x[3],@y[7]
+	xvst		@x[0],$out,32*4
+	xvst		@x[1],$out,32*5
+	xvst		@x[2],$out,32*6
+	xvst		@x[3],$out,32*7
+
+	xvld		@x[0],$inp,32*8
+	xvld		@x[1],$inp,32*9
+	xvld		@x[2],$inp,32*10
+	xvld		@x[3],$inp,32*11
+	xvxor.v		@x[0],@x[0],@y[8]
+	xvxor.v		@x[1],@x[1],@y[9]
+	xvxor.v		@x[2],@x[2],@y[10]
+	xvxor.v		@x[3],@x[3],@y[11]
+	xvst		@x[0],$out,32*8
+	xvst		@x[1],$out,32*9
+	xvst		@x[2],$out,32*10
+	xvst		@x[3],$out,32*11
+
+	xvld		@x[0],$inp,32*12
+	xvld		@x[1],$inp,32*13
+	xvld		@x[2],$inp,32*14
+	xvld		@x[3],$inp,32*15
+	xvxor.v		@x[0],@x[0],@y[12]
+	xvxor.v		@x[1],@x[1],@y[13]
+	xvxor.v		@x[2],@x[2],@y[14]
+	xvxor.v		@x[3],@x[3],@y[15]
+	xvst		@x[0],$out,32*12
+	xvst		@x[1],$out,32*13
+	xvst		@x[2],$out,32*14
+	xvst		@x[3],$out,32*15
+
+	addi.d		$len,$len,-64*8
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,64*8
+	addi.d		$out,$out,64*8
+	addi.w		$t4,$t4,8
+	b			.Loop_outer_8x
+
+.Ltail_8x:
+	# Handle the tail for 8x (1 <= tail_len <= 511)
+	ori			$t8,$zero,448
+	bgeu		$len,$t8,.L448_or_more8x
+	ori			$t8,$zero,384
+	bgeu		$len,$t8,.L384_or_more8x
+	ori			$t8,$zero,320
+	bgeu		$len,$t8,.L320_or_more8x
+	ori			$t8,$zero,256
+	bgeu		$len,$t8,.L256_or_more8x
+	ori			$t8,$zero,192
+	bgeu		$len,$t8,.L192_or_more8x
+	ori			$t8,$zero,128
+	bgeu		$len,$t8,.L128_or_more8x
+	ori			$t8,$zero,64
+	bgeu		$len,$t8,.L64_or_more8x
+
+	xvst		@y[0],$sp,32*0
+	xvst		@y[1],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.align 5
+.L64_or_more8x:
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+
+	addi.d		$len,$len,-64
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,64
+	addi.d		$out,$out,64
+	xvst		@y[2],$sp,32*0
+	xvst		@y[3],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.align 5
+.L128_or_more8x:
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvld		@x[2],$inp,32*2
+	xvld		@x[3],$inp,32*3
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvxor.v		@x[2],@x[2],@y[2]
+	xvxor.v		@x[3],@x[3],@y[3]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+	xvst		@x[2],$out,32*2
+	xvst		@x[3],$out,32*3
+
+	addi.d		$len,$len,-128
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,128
+	addi.d		$out,$out,128
+	xvst		@y[4],$sp,32*0
+	xvst		@y[5],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.align 5
+.L192_or_more8x:
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvld		@x[2],$inp,32*2
+	xvld		@x[3],$inp,32*3
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvxor.v		@x[2],@x[2],@y[2]
+	xvxor.v		@x[3],@x[3],@y[3]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+	xvst		@x[2],$out,32*2
+	xvst		@x[3],$out,32*3
+
+	xvld		@x[0],$inp,32*4
+	xvld		@x[1],$inp,32*5
+	xvxor.v		@x[0],@x[0],@y[4]
+	xvxor.v		@x[1],@x[1],@y[5]
+	xvst		@x[0],$out,32*4
+	xvst		@x[1],$out,32*5
+
+	addi.d		$len,$len,-192
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,192
+	addi.d		$out,$out,192
+	xvst		@y[6],$sp,32*0
+	xvst		@y[7],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.align 5
+.L256_or_more8x:
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvld		@x[2],$inp,32*2
+	xvld		@x[3],$inp,32*3
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvxor.v		@x[2],@x[2],@y[2]
+	xvxor.v		@x[3],@x[3],@y[3]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+	xvst		@x[2],$out,32*2
+	xvst		@x[3],$out,32*3
+
+	xvld		@x[0],$inp,32*4
+	xvld		@x[1],$inp,32*5
+	xvld		@x[2],$inp,32*6
+	xvld		@x[3],$inp,32*7
+	xvxor.v		@x[0],@x[0],@y[4]
+	xvxor.v		@x[1],@x[1],@y[5]
+	xvxor.v		@x[2],@x[2],@y[6]
+	xvxor.v		@x[3],@x[3],@y[7]
+	xvst		@x[0],$out,32*4
+	xvst		@x[1],$out,32*5
+	xvst		@x[2],$out,32*6
+	xvst		@x[3],$out,32*7
+
+	addi.d		$len,$len,-256
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,256
+	addi.d		$out,$out,256
+	xvst		@y[8],$sp,32*0
+	xvst		@y[9],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.align 5
+.L320_or_more8x:
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvld		@x[2],$inp,32*2
+	xvld		@x[3],$inp,32*3
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvxor.v		@x[2],@x[2],@y[2]
+	xvxor.v		@x[3],@x[3],@y[3]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+	xvst		@x[2],$out,32*2
+	xvst		@x[3],$out,32*3
+
+	xvld		@x[0],$inp,32*4
+	xvld		@x[1],$inp,32*5
+	xvld		@x[2],$inp,32*6
+	xvld		@x[3],$inp,32*7
+	xvxor.v		@x[0],@x[0],@y[4]
+	xvxor.v		@x[1],@x[1],@y[5]
+	xvxor.v		@x[2],@x[2],@y[6]
+	xvxor.v		@x[3],@x[3],@y[7]
+	xvst		@x[0],$out,32*4
+	xvst		@x[1],$out,32*5
+	xvst		@x[2],$out,32*6
+	xvst		@x[3],$out,32*7
+
+	xvld		@x[0],$inp,32*8
+	xvld		@x[1],$inp,32*9
+	xvxor.v		@x[0],@x[0],@y[8]
+	xvxor.v		@x[1],@x[1],@y[9]
+	xvst		@x[0],$out,32*8
+	xvst		@x[1],$out,32*9
+
+	addi.d		$len,$len,-320
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,320
+	addi.d		$out,$out,320
+	xvst		@y[10],$sp,32*0
+	xvst		@y[11],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.align 5
+.L384_or_more8x:
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvld		@x[2],$inp,32*2
+	xvld		@x[3],$inp,32*3
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvxor.v		@x[2],@x[2],@y[2]
+	xvxor.v		@x[3],@x[3],@y[3]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+	xvst		@x[2],$out,32*2
+	xvst		@x[3],$out,32*3
+
+	xvld		@x[0],$inp,32*4
+	xvld		@x[1],$inp,32*5
+	xvld		@x[2],$inp,32*6
+	xvld		@x[3],$inp,32*7
+	xvxor.v		@x[0],@x[0],@y[4]
+	xvxor.v		@x[1],@x[1],@y[5]
+	xvxor.v		@x[2],@x[2],@y[6]
+	xvxor.v		@x[3],@x[3],@y[7]
+	xvst		@x[0],$out,32*4
+	xvst		@x[1],$out,32*5
+	xvst		@x[2],$out,32*6
+	xvst		@x[3],$out,32*7
+
+	xvld		@x[0],$inp,32*8
+	xvld		@x[1],$inp,32*9
+	xvld		@x[2],$inp,32*10
+	xvld		@x[3],$inp,32*11
+	xvxor.v		@x[0],@x[0],@y[8]
+	xvxor.v		@x[1],@x[1],@y[9]
+	xvxor.v		@x[2],@x[2],@y[10]
+	xvxor.v		@x[3],@x[3],@y[11]
+	xvst		@x[0],$out,32*8
+	xvst		@x[1],$out,32*9
+	xvst		@x[2],$out,32*10
+	xvst		@x[3],$out,32*11
+
+	addi.d		$len,$len,-384
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,384
+	addi.d		$out,$out,384
+	xvst		@y[12],$sp,32*0
+	xvst		@y[13],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.align 5
+.L448_or_more8x:
+	xvld		@x[0],$inp,32*0
+	xvld		@x[1],$inp,32*1
+	xvld		@x[2],$inp,32*2
+	xvld		@x[3],$inp,32*3
+	xvxor.v		@x[0],@x[0],@y[0]
+	xvxor.v		@x[1],@x[1],@y[1]
+	xvxor.v		@x[2],@x[2],@y[2]
+	xvxor.v		@x[3],@x[3],@y[3]
+	xvst		@x[0],$out,32*0
+	xvst		@x[1],$out,32*1
+	xvst		@x[2],$out,32*2
+	xvst		@x[3],$out,32*3
+
+	xvld		@x[0],$inp,32*4
+	xvld		@x[1],$inp,32*5
+	xvld		@x[2],$inp,32*6
+	xvld		@x[3],$inp,32*7
+	xvxor.v		@x[0],@x[0],@y[4]
+	xvxor.v		@x[1],@x[1],@y[5]
+	xvxor.v		@x[2],@x[2],@y[6]
+	xvxor.v		@x[3],@x[3],@y[7]
+	xvst		@x[0],$out,32*4
+	xvst		@x[1],$out,32*5
+	xvst		@x[2],$out,32*6
+	xvst		@x[3],$out,32*7
+
+	xvld		@x[0],$inp,32*8
+	xvld		@x[1],$inp,32*9
+	xvld		@x[2],$inp,32*10
+	xvld		@x[3],$inp,32*11
+	xvxor.v		@x[0],@x[0],@y[8]
+	xvxor.v		@x[1],@x[1],@y[9]
+	xvxor.v		@x[2],@x[2],@y[10]
+	xvxor.v		@x[3],@x[3],@y[11]
+	xvst		@x[0],$out,32*8
+	xvst		@x[1],$out,32*9
+	xvst		@x[2],$out,32*10
+	xvst		@x[3],$out,32*11
+
+	xvld		@x[0],$inp,32*12
+	xvld		@x[1],$inp,32*13
+	xvxor.v		@x[0],@x[0],@y[12]
+	xvxor.v		@x[1],@x[1],@y[13]
+	xvst		@x[0],$out,32*12
+	xvst		@x[1],$out,32*13
+
+	addi.d		$len,$len,-448
+	beqz		$len,.Ldone_8x
+	addi.d		$inp,$inp,448
+	addi.d		$out,$out,448
+	xvst		@y[14],$sp,32*0
+	xvst		@y[15],$sp,32*1
+	move		$t8,$zero
+	b			.Loop_tail_8x
+
+.Loop_tail_8x:
+	# Xor input with states byte by byte
+	ldx.bu		$t5,$inp,$t8
+	ldx.bu		$t6,$sp,$t8
+	xor			$t5,$t5,$t6
+	stx.b		$t5,$out,$t8
+	addi.w		$t8,$t8,1
+	addi.d		$len,$len,-1
+	bnez		$len,.Loop_tail_8x
+	b			.Ldone_8x
+
+.Ldone_8x:
+	addi.d		$sp,$sp,128
+	b			.Lend
+
+EOF
+}
+
+$code .= <<EOF;
+.Lno_data:
+.Lend:
+	jr	$ra
+.size ChaCha20_ctr32,.-ChaCha20_ctr32
+EOF
+
+$code =~ s/\`([^\`]*)\`/eval($1)/gem;
+
+print $code;
+
+close STDOUT;
diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index 1fa1a716f51f0e9b3cff87dbfbe26b8504d5fb12..24593e6c1303c030b259b880e9c29ad4be396806 100644
--- a/crypto/chacha/build.info
+++ b/crypto/chacha/build.info
@@ -12,6 +12,8 @@ IF[{- !$disabled{asm} -}]
   $CHACHAASM_armv4=chacha-armv4.S
   $CHACHAASM_aarch64=chacha-armv8.S chacha-armv8-sve.S
 
+  $CHACHAASM_loongarch64=chacha-loongarch64.S
+
   $CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s
   IF[{- $target{sys_id} ne "AIX" && $target{sys_id} ne "MACOSX" -}]
     $CHACHAASM_ppc32=chacha_ppc.c chacha-ppc.s chachap10-ppc.s
@@ -39,8 +41,10 @@ GENERATE[chacha-armv8.S]=asm/chacha-armv8.pl
 GENERATE[chacha-armv8-sve.S]=asm/chacha-armv8-sve.pl
 INCLUDE[chacha-armv8.o]=..
 INCLUDE[chacha-armv8-sve.o]=..
+INCLUDE[chacha-loongarch64.o]=..
 INCLUDE[chacha-s390x.o]=..
 GENERATE[chacha-c64xplus.S]=asm/chacha-c64xplus.pl
 GENERATE[chacha-s390x.S]=asm/chacha-s390x.pl
 GENERATE[chacha-ia64.S]=asm/chacha-ia64.pl
 GENERATE[chacha-ia64.s]=chacha-ia64.S
+GENERATE[chacha-loongarch64.S]=asm/chacha-loongarch64.pl
diff --git a/crypto/chacha/chacha_ppc.c b/crypto/chacha/chacha_ppc.c
index 29eb9833d00e48cb3fde8ce3c0133a131ad22e94..91ed85eaf02b100e870395d0324be7918af96624 100644
--- a/crypto/chacha/chacha_ppc.c
+++ b/crypto/chacha/chacha_ppc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2009-2023 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
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index f8823f4aa9c58edb96e1b786e6c123f1cde34186..50c8511ba7dd51d3a0783f7a0ed13ab1dea88e7e 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2010-2023 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
diff --git a/crypto/cmp/cmp_asn.c b/crypto/cmp/cmp_asn.c
index 4cf203f8e4ef35087c7b6ebbf68ac1db1170b835..0133dc5f80b610e126f0cc90e6dddc51b6c94596 100644
--- a/crypto/cmp/cmp_asn.c
+++ b/crypto/cmp/cmp_asn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c
index 0c39b13f91d5d744696bed2a614d23ea1f2e7862..b5b0557b0d046fab248102e5f621bf9b9cc29986 100644
--- a/crypto/cmp/cmp_client.c
+++ b/crypto/cmp/cmp_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c
index ce8e94662e7570e1dd7222c8ba5c1192ea98e55f..b95c540133ca7a69bc3285cf3760dc36633dbe64 100644
--- a/crypto/cmp/cmp_ctx.c
+++ b/crypto/cmp/cmp_ctx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_genm.c b/crypto/cmp/cmp_genm.c
index 97a7293db3d992e625c5a69a5b0b19a0a5eb6050..dad6ef1189713e97dc6fe7e4352a3505ec41646a 100644
--- a/crypto/cmp/cmp_genm.c
+++ b/crypto/cmp/cmp_genm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Siemens AG 2022
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/cmp/cmp_http.c b/crypto/cmp/cmp_http.c
index 6e77c9c708a1c4c922474893b662d0da3e4c421e..ef77d251efc93a3cf6eb63285cbc9bae9a711568 100644
--- a/crypto/cmp/cmp_http.c
+++ b/crypto/cmp/cmp_http.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h
index d1035c2da965a5180c80e90a5c3e2ec00da5ccde..3fb479ca39c3941c88f8e532da07ae110a5d848a 100644
--- a/crypto/cmp/cmp_local.h
+++ b/crypto/cmp/cmp_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index 242ba866d5e75b6c4ee8bd5c93503f50dbb48370..e00afc809e2b8abec480c0b9cc67f0e50cccc6de 100644
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_protect.c b/crypto/cmp/cmp_protect.c
index 3d633bef79385c9862df34b3d8970fb225ed29d7..f59fee44ec26c8c18ed2e053cef6ccf1d7b3180a 100644
--- a/crypto/cmp/cmp_protect.c
+++ b/crypto/cmp/cmp_protect.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
@@ -22,9 +22,11 @@
 /*
  * This function is also used by the internal verify_PBMAC() in cmp_vfy.c.
  *
- * Calculate protection for given PKImessage according to
- * the algorithm and parameters in the message header's protectionAlg
+ * Calculate protection for |msg| according to |msg->header->protectionAlg|
  * using the credentials, library context, and property criteria in the ctx.
+ * Unless |msg->header->protectionAlg| is PasswordBasedMAC,
+ * its value is completed according to |ctx->pkey| and |ctx->digest|,
+ * where the latter irrelevant in the case of Edwards curves.
  *
  * returns ASN1_BIT_STRING representing the protection on success, else NULL
  */
@@ -104,23 +106,22 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
         OPENSSL_free(prot_part_der);
         return prot;
     } else {
-        int md_nid;
-        const EVP_MD *md = NULL;
+        const EVP_MD *md = ctx->digest;
+        char name[80] = "";
 
         if (ctx->pkey == NULL) {
             ERR_raise(ERR_LIB_CMP,
                       CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
             return NULL;
         }
-        if (!OBJ_find_sigid_algs(OBJ_obj2nid(algorOID), &md_nid, NULL)
-                || (md = EVP_get_digestbynid(md_nid)) == NULL) {
-            ERR_raise(ERR_LIB_CMP, CMP_R_UNKNOWN_ALGORITHM_ID);
-            return NULL;
-        }
+        if (EVP_PKEY_get_default_digest_name(ctx->pkey, name, sizeof(name)) > 0
+            && strcmp(name, "UNDEF") == 0) /* at least for Ed25519, Ed448 */
+            md = NULL;
 
         if ((prot = ASN1_BIT_STRING_new()) == NULL)
             return NULL;
-        if (ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART), NULL,
+        if (ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART),
+                              msg->header->protectionAlg, /* sets X509_ALGOR */
                               NULL, prot, &prot_part, NULL, ctx->pkey, md,
                               ctx->libctx, ctx->propq))
             return prot;
@@ -216,18 +217,6 @@ static X509_ALGOR *pbmac_algor(const OSSL_CMP_CTX *ctx)
     return alg;
 }
 
-static X509_ALGOR *sig_algor(const OSSL_CMP_CTX *ctx)
-{
-    int nid = 0;
-
-    if (!OBJ_find_sigid_by_algs(&nid, EVP_MD_get_type(ctx->digest),
-                                EVP_PKEY_get_id(ctx->pkey))) {
-        ERR_raise(ERR_LIB_CMP, CMP_R_UNSUPPORTED_KEY_TYPE);
-        return 0;
-    }
-    return ossl_X509_ALGOR_from_nid(nid, V_ASN1_UNDEF, NULL);
-}
-
 static int set_senderKID(const OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg,
                          const ASN1_OCTET_STRING *id)
 {
@@ -275,7 +264,7 @@ int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
             goto err;
         }
 
-        if ((msg->header->protectionAlg = sig_algor(ctx)) == NULL)
+        if ((msg->header->protectionAlg = X509_ALGOR_new()) == NULL)
             goto err;
         /* set senderKID to keyIdentifier of the cert according to 5.1.1 */
         if (!set_senderKID(ctx, msg, X509_get0_subject_key_id(ctx->cert)))
@@ -291,6 +280,7 @@ int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
         goto err;
     }
     if (!ctx->unprotectedSend
+        /* protect according to msg->header->protectionAlg partly set above */
             && ((msg->protection = ossl_cmp_calc_protection(ctx, msg)) == NULL))
         goto err;
 
diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c
index ce85dbe2f4e5442086b079571aae07496f48bd4b..06ef8fbb613ef5490eeac53c525f8855c85355e2 100644
--- a/crypto/cmp/cmp_server.c
+++ b/crypto/cmp/cmp_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_status.c b/crypto/cmp/cmp_status.c
index ecb97854d975bd99cc7afdfcc722d985e353c459..b9086d84f8462d806bf3d7084ea828fa6ba582d1 100644
--- a/crypto/cmp/cmp_status.c
+++ b/crypto/cmp/cmp_status.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c
index d6521d870079489b93510dee6f462c76baeed0d6..2d7b2388ced41a792e5e797bf7d0f6b25e24dcca 100644
--- a/crypto/cmp/cmp_vfy.c
+++ b/crypto/cmp/cmp_vfy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2020
  * Copyright Siemens AG 2015-2020
  *
diff --git a/crypto/cms/cms_dh.c b/crypto/cms/cms_dh.c
index c1b763e98ec038066227ea0b6392c76b832f3e89..c6e8c076da72d56e3f8f34941567c022542807ae 100644
--- a/crypto/cms/cms_dh.c
+++ b/crypto/cms/cms_dh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/cms/cms_ec.c b/crypto/cms/cms_ec.c
index 2e4f19552f507892e6f8e44d43fb146ee709c744..a4427d7ee21b065572dd78577c664a659f36a4ab 100644
--- a/crypto/cms/cms_ec.c
+++ b/crypto/cms/cms_ec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 6fc27565cddf771d89174e1abdeafc6d0c572bfd..b877e106199aeeaf6a1dc98d0d2cb85a45b63af9 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index fb1c8203e8f83ff6eabc6dc98130095640aa9572..afc210c9d0c8a82bc946c572b2af6fc9211e58bd 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h
index 92d8723428a95a7a9aeed81c1dbad779b16d4939..7069021267defaa6e7b0b6e6fb5b451005f62ade 100644
--- a/crypto/cms/cms_local.h
+++ b/crypto/cms/cms_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/crypto/cms/cms_rsa.c b/crypto/cms/cms_rsa.c
index 4e0712f94c9b178260bad6e2e2b8e69d0d48431f..7f327dec93f338fbb152ca57f78e045db3f8090d 100644
--- a/crypto/cms/cms_rsa.c
+++ b/crypto/cms/cms_rsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index 0d3e22c9e8ed12c4c9bef9aab353401f2ac2593d..c32e95f10dda1155902c126d929f0ac5e49cc512 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
@@ -262,13 +262,13 @@ static int cms_sd_asn1_ctrl(CMS_SignerInfo *si, int cmd)
     int i;
 
     if (EVP_PKEY_is_a(pkey, "DSA") || EVP_PKEY_is_a(pkey, "EC"))
-        return cms_generic_sign(si, cmd);
+        return cms_generic_sign(si, cmd) > 0;
     else if (EVP_PKEY_is_a(pkey, "RSA") || EVP_PKEY_is_a(pkey, "RSA-PSS"))
-        return ossl_cms_rsa_sign(si, cmd);
+        return ossl_cms_rsa_sign(si, cmd) > 0;
 
     /* Now give engines, providers, etc a chance to handle this */
     if (pkey->ameth == NULL || pkey->ameth->pkey_ctrl == NULL)
-        return cms_generic_sign(si, cmd);
+        return cms_generic_sign(si, cmd) > 0;
     i = pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_CMS_SIGN, cmd, si);
     if (i == -2) {
         ERR_raise(ERR_LIB_CMS, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index cf12c5b78580ea88e0aaa162716dad16e3d2a4d0..65f9674037761729e232d3e83f4864533b033863 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/crypto/comp/c_brotli.c b/crypto/comp/c_brotli.c
index df63a43b417d9dfb6ae8367edb8458ec83c0e4c4..07e1e76471c5d199c30b200dc22f2d7688498cb9 100644
--- a/crypto/comp/c_brotli.c
+++ b/crypto/comp/c_brotli.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2023 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
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 52f2e26a73f7e9a258acc87eaafe1021a190b55a..0fbab8f014fe51b1408c6748f287a9c17145fe4d 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2023 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
diff --git a/crypto/comp/c_zstd.c b/crypto/comp/c_zstd.c
index 7f6c5cc72c21415d3f090c4fa95fdef699644250..b4667649f3ce0ce1a425d673b0b22ff4e1bd0c99 100644
--- a/crypto/comp/c_zstd.c
+++ b/crypto/comp/c_zstd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2023 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
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 2a2b3d211467de3eedfe191bc521ba0cbd56b84b..e047746f67642632ebc5e8c7bfa57023c9633da0 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -892,7 +892,7 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx)
 
 static int is_keytype(const CONF *conf, char c, unsigned short type)
 {
-    const unsigned short * keytypes = (const unsigned short *) conf->meth_data;
+    const unsigned short *keytypes = (const unsigned short *) conf->meth_data;
     unsigned char key = (unsigned char)c;
 
 #ifdef CHARSET_EBCDIC
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 38a8d4412f11fddcf1937c9eaca4d11860c249da..d6a5f3ff3556bfaf6b1344a16064095c5b5d8070 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 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
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 2e1848866418e6a8465c8a0f9e77d5a9c0ad5d46..3019bcf31af81abf116cc6bae319b3d9cb094fd3 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 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
diff --git a/crypto/context.c b/crypto/context.c
index ba67b0c618e9c010397eb5fd61989d79ad20fa72..33d52a964b136b0ca1d2135e46a99129d8b58cf8 100644
--- a/crypto/context.c
+++ b/crypto/context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index 25e0eb90ebb716f24542f3d7ee4fa1636c7affbd..1dcf390fc2e770c6470ce2ebf38f54441f72b26a 100644
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/cpuid.c b/crypto/cpuid.c
index f3d966dbf0b53ab657ea46cd3056f4de72c88f95..e5db03f3f6af2c33b218d0adc1469cb8e2342460 100644
--- a/crypto/cpuid.c
+++ b/crypto/cpuid.c
@@ -34,7 +34,7 @@ static variant_char *ossl_getenv(const char *name)
 {
     /*
      * Since we pull only one environment variable, it's simpler to
-     * to just ignore |name| and use equivalent wide-char L-literal.
+     * just ignore |name| and use equivalent wide-char L-literal.
      * As well as to ignore excessively long values...
      */
     static WCHAR value[48];
@@ -173,7 +173,7 @@ void OPENSSL_cpuid_setup(void)
  */
 
 /*
- * The volatile is used to to ensure that the compiler generates code that reads
+ * The volatile is used to ensure that the compiler generates code that reads
  * all values from the array and doesn't try to optimize this away. The standard
  * doesn't actually require this behavior if the original data pointed to is
  * not volatile, but compilers do this in practice anyway.
@@ -181,7 +181,7 @@ void OPENSSL_cpuid_setup(void)
  * There are also assembler versions of this function.
  */
 # undef CRYPTO_memcmp
-int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len)
+int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
 {
     size_t i;
     const volatile unsigned char *a = in_a;
diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c
index 12939b9920c8320956e4446e183e4d34a8884c9d..cb077e41d2c4c54f2499aeabc67d1493e4309510 100644
--- a/crypto/crmf/crmf_lib.c
+++ b/crypto/crmf/crmf_lib.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2018
  * Copyright Siemens AG 2015-2019
  *
@@ -386,8 +386,9 @@ static int create_popo_signature(OSSL_CRMF_POPOSIGNINGKEY *ps,
         digest = NULL;
 
     return ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CRMF_CERTREQUEST),
-                             ps->algorithmIdentifier, NULL, ps->signature, cr,
-                             NULL, pkey, digest, libctx, propq);
+                             ps->algorithmIdentifier, /* sets this X509_ALGOR */
+                             NULL, ps->signature, /* sets the ASN1_BIT_STRING */
+                             cr, NULL, pkey, digest, libctx, propq);
 }
 
 int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 1b1830f31aa7a804607dcb8e710e1f1b2a1675aa..6c1947943879d7eaa6f3b6f4915ec12f7ff84483 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ctype.c b/crypto/ctype.c
index d46aeac6ec0427d845d8a3ba3e7e5fe3b5b134f3..48b3025ba539dfdc404b7c063532db48957995c4 100644
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/crypto/des/des_local.h b/crypto/des/des_local.h
index 5abf62d6f7a8f047881dbcc251057f0285f40696..d43f2c87374d6269b6a94a978c8556e923405547 100644
--- a/crypto/des/des_local.h
+++ b/crypto/des/des_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/deterministic_nonce.c b/crypto/deterministic_nonce.c
index afa8543336e977d605a6f62c8440f9bbe98e4fd2..60af7f6ab66558b37268e42e3b28f07f8bd74df1 100644
--- a/crypto/deterministic_nonce.c
+++ b/crypto/deterministic_nonce.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/dh/dh_backend.c b/crypto/dh/dh_backend.c
index abc66a5b309116dff6c2fa9f7b8e7805b768a029..1aaa88dacae111e1d37db702a560e597282dc6a7 100644
--- a/crypto/dh/dh_backend.c
+++ b/crypto/dh/dh_backend.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c
index 58c1d1798b6201fdc307a5e13de782561e03ac82..f4173e21371e01ef03f990a83e764b5141693f83 100644
--- a/crypto/dh/dh_check.c
+++ b/crypto/dh/dh_check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 328780b9a9f1f9d6d93f91e354370fb0a16d95f0..bc26cee303e970e2eccc6a082e37bc5a325a9786 100644
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index d67511f15c4e46d6914d5270d00b2ceba418434c..e2eb53961cb6593d070d20824de2bbf8ac50343e 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/dsa/dsa_backend.c b/crypto/dsa/dsa_backend.c
index ceaf6e6877f36f5c1ee0b4355b170b3695e20c04..8bd4b8ad7e0e2c6251587e54c38aa710ff8ea4b4 100644
--- a/crypto/dsa/dsa_backend.c
+++ b/crypto/dsa/dsa_backend.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 7fc762880bed256e9181987d26e35e274a49832b..1c2bab1714b3b57d42bea2171853a54087cc4980 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index c2ae3bf1584a29915633dcc671b9a1381d1851c5..b18fda33782705c055c245f193d7d05df38acb91 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 38e8fa145233ba5ccb0cd1d47bd3825adf496c4c..29e2a8057250b16d40c0b7a9595e4496869433f7 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index 487a7e251686f508a3107d89e0bf64fa3d8aa9b8..b806e7e65511a4fb2b3b2c42eed26f59c38f67bf 100644
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 7680c40547a010c1545d62faf3cb4b40094bf0de..8f3387e9b802085420ac49c6c65615226215eda1 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/crypto/dso/dso_local.h b/crypto/dso/dso_local.h
index 3100ba08446156bbf4b09ee33504773c37b1d107..d7af0b064e504d14caec03cb3c05dbce10f60699 100644
--- a/crypto/dso/dso_local.h
+++ b/crypto/dso/dso_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/ec/asm/ecp_nistp521-ppc64.pl b/crypto/ec/asm/ecp_nistp521-ppc64.pl
index f8393e465d15b96d4ad1300831e505caf90fa4ef..cf3bc79085f83d4181a23a89449eba5e08eca759 100755
--- a/crypto/ec/asm/ecp_nistp521-ppc64.pl
+++ b/crypto/ec/asm/ecp_nistp521-ppc64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
diff --git a/crypto/ec/curve25519.c b/crypto/ec/curve25519.c
index 4f033d74d0e5e5b10186a400d23786cbe332e2d7..cae2ac101dbaff4537dbfa279e0a3475c08f3538 100644
--- a/crypto/ec/curve25519.c
+++ b/crypto/ec/curve25519.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/ec/curve448/arch_32/f_impl32.c b/crypto/ec/curve448/arch_32/f_impl32.c
index 8a7a1fdbdeae542902a82ec4485ce0adaf347730..140c73c64fc19a607c4a3d2c0a8ba4af3b713529 100644
--- a/crypto/ec/curve448/arch_32/f_impl32.c
+++ b/crypto/ec/curve448/arch_32/f_impl32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2014 Cryptography Research, Inc.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/curve448/arch_64/f_impl64.c b/crypto/ec/curve448/arch_64/f_impl64.c
index 419f8a8e65d04e05faa2f7e757d85f831c453641..c944005da5d77d77c3b5bd761db31b081190aa70 100644
--- a/crypto/ec/curve448/arch_64/f_impl64.c
+++ b/crypto/ec/curve448/arch_64/f_impl64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2014 Cryptography Research, Inc.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c
index 914a15d77e2f3130b8c5359a1c672e853a457bee..2422d068a0364e524bf80495ab73e25159831e39 100644
--- a/crypto/ec/curve448/curve448.c
+++ b/crypto/ec/curve448/curve448.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2015-2016 Cryptography Research, Inc.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -221,7 +221,7 @@ ossl_curve448_point_valid(const curve448_point_t p)
 }
 
 static ossl_inline void constant_time_lookup_niels(niels_s * RESTRICT ni,
-                                                   const niels_t * table,
+                                                   const niels_t *table,
                                                    int nelts, int idx)
 {
     constant_time_lookup(ni, table, sizeof(niels_s), nelts, idx);
@@ -229,7 +229,7 @@ static ossl_inline void constant_time_lookup_niels(niels_s * RESTRICT ni,
 
 void
 ossl_curve448_precomputed_scalarmul(curve448_point_t out,
-                                    const curve448_precomputed_s * table,
+                                    const curve448_precomputed_s *table,
                                     const curve448_scalar_t scalar)
 {
     unsigned int i, j, k;
@@ -612,7 +612,7 @@ static int recode_wnaf(struct smvt_control *control,
     return n - 1;
 }
 
-static void prepare_wnaf_table(pniels_t * output,
+static void prepare_wnaf_table(pniels_t *output,
                                const curve448_point_t working,
                                unsigned int tbits)
 {
diff --git a/crypto/ec/curve448/curve448_local.h b/crypto/ec/curve448/curve448_local.h
index f118d851ee282774556bc7d7ccce65f911439bde..5c569ea8b9d2ba3b0b6bf7b623f02357d0e980b9 100644
--- a/crypto/ec/curve448/curve448_local.h
+++ b/crypto/ec/curve448/curve448_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c
index cbef27d9bb0b242b73411dd36266c56e085e9f4e..ff7f11dd343ac153bce490aba496ffab29c455bf 100644
--- a/crypto/ec/curve448/eddsa.c
+++ b/crypto/ec/curve448/eddsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2015-2016 Cryptography Research, Inc.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/curve448/f_generic.c b/crypto/ec/curve448/f_generic.c
index 997862ec200553fed6c72103942a53f0c79b5f60..9a4675a8b3db4ab2e480e67060922293df7e9a7c 100644
--- a/crypto/ec/curve448/f_generic.c
+++ b/crypto/ec/curve448/f_generic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2015-2016 Cryptography Research, Inc.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h
index 73a6c7374312df91cc12cf93479bfcd22361c765..80b1355b77aa4d6823969891ac4d68af9cdcbb11 100644
--- a/crypto/ec/curve448/field.h
+++ b/crypto/ec/curve448/field.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2014 Cryptography Research, Inc.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h
index e67ea68044ebad8c7ce00b68cbaddc5eb89b353d..597ded42114098e42f2ba0db4dd56b7575a46b43 100644
--- a/crypto/ec/curve448/point_448.h
+++ b/crypto/ec/curve448/point_448.h
@@ -271,7 +271,7 @@ ossl_x448_derive_public_key(uint8_t out[X448_PUBLIC_BYTES],
  */
 void
 ossl_curve448_precomputed_scalarmul(curve448_point_t scaled,
-                                    const curve448_precomputed_s * base,
+                                    const curve448_precomputed_s *base,
                                     const curve448_scalar_t scalar);
 
 /*
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 2bf3e601f17f2fdb2effa0e0a692f1ec98b34025..9bc4e032c557171925e732e01217b59af060b31b 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c
index 3471a82d7c8dee52a9c5783785a9d2b07a86265d..054a3333a78f163d2a43994748f91efbbd31f58b 100644
--- a/crypto/ec/ec_kmeth.c
+++ b/crypto/ec/ec_kmeth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index e0d6cf73426a732c65eed591db5fc4843f9b5bb0..c92b4dcb0ac45b6581be216383d2cf8a8f4477e3 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/ec_local.h b/crypto/ec/ec_local.h
index 803786fdd209630f070a501bf357a482a25733c7..2814d8739438f86894588290d2841ad34a9f5145 100644
--- a/crypto/ec/ec_local.h
+++ b/crypto/ec/ec_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 2317fc0ab56206700b8a78671ea8868a8de7bedf..9eb007cdf908285b4a26ae0eee1f8a2137a8c394 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/ec/ecdsa_ossl.c b/crypto/ec/ecdsa_ossl.c
index 0d0506937ab37dc907f68b2e20ba0db7da6011e4..0da33799e43c7f0b9fcadc1bca6a62a13bcc4b91 100644
--- a/crypto/ec/ecdsa_ossl.c
+++ b/crypto/ec/ecdsa_ossl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 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
diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 6c55724689510b023b6761ebcdba8aad812ff14f..debfdb3dc942e394d933b0b9f48817963f75fcb3 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2010-2023 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
diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c
index b20107a5fa2fbcb31f9f6ca136ff6561636ca794..d28306a6bd15be35d3950811d0bfb74512141b74 100644
--- a/crypto/ec/ecp_nistp256.c
+++ b/crypto/ec/ecp_nistp256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 32a9268ecf171843a8050159c3b79f3634f94074..db5a9dd5def3691269d9fe769f0755fd1e4f6044 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 8addb1e40c08bdf5a183db4152eef5dd603e2fe5..5760639a2ee2405b2413b672db347e898a426d4d 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2014, Intel Corporation. All Rights Reserved.
  * Copyright (c) 2015, CloudFlare, Inc.
  *
diff --git a/crypto/ec/ecp_s390x_nistp.c b/crypto/ec/ecp_s390x_nistp.c
index 6bf2da9b4bb14b04ea98edf253d3bb6f1bed9846..eae0b52c4e69bdb6a2fdc31f81cffbf8ed418c18 100644
--- a/crypto/ec/ecp_s390x_nistp.c
+++ b/crypto/ec/ecp_s390x_nistp.c
@@ -178,7 +178,7 @@ static ECDSA_SIG *ecdsa_s390x_nistp_sign_sig(const unsigned char *dgst,
             goto ret;
         }
         /*
-         * Generate random k and copy to param param block. RAND_priv_bytes_ex
+         * Generate random k and copy to param block. RAND_priv_bytes_ex
          * is used instead of BN_priv_rand_range or BN_generate_dsa_nonce
          * because kdsa instruction constructs an in-range, invertible nonce
          * internally implementing counter-measures for RNG weakness.
diff --git a/crypto/ec/ecx_backend.c b/crypto/ec/ecx_backend.c
index 0107a612a8b9f086affad867024bb0de455e9703..943a6bb3702a2c2ecd1d8b06b977871f1f7e3c35 100644
--- a/crypto/ec/ecx_backend.c
+++ b/crypto/ec/ecx_backend.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/ec/ecx_key.c b/crypto/ec/ecx_key.c
index 36276ce98e47338358446af2fd0aef1ba61d2604..ba725eb573c28cabf0199f889586e419000087c1 100644
--- a/crypto/ec/ecx_key.c
+++ b/crypto/ec/ecx_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c
index 81e0beb485a803183815bc4ff4e94f45a2eda0bd..6c445f9121b6fbaec35bbf501a213e01268ed2cc 100644
--- a/crypto/ec/ecx_meth.c
+++ b/crypto/ec/ecx_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c
index 3718a696ae34461c3468e4bdeffea45913718c41..2e74816ee1d04477359dec5c2124e8c1d2e0ce62 100644
--- a/crypto/encode_decode/decoder_lib.c
+++ b/crypto/encode_decode/decoder_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/encode_decode/decoder_meth.c b/crypto/encode_decode/decoder_meth.c
index fca8be1bb1f68b4003e5dd7f47e897cf281fbf87..2e70e8aa37949fbca68e9d42f1ffb1f97adf5ffc 100644
--- a/crypto/encode_decode/decoder_meth.c
+++ b/crypto/encode_decode/decoder_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c
index c38c7e3dffa4b1e0ab9eb2a22c8f1acf4922aab5..24f61fbf1593a5505f80520d7e26e73a0cd2918c 100644
--- a/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/encode_decode/decoder_pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/encode_decode/encoder_local.h b/crypto/encode_decode/encoder_local.h
index 62da028becb799165004e960d058385b5375f8ba..91e601aeafffdca8c1d526aefd97a70ef8335452 100644
--- a/crypto/encode_decode/encoder_local.h
+++ b/crypto/encode_decode/encoder_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/encode_decode/encoder_meth.c b/crypto/encode_decode/encoder_meth.c
index dbc8d9f9974501bc7dcdd931cd884d1df2b5da33..adf34bbb9f1b4e88496d1c9672cfec630ddd1d64 100644
--- a/crypto/encode_decode/encoder_meth.c
+++ b/crypto/encode_decode/encoder_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c
index d482260102b38daa1af87c4464851c77e03fd451..29060c5f9de875549d2882862be8cbecf6972461 100644
--- a/crypto/encode_decode/encoder_pkey.c
+++ b/crypto/encode_decode/encoder_pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c
index 2e085d6d8e949a291c1f597329d373afa2b7b153..f1da9b23bb58ad0a16f12e42863aa9c25102d5db 100644
--- a/crypto/engine/eng_ctrl.c
+++ b/crypto/engine/eng_ctrl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index ca1cd45e976fb664b6e937814cdbb21f748e8804..0ac91ff5ed7984fd75b43cd37960e1d61ce63bfb 100644
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 3bb89111ff8cbe5310564bff48ab699105960e69..8345f684c813f5c72dad27e1cd080ff61579c1b6 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 5a6238daf4c02db3f00a7c59afe5076083e5d561..119e1c60459a8d39eed6b54ad3b554130368832f 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/engine/eng_local.h b/crypto/engine/eng_local.h
index 71d65cda6db1a803b8c016dbb94a4ccc8a003be5..6f5d380d02a43e647a48fdc6f2c48214daf19162 100644
--- a/crypto/engine/eng_local.h
+++ b/crypto/engine/eng_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
index 6245d68206be6cdc520518911b8cdbfa0f877edf..b3ece7bd912370b13487fd676f4a5b7eae6c6c15 100644
--- a/crypto/engine/eng_rdrand.c
+++ b/crypto/engine/eng_rdrand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c
index d6a7452c76d0dc92ba611adfa1b34d90feab9175..17225d0ad44cb6261f8c8e9c2ad960fe4cf4d5b7 100644
--- a/crypto/engine/eng_table.c
+++ b/crypto/engine/eng_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index a436a1856d9e82e9ff9d3430f5e7cc7d56bcc436..c74fc4700b4fba1a7a18a43ca79310d3b4587498 100644
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 972856ad2356ea65f7897828070a48b4db25a53c..3fc296929c5f64583075f6d6b3e45ec827c84379 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index bbb7eda6d5bcef71801a5be756428e29279a5b07..86b609a555f02bb82f69b1300f05c35327dd433a 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/err/err_local.h b/crypto/err/err_local.h
index 202ac35ad484f7d8ca15547b3be8449133565001..c5c5bf45ba5cec6b66a2d6af1f5f533fa30c9afb 100644
--- a/crypto/err/err_local.h
+++ b/crypto/err/err_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/err/err_mark.c b/crypto/err/err_mark.c
index 1395e944dd23df67b7126d7c1939e2e2e84f693c..82dc4764c498b0d403dd35b6bf2e3008dd67a499 100644
--- a/crypto/err/err_mark.c
+++ b/crypto/err/err_mark.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2003-2023 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
diff --git a/crypto/evp/asymcipher.c b/crypto/evp/asymcipher.c
index c431d78a403f39fd4d2fb0586a783c2e937773f1..d22ab2a01a16dbea620286a57821bf20248d3bde 100644
--- a/crypto/evp/asymcipher.c
+++ b/crypto/evp/asymcipher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c
index 4822d37ea4bece2ca00ffd90d8a54d80ff596a67..8700315a6bfca2e7372f0bf0ae90b5445f3dc83c 100644
--- a/crypto/evp/bio_b64.c
+++ b/crypto/evp/bio_b64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index 4a2e5a8303fe9d9f208298d203fe91309011d029..ece3f6d57f070581f2c5b49cd59b66b3f0db7a0b 100644
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index a72acfb39be962760d76dd5a9f2ed6a534cba66e..2aa1ed75582e3428d4c762fdfa6a1f147ceed982 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c
index ab0d2465853adf3ebc388c5b882f2de9ccba31fa..41a1bade2c445c7db18fd985313ed15a0d49005e 100644
--- a/crypto/evp/cmeth_lib.c
+++ b/crypto/evp/cmeth_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c
index 87773feb3303141cff8148872780a53d8e0b7d64..54e589054c603fb3bd4619b636c0688e0ff3d6a1 100644
--- a/crypto/evp/ctrl_params_translate.c
+++ b/crypto/evp/ctrl_params_translate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 9a0d1b5b08b8060b99e51355204e030dab18aae5..01f54792f6f377caf208a07d3ba31a9d86a0e539 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index fad7682328b62565c465a2f00ebbb5cdf2abc473..68b216f10cb456402a3be51fc9916603f4106ebb 100644
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
@@ -55,7 +55,7 @@ static int chacha_init_key(EVP_CIPHER_CTX *ctx,
     return 1;
 }
 
-static int chacha_cipher(EVP_CIPHER_CTX * ctx, unsigned char *out,
+static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                          const unsigned char *inp, size_t len)
 {
     EVP_CHACHA_KEY *key = data(ctx);
diff --git a/crypto/evp/ec_ctrl.c b/crypto/evp/ec_ctrl.c
index ae4955287cc415c0225820c9f91c55cdaf36179a..c1cf221a0db530c89d760fa4c0d59955553ddf81 100644
--- a/crypto/evp/ec_ctrl.c
+++ b/crypto/evp/ec_ctrl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 8dddcc0bb51ef8cbeb062224203d2d725fff71c2..84ce108b2540ebd52acfb422d457d299f05ed1ec 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index 11281312993b26aeba4704c95137cec51cc2a1cf..c643ae8f9a028caa067c1c74c0efc6e5d5978ca5 100644
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index bc263b643021ca8756147157b94ef07b51ca6453..f29d592e0fbcd0536e278b934aed3c1b43835d36 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/evp_local.h b/crypto/evp/evp_local.h
index e3a1d7d53c91306004d62d4407fa2fa7f664bf28..9e4059d7037977cf90e272736c68b6b9c5fb182d 100644
--- a/crypto/evp/evp_local.h
+++ b/crypto/evp/evp_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index 9901d66a777fc505eb62de8f0802b7c0a66b3c3f..9153ecfaab1ea8f8cc4fe3a76e5415d706d7e7c4 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 97237e01abe58d7e2ff0002fd07f280a73ffdbb1..a4505a9d036c5ab5a8244f0c9d7051ed6c5eb340 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/evp/evp_rand.c b/crypto/evp/evp_rand.c
index 03458a090f3621567536a60633990f716497eec2..ecfc876cda8617b23914c97ac360b1ad12b2d66e 100644
--- a/crypto/evp/evp_rand.c
+++ b/crypto/evp/evp_rand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c
index 195c32cfc9b984d583e20e79f7010d80a1ff20af..d9eed1cea5be26a852e187026fba4ff2c0213084 100644
--- a/crypto/evp/exchange.c
+++ b/crypto/evp/exchange.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c
index c043598d07fdcd76c6eed19df6a742f46a2f084f..5ee36b2b4213ee8af0afb7d347d35dac6b4cf29e 100644
--- a/crypto/evp/kdf_meth.c
+++ b/crypto/evp/kdf_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/evp/kem.c b/crypto/evp/kem.c
index 5491cabd4eeef6bd65e74530b451b864da3ccab0..f96012ccf01edc966fa900264431aa5515bb28a8 100644
--- a/crypto/evp/kem.c
+++ b/crypto/evp/kem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c
index 47c802bfb4af809706180ad3eaf48014f36041e6..6408076b1f3be45bcff8dd2911238441796c29ab 100644
--- a/crypto/evp/keymgmt_lib.c
+++ b/crypto/evp/keymgmt_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c
index 882c068a71b9b51d7a05ae5e498b9980167755d3..1d7031f33c824e906811ff520e664232094cea13 100644
--- a/crypto/evp/keymgmt_meth.c
+++ b/crypto/evp/keymgmt_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index e7888d2acd6e963559dbdce5c51ffb3e16bcf09b..3a979f4bd459213d7d14bc7b23419fb129494361 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c
index a146c4afba1d2af90453dff373454db7497d56a3..a3e7a0220850db2f517ef129a4db64cfa1d2d291 100644
--- a/crypto/evp/mac_meth.c
+++ b/crypto/evp/mac_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index d9a81f23b831f961f7bed73bc5205f8079b42f14..35617390233429073387beb1bc5fa6b6621e0f3f 100644
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 0fce412c372d5b124fee4cf4c2dd4066f544d7e4..bd9e5a91003f85c4ce634c655f4a7272f9106029 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index ae0de57202a109b7f92f7575335ac36a1415b02a..e5555281a6b0911decac68c3ff93eea97ce793f8 100644
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index 8478e643dd858e40743160f76e4dee5eefc9a0ae..02db143d13241856ff9aca90614f2fcecbe5fd5d 100644
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index e5ca009b5c34413df637f111186c6261cb0ef224..6bd999407263295b45ca0007acd60f3fef32bdcb 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/evp/signature.c b/crypto/evp/signature.c
index 0596a2b337c5ec60b44780a51143a61ca97b27f0..379b344f0da68f2f3de37aa7f4a0c9c393ceb97d 100644
--- a/crypto/evp/signature.c
+++ b/crypto/evp/signature.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 48321febe4c9e6a2ed4c3e80e13a815a41abcded..c9ec9d33370d2ec7345242e22cba37241f83d6e7 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/ffc/ffc_backend.c b/crypto/ffc/ffc_backend.c
index 954efb27bbc4510fa6b5c03e966c5befe90a75e7..c12a88148fc81c2f704287c4f4977991f9414082 100644
--- a/crypto/ffc/ffc_backend.c
+++ b/crypto/ffc/ffc_backend.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/ffc/ffc_key_validate.c b/crypto/ffc/ffc_key_validate.c
index 442303e4b334f7abd4b70e97cd50c71471f64efd..342789621d6df1a6758a875490aec6dd7b2da4af 100644
--- a/crypto/ffc/ffc_key_validate.c
+++ b/crypto/ffc/ffc_key_validate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/ffc/ffc_params.c b/crypto/ffc/ffc_params.c
index 54068cbd9efbbb68f2a59a377d154d10377fb00b..680f85ffaf8047dd82b1770cf4bae200ec56a103 100644
--- a/crypto/ffc/ffc_params.c
+++ b/crypto/ffc/ffc_params.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/ffc/ffc_params_generate.c b/crypto/ffc/ffc_params_generate.c
index a369370145413d4f5080650519f2b41302677f0b..8294fbec36b20621da33ef27695271bf390b4c9c 100644
--- a/crypto/ffc/ffc_params_generate.c
+++ b/crypto/ffc/ffc_params_generate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/hpke/hpke.c b/crypto/hpke/hpke.c
index 8178ff249a19d26385ab0a11bf84044d01b6a169..e2cbd17915626d6b4c620bd75812280c3582e99e 100644
--- a/crypto/hpke/hpke.c
+++ b/crypto/hpke/hpke.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/hpke/hpke_util.c b/crypto/hpke/hpke_util.c
index 2f863cd6089de463e971ce008f0e6ab06c6e2f83..0d1cc602f717f0123de7005c34d152e9c5b940f7 100644
--- a/crypto/hpke/hpke_util.c
+++ b/crypto/hpke/hpke_util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c
index fba81021ccb897702e5066d80472e234ea66eeec..474a6e59e3eb1336ebf78ae7413f8421175268b1 100644
--- a/crypto/http/http_client.c
+++ b/crypto/http/http_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Siemens AG 2018-2020
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -1473,7 +1473,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
     do {
         /*
          * This does not necessarily catch the case when the full
-         * HTTP response came in in more than a single TCP message.
+         * HTTP response came in more than a single TCP message.
          */
         read_len = BIO_gets(fbio, mbuf, BUF_SIZE);
     } while (read_len > 2);
diff --git a/crypto/http/http_lib.c b/crypto/http/http_lib.c
index 23327a3b9b55804e3b17b7d06efb013558f3d6f4..3164d01d9e48fe1fd4841598f5bb47605eac1d9d 100644
--- a/crypto/http/http_lib.c
+++ b/crypto/http/http_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/info.c b/crypto/info.c
index b4c9afd36b5a484bafe688ec1e9d9d832881558f..9ef9ee4704705519df29a84a401936ce2ad6e4dd 100644
--- a/crypto/info.c
+++ b/crypto/info.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/init.c b/crypto/init.c
index eaff1f324cbc07e5e4a8a56603bbadd9aa0318a3..33c739c30e6c78292793b19bbce781fe5e31dbee 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/loongarch_arch.h b/crypto/loongarch_arch.h
index 9d895fe344d94e8f441cac87c1982a2cb5fd94db..c7fd42df1e0a8af404aac6e0103f1dbbeaa79bc3 100644
--- a/crypto/loongarch_arch.h
+++ b/crypto/loongarch_arch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/loongarchcap.c b/crypto/loongarchcap.c
index 89839099386be61e85605305f8160b8bcf037f2f..2123fd9c083175221ef1a811fa192a43870fa532 100644
--- a/crypto/loongarchcap.c
+++ b/crypto/loongarchcap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/md5/asm/md5-aarch64.pl b/crypto/md5/asm/md5-aarch64.pl
index 41f81051bb60442b3cf563510b8cd7379760ec9b..3200a0fa9bff08c6da24129dd0c7e83e49566d95 100755
--- a/crypto/md5/asm/md5-aarch64.pl
+++ b/crypto/md5/asm/md5-aarch64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
diff --git a/crypto/mem.c b/crypto/mem.c
index 74bf3b892cb6059c022700527235070f9518260a..62fee878429acae2178e0f03047f4b6694290663 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -214,7 +214,6 @@ void *CRYPTO_zalloc(size_t num, const char *file, int line)
     void *ret;
 
     ret = CRYPTO_malloc(num, file, line);
-    FAILTEST();
     if (ret != NULL)
         memset(ret, 0, num);
 
@@ -227,7 +226,6 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
     if (realloc_impl != CRYPTO_realloc)
         return realloc_impl(str, num, file, line);
 
-    FAILTEST();
     if (str == NULL)
         return CRYPTO_malloc(num, file, line);
 
@@ -236,6 +234,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
         return NULL;
     }
 
+    FAILTEST();
     return realloc(str, num);
 }
 
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 409aee5e0c2e9c66b08b635a2abc03717ff5c542..557c697c9aaf688b82bec3ae78bb2f3f71e8ac5f 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2004-2014, Akamai Technologies. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl b/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
index f123be7db123232c00305c6acd83fc8db47d696d..d516359eb81b8cbfb2e41471e85a994dc8b5dd15 100644
--- a/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
+++ b/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
diff --git a/crypto/modes/asm/aes-gcm-armv8_64.pl b/crypto/modes/asm/aes-gcm-armv8_64.pl
index 0904440a44426edb89c80e0a16b34e071e1e6b9e..e7b1a17895d41283b5382951d871b05c5b6db89d 100755
--- a/crypto/modes/asm/aes-gcm-armv8_64.pl
+++ b/crypto/modes/asm/aes-gcm-armv8_64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2019-2023 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
diff --git a/crypto/modes/asm/aes-gcm-avx512.pl b/crypto/modes/asm/aes-gcm-avx512.pl
index 3433f52f500593b6011d403c1bde222bc7ea1100..afd2af941a85300ca279e5bc18db83bdbf8c7598 100644
--- a/crypto/modes/asm/aes-gcm-avx512.pl
+++ b/crypto/modes/asm/aes-gcm-avx512.pl
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright (c) 2021, Intel Corporation. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/modes/asm/ghash-riscv64.pl b/crypto/modes/asm/ghash-riscv64.pl
index 2ed4740b496467d25d9a20c5ac17c0e0c0741c6a..ee97ff0dd3f38e95a8366fb4ece43e9e93a04902 100644
--- a/crypto/modes/asm/ghash-riscv64.pl
+++ b/crypto/modes/asm/ghash-riscv64.pl
@@ -2,7 +2,7 @@
 # This file is dual-licensed, meaning that you can use it under your
 # choice of either of the following two licenses:
 #
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License"). You can obtain
 # a copy in the file LICENSE in the source distribution or at
diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 9639ef4666926c23a990ea08d848a189f8577436..677eb21a0bd35ad8dc880b93dca445859f94c1de 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2010-2023 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
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index b55a3a5be8df62d86b0bde0e7e5645ee7f646aaf..2c1a288167e4e013f1914cb5ccfe8d5dd4fb8500 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 753b30ce47a792d9f760417a37143715b8647152..9707ccb94f4c511986342e8e06efa35608ab2fa6 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c
index f79aca5bdad0ad3fbf3ef41ae10172da1918b3a9..6fe65b6c0de380a15d7e1056c19240434ab3892b 100644
--- a/crypto/ocsp/ocsp_prn.c
+++ b/crypto/ocsp/ocsp_prn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/crypto/packet.c b/crypto/packet.c
index ac5c2e33f8238463924d82e4e65e217183f18738..6a43b35655fb43e6c34559ab15ea0e866270dc7c 100644
--- a/crypto/packet.c
+++ b/crypto/packet.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/crypto/param_build.c b/crypto/param_build.c
index 7604f9bd6ce9adf95a582d8beb958969f631eaa5..2392e5909cf43c68901f941eaab81d3db89d8fa5 100644
--- a/crypto/param_build.c
+++ b/crypto/param_build.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -233,8 +233,8 @@ static int push_BN(OSSL_PARAM_BLD *bld, const char *key,
 int OSSL_PARAM_BLD_push_BN(OSSL_PARAM_BLD *bld, const char *key,
                            const BIGNUM *bn)
 {
-    if (BN_is_negative(bn))
-        return push_BN(bld, key, bn, bn == NULL ? 0 : BN_num_bytes(bn) + 1,
+    if (bn != NULL && BN_is_negative(bn))
+        return push_BN(bld, key, bn, BN_num_bytes(bn) + 1,
                        OSSL_PARAM_INTEGER);
     return push_BN(bld, key, bn, bn == NULL ? 0 : BN_num_bytes(bn),
                    OSSL_PARAM_UNSIGNED_INTEGER);
@@ -243,8 +243,8 @@ int OSSL_PARAM_BLD_push_BN(OSSL_PARAM_BLD *bld, const char *key,
 int OSSL_PARAM_BLD_push_BN_pad(OSSL_PARAM_BLD *bld, const char *key,
                                const BIGNUM *bn, size_t sz)
 {
-    if (BN_is_negative(bn))
-        return push_BN(bld, key, bn, bn == NULL ? 0 : BN_num_bytes(bn),
+    if (bn != NULL && BN_is_negative(bn))
+        return push_BN(bld, key, bn, BN_num_bytes(bn),
                        OSSL_PARAM_INTEGER);
     return push_BN(bld, key, bn, sz, OSSL_PARAM_UNSIGNED_INTEGER);
 }
diff --git a/crypto/params.c b/crypto/params.c
index 258d1a5f0dd1ef8f35fb052a0d48049f52ff7b4f..f2582b0927a16f02c1e924bf087f9597700d1f2f 100644
--- a/crypto/params.c
+++ b/crypto/params.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index f7a1bd830217edd79f8559399c56a829d4347fd7..9d8ad35ad39ff55600368f830a9bc84328bc7f7e 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -929,7 +929,7 @@ int PEM_read_bio_ex(BIO *bp, char **name_out, char **header,
     BIO *headerB = NULL, *dataB = NULL;
     char *name = NULL;
     int len, taillen, headerlen, ret = 0;
-    BUF_MEM * buf_mem;
+    BUF_MEM *buf_mem;
 
     *len_out = 0;
     *name_out = *header = NULL;
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index 284b144fd640fd313c8394a50d467315e13f1c0c..4deee46ce5506f85efa45f8a1e5871b96da3e4d9 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 8931386fae554d172d2b0a5bb009cd573e6da462..d8aaebe72f58638db8707ba59608ef35eeff7cf1 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -150,7 +150,7 @@ static EVP_PKEY *evp_pkey_new0_key(void *key, int evp_type)
  * Read the MSBLOB header and get relevant data from it.
  *
  * |pisdss| and |pispub| have a double role, as they can be used for
- * discovery as well as to check the the blob meets expectations.
+ * discovery as well as to check the blob meets expectations.
  * |*pisdss| is the indicator for whether the key is a DSA key or not.
  * |*pispub| is the indicator for whether the key is public or not.
  * In both cases, the following input values apply:
diff --git a/crypto/perlasm/arm-xlate.pl b/crypto/perlasm/arm-xlate.pl
index b9b56463b2a9c1e94987c81a79361fbbeee37a5e..3b0dcad4139f90ddb091dfa4868f741341619e31 100755
--- a/crypto/perlasm/arm-xlate.pl
+++ b/crypto/perlasm/arm-xlate.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index aaef5874f1584faec358d69f2e727828966ac830..64b17d74e8740a18ea7f286121daef9f3a912699 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c
index caae639f8835fef029df7436f3f75ff14ebd33bb..e4247b27fc3a2366deae80a0235fd9183184c8f9 100644
--- a/crypto/pkcs12/p12_asn.c
+++ b/crypto/pkcs12/p12_asn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 1d6c74b8c438ba2e981f287dfcfb2dcfb67a5ada..537a1e3168cea6792a8fd48c67ba4c3c36d5de1e 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index f172e8b96d392793a326358811d36baa3ac04799..0901dc94085f5da6aea64acc5dd4af56bece30ec 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/pkcs12/p12_local.h b/crypto/pkcs12/p12_local.h
index 97697922bd72d1e9735ec3884d9450fed1cf3fd4..7f02874a97623c34c485cd54749332d773de94d5 100644
--- a/crypto/pkcs12/p12_local.h
+++ b/crypto/pkcs12/p12_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index d20b9db9ffbe5a7b3610b61b7e4ce09bff6ad301..4096aa1f8a729482b56e5cc6baa8eefa812bf577 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
index 90139100c6dbf96256ce1decabf7aeed24261c65..9ea82d09d803e4ceb143bb9b04485157d102f4f3 100644
--- a/crypto/pkcs12/p12_npas.c
+++ b/crypto/pkcs12/p12_npas.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index 73e55461eb18a91938a3effdb357b44f686c3986..04ef0b74edef4ab0eecf600a539ad192c660f3a6 100644
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index 59e0cda814c8b3b8591c663be36302d74983ed92..a96623f19fbadeaff5724dc51021e0c1860c7290 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index 798b38a6c0fbc252453b808c393f1b721cf356fb..e9bcaf4b6e5a4ceb8bed676454897f1c03e13fc5 100644
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index d3f65adb66d6aac0f1c2e6e0680e8f6bea038e1e..43ea2a9b60f9ba534b9371a54b7c6f82e2ecada4 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index aa600d1794634edf5e25a3af40ae53f501c22d24..7be292854296445d13ba56bc8e9475c92d6762cc 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 5b7b8e26badbe2b1c61934a8f051b8d3f7af8d17..1f951d77fb41acf79a55f72d40ae75094fbb8478 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/poly1305/asm/poly1305-armv4.pl b/crypto/poly1305/asm/poly1305-armv4.pl
index 7cc681838d1ab1bfff9886e1f998f636456c3d34..b98beefa184ee124931e563f42930089b1b44df5 100755
--- a/crypto/poly1305/asm/poly1305-armv4.pl
+++ b/crypto/poly1305/asm/poly1305-armv4.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl
index 24bab9d0bcf950711611ddcb5414b548b16f5cb0..4cddca1c514c04ff72b7b0b36caa2ec1c117b1a2 100755
--- a/crypto/poly1305/asm/poly1305-x86_64.pl
+++ b/crypto/poly1305/asm/poly1305-x86_64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/crypto/poly1305/poly1305_ieee754.c b/crypto/poly1305/poly1305_ieee754.c
index ac555d2a2206db0d82142c40d59229acfdb22916..fa0ab1ed1d2fbd8c8b586444e19c6b2ae09f08cf 100644
--- a/crypto/poly1305/poly1305_ieee754.c
+++ b/crypto/poly1305/poly1305_ieee754.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/property/property.c b/crypto/property/property.c
index 0ea984a7fbe56bee3f319ed4562922a74a5f1b88..c551c825b19b31a3fab3453df5b2703c2e839569 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/crypto/provider.c b/crypto/provider.c
index 9cc51d3ae7aad6a3b3a2c14e0d784aa0d247e600..b55561abf8318deaf6f46478813bef4be51e0db9 100644
--- a/crypto/provider.c
+++ b/crypto/provider.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/provider_child.c b/crypto/provider_child.c
index ed8ee3b3a1421404591830abaf73917c284337dc..52e9cb405f28a172aff519b8d44536fa36e0283b 100644
--- a/crypto/provider_child.c
+++ b/crypto/provider_child.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c
index 11294b2996f9db8cd909dc8bdb0bd16e8ab30647..288ade6b4de25bce61d438669c734ad65e4e5071 100644
--- a/crypto/provider_conf.c
+++ b/crypto/provider_conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 2e2c597f37dde9c0dcb1b78445fd9d535c0d6c73..7f5e48f26c68aa0c7457c9e243ba9d43945a21e4 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/punycode.c b/crypto/punycode.c
index 332817763dc6e24faa1b947bdb89b76da9a6298f..68fc586e68157529e22235987960fdcda17a4e1a 100644
--- a/crypto/punycode.c
+++ b/crypto/punycode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index d3e156700a2c6521aa2f8799135b9cae9835c99c..8dd1d071e89410f695022a5ad39a56f07de568de 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/rc2/rc2_local.h b/crypto/rc2/rc2_local.h
index 2b8dccdc5d1db175cd8ff616a1c1a1d24d185571..f9ca888a638c5ece426f3816d0cea646a810a836 100644
--- a/crypto/rc2/rc2_local.h
+++ b/crypto/rc2/rc2_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl
index 65752d19bf521d2d2d334a71b90f8670a9844f32..83a1d13635fdc9345d9f7dc7f32573f6b357869f 100755
--- a/crypto/rc4/asm/rc4-x86_64.pl
+++ b/crypto/rc4/asm/rc4-x86_64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2005-2023 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
diff --git a/crypto/rc5/rc5_local.h b/crypto/rc5/rc5_local.h
index 74d072a3797dfaf89152a6ce70b2dc8962c19c34..4ba8745ca5bb97f1078656d5808cc4c0037c3061 100644
--- a/crypto/rc5/rc5_local.h
+++ b/crypto/rc5/rc5_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index a0cb63f3b86ee6ca96ff8b414f01c7310c5c23a8..148d0bbbd153b139da936a0906e0dd652dc8adfd 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
@@ -60,13 +60,16 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     if (!rsa_param_encode(pkey, &str, &strtype))
         return 0;
     penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc);
-    if (penclen <= 0)
+    if (penclen <= 0) {
+        ASN1_STRING_free(str);
         return 0;
+    }
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
                                strtype, str, penc, penclen))
         return 1;
 
     OPENSSL_free(penc);
+    ASN1_STRING_free(str);
     return 0;
 }
 
diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c
index 73ac607da94897c84cea98a67eca89acbc2cb464..0df254676adfa3c87a9b9ce139abc0e37afa9599 100644
--- a/crypto/rsa/rsa_chk.c
+++ b/crypto/rsa/rsa_chk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index 4acaa515f77423ceb53c1dacbb8c8af039295873..0cdbb3fde250155be848cfe8062697bb8d43a887 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 1601e92ddb006a9dc02a5def4671b28bb94e8c25..f1be43351292bfa7df9710235ab039e54f4dab7e 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c
index 6e1350c51bfdb58c40c759afedf7cb9897a4d4b2..14dfd457f9d2a4175929264321e64214f57acbf2 100644
--- a/crypto/rsa/rsa_ossl.c
+++ b/crypto/rsa/rsa_ossl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index c91457db60809a9e1d49bc871fc75077e8ca387e..7655ef9a97dc0341e77ef9fc74776a20bc4bb077 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 3279ea02edcb873a5c972464b00881abad9ae0c1..fc3391ead20b56907b732a9876166848b60cf97e 100644
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index 75fdef1f8c210b7b37c52039751de51e02c6bb2f..089730bbaef35114b75816d2730773152b9729f8 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
diff --git a/crypto/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c
index 819feaa3ac6a2475ec69d1667d3babbdf049482a..9fa85bfdf3b692e3d3fe069d7fc8268b92f713b8 100644
--- a/crypto/rsa/rsa_sp800_56b_gen.c
+++ b/crypto/rsa/rsa_sp800_56b_gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2018-2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -423,7 +423,7 @@ err:
  * See SP800-56Br1 6.3.1.3 (Step 6) Perform a pair-wise consistency test by
  * verifying that: k = (k^e)^d mod n for some integer k where 1 < k < n-1.
  *
- * Returns 1 if the RSA key passes the pairwise test or 0 it it fails.
+ * Returns 1 if the RSA key passes the pairwise test or 0 if it fails.
  */
 int ossl_rsa_sp800_56b_pairwise_test(RSA *rsa, BN_CTX *ctx)
 {
diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c
index 86b4e72f5c3b29deefb84d4be48cc8dcd7dfba7a..290e95b468544e525145f323e80d294eaa89e93d 100644
--- a/crypto/rsa/rsa_x931g.c
+++ b/crypto/rsa/rsa_x931g.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/s390x_arch.h b/crypto/s390x_arch.h
index 3f7dac2e7424c6a7425ed2dc691a743ad0e73317..fdc682af06bc93edbae579593b6eccd8a708e56d 100644
--- a/crypto/s390x_arch.h
+++ b/crypto/s390x_arch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
index 6bb9abb809811f3e469244fd5cd89a8d3a916048..7721b5c801a93490cbd764a72ad2de368267a181 100644
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2010-2023 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
diff --git a/crypto/sha/asm/keccak1600-avx2.pl b/crypto/sha/asm/keccak1600-avx2.pl
index 4fa3f787fa80b6a0e86544a7fb0faa0955355658..864066533445a6674665f77c2d4aafa2915cc851 100755
--- a/crypto/sha/asm/keccak1600-avx2.pl
+++ b/crypto/sha/asm/keccak1600-avx2.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/crypto/sha/asm/keccak1600-avx512.pl b/crypto/sha/asm/keccak1600-avx512.pl
index 8bcf3a0804157b73b9729da7d4294da9d71d0c9c..efc32545c35625f84e56980a58486088e0e66f1a 100755
--- a/crypto/sha/asm/keccak1600-avx512.pl
+++ b/crypto/sha/asm/keccak1600-avx512.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/crypto/sha/asm/keccak1600-avx512vl.pl b/crypto/sha/asm/keccak1600-avx512vl.pl
index da93faa53941a4e1152a4e05597d754591ab9688..f941556b42a8b7f8c2f9e8249e05a94fbff2d593 100755
--- a/crypto/sha/asm/keccak1600-avx512vl.pl
+++ b/crypto/sha/asm/keccak1600-avx512vl.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
index ec7195a070872a54ec295b815cd72f35f92c7fde..2832c5b5302e2859a6e9cfe2efa373c177d4bfc2 100644
--- a/crypto/sha/asm/sha1-armv4-large.pl
+++ b/crypto/sha/asm/sha1-armv4-large.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2007-2023 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
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index 0ac72bda63c7d1b6c1c0f33b6316a21f21b8523f..8bac84b1a855f2cb6f4c5c73ad7a2a628b37174f 100644
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2007-2023 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
diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index 5579cda6e9b7f8fa3de299f2321e623c160e9503..c8b81106719f0678341a7f9a8fcb579dd05567f6 100644
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2007-2023 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
diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c
index 17909a769b2e033456806541eef30ed58affe728..062111b6380ca6ed2b2accd3ca858e4789d4578c 100644
--- a/crypto/sha/keccak1600.c
+++ b/crypto/sha/keccak1600.c
@@ -1153,7 +1153,7 @@ void SHA3_sponge(const unsigned char *inp, size_t len,
 
 # include <stdio.h>
 
-int main()
+int main(void)
 {
     /*
      * This is 5-bit SHAKE128 test from http://csrc.nist.gov/groups/ST/toolkit/examples.html#aHashing
diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 2e844f8587f50fbdbd618548c197dfa0bcdda531..4017137c270134d2b526057003317be1c53a17c9 100644
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/crypto/sleep.c b/crypto/sleep.c
index d57a9e3caa95491a9684a668b37201f0c0864331..d9c5b35b215f751b68de32b5f048dca45cc31237 100644
--- a/crypto/sleep.c
+++ b/crypto/sleep.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/sm2/sm2_sign.c b/crypto/sm2/sm2_sign.c
index 67d020ffaacd7ea4e6ebc1281f48829d909ebbcf..ca76128a248b7ee4bc82806ff2c547f99b441964 100644
--- a/crypto/sm2/sm2_sign.c
+++ b/crypto/sm2/sm2_sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2017 Ribose Inc. All Rights Reserved.
  * Ported from Ribose contributions from Botan.
  *
diff --git a/crypto/sm3/asm/sm3-armv8.pl b/crypto/sm3/asm/sm3-armv8.pl
index 56b4efd3bc608504951273ebd2f22edce8996ec3..bdbb1af1d6f8f2a747b9c01b85f5bc579b91577a 100644
--- a/crypto/sm3/asm/sm3-armv8.pl
+++ b/crypto/sm3/asm/sm3-armv8.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
index a09e44cada7cbd155a58e3459f12aa2bc892d1ab..ee96046b957dbc35184a632025b027360597172f 100755
--- a/crypto/sm4/asm/vpsm4-armv8.pl
+++ b/crypto/sm4/asm/vpsm4-armv8.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
@@ -569,11 +569,11 @@ _vpsm4_consts:
 	.long 0xA0A7AEB5, 0xBCC3CAD1, 0xD8DFE6ED, 0xF4FB0209
 	.long 0x10171E25, 0x2C333A41, 0x484F565D, 0x646B7279
 .Lfk:
-	.dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
+	.quad 0x56aa3350a3b1bac6,0xb27022dc677d9197
 .Lshuffles:
-	.dword 0x0B0A090807060504,0x030201000F0E0D0C
+	.quad 0x0B0A090807060504,0x030201000F0E0D0C
 .Lxts_magic:
-	.dword 0x0101010101010187,0x0101010101010101
+	.quad 0x0101010101010187,0x0101010101010101
 
 .size	_vpsm4_consts,.-_vpsm4_consts
 ___
diff --git a/crypto/sm4/asm/vpsm4_ex-armv8.pl b/crypto/sm4/asm/vpsm4_ex-armv8.pl
index 992ac98af72c2c5995958382344c64a6931ea328..27dd25aa539ed14e29c3bb62f46cd42e3e9af987 100644
--- a/crypto/sm4/asm/vpsm4_ex-armv8.pl
+++ b/crypto/sm4/asm/vpsm4_ex-armv8.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
@@ -553,18 +553,18 @@ _${prefix}_consts:
 	.long 0xA0A7AEB5, 0xBCC3CAD1, 0xD8DFE6ED, 0xF4FB0209
 	.long 0x10171E25, 0x2C333A41, 0x484F565D, 0x646B7279
 .Lfk:
-	.dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
+	.quad 0x56aa3350a3b1bac6,0xb27022dc677d9197
 .Lshuffles:
-	.dword 0x0B0A090807060504,0x030201000F0E0D0C
+	.quad 0x0B0A090807060504,0x030201000F0E0D0C
 .Lxts_magic:
-	.dword 0x0101010101010187,0x0101010101010101
+	.quad 0x0101010101010187,0x0101010101010101
 .Lsbox_magic:
-	.dword 0x0b0e0104070a0d00,0x0306090c0f020508
-	.dword 0x62185a2042387a00,0x22581a6002783a40
-	.dword 0x15df62a89e54e923,0xc10bb67c4a803df7
-	.dword 0xb9aa6b78c1d21300,0x1407c6d56c7fbead
-	.dword 0x6404462679195b3b,0xe383c1a1fe9edcbc
-	.dword 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
+	.quad 0x0b0e0104070a0d00,0x0306090c0f020508
+	.quad 0x62185a2042387a00,0x22581a6002783a40
+	.quad 0x15df62a89e54e923,0xc10bb67c4a803df7
+	.quad 0xb9aa6b78c1d21300,0x1407c6d56c7fbead
+	.quad 0x6404462679195b3b,0xe383c1a1fe9edcbc
+	.quad 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
 
 .size	_${prefix}_consts,.-_${prefix}_consts
 ___
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 72ef5e814e68cdbaee29a9cb208b1e4433d0100e..2ca515396b7189ec49904a0e5845a8f9e1fefce8 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -281,6 +281,7 @@ SRP_VBASE *SRP_VBASE_new(char *seed_key)
         return NULL;
     if ((vb->users_pwd = sk_SRP_user_pwd_new_null()) == NULL
         || (vb->gN_cache = sk_SRP_gN_cache_new_null()) == NULL) {
+        sk_SRP_user_pwd_free(vb->users_pwd);
         OPENSSL_free(vb);
         return NULL;
     }
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 1e7f30072300902dda49e00a8d139294ad05e5a2..72e3087e89b3251916c4f9adfc516171865a5ef2 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index fcacf687e629d1b90810437e227edb805d1a3d65..df3180c04847cefbc540685bc55c87753b89981b 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c
@@ -428,14 +428,14 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
 
             load_data.v = NULL;
             load_data.ctx = ctx;
+            ctx->error_flag = 0;
 
             if (!ctx->fetched_loader->p_load(ctx->loader_ctx,
                                              ossl_store_handle_load_result,
                                              &load_data,
                                              ossl_pw_passphrase_callback_dec,
                                              &ctx->pwdata)) {
-                if (!OSSL_STORE_eof(ctx))
-                    ctx->error_flag = 1;
+                ctx->error_flag = 1;
                 return NULL;
             }
             v = load_data.v;
@@ -1013,7 +1013,7 @@ OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, const char *scheme,
     ctx->post_process_data = post_process_data;
 
     /*
-     * ossl_store_get0_loader_int will raise an error if the loader for the
+     * ossl_store_get0_loader_int will raise an error if the loader for
      * the scheme cannot be retrieved. But if a loader was successfully
      * fetched then we remove this error from the error stack.
      */
diff --git a/crypto/store/store_local.h b/crypto/store/store_local.h
index 6526a7260a02a8d451281ccddd256289d6dcac91..223758ab2b7180df426f5f805ed9f8c09d8ea5ef 100644
--- a/crypto/store/store_local.h
+++ b/crypto/store/store_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c
index e9f5a0eb8ab04e3c801e98f1bcbfc0b66dfe811b..7fc79e2989087d4e8c1d8a2ac7dcd115915e2cb7 100644
--- a/crypto/store/store_meth.c
+++ b/crypto/store/store_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c
index 6fe2b71bc1743eafdc774defc30432a67fc53d8e..27323ad2b0fa9767bba943ac46b18e2fca084df5 100644
--- a/crypto/store/store_result.c
+++ b/crypto/store/store_result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/thread/arch.c b/crypto/thread/arch.c
index f6a83540b37aaab2d8431bb789b5cdea7f7a1b54..7c139a6a60cf82ca89c015c854f892b9ad8f3e19 100644
--- a/crypto/thread/arch.c
+++ b/crypto/thread/arch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/thread/arch/thread_none.c b/crypto/thread/arch/thread_none.c
index 675944bc5296f139cbaded9d39bf7cfb222269ed..10a804f1b78ee54213474fb1e45d831399dacfdc 100644
--- a/crypto/thread/arch/thread_none.c
+++ b/crypto/thread/arch/thread_none.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/thread/arch/thread_posix.c b/crypto/thread/arch/thread_posix.c
index 0ab27b12302dd0a89a51c73c989270f2d0e0bfb2..7650ddc85abee741a2e11206848165a8d21a8b31 100644
--- a/crypto/thread/arch/thread_posix.c
+++ b/crypto/thread/arch/thread_posix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -120,18 +120,22 @@ int ossl_crypto_mutex_try_lock(CRYPTO_MUTEX *mutex)
 
 void ossl_crypto_mutex_lock(CRYPTO_MUTEX *mutex)
 {
+    int rc;
     pthread_mutex_t *mutex_p;
 
     mutex_p = (pthread_mutex_t *)mutex;
-    pthread_mutex_lock(mutex_p);
+    rc = pthread_mutex_lock(mutex_p);
+    OPENSSL_assert(rc == 0);
 }
 
 void ossl_crypto_mutex_unlock(CRYPTO_MUTEX *mutex)
 {
+    int rc;
     pthread_mutex_t *mutex_p;
 
     mutex_p = (pthread_mutex_t *)mutex;
-    pthread_mutex_unlock(mutex_p);
+    rc = pthread_mutex_unlock(mutex_p);
+    OPENSSL_assert(rc == 0);
 }
 
 void ossl_crypto_mutex_free(CRYPTO_MUTEX **mutex)
diff --git a/crypto/thread/arch/thread_win.c b/crypto/thread/arch/thread_win.c
index ce7ff4931134e265b3460ddac175f12668f7c874..fc0c2147701e7bc2100e3c407df6f571badc608b 100644
--- a/crypto/thread/arch/thread_win.c
+++ b/crypto/thread/arch/thread_win.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -173,58 +173,360 @@ static int determine_timeout(OSSL_TIME deadline, DWORD *w_timeout_p)
 }
 
 # if defined(OPENSSL_THREADS_WINNT_LEGACY)
+#  include <assert.h>
+
+/*
+ * Win32, before Vista, did not have an OS-provided condition variable
+ * construct. This leads to the need to construct our own condition variable
+ * construct in order to support Windows XP.
+ *
+ * It is difficult to construct a condition variable construct using the
+ * OS-provided primitives in a way that is both correct (avoiding race
+ * conditions where broadcasts get lost) and fair.
+ *
+ * CORRECTNESS:
+ *   A blocked thread is a thread which is calling wait(), between the
+ *   precise instants at which the external mutex passed to wait() is
+ *   unlocked and the instant at which it is relocked.
+ *
+ *   a)
+ *     - If broadcast() is called, ALL blocked threads MUST be unblocked.
+ *     - If signal() is called, at least one blocked thread MUST be unblocked.
+ *
+ *     (i.e.: a signal or broadcast must never get 'lost')
+ *
+ *   b)
+ *     - If broadcast() or signal() is called, this must not cause a thread
+ *       which is not blocked to return immediately from a subsequent
+ *       call to wait().
+ *
+ * FAIRNESS:
+ *   If broadcast() is called at time T1, all blocked threads must be unblocked
+ *   before any thread which subsequently calls wait() at time T2 > T1 is
+ *   unblocked.
+ *
+ *   An example of an implementation which lacks fairness is as follows:
+ *
+ *     t1 enters wait()
+ *     t2 enters wait()
+ *
+ *     tZ calls broadcast()
+ *
+ *     t1 exits wait()
+ *     t1 enters wait()
+ *
+ *     tZ calls broadcast()
+ *
+ *     t1 exits wait()
+ *
+ * IMPLEMENTATION:
+ *
+ *   The most suitable primitives available to us in Windows XP are semaphores,
+ *   auto-reset events and manual-reset events. A solution based on semaphores
+ *   is chosen.
+ *
+ *   PROBLEM. Designing a solution based on semaphores is non-trivial because,
+ *   while it is easy to track the number of waiters in an interlocked data
+ *   structure and then add that number to the semaphore, this does not
+ *   guarantee fairness or correctness. Consider the following situation:
+ *
+ *     - t1 enters wait(), adding 1 to the wait counter & blocks on the semaphore
+ *     - t2 enters wait(), adding 1 to the wait counter & blocks on the semaphore
+ *     - tZ calls broadcast(), finds the wait counter is 2, adds 2 to the semaphore
+ *
+ *     - t1 exits wait()
+ *     - t1 immediately reenters wait() and blocks on the semaphore
+ *     - The semaphore is still positive due to also having been signalled
+ *       for t2, therefore it is decremented
+ *     - t1 exits wait() immediately; t2 is never woken
+ *
+ *   GENERATION COUNTERS. One naive solution to this is to use a generation
+ *   counter. Each broadcast() invocation increments a generation counter. If
+ *   the generation counter has not changed during a semaphore wait operation
+ *   inside wait(), this indicates that no broadcast() call has been made in
+ *   the meantime; therefore, the successful semaphore decrement must have
+ *   'stolen' a wakeup from another thread which was waiting to wakeup from the
+ *   prior broadcast() call but which had not yet had a chance to do so. The
+ *   semaphore can then be reincremented and the wait() operation repeated.
+ *
+ *   However, this suffers from the obvious problem that without OS guarantees
+ *   as to how semaphore readiness events are distributed amongst threads,
+ *   there is no particular guarantee that the semaphore readiness event will
+ *   not be immediately redistributed back to the same thread t1.
+ *
+ *   SOLUTION. A solution is chosen as follows. In its initial state, a
+ *   condition variable can accept waiters, who wait for the semaphore
+ *   normally. However, once broadcast() is called, the condition
+ *   variable becomes 'closed'. Any existing blocked threads are unblocked,
+ *   but any new calls to wait() will instead enter a blocking pre-wait stage.
+ *   Pre-wait threads are not considered to be waiting (and the external
+ *   mutex remains held). A call to wait() in pre-wait cannot progress
+ *   to waiting until all threads due to be unblocked by the prior broadcast()
+ *   call have returned and had a chance to execute.
+ *
+ *   This pre-wait does not affect a thread if it does not call wait()
+ *   again until after all threads have had a chance to execute.
+ *
+ *   RESOURCE USAGE. Aside from an allocation for the condition variable
+ *   structure, this solution uses two Win32 semaphores.
+ *
+ * FUTURE OPTIMISATIONS:
+ *
+ *   An optimised multi-generation implementation is possible at the cost of
+ *   higher Win32 resource usage. Multiple 'buckets' could be defined, with
+ *   usage rotating between buckets internally as buckets become closed.
+ *   This would avoid the need for the prewait in more cases, depending
+ *   on intensity of usage.
+ *
+ */
+typedef struct legacy_condvar_st {
+    CRYPTO_MUTEX    *int_m;       /* internal mutex */
+    HANDLE          sema;         /* main wait semaphore */
+    HANDLE          prewait_sema; /* prewait semaphore */
+    /*
+     * All of the following fields are protected by int_m.
+     *
+     * num_wake only ever increases by virtue of a corresponding decrease in
+     * num_wait. num_wait can decrease for other reasons (for example due to a
+     * wait operation timing out).
+     */
+    size_t          num_wait;     /* Num. threads currently blocked */
+    size_t          num_wake;     /* Num. threads due to wake up */
+    size_t          num_prewait;  /* Num. threads in prewait */
+    size_t          gen;          /* Prewait generation */
+    int             closed;       /* Is closed? */
+} LEGACY_CONDVAR;
 
 CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
 {
-    HANDLE h;
+    LEGACY_CONDVAR *cv;
+
+    if ((cv = OPENSSL_malloc(sizeof(LEGACY_CONDVAR))) == NULL)
+        return NULL;
 
-    if ((h = CreateEventA(NULL, FALSE, FALSE, NULL)) == NULL)
+    if ((cv->int_m = ossl_crypto_mutex_new()) == NULL) {
+        OPENSSL_free(cv);
         return NULL;
+    }
 
-    return (CRYPTO_CONDVAR *)h;
+    if ((cv->sema = CreateSemaphoreA(NULL, 0, LONG_MAX, NULL)) == NULL) {
+        ossl_crypto_mutex_free(&cv->int_m);
+        OPENSSL_free(cv);
+        return NULL;
+    }
+
+    if ((cv->prewait_sema = CreateSemaphoreA(NULL, 0, LONG_MAX, NULL)) == NULL) {
+        CloseHandle(cv->sema);
+        ossl_crypto_mutex_free(&cv->int_m);
+        OPENSSL_free(cv);
+        return NULL;
+    }
+
+    cv->num_wait      = 0;
+    cv->num_wake      = 0;
+    cv->num_prewait   = 0;
+    cv->closed        = 0;
+
+    return (CRYPTO_CONDVAR *)cv;
 }
 
-void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex)
+void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv_p)
 {
-    ossl_crypto_mutex_unlock(mutex);
-    WaitForSingleObject((HANDLE)cv, INFINITE);
-    ossl_crypto_mutex_lock(mutex);
+    if (*cv_p != NULL) {
+        LEGACY_CONDVAR *cv = *(LEGACY_CONDVAR **)cv_p;
+
+        CloseHandle(cv->sema);
+        CloseHandle(cv->prewait_sema);
+        ossl_crypto_mutex_free(&cv->int_m);
+        OPENSSL_free(cv);
+    }
+
+    *cv_p = NULL;
 }
 
-void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex,
-                                      OSSL_TIME deadline)
+static uint32_t obj_wait(HANDLE h, OSSL_TIME deadline)
 {
     DWORD timeout;
 
     if (!determine_timeout(deadline, &timeout))
         timeout = 1;
 
-    ossl_crypto_mutex_unlock(mutex);
-    WaitForSingleObject((HANDLE)cv, timeout);
-    ossl_crypto_mutex_lock(mutex);
+    return WaitForSingleObject(h, timeout);
 }
 
-void ossl_crypto_condvar_broadcast(CRYPTO_CONDVAR *cv)
+void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv_, CRYPTO_MUTEX *ext_m,
+                                      OSSL_TIME deadline)
+{
+    LEGACY_CONDVAR *cv = (LEGACY_CONDVAR *)cv_;
+    int closed, set_prewait = 0, have_orig_gen = 0;
+    uint32_t rc;
+    size_t orig_gen;
+
+    /* Admission control - prewait until we can enter our actual wait phase. */
+    do {
+        ossl_crypto_mutex_lock(cv->int_m);
+
+        closed = cv->closed;
+
+        /*
+         * Once prewait is over the prewait semaphore is signalled and
+         * num_prewait is set to 0. Use a generation counter to track if we need
+         * to remove a value we added to num_prewait when exiting (e.g. due to
+         * timeout or failure of WaitForSingleObject).
+         */
+        if (!have_orig_gen) {
+            orig_gen = cv->gen;
+            have_orig_gen = 1;
+        } else if (cv->gen != orig_gen) {
+            set_prewait = 0;
+            orig_gen = cv->gen;
+        }
+
+        if (!closed) {
+            /* We can now be admitted. */
+            ++cv->num_wait;
+            if (set_prewait) {
+                --cv->num_prewait;
+                set_prewait = 0;
+            }
+        } else if (!set_prewait) {
+            ++cv->num_prewait;
+            set_prewait = 1;
+        }
+
+        ossl_crypto_mutex_unlock(cv->int_m);
+
+        if (closed)
+            if (obj_wait(cv->prewait_sema, deadline) != WAIT_OBJECT_0) {
+                /*
+                 * If we got WAIT_OBJECT_0 we are safe - num_prewait has been
+                 * set to 0 and the semaphore has been consumed. On the other
+                 * hand if we timed out, there may be a residual posting that
+                 * was made just after we timed out. However in the worst case
+                 * this will just cause an internal spurious wakeup here in the
+                 * future, so we do not care too much about this. We treat
+                 * failure and timeout cases as the same, and simply exit in
+                 * this case.
+                 */
+                ossl_crypto_mutex_lock(cv->int_m);
+                if (set_prewait && cv->gen == orig_gen)
+                    --cv->num_prewait;
+                ossl_crypto_mutex_unlock(cv->int_m);
+                return;
+            }
+    } while (closed);
+
+    /*
+     * Unlock external mutex. Do not do this until we have been admitted, as we
+     * must guarantee we wake if broadcast is called at any time after ext_m is
+     * unlocked.
+     */
+    ossl_crypto_mutex_unlock(ext_m);
+
+    for (;;) {
+        /* Wait. */
+        rc = obj_wait(cv->sema, deadline);
+
+        /* Reacquire internal mutex and probe state. */
+        ossl_crypto_mutex_lock(cv->int_m);
+
+        if (cv->num_wake > 0) {
+            /*
+             * A wake token is available, so we can wake up. Consume the token
+             * and get out of here. We don't care what WaitForSingleObject
+             * returned here (e.g. if it timed out coincidentally). In the
+             * latter case a signal might be left in the semaphore which causes
+             * a future WaitForSingleObject call to return immediately, but in
+             * this case we will just loop again.
+             */
+            --cv->num_wake;
+            if (cv->num_wake == 0 && cv->closed) {
+                /*
+                 * We consumed the last wake token, so we can now open the
+                 * condition variable for new admissions.
+                 */
+                cv->closed = 0;
+                if (cv->num_prewait > 0) {
+                    ReleaseSemaphore(cv->prewait_sema, (LONG)cv->num_prewait, NULL);
+                    cv->num_prewait = 0;
+                    ++cv->gen;
+                }
+            }
+        } else if (rc == WAIT_OBJECT_0) {
+            /*
+             * We got a wakeup from the semaphore but we did not have any wake
+             * tokens. This ideally does not happen, but might if during a
+             * previous wait() call the semaphore is posted just after
+             * WaitForSingleObject returns due to a timeout (such that the
+             * num_wake > 0 case is taken above). Just spin again. (It is worth
+             * noting that repeated WaitForSingleObject calls is the only method
+             * documented for decrementing a Win32 semaphore, so this is
+             * basically the best possible strategy.)
+             */
+            ossl_crypto_mutex_unlock(cv->int_m);
+            continue;
+        } else {
+            /*
+             * Assume we timed out. The WaitForSingleObject call may also have
+             * failed for some other reason, which we treat as a timeout.
+             */
+            assert(cv->num_wait > 0);
+            --cv->num_wait;
+        }
+
+        break;
+    }
+
+    ossl_crypto_mutex_unlock(cv->int_m);
+    ossl_crypto_mutex_lock(ext_m);
+}
+
+void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *ext_m)
 {
-    /* Not supported */
+    ossl_crypto_condvar_wait_timeout(cv, ext_m, ossl_time_infinite());
 }
 
-void ossl_crypto_condvar_signal(CRYPTO_CONDVAR *cv)
+void ossl_crypto_condvar_broadcast(CRYPTO_CONDVAR *cv_)
 {
-    HANDLE *cv_p = (HANDLE *)cv;
+    LEGACY_CONDVAR *cv = (LEGACY_CONDVAR *)cv_;
+    size_t num_wake;
+
+    ossl_crypto_mutex_lock(cv->int_m);
+
+    num_wake = cv->num_wait;
+    if (num_wake == 0) {
+        ossl_crypto_mutex_unlock(cv->int_m);
+        return;
+    }
 
-    SetEvent(cv_p);
+    cv->num_wake  += num_wake;
+    cv->num_wait  -= num_wake;
+    cv->closed     = 1;
+
+    ossl_crypto_mutex_unlock(cv->int_m);
+    ReleaseSemaphore(cv->sema, num_wake, NULL);
 }
 
-void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv)
+void ossl_crypto_condvar_signal(CRYPTO_CONDVAR *cv_)
 {
-    HANDLE **cv_p;
+    LEGACY_CONDVAR *cv = (LEGACY_CONDVAR *)cv_;
 
-    cv_p = (HANDLE **)cv;
-    if (*cv_p != NULL)
-        CloseHandle(*cv_p);
+    ossl_crypto_mutex_lock(cv->int_m);
 
-    *cv_p = NULL;
+    if (cv->num_wait == 0) {
+        ossl_crypto_mutex_unlock(cv->int_m);
+        return;
+    }
+
+    /*
+     * We do not close the condition variable when merely signalling, as there
+     * are no guaranteed fairness semantics here, unlike for a broadcast.
+     */
+    --cv->num_wait;
+    ++cv->num_wake;
+
+    ossl_crypto_mutex_unlock(cv->int_m);
+    ReleaseSemaphore(cv->sema, 1, NULL);
 }
 
 # else
diff --git a/crypto/thread/internal.c b/crypto/thread/internal.c
index 688848738bd19971c9246d3ed81b2468f56de909..61486c8d4d586fd1fb5fe2e0e9594ca6299d7741 100644
--- a/crypto/thread/internal.c
+++ b/crypto/thread/internal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index a2f4b1fde0e1ce4b3a32d4d9016fd95517f7139a..580e5345d20db781b496cc3c3848f3026ed33fc9 100644
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 0581d09486596a3aa4309d61afc2c788688271c1..59ddcdbff83282c7f8e417dbdcb0020ce1d5aa1c 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index 8018e87b2565e0149b76258e33c1cd21543e2633..4cdc62339dea62117fba7c222e0beca53ccd2abc 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/crypto/time.c b/crypto/time.c
index 4e7d3eebac7f8ca4c116f806bc4121ff2b0e0c74..b0593a238bd1aebcd7f2e19d9bb8432b70e6a6dd 100644
--- a/crypto/time.c
+++ b/crypto/time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/crypto/trace.c b/crypto/trace.c
index 8e5836de3227aca25fee27a188de468cb66f43b1..51387641de948c88c01f80c97df2323f2a419e3b 100644
--- a/crypto/trace.c
+++ b/crypto/trace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -502,7 +502,7 @@ BIO *OSSL_trace_begin(int category)
     return channel;
 }
 
-void OSSL_trace_end(int category, BIO * channel)
+void OSSL_trace_end(int category, BIO *channel)
 {
 #ifndef OPENSSL_NO_TRACE
     char *suffix = NULL;
diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 3fde53cf9fb7cabb0c959072ba8669eace9f7e02..158e1c424258d8f2212ce2d2588d3becf8eca024 100644
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index 437b1b9c10903afe1ccd9ac63d32e86dba4aa51b..25fe9bf64bf7b93291dadfbcf6772b3955a52207 100644
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index 859557a0a4e4e449f27637b11ea48ffb351180e7..a8756af1cdeabbfb93b63b88fb5c523d1fb02ad7 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
index e26c1b5d25d5016463a522aa7220bab4cb82308e..59b00b225adfa2c17bbb37eb113887f77344401d 100644
--- a/crypto/ui/ui_util.c
+++ b/crypto/ui/ui_util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 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
diff --git a/crypto/uid.c b/crypto/uid.c
index e26c27c6749b2e716c2750606df2a66adbb742fc..45b63a431e08288ba2eecdbeb1d68a02b68ea8c8 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/whrlpool/wp_dgst.c b/crypto/whrlpool/wp_dgst.c
index 2a4e392e087317497b20ce40ddaa7b95790b0f6b..3f970deb9c7be7b2d9563a66d2ec8bb667c11ab8 100644
--- a/crypto/whrlpool/wp_dgst.c
+++ b/crypto/whrlpool/wp_dgst.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index bb683a7795f8620b16891c8af9795577d5ea2f70..1d401d042088466231cb2bfc27f0061c18b2e4bd 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/by_store.c b/crypto/x509/by_store.c
index 6a80ab7ed0b74671d7eb0f8a540857650f595bb0..ee92f4b16fd8114fa8447603ce24521d78a93bb0 100644
--- a/crypto/x509/by_store.c
+++ b/crypto/x509/by_store.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/crypto/x509/pcy_cache.c b/crypto/x509/pcy_cache.c
index b5bb49d43708df4941af241bbaefea9491597508..2d1d4cd367c032304641f27f5ac9cfb3c6951d3d 100644
--- a/crypto/x509/pcy_cache.c
+++ b/crypto/x509/pcy_cache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/crypto/x509/pcy_local.h b/crypto/x509/pcy_local.h
index cba107ca0358032b2fad4e3d828d2b0a0b3301c4..523f3e35feebac06e834c4b74ca1879eec14b238 100644
--- a/crypto/x509/pcy_local.h
+++ b/crypto/x509/pcy_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/crypto/x509/pcy_node.c b/crypto/x509/pcy_node.c
index 32e3d226bb1d7d1ecd8acf8af45de92103a8d66f..c6e7af5ab1985b749bdab3fc0c91d17a108db8ca 100644
--- a/crypto/x509/pcy_node.c
+++ b/crypto/x509/pcy_node.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index dc525b0051cadcbfbdbb5944c473c1c56e1e4368..d7307b12dabb480569b749daeb01ba4b6657b095 100644
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c
index 221acd09b05c3688875f4b69d07c01363eb7cbef..f4c8de2d160b9e2e79dfd34b1be53466d834a2a5 100644
--- a/crypto/x509/v3_addr.c
+++ b/crypto/x509/v3_addr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2023 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
diff --git a/crypto/x509/v3_admis.c b/crypto/x509/v3_admis.c
index 7aa8a4a420050f7da10b7e7ea244a6b05f961ed6..c3182a71db87fbdb7646a597cebd831f6995ed6b 100644
--- a/crypto/x509/v3_admis.c
+++ b/crypto/x509/v3_admis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
@@ -71,7 +71,7 @@ const X509V3_EXT_METHOD ossl_v3_ext_admission = {
 static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in,
                                 BIO *bp, int ind)
 {
-    NAMING_AUTHORITY * namingAuthority = (NAMING_AUTHORITY*) in;
+    NAMING_AUTHORITY *namingAuthority = (NAMING_AUTHORITY*) in;
 
     if (namingAuthority == NULL)
         return 0;
@@ -118,7 +118,7 @@ err:
 static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
                                 BIO *bp, int ind)
 {
-    ADMISSION_SYNTAX * admission = (ADMISSION_SYNTAX *)in;
+    ADMISSION_SYNTAX *admission = (ADMISSION_SYNTAX *)in;
     int i, j, k;
 
     if (admission->admissionAuthority != NULL) {
diff --git a/crypto/x509/v3_genn.c b/crypto/x509/v3_genn.c
index 1741c2d2f62932a959a1e48cc00e9a758e3b6e6d..1f67bf2f63ab879ea24146da0d42234ff1f75066 100644
--- a/crypto/x509/v3_genn.c
+++ b/crypto/x509/v3_genn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/x509/v3_ist.c b/crypto/x509/v3_ist.c
index c30725dc486833ea4cc22b1ecd156c57c2933669..978a0f3ed867030f76084aa642306a3edb963780 100644
--- a/crypto/x509/v3_ist.c
+++ b/crypto/x509/v3_ist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/crypto/x509/v3_lib.c b/crypto/x509/v3_lib.c
index 3f933ee8b9291b9a4bf352b42a166c038ea41e07..077b22c863ec69d3ecc30a40cb82cc09c8017b96 100644
--- a/crypto/x509/v3_lib.c
+++ b/crypto/x509/v3_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c
index ba8141b8c1b4c877749563c970339fceb91027a1..a6817b9e177f320b9af2def77b5deb479877e29c 100644
--- a/crypto/x509/v3_ncons.c
+++ b/crypto/x509/v3_ncons.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2003-2023 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
diff --git a/crypto/x509/v3_purp.c b/crypto/x509/v3_purp.c
index 800cbbcd51a18bd0b1e82b0b744a710c583f2d5b..e917c455dec7ceccacade3f03a6a1eb58db2185b 100644
--- a/crypto/x509/v3_purp.c
+++ b/crypto/x509/v3_purp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index 325a0dc1dd53874fbca5df957dd51013a05cf88d..3878bb3ef598f30866b040586d50b1525906035b 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 046a10bbbbf2b88900f112294aa2225c41ce52dc..7094280d485e868590b0addd64bf66665e363151 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
index b8bdcb4841950159b15533a683bb411b505c759c..2851fbcd9f93b862e42d356af4ea3f5ddfba36e6 100644
--- a/crypto/x509/x509_def.c
+++ b/crypto/x509/x509_def.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index 3e10443582d755b7e869fc644ab390ef06d5b203..226e45a737b853133de99bb267fd57dd44e615a3 100644
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index c639b54a543c8b04d1b2f914ea3acc0f0f430443..0ca7cb960d4fd9f882c8fbda448f96822d74ed3f 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index d4a68918290fe2fd4d2e24fe312b239f01c089ab..0881be7292b06b6605dbf8df252dfb68fdf63b0b 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/x509_trust.c b/crypto/x509/x509_trust.c
index d85b775f5ef37c3a192824452ba22c3adfdd694a..1a4345f2fec0a24450f245c33b49ef5e2a8a7296 100644
--- a/crypto/x509/x509_trust.c
+++ b/crypto/x509/x509_trust.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
@@ -275,7 +275,7 @@ static int obj_trust(int id, X509 *x, int flags)
         /*
          * Reject when explicit trust EKU are set and none match.
          *
-         * Returning untrusted is enough for for full chains that end in
+         * Returning untrusted is enough for full chains that end in
          * self-signed roots, because when explicit trust is specified it
          * suppresses the default blanket trust of self-signed objects.
          *
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index e635bea6b69ae52942ec73d7f63ae991113541f5..023a38a1c9fc80464bf80687228ff485afd46342 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index 3eec7d6412d9930c787224e798edcc45167b3321..205fe3d6e5a4d01a72f40520dc7b55a7ded04675 100644
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
index 09a1034a530ba441d68f8ec510dc0ef1cb5847a7..3e4c852b70a104385cd51ce44b703881634daeb3 100644
--- a/crypto/x509/x_all.c
+++ b/crypto/x509/x_all.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c
index ed10e0fbc2b42e0c1611cb6895768fc7effe6c78..004c7bdfebacc74ecd92632939543b54d2e55016 100644
--- a/crypto/x509/x_pubkey.c
+++ b/crypto/x509/x_pubkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index c96e6eb08c09fc004dc6242b7f1172643916f230..c4abdf5cd351e8a08294321f1c26a5c3e46ebe80 100644
--- a/demos/bio/client-arg.c
+++ b/demos/bio/client-arg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-2023 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
diff --git a/demos/bio/client-conf.c b/demos/bio/client-conf.c
index b8bb6819b9cf53ed4218dbfc8954bbba34964c93..766f1b5299a5f19a4966524e1f793df0cc3589eb 100644
--- a/demos/bio/client-conf.c
+++ b/demos/bio/client-conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-2023 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
diff --git a/demos/cipher/aesccm.c b/demos/cipher/aesccm.c
index b70209be86caba182cab04dc156640bf40681f1a..3c4b9e7445339b5133a00bc5505e71163e6e97d7 100644
--- a/demos/cipher/aesccm.c
+++ b/demos/cipher/aesccm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-2023 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
diff --git a/demos/cipher/aesgcm.c b/demos/cipher/aesgcm.c
index 0e4cf7122d7d11f75afa9757009cde7cd89e1bfc..64fa8184f1372f70112d1d53fdc85cffd0ba26f9 100644
--- a/demos/cipher/aesgcm.c
+++ b/demos/cipher/aesgcm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-2023 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
diff --git a/demos/cipher/aeskeywrap.c b/demos/cipher/aeskeywrap.c
index 3909fd473ca04c0aac70ebbd08c4edeec59bf571..3207b85663d19a4908f9a905ff54501e1b5342fb 100644
--- a/demos/cipher/aeskeywrap.c
+++ b/demos/cipher/aeskeywrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/cipher/ariacbc.c b/demos/cipher/ariacbc.c
index 8542e4673eac09fedc72aaec12d0d607e3c1dda4..f9898e12c798577633c269292ac94a5224a7218a 100644
--- a/demos/cipher/ariacbc.c
+++ b/demos/cipher/ariacbc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-2023 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
diff --git a/demos/cms/cms_comp.c b/demos/cms/cms_comp.c
index 3ccbfddddaedc0a71670aa5ce6eead44889ae96d..30c5fc7fcf536634462d503e029f52c594ab7dcd 100644
--- a/demos/cms/cms_comp.c
+++ b/demos/cms/cms_comp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c
index 285eba91df00298cc7d1f5b550952416e529c891..f65a77e129dc2ef06b1362b75b2be595d7c106e2 100644
--- a/demos/cms/cms_ddec.c
+++ b/demos/cms/cms_ddec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c
index 436f0088d20554a52e26ad0b6a52a8f98ba017c9..ebc34a5f94cbba169ed6b67d9e503122961b9475 100644
--- a/demos/cms/cms_dec.c
+++ b/demos/cms/cms_dec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_denc.c b/demos/cms/cms_denc.c
index 4fbd72aae548f0415b431a15a5b101a8d6a3abba..53b680f67484d32f47c2305961128a00779225f6 100644
--- a/demos/cms/cms_denc.c
+++ b/demos/cms/cms_denc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_enc.c b/demos/cms/cms_enc.c
index 3af321521cb3d78eb63689eed1644d3b89f0c207..a0af2c47742a5e2efd6390238067f5358495afbc 100644
--- a/demos/cms/cms_enc.c
+++ b/demos/cms/cms_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c
index 8abc561941a48ac1856900e4c181328a03a65b85..35fc889f8001fab8c0c4641e1fc0c53d54bae9c1 100644
--- a/demos/cms/cms_sign.c
+++ b/demos/cms/cms_sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c
index 72c7862593fc3a02fec3e9df6f6ecbc36fe2799b..b10043f92137ffe15c06163ccf341e34d6fe99fb 100644
--- a/demos/cms/cms_sign2.c
+++ b/demos/cms/cms_sign2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_uncomp.c b/demos/cms/cms_uncomp.c
index 02106197b40a7a507f1be3d4b1bd7dec839cd51c..13f1e756da1ea9150e172966aa31dbf631c5d5d6 100644
--- a/demos/cms/cms_uncomp.c
+++ b/demos/cms/cms_uncomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/cms/cms_ver.c b/demos/cms/cms_ver.c
index 0b6c469bf43324792db0b8ee2d0e6bf88ee3a910..f7d3a9bc854318c95bb634c6ac18e0113286bf0a 100644
--- a/demos/cms/cms_ver.c
+++ b/demos/cms/cms_ver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2023 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
diff --git a/demos/digest/BIO_f_md.c b/demos/digest/BIO_f_md.c
index 1317e82237a55102ee97150cd85a97981b66fd33..119bdecf3cde1c4e5a6865da46a5bed5dec346ee 100644
--- a/demos/digest/BIO_f_md.c
+++ b/demos/digest/BIO_f_md.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -34,7 +34,7 @@
  * The default digest is SHA3-512
  */
 
-int main(int argc, char * argv[])
+int main(int argc, char *argv[])
 {
     int ret = EXIT_FAILURE;
     OSSL_LIB_CTX *library_context = NULL;
diff --git a/demos/digest/EVP_MD_demo.c b/demos/digest/EVP_MD_demo.c
index 51a87559d22e60ee373343329d89531efa03b808..8cf3bd8e7b8663205f2c4528e9ef61c8c3527310 100644
--- a/demos/digest/EVP_MD_demo.c
+++ b/demos/digest/EVP_MD_demo.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
@@ -24,7 +24,7 @@
  * more than once.
  */
 
-const char * hamlet_1 =
+const char *hamlet_1 =
     "To be, or not to be, that is the question,\n"
     "Whether tis nobler in the minde to suffer\n"
     "The ſlings and arrowes of outragious fortune,\n"
@@ -43,7 +43,7 @@ const char * hamlet_1 =
     "The oppressor's wrong, the proud man's Contumely,\n"
     "The pangs of dispised love, the Law's delay,\n"
 ;
-const char * hamlet_2 =
+const char *hamlet_2 =
     "The insolence of Office, and the spurns\n"
     "That patient merit of the'unworthy takes,\n"
     "When he himself might his Quietas make\n"
diff --git a/demos/digest/EVP_MD_stdin.c b/demos/digest/EVP_MD_stdin.c
index 6990b721c5f98d6f17643ff48073cab4243077c8..11bffb6bcca88f015cdf35b0a2780c78fe91a941 100644
--- a/demos/digest/EVP_MD_stdin.c
+++ b/demos/digest/EVP_MD_stdin.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -35,7 +35,7 @@ int demonstrate_digest(BIO *input)
 {
     OSSL_LIB_CTX *library_context = NULL;
     int ret = 0;
-    const char * option_properties = NULL;
+    const char *option_properties = NULL;
     EVP_MD *message_digest = NULL;
     EVP_MD_CTX *digest_context = NULL;
     unsigned int digest_length;
diff --git a/demos/digest/EVP_MD_xof.c b/demos/digest/EVP_MD_xof.c
index c2bd1a9fc50d8d0b5907c01e77a6df12a0157c8f..a70e4dc412a4d279b645a668f595b80e130bf398 100644
--- a/demos/digest/EVP_MD_xof.c
+++ b/demos/digest/EVP_MD_xof.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/encode/ec_encode.c b/demos/encode/ec_encode.c
index a5fe2213dfb31651761c3089a7f01a4f999a0d20..4f15ce41e542baa24dc95ee39791263fff2c0e0f 100644
--- a/demos/encode/ec_encode.c
+++ b/demos/encode/ec_encode.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/encode/rsa_encode.c b/demos/encode/rsa_encode.c
index fd06b970db0ceb9f711f6e1e5af119d7a7cc0c38..8905ebe91f55fad9178ed34d6f60e0f4bc183308 100644
--- a/demos/encode/rsa_encode.c
+++ b/demos/encode/rsa_encode.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/guide/Makefile b/demos/guide/Makefile
index d665edc27d345fff70621585e82c819830b17f6c..d12d6c0cad9445adc16a0c97c78ffabf21cb5358 100644
--- a/demos/guide/Makefile
+++ b/demos/guide/Makefile
@@ -9,7 +9,8 @@ CFLAGS = -I../../include -g
 LDFLAGS = -L../..
 LDLIBS = -lcrypto -lssl
 
-all: tls-client-block quic-client-block quic-multi-stream
+all: tls-client-block quic-client-block quic-multi-stream tls-client-non-block \
+     quic-client-non-block
 
 tls-client-block: tls-client-block.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
@@ -20,5 +21,12 @@ quic-client-block: quic-client-block.c
 quic-multi-stream: quic-multi-stream.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
+tls-client-non-block: tls-client-non-block.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+
+quic-client-non-block: quic-client-non-block.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+
 clean:
-	$(RM) *.o tls-client-block quic-client-block quic-multi-stream
+	$(RM) *.o tls-client-block quic-client-block quic-multi-stream \
+	      tls-client-non-block quic-client-non-block
diff --git a/demos/guide/quic-client-block.c b/demos/guide/quic-client-block.c
index 54e52d5c28e0c29317425d882db711d0d5b06187..e6cabfef260a8cfa2ef7c2b825d5b561c03e28e1 100644
--- a/demos/guide/quic-client-block.c
+++ b/demos/guide/quic-client-block.c
@@ -47,7 +47,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
      */
     for (ai = res; ai != NULL; ai = BIO_ADDRINFO_next(ai)) {
         /*
-         * Create a TCP socket. We could equally use non-OpenSSL calls such
+         * Create a UDP socket. We could equally use non-OpenSSL calls such
          * as "socket" here for this and the subsequent connect and close
          * functions. But for portability reasons and also so that we get
          * errors on the OpenSSL stack in the event of a failure we use
@@ -66,6 +66,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
 
         /* Set to nonblocking mode */
         if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
             sock = -1;
             continue;
         }
@@ -81,7 +82,6 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
         }
     }
 
-
     /* Free the address information resources we allocated earlier */
     BIO_ADDRINFO_free(res);
 
@@ -89,10 +89,12 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
     if (sock == -1)
         return NULL;
 
-    /* Create a BIO to wrap the socket*/
+    /* Create a BIO to wrap the socket */
     bio = BIO_new(BIO_s_datagram());
-    if (bio == NULL)
+    if (bio == NULL) {
         BIO_closesocket(sock);
+        return NULL;
+    }
 
     /*
      * Associate the newly created BIO with the underlying socket. By
diff --git a/demos/guide/quic-client-non-block.c b/demos/guide/quic-client-non-block.c
new file mode 100644
index 0000000000000000000000000000000000000000..61d339c79ca57b4244abf7ea82884e36f2a4c5b0
--- /dev/null
+++ b/demos/guide/quic-client-non-block.c
@@ -0,0 +1,408 @@
+/*
+ *  Copyright 2023 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
+ *  in the file LICENSE in the source distribution or at
+ *  https://www.openssl.org/source/license.html
+ */
+
+/*
+ * NB: Changes to this file should also be reflected in
+ * doc/man7/ossl-guide-quic-client-non-block.pod
+ */
+
+#include <string.h>
+
+/* Include the appropriate header file for SOCK_DGRAM */
+#ifdef _WIN32 /* Windows */
+# include <winsock2.h>
+#else /* Linux/Unix */
+# include <sys/socket.h>
+# include <sys/select.h>
+#endif
+
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+/* Helper function to create a BIO connected to the server */
+static BIO *create_socket_bio(const char *hostname, const char *port,
+                              BIO_ADDR **peer_addr)
+{
+    int sock = -1;
+    BIO_ADDRINFO *res;
+    const BIO_ADDRINFO *ai = NULL;
+    BIO *bio;
+
+    /*
+     * Lookup IP address info for the server.
+     */
+    if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, 0, SOCK_DGRAM, 0,
+                       &res))
+        return NULL;
+
+    /*
+     * Loop through all the possible addresses for the server and find one
+     * we can connect to.
+     */
+    for (ai = res; ai != NULL; ai = BIO_ADDRINFO_next(ai)) {
+        /*
+         * Create a UDP socket. We could equally use non-OpenSSL calls such
+         * as "socket" here for this and the subsequent connect and close
+         * functions. But for portability reasons and also so that we get
+         * errors on the OpenSSL stack in the event of a failure we use
+         * OpenSSL's versions of these functions.
+         */
+        sock = BIO_socket(BIO_ADDRINFO_family(ai), SOCK_DGRAM, 0, 0);
+        if (sock == -1)
+            continue;
+
+        /* Connect the socket to the server's address */
+        if (!BIO_connect(sock, BIO_ADDRINFO_address(ai), 0)) {
+            BIO_closesocket(sock);
+            sock = -1;
+            continue;
+        }
+
+        /* Set to nonblocking mode */
+        if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
+            sock = -1;
+            continue;
+        }
+
+        break;
+    }
+
+    if (sock != -1) {
+        *peer_addr = BIO_ADDR_dup(BIO_ADDRINFO_address(ai));
+        if (*peer_addr == NULL) {
+            BIO_closesocket(sock);
+            return NULL;
+        }
+    }
+
+    /* Free the address information resources we allocated earlier */
+    BIO_ADDRINFO_free(res);
+
+    /* If sock is -1 then we've been unable to connect to the server */
+    if (sock == -1)
+        return NULL;
+
+    /* Create a BIO to wrap the socket */
+    bio = BIO_new(BIO_s_datagram());
+    if (bio == NULL) {
+        BIO_closesocket(sock);
+        return NULL;
+    }
+
+    /*
+     * Associate the newly created BIO with the underlying socket. By
+     * passing BIO_CLOSE here the socket will be automatically closed when
+     * the BIO is freed. Alternatively you can use BIO_NOCLOSE, in which
+     * case you must close the socket explicitly when it is no longer
+     * needed.
+     */
+    BIO_set_fd(bio, sock, BIO_CLOSE);
+
+    return bio;
+}
+
+static void wait_for_activity(SSL *ssl)
+{
+    fd_set wfds, rfds;
+    int width, sock, isinfinite;
+    struct timeval tv;
+    struct timeval *tvp = NULL;
+
+    /* Get hold of the underlying file descriptor for the socket */
+    sock = SSL_get_fd(ssl);
+
+    FD_ZERO(&wfds);
+    FD_ZERO(&rfds);
+
+    /*
+     * Find out if we would like to write to the socket, or read from it (or
+     * both)
+     */
+    if (SSL_net_write_desired(ssl))
+        FD_SET(sock, &wfds);
+    if (SSL_net_read_desired(ssl))
+        FD_SET(sock, &rfds);
+    width = sock + 1;
+
+    /*
+     * Find out when OpenSSL would next like to be called, regardless of
+     * whether the state of the underlying socket has changed or not.
+     */
+    if (SSL_get_event_timeout(ssl, &tv, &isinfinite) && !isinfinite)
+        tvp = &tv;
+
+    /*
+     * Wait until the socket is writeable or readable. We use select here
+     * for the sake of simplicity and portability, but you could equally use
+     * poll/epoll or similar functions
+     *
+     * NOTE: For the purposes of this demonstration code this effectively
+     * makes this demo block until it has something more useful to do. In a
+     * real application you probably want to go and do other work here (e.g.
+     * update a GUI, or service other connections).
+     *
+     * Let's say for example that you want to update the progress counter on
+     * a GUI every 100ms. One way to do that would be to use the timeout in
+     * the last parameter to "select" below. If the tvp value is greater
+     * than 100ms then use 100ms instead. Then, when select returns, you
+     * check if it did so because of activity on the file descriptors or
+     * because of the timeout. If the 100ms GUI timeout has expired but the
+     * tvp timeout has not then go and update the GUI and then restart the
+     * "select" (with updated timeouts).
+     */
+
+    select(width, &rfds, &wfds, NULL, tvp);
+}
+
+static int handle_io_failure(SSL *ssl, int res)
+{
+    switch (SSL_get_error(ssl, res)) {
+    case SSL_ERROR_WANT_READ:
+    case SSL_ERROR_WANT_WRITE:
+        /* Temporary failure. Wait until we can read/write and try again */
+        wait_for_activity(ssl);
+        return 1;
+
+    case SSL_ERROR_ZERO_RETURN:
+        /* EOF */
+        return 0;
+
+    case SSL_ERROR_SYSCALL:
+        return -1;
+
+    case SSL_ERROR_SSL:
+        /*
+         * Some stream fatal error occurred. This could be because of a
+         * stream reset - or some failure occurred on the underlying
+         * connection.
+         */
+        switch (SSL_get_stream_read_state(ssl)) {
+        case SSL_STREAM_STATE_RESET_REMOTE:
+            printf("Stream reset occurred\n");
+            /*
+             * The stream has been reset but the connection is still
+             * healthy.
+             */
+            break;
+
+        case SSL_STREAM_STATE_CONN_CLOSED:
+            printf("Connection closed\n");
+            /* Connection is already closed. */
+            break;
+
+        default:
+            printf("Unknown stream failure\n");
+            break;
+        }
+        /*
+         * If the failure is due to a verification error we can get more
+         * information about it from SSL_get_verify_result().
+         */
+        if (SSL_get_verify_result(ssl) != X509_V_OK)
+            printf("Verify error: %s\n",
+                X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
+        return -1;
+
+    default:
+        return -1;
+    }
+}
+
+/* Server hostname and port details. Must be in quotes */
+#ifndef HOSTNAME
+# define HOSTNAME "www.example.com"
+#endif
+#ifndef PORT
+# define PORT     "443"
+#endif
+
+/*
+ * Simple application to send a basic HTTP/1.0 request to a server and
+ * print the response on the screen. Note that HTTP/1.0 over QUIC is
+ * non-standard and will not typically be supported by real world servers. This
+ * is for demonstration purposes only.
+ */
+int main(void)
+{
+    SSL_CTX *ctx = NULL;
+    SSL *ssl = NULL;
+    BIO *bio = NULL;
+    int res = EXIT_FAILURE;
+    int ret;
+    unsigned char alpn[] = { 8, 'h', 't', 't', 'p', '/', '1', '.', '0' };
+    const char *request =
+        "GET / HTTP/1.0\r\nConnection: close\r\nHost: "HOSTNAME"\r\n\r\n";
+    size_t written, readbytes;
+    char buf[160];
+    BIO_ADDR *peer_addr = NULL;
+    int eof = 0;
+
+    /*
+     * Create an SSL_CTX which we can use to create SSL objects from. We
+     * want an SSL_CTX for creating clients so we use
+     * OSSL_QUIC_client_method() here.
+     */
+    ctx = SSL_CTX_new(OSSL_QUIC_client_method());
+    if (ctx == NULL) {
+        printf("Failed to create the SSL_CTX\n");
+        goto end;
+    }
+
+    /*
+     * Configure the client to abort the handshake if certificate
+     * verification fails. Virtually all clients should do this unless you
+     * really know what you are doing.
+     */
+    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
+
+    /* Use the default trusted certificate store */
+    if (!SSL_CTX_set_default_verify_paths(ctx)) {
+        printf("Failed to set the default trusted certificate store\n");
+        goto end;
+    }
+
+    /* Create an SSL object to represent the TLS connection */
+    ssl = SSL_new(ctx);
+    if (ssl == NULL) {
+        printf("Failed to create the SSL object\n");
+        goto end;
+    }
+
+    /*
+     * Create the underlying transport socket/BIO and associate it with the
+     * connection.
+     */
+    bio = create_socket_bio(HOSTNAME, PORT, &peer_addr);
+    if (bio == NULL) {
+        printf("Failed to crete the BIO\n");
+        goto end;
+    }
+    SSL_set_bio(ssl, bio, bio);
+
+    /*
+     * Tell the server during the handshake which hostname we are attempting
+     * to connect to in case the server supports multiple hosts.
+     */
+    if (!SSL_set_tlsext_host_name(ssl, HOSTNAME)) {
+        printf("Failed to set the SNI hostname\n");
+        goto end;
+    }
+
+    /*
+     * Ensure we check during certificate verification that the server has
+     * supplied a certificate for the hostname that we were expecting.
+     * Virtually all clients should do this unless you really know what you
+     * are doing.
+     */
+    if (!SSL_set1_host(ssl, HOSTNAME)) {
+        printf("Failed to set the certificate verification hostname");
+        goto end;
+    }
+
+    /* SSL_set_alpn_protos returns 0 for success! */
+    if (SSL_set_alpn_protos(ssl, alpn, sizeof(alpn)) != 0) {
+        printf("Failed to set the ALPN for the connection\n");
+        goto end;
+    }
+
+    /* Set the IP address of the remote peer */
+    if (!SSL_set1_initial_peer_addr(ssl, peer_addr)) {
+        printf("Failed to set the initial peer address\n");
+        goto end;
+    }
+
+    /*
+     * The underlying socket is always nonblocking with QUIC, but the default
+     * behaviour of the SSL object is still to block. We set it for nonblocking
+     * mode in this demo.
+     */
+    if (!SSL_set_blocking_mode(ssl, 0)) {
+        printf("Failed to turn off blocking mode\n");
+        goto end;
+    }
+
+    /* Do the handshake with the server */
+    while ((ret = SSL_connect(ssl)) != 1) {
+        if (handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+        printf("Failed to connect to server\n");
+        goto end; /* Cannot retry: error */
+    }
+
+    /* Write an HTTP GET request to the peer */
+    while (!SSL_write_ex(ssl, request, strlen(request), &written)) {
+        if (handle_io_failure(ssl, 0) == 1)
+            continue; /* Retry */
+        printf("Failed to write HTTP request\n");
+        goto end; /* Cannot retry: error */
+    }
+
+    do {
+        /*
+         * Get up to sizeof(buf) bytes of the response. We keep reading until
+         * the server closes the connection.
+         */
+        while (!eof && !SSL_read_ex(ssl, buf, sizeof(buf), &readbytes)) {
+            switch (handle_io_failure(ssl, 0)) {
+            case 1:
+                continue; /* Retry */
+            case 0:
+                eof = 1;
+                continue;
+            case -1:
+            default:
+                printf("Failed reading remaining data\n");
+                goto end; /* Cannot retry: error */
+            }
+        }
+        /*
+         * OpenSSL does not guarantee that the returned data is a string or
+         * that it is NUL terminated so we use fwrite() to write the exact
+         * number of bytes that we read. The data could be non-printable or
+         * have NUL characters in the middle of it. For this simple example
+         * we're going to print it to stdout anyway.
+         */
+        if (!eof)
+            fwrite(buf, 1, readbytes, stdout);
+    } while (!eof);
+    /* In case the response didn't finish with a newline we add one now */
+    printf("\n");
+
+    /*
+     * Repeatedly call SSL_shutdown() until the connection is fully
+     * closed.
+     */
+    while ((ret = SSL_shutdown(ssl)) != 1) {
+        if (ret < 0 && handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+    }
+
+    /* Success! */
+    res = EXIT_SUCCESS;
+ end:
+    /*
+     * If something bad happened then we will dump the contents of the
+     * OpenSSL error stack to stderr. There might be some useful diagnostic
+     * information there.
+     */
+    if (res == EXIT_FAILURE)
+        ERR_print_errors_fp(stderr);
+
+    /*
+     * Free the resources we allocated. We do not free the BIO object here
+     * because ownership of it was immediately transferred to the SSL object
+     * via SSL_set_bio(). The BIO will be freed when we free the SSL object.
+     */
+    SSL_free(ssl);
+    SSL_CTX_free(ctx);
+    BIO_ADDR_free(peer_addr);
+    return res;
+}
diff --git a/demos/guide/quic-multi-stream.c b/demos/guide/quic-multi-stream.c
index 5b7c8581eb7b9acd09f7c0684e6d528f76da378b..56db5a98a8b40953790aeb2e7646c8098a20de2c 100644
--- a/demos/guide/quic-multi-stream.c
+++ b/demos/guide/quic-multi-stream.c
@@ -66,6 +66,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
 
         /* Set to nonblocking mode */
         if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
             sock = -1;
             continue;
         }
@@ -89,11 +90,12 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
     if (sock == -1)
         return NULL;
 
-    /* Create a BIO to wrap the socket*/
+    /* Create a BIO to wrap the socket */
     bio = BIO_new(BIO_s_datagram());
-    if (bio == NULL)
+    if (bio == NULL) {
         BIO_closesocket(sock);
-
+        return NULL;
+    }
     /*
      * Associate the newly created BIO with the underlying socket. By
      * passing BIO_CLOSE here the socket will be automatically closed when
diff --git a/demos/guide/tls-client-block.c b/demos/guide/tls-client-block.c
index b2d2a89dd139faf1d25d2ad901f7692497f9a97d..75ce7ebcc2458f9ce74a6ebb5fe08df3a77a2c17 100644
--- a/demos/guide/tls-client-block.c
+++ b/demos/guide/tls-client-block.c
@@ -76,8 +76,10 @@ static BIO *create_socket_bio(const char *hostname, const char *port)
 
     /* Create a BIO to wrap the socket*/
     bio = BIO_new(BIO_s_socket());
-    if (bio == NULL)
+    if (bio == NULL) {
         BIO_closesocket(sock);
+        return NULL;
+    }
 
     /*
      * Associate the newly created BIO with the underlying socket. By
diff --git a/demos/guide/tls-client-non-block.c b/demos/guide/tls-client-non-block.c
new file mode 100644
index 0000000000000000000000000000000000000000..14448c968523e69d0c5e9372ad134046becc56c9
--- /dev/null
+++ b/demos/guide/tls-client-non-block.c
@@ -0,0 +1,352 @@
+/*
+ *  Copyright 2023 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
+ *  in the file LICENSE in the source distribution or at
+ *  https://www.openssl.org/source/license.html
+ */
+
+/*
+ * NB: Changes to this file should also be reflected in
+ * doc/man7/ossl-guide-tls-client-non-block.pod
+ */
+
+#include <string.h>
+
+/* Include the appropriate header file for SOCK_STREAM */
+#ifdef _WIN32 /* Windows */
+# include <winsock2.h>
+#else /* Linux/Unix */
+# include <sys/socket.h>
+# include <sys/select.h>
+#endif
+
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+/* Helper function to create a BIO connected to the server */
+static BIO *create_socket_bio(const char *hostname, const char *port)
+{
+    int sock = -1;
+    BIO_ADDRINFO *res;
+    const BIO_ADDRINFO *ai = NULL;
+    BIO *bio;
+
+    /*
+     * Lookup IP address info for the server.
+     */
+    if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, 0, SOCK_STREAM, 0,
+                       &res))
+        return NULL;
+
+    /*
+     * Loop through all the possible addresses for the server and find one
+     * we can connect to.
+     */
+    for (ai = res; ai != NULL; ai = BIO_ADDRINFO_next(ai)) {
+        /*
+         * Create a TCP socket. We could equally use non-OpenSSL calls such
+         * as "socket" here for this and the subsequent connect and close
+         * functions. But for portability reasons and also so that we get
+         * errors on the OpenSSL stack in the event of a failure we use
+         * OpenSSL's versions of these functions.
+         */
+        sock = BIO_socket(BIO_ADDRINFO_family(ai), SOCK_STREAM, 0, 0);
+        if (sock == -1)
+            continue;
+
+        /* Connect the socket to the server's address */
+        if (!BIO_connect(sock, BIO_ADDRINFO_address(ai), BIO_SOCK_NODELAY)) {
+            BIO_closesocket(sock);
+            sock = -1;
+            continue;
+        }
+
+        /* Set to nonblocking mode */
+        if (!BIO_socket_nbio(sock, 1)) {
+            sock = -1;
+            continue;
+        }
+
+        /* We have a connected socket so break out of the loop */
+        break;
+    }
+
+    /* Free the address information resources we allocated earlier */
+    BIO_ADDRINFO_free(res);
+
+    /* If sock is -1 then we've been unable to connect to the server */
+    if (sock == -1)
+        return NULL;
+
+    /* Create a BIO to wrap the socket */
+    bio = BIO_new(BIO_s_socket());
+    if (bio == NULL) {
+        BIO_closesocket(sock);
+        return NULL;
+    }
+
+    /*
+     * Associate the newly created BIO with the underlying socket. By
+     * passing BIO_CLOSE here the socket will be automatically closed when
+     * the BIO is freed. Alternatively you can use BIO_NOCLOSE, in which
+     * case you must close the socket explicitly when it is no longer
+     * needed.
+     */
+    BIO_set_fd(bio, sock, BIO_CLOSE);
+
+    return bio;
+}
+
+static void wait_for_activity(SSL *ssl, int write)
+{
+    fd_set fds;
+    int width, sock;
+
+    /* Get hold of the underlying file descriptor for the socket */
+    sock = SSL_get_fd(ssl);
+
+    FD_ZERO(&fds);
+    FD_SET(sock, &fds);
+    width = sock + 1;
+
+    /*
+     * Wait until the socket is writeable or readable. We use select here
+     * for the sake of simplicity and portability, but you could equally use
+     * poll/epoll or similar functions
+     *
+     * NOTE: For the purposes of this demonstration code this effectively
+     * makes this demo block until it has something more useful to do. In a
+     * real application you probably want to go and do other work here (e.g.
+     * update a GUI, or service other connections).
+     *
+     * Let's say for example that you want to update the progress counter on
+     * a GUI every 100ms. One way to do that would be to add a 100ms timeout
+     * in the last parameter to "select" below. Then, when select returns,
+     * you check if it did so because of activity on the file descriptors or
+     * because of the timeout. If it is due to the timeout then update the
+     * GUI and then restart the "select".
+     */
+    if (write)
+        select(width, NULL, &fds, NULL, NULL);
+    else
+        select(width, &fds, NULL, NULL, NULL);
+}
+
+static int handle_io_failure(SSL *ssl, int res)
+{
+    switch (SSL_get_error(ssl, res)) {
+    case SSL_ERROR_WANT_READ:
+        /* Temporary failure. Wait until we can read and try again */
+        wait_for_activity(ssl, 0);
+        return 1;
+
+    case SSL_ERROR_WANT_WRITE:
+        /* Temporary failure. Wait until we can write and try again */
+        wait_for_activity(ssl, 1);
+        return 1;
+
+    case SSL_ERROR_ZERO_RETURN:
+        /* EOF */
+        return 0;
+
+    case SSL_ERROR_SYSCALL:
+        return -1;
+
+    case SSL_ERROR_SSL:
+        /*
+        * If the failure is due to a verification error we can get more
+        * information about it from SSL_get_verify_result().
+        */
+        if (SSL_get_verify_result(ssl) != X509_V_OK)
+            printf("Verify error: %s\n",
+                X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
+        return -1;
+
+    default:
+        return -1;
+    }
+}
+
+/* Server hostname and port details. Must be in quotes */
+#ifndef HOSTNAME
+# define HOSTNAME "www.example.com"
+#endif
+#ifndef PORT
+# define PORT     "443"
+#endif
+
+/*
+ * Simple application to send a basic HTTP/1.0 request to a server and
+ * print the response on the screen.
+ */
+int main(void)
+{
+    SSL_CTX *ctx = NULL;
+    SSL *ssl = NULL;
+    BIO *bio = NULL;
+    int res = EXIT_FAILURE;
+    int ret;
+    const char *request =
+        "GET / HTTP/1.0\r\nConnection: close\r\nHost: "HOSTNAME"\r\n\r\n";
+    size_t written, readbytes;
+    char buf[160];
+    int eof = 0;
+
+    /*
+     * Create an SSL_CTX which we can use to create SSL objects from. We
+     * want an SSL_CTX for creating clients so we use TLS_client_method()
+     * here.
+     */
+    ctx = SSL_CTX_new(TLS_client_method());
+    if (ctx == NULL) {
+        printf("Failed to create the SSL_CTX\n");
+        goto end;
+    }
+
+    /*
+     * Configure the client to abort the handshake if certificate
+     * verification fails. Virtually all clients should do this unless you
+     * really know what you are doing.
+     */
+    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
+
+    /* Use the default trusted certificate store */
+    if (!SSL_CTX_set_default_verify_paths(ctx)) {
+        printf("Failed to set the default trusted certificate store\n");
+        goto end;
+    }
+
+    /*
+     * TLSv1.1 or earlier are deprecated by IETF and are generally to be
+     * avoided if possible. We require a minimum TLS version of TLSv1.2.
+     */
+    if (!SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION)) {
+        printf("Failed to set the minimum TLS protocol version\n");
+        goto end;
+    }
+
+    /* Create an SSL object to represent the TLS connection */
+    ssl = SSL_new(ctx);
+    if (ssl == NULL) {
+        printf("Failed to create the SSL object\n");
+        goto end;
+    }
+
+    /*
+     * Create the underlying transport socket/BIO and associate it with the
+     * connection.
+     */
+    bio = create_socket_bio(HOSTNAME, PORT);
+    if (bio == NULL) {
+        printf("Failed to crete the BIO\n");
+        goto end;
+    }
+    SSL_set_bio(ssl, bio, bio);
+
+    /*
+     * Tell the server during the handshake which hostname we are attempting
+     * to connect to in case the server supports multiple hosts.
+     */
+    if (!SSL_set_tlsext_host_name(ssl, HOSTNAME)) {
+        printf("Failed to set the SNI hostname\n");
+        goto end;
+    }
+
+    /*
+     * Ensure we check during certificate verification that the server has
+     * supplied a certificate for the hostname that we were expecting.
+     * Virtually all clients should do this unless you really know what you
+     * are doing.
+     */
+    if (!SSL_set1_host(ssl, HOSTNAME)) {
+        printf("Failed to set the certificate verification hostname");
+        goto end;
+    }
+
+    /* Do the handshake with the server */
+    while ((ret = SSL_connect(ssl)) != 1) {
+        if (handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+        printf("Failed to connect to server\n");
+        goto end; /* Cannot retry: error */
+    }
+
+    /* Write an HTTP GET request to the peer */
+    while (!SSL_write_ex(ssl, request, strlen(request), &written)) {
+        if (handle_io_failure(ssl, 0) == 1)
+            continue; /* Retry */
+        printf("Failed to write HTTP request\n");
+        goto end; /* Cannot retry: error */
+    }
+
+    do {
+        /*
+         * Get up to sizeof(buf) bytes of the response. We keep reading until
+         * the server closes the connection.
+         */
+        while (!eof && !SSL_read_ex(ssl, buf, sizeof(buf), &readbytes)) {
+            switch (handle_io_failure(ssl, 0)) {
+            case 1:
+                continue; /* Retry */
+            case 0:
+                eof = 1;
+                continue;
+            case -1:
+            default:
+                printf("Failed reading remaining data\n");
+                goto end; /* Cannot retry: error */
+            }
+        }
+        /*
+         * OpenSSL does not guarantee that the returned data is a string or
+         * that it is NUL terminated so we use fwrite() to write the exact
+         * number of bytes that we read. The data could be non-printable or
+         * have NUL characters in the middle of it. For this simple example
+         * we're going to print it to stdout anyway.
+         */
+        if (!eof)
+            fwrite(buf, 1, readbytes, stdout);
+    } while (!eof);
+    /* In case the response didn't finish with a newline we add one now */
+    printf("\n");
+
+    /*
+     * The peer already shutdown gracefully (we know this because of the
+     * SSL_ERROR_ZERO_RETURN (i.e. EOF) above). We should do the same back.
+     */
+    while ((ret = SSL_shutdown(ssl)) != 1) {
+        if (ret < 0 && handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+        /*
+         * ret == 0 is unexpected here because that means "we've sent a
+         * close_notify and we're waiting for one back". But we already know
+         * we got one from the peer because of the SSL_ERROR_ZERO_RETURN
+         * (i.e. EOF) above.
+         */
+        printf("Error shutting down\n");
+        goto end; /* Cannot retry: error */
+    }
+
+    /* Success! */
+    res = EXIT_SUCCESS;
+ end:
+    /*
+     * If something bad happened then we will dump the contents of the
+     * OpenSSL error stack to stderr. There might be some useful diagnostic
+     * information there.
+     */
+    if (res == EXIT_FAILURE)
+        ERR_print_errors_fp(stderr);
+
+    /*
+     * Free the resources we allocated. We do not free the BIO object here
+     * because ownership of it was immediately transferred to the SSL object
+     * via SSL_set_bio(). The BIO will be freed when we free the SSL object.
+     */
+    SSL_free(ssl);
+    SSL_CTX_free(ctx);
+    return res;
+}
diff --git a/demos/kdf/hkdf.c b/demos/kdf/hkdf.c
index 52f505cfa3bd24066cbf35d95402c9a6abac5c13..8d7c436575fd6bc25c451d93358b7db3fe430538 100644
--- a/demos/kdf/hkdf.c
+++ b/demos/kdf/hkdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/kdf/pbkdf2.c b/demos/kdf/pbkdf2.c
index fc87e6bbe090eaaf43834318a4cd9f7d9fa48bce..ae9a9d726c1252bf662ded10c9f3d1eaf48ce9e9 100644
--- a/demos/kdf/pbkdf2.c
+++ b/demos/kdf/pbkdf2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/kdf/scrypt.c b/demos/kdf/scrypt.c
index e4565ae7242bd7a42875b97543501b290253a39d..5c07ebffbdddb48e6413a5b85591ca535a2c2faf 100644
--- a/demos/kdf/scrypt.c
+++ b/demos/kdf/scrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/keyexch/x25519.c b/demos/keyexch/x25519.c
index b4f1a431895347de46d811f3b0156ef8d2056bae..f0fb160a2fa43dc83473f16d8330816e48fce8bf 100644
--- a/demos/keyexch/x25519.c
+++ b/demos/keyexch/x25519.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/mac/cmac-aes256.c b/demos/mac/cmac-aes256.c
index 0431508b98335f567245c80e2e350a336de55ab0..64069cf3a8296f47747da6a77354d00606e5d05d 100644
--- a/demos/mac/cmac-aes256.c
+++ b/demos/mac/cmac-aes256.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/mac/gmac.c b/demos/mac/gmac.c
index 86bd4720856d07695746e9a64e16b9e77e3ab8fe..d4e350a2da65ac3b501da23d9eb082278f6c2151 100644
--- a/demos/mac/gmac.c
+++ b/demos/mac/gmac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/mac/hmac-sha512.c b/demos/mac/hmac-sha512.c
index 4bdac63e55337341baeb1814828efba2214ea49c..47b5246a19abcbc8e674df25ed8de381cafe9434 100644
--- a/demos/mac/hmac-sha512.c
+++ b/demos/mac/hmac-sha512.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/mac/poly1305.c b/demos/mac/poly1305.c
index bd2a6da0a25905c95e7f6616d6f7a6f6040d3373..15c9c0097d97f1596ea0323a4b347c7633d8fa06 100644
--- a/demos/mac/poly1305.c
+++ b/demos/mac/poly1305.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/mac/siphash.c b/demos/mac/siphash.c
index 5487e35c8e855345d08b0cf5e26d636aba3f4151..2fdbfb07be5dbeaba0c0c880ff3143c7456642e0 100644
--- a/demos/mac/siphash.c
+++ b/demos/mac/siphash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/pkcs12/pkwrite.c b/demos/pkcs12/pkwrite.c
index 214ab5cbac20c3255144cf452c0cc548688ee5bf..7bb73f35a41eacf7fbdf33b8c6af7a208773ee99 100644
--- a/demos/pkcs12/pkwrite.c
+++ b/demos/pkcs12/pkwrite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 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
diff --git a/demos/pkey/EVP_PKEY_DSA_keygen.c b/demos/pkey/EVP_PKEY_DSA_keygen.c
index c0c13bf2f5b89fff9462b5a2c7b244f6ac7a4b17..579f5f790ac766c731a7ab21a3c4bb712fc9c430 100644
--- a/demos/pkey/EVP_PKEY_DSA_keygen.c
+++ b/demos/pkey/EVP_PKEY_DSA_keygen.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/pkey/EVP_PKEY_DSA_paramfromdata.c b/demos/pkey/EVP_PKEY_DSA_paramfromdata.c
index f1c6c560c27bb4b76f035cd268af2cc5d77bb387..ec7d69d54389d45c7faca5c5c43aca335f8d3a8d 100644
--- a/demos/pkey/EVP_PKEY_DSA_paramfromdata.c
+++ b/demos/pkey/EVP_PKEY_DSA_paramfromdata.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/pkey/EVP_PKEY_DSA_paramgen.c b/demos/pkey/EVP_PKEY_DSA_paramgen.c
index e2754f10ce3ac5875e96e2c8c7ddbc4797ca68a6..ad879f0d7f8cc8b29d9e76d68804f2f4b75a9b8e 100644
--- a/demos/pkey/EVP_PKEY_DSA_paramgen.c
+++ b/demos/pkey/EVP_PKEY_DSA_paramgen.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
index 7a0c1ba71bd60b2a8834fe242df402276474e99a..4754789f9c9dfa25034c62d028307b9f8080489f 100644
--- a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
+++ b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/pkey/EVP_PKEY_EC_keygen.c b/demos/pkey/EVP_PKEY_EC_keygen.c
index 785799daa48ff451d2fabebd5c70ad4ff61394cf..76c6217975e034b365f7147495774e4255cced94 100644
--- a/demos/pkey/EVP_PKEY_EC_keygen.c
+++ b/demos/pkey/EVP_PKEY_EC_keygen.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/pkey/EVP_PKEY_RSA_keygen.c b/demos/pkey/EVP_PKEY_RSA_keygen.c
index ebb971b6b038f500e6dabf6c6724839ff9423758..353c08152c04800f45792dfa86b187987aaf58d1 100644
--- a/demos/pkey/EVP_PKEY_RSA_keygen.c
+++ b/demos/pkey/EVP_PKEY_RSA_keygen.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/signature/EVP_DSA_Signature_demo.c b/demos/signature/EVP_DSA_Signature_demo.c
index 8c23db647be4d84c4474ca6d1f31521c62f83ba6..de1efd2b490c7ba4f648402829aab7f116333da7 100644
--- a/demos/signature/EVP_DSA_Signature_demo.c
+++ b/demos/signature/EVP_DSA_Signature_demo.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/signature/EVP_EC_Signature_demo.c b/demos/signature/EVP_EC_Signature_demo.c
index 8779fced47c05763b253a23156de1fb34454f069..9e4f8e45daddb50897c1b8dbe0808d5f0513d9c6 100644
--- a/demos/signature/EVP_EC_Signature_demo.c
+++ b/demos/signature/EVP_EC_Signature_demo.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/demos/signature/rsa_pss_direct.c b/demos/signature/rsa_pss_direct.c
index 6e996cdadd2e490ece8264b04dbee9a51fa76f8e..41d8c2211df360b8a979b490b287fdd398a8e58b 100644
--- a/demos/signature/rsa_pss_direct.c
+++ b/demos/signature/rsa_pss_direct.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/signature/rsa_pss_hash.c b/demos/signature/rsa_pss_hash.c
index 71f50cab802c9924cf2dc6b8db747f4ed2903c12..a84df8ab626d82b8b8fdf5a2bdda81c8d7818339 100644
--- a/demos/signature/rsa_pss_hash.c
+++ b/demos/signature/rsa_pss_hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c
index bd8ac88d93c125e6eacb750affc272078dac42f4..7cf66f1dcd8133af27631454b44f0de6ca9a5143 100644
--- a/demos/smime/smdec.c
+++ b/demos/smime/smdec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 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
diff --git a/demos/smime/smenc.c b/demos/smime/smenc.c
index 87c43b6e73d95dd128225c7d7b5e79a8d11e3bc9..3e3f34d1cf354b65b1022aa6cd524a929bd92790 100644
--- a/demos/smime/smenc.c
+++ b/demos/smime/smenc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 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
diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c
index 6e627ec944f2eee1f1691aa69803a8d3894bbc28..4ce671d05ceeb88b290cd04b46824e563b2d3179 100644
--- a/demos/smime/smsign.c
+++ b/demos/smime/smsign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 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
diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c
index 88a61b7f22f2ae92703e275826df70ce0962026f..4e62c6b82cc8c1b3d46d5177a5579f85618a7607 100644
--- a/demos/smime/smsign2.c
+++ b/demos/smime/smsign2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 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
diff --git a/demos/smime/smver.c b/demos/smime/smver.c
index 9f77b7f552c9d21b0e0f3038225a3ce74eb002a7..2e55c72584e26dc52605298e02e9d8f2a045ab13 100644
--- a/demos/smime/smver.c
+++ b/demos/smime/smver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 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
diff --git a/demos/sslecho/main.c b/demos/sslecho/main.c
index 3f508b6756201fae8ff31deb5070897a51d2a6d7..8cf774450171cc5305b6436cd1e5cf23f282fd6c 100644
--- a/demos/sslecho/main.c
+++ b/demos/sslecho/main.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ *  Copyright 2022-2023 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
@@ -118,7 +118,7 @@ void configure_client_context(SSL_CTX *ctx)
     }
 }
 
-void usage()
+void usage(void)
 {
     printf("Usage: sslecho s\n");
     printf("       --or--\n");
diff --git a/doc/build.info b/doc/build.info
index 5af90ed5b291d22f506bc568c2311ca313734ec3..aec4ae616fb407631b119d5a7822e972b653e37b 100644
--- a/doc/build.info
+++ b/doc/build.info
@@ -4779,6 +4779,10 @@ DEPEND[html/man7/ossl-guide-quic-client-block.html]=man7/ossl-guide-quic-client-
 GENERATE[html/man7/ossl-guide-quic-client-block.html]=man7/ossl-guide-quic-client-block.pod
 DEPEND[man/man7/ossl-guide-quic-client-block.7]=man7/ossl-guide-quic-client-block.pod
 GENERATE[man/man7/ossl-guide-quic-client-block.7]=man7/ossl-guide-quic-client-block.pod
+DEPEND[html/man7/ossl-guide-quic-client-non-block.html]=man7/ossl-guide-quic-client-non-block.pod
+GENERATE[html/man7/ossl-guide-quic-client-non-block.html]=man7/ossl-guide-quic-client-non-block.pod
+DEPEND[man/man7/ossl-guide-quic-client-non-block.7]=man7/ossl-guide-quic-client-non-block.pod
+GENERATE[man/man7/ossl-guide-quic-client-non-block.7]=man7/ossl-guide-quic-client-non-block.pod
 DEPEND[html/man7/ossl-guide-quic-introduction.html]=man7/ossl-guide-quic-introduction.pod
 GENERATE[html/man7/ossl-guide-quic-introduction.html]=man7/ossl-guide-quic-introduction.pod
 DEPEND[man/man7/ossl-guide-quic-introduction.7]=man7/ossl-guide-quic-introduction.pod
@@ -4791,6 +4795,10 @@ DEPEND[html/man7/ossl-guide-tls-client-block.html]=man7/ossl-guide-tls-client-bl
 GENERATE[html/man7/ossl-guide-tls-client-block.html]=man7/ossl-guide-tls-client-block.pod
 DEPEND[man/man7/ossl-guide-tls-client-block.7]=man7/ossl-guide-tls-client-block.pod
 GENERATE[man/man7/ossl-guide-tls-client-block.7]=man7/ossl-guide-tls-client-block.pod
+DEPEND[html/man7/ossl-guide-tls-client-non-block.html]=man7/ossl-guide-tls-client-non-block.pod
+GENERATE[html/man7/ossl-guide-tls-client-non-block.html]=man7/ossl-guide-tls-client-non-block.pod
+DEPEND[man/man7/ossl-guide-tls-client-non-block.7]=man7/ossl-guide-tls-client-non-block.pod
+GENERATE[man/man7/ossl-guide-tls-client-non-block.7]=man7/ossl-guide-tls-client-non-block.pod
 DEPEND[html/man7/ossl-guide-tls-introduction.html]=man7/ossl-guide-tls-introduction.pod
 GENERATE[html/man7/ossl-guide-tls-introduction.html]=man7/ossl-guide-tls-introduction.pod
 DEPEND[man/man7/ossl-guide-tls-introduction.7]=man7/ossl-guide-tls-introduction.pod
@@ -5003,9 +5011,11 @@ html/man7/ossl-guide-libraries-introduction.html \
 html/man7/ossl-guide-libssl-introduction.html \
 html/man7/ossl-guide-migration.html \
 html/man7/ossl-guide-quic-client-block.html \
+html/man7/ossl-guide-quic-client-non-block.html \
 html/man7/ossl-guide-quic-introduction.html \
 html/man7/ossl-guide-quic-multi-stream.html \
 html/man7/ossl-guide-tls-client-block.html \
+html/man7/ossl-guide-tls-client-non-block.html \
 html/man7/ossl-guide-tls-introduction.html \
 html/man7/ossl_store-file.html \
 html/man7/ossl_store.html \
@@ -5143,9 +5153,11 @@ man/man7/ossl-guide-libraries-introduction.7 \
 man/man7/ossl-guide-libssl-introduction.7 \
 man/man7/ossl-guide-migration.7 \
 man/man7/ossl-guide-quic-client-block.7 \
+man/man7/ossl-guide-quic-client-non-block.7 \
 man/man7/ossl-guide-quic-introduction.7 \
 man/man7/ossl-guide-quic-multi-stream.7 \
 man/man7/ossl-guide-tls-client-block.7 \
+man/man7/ossl-guide-tls-client-non-block.7 \
 man/man7/ossl-guide-tls-introduction.7 \
 man/man7/ossl_store-file.7 \
 man/man7/ossl_store.7 \
diff --git a/doc/internal/man3/OSSL_EVENT.pod b/doc/internal/man3/OSSL_EVENT.pod
index 089890de9d7c708d0371a89b91a4c542302f988d..fb3e937ea85a031f467e101af05afb14c2de39e9 100644
--- a/doc/internal/man3/OSSL_EVENT.pod
+++ b/doc/internal/man3/OSSL_EVENT.pod
@@ -191,7 +191,7 @@ This functionality was added to OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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 in the file
diff --git a/doc/internal/man3/evp_generic_fetch.pod b/doc/internal/man3/evp_generic_fetch.pod
index b4f625285a98def9b2448c91eba152e48c71a6d2..8057a7170eca884e662b7a4964d8b2ea52c3adef 100644
--- a/doc/internal/man3/evp_generic_fetch.pod
+++ b/doc/internal/man3/evp_generic_fetch.pod
@@ -270,7 +270,7 @@ The functions described here were all added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod b/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod
index 0a32da25a98991a94bd6b84074b37329330bf297..1008d2113149e8550cb54144491e3afd24f3929e 100644
--- a/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod
+++ b/doc/internal/man3/evp_keymgmt_util_export_to_provider.pod
@@ -95,7 +95,7 @@ L<EVP_PKEY_ASN1_METHOD(3)>, L<EVP_PKEY_assign_RSA(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/internal/man3/ossl_cmp_certreq_new.pod b/doc/internal/man3/ossl_cmp_certreq_new.pod
index 159a00c1ecafe42f07495cd76c7bbe1cc778b1da..37a234066d36851a9cde587c1b6d955af38b7396 100644
--- a/doc/internal/man3/ossl_cmp_certreq_new.pod
+++ b/doc/internal/man3/ossl_cmp_certreq_new.pod
@@ -168,7 +168,7 @@ The OpenSSL CMP support was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/internal/man3/ossl_cmp_mock_srv_new.pod b/doc/internal/man3/ossl_cmp_mock_srv_new.pod
index 1789fad2754c82e40c5c808eaff98caacb7d5074..6f4f4fe86ba0c93a8de4ab7d7bdb938ed223768d 100644
--- a/doc/internal/man3/ossl_cmp_mock_srv_new.pod
+++ b/doc/internal/man3/ossl_cmp_mock_srv_new.pod
@@ -102,7 +102,7 @@ The OpenSSL CMP support was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/internal/man3/ossl_cmp_msg_protect.pod b/doc/internal/man3/ossl_cmp_msg_protect.pod
index 04da21fd9f9b6d9fa87d32efe3923a419541a343..7e14274f584ab73ee9971dfc560f59e6d359bbe9 100644
--- a/doc/internal/man3/ossl_cmp_msg_protect.pod
+++ b/doc/internal/man3/ossl_cmp_msg_protect.pod
@@ -21,6 +21,9 @@ ossl_cmp_msg_add_extraCerts
 ossl_cmp_calc_protection() calculates the protection for the given I<msg>
 according to the algorithm and parameters in the message header's protectionAlg
 using the credentials, library context, and property criteria in the I<ctx>.
+Unless I<msg->header->protectionAlg> is B<PasswordBasedMAC>,
+its value is completed according to I<ctx->pkey> and I<ctx->digest>,
+where the latter irrelevant in the case of Edwards curves.
 
 ossl_cmp_msg_protect() (re-)protects the given message I<msg> using an algorithm
 depending on the available context information given in the I<ctx>.
@@ -56,7 +59,7 @@ The OpenSSL CMP support was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/internal/man3/ossl_cmp_pkisi_get_status.pod b/doc/internal/man3/ossl_cmp_pkisi_get_status.pod
index 135be39ed674d9936606c6662bd9c417e12f7669..e44bfd3f01904c3c2c84589d04fa5918732f8cc7 100644
--- a/doc/internal/man3/ossl_cmp_pkisi_get_status.pod
+++ b/doc/internal/man3/ossl_cmp_pkisi_get_status.pod
@@ -89,7 +89,7 @@ The OpenSSL CMP support was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/internal/man3/ossl_punycode_decode.pod b/doc/internal/man3/ossl_punycode_decode.pod
index 7a20864bcd8c00910d304ee0f58d20bf347cd32a..64fe670ac6ae29c9790c201032c54c5b2ca6af0e 100644
--- a/doc/internal/man3/ossl_punycode_decode.pod
+++ b/doc/internal/man3/ossl_punycode_decode.pod
@@ -40,7 +40,7 @@ The functions described here were all added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/internal/man7/build.info.pod b/doc/internal/man7/build.info.pod
index 0f1f8be006034595a867a90662543b2d9c5ac1ff..6f67aca7a55ada2b9c9d7468ad70ad4a16aae5a3 100644
--- a/doc/internal/man7/build.info.pod
+++ b/doc/internal/man7/build.info.pod
@@ -667,7 +667,7 @@ L<Text::Template|https://metacpan.org/pod/Text::Template>
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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 in the file
diff --git a/doc/man1/openssl-asn1parse.pod.in b/doc/man1/openssl-asn1parse.pod.in
index 892fc47e7de7d7c43d7e3b6c5bf5a2971ee84ce8..6fd5ed692d95ef1abcaec09cf78b525f7d44d4bd 100644
--- a/doc/man1/openssl-asn1parse.pod.in
+++ b/doc/man1/openssl-asn1parse.pod.in
@@ -210,7 +210,7 @@ L<ASN1_generate_nconf(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-ca.pod.in b/doc/man1/openssl-ca.pod.in
index 3474e12c794e9363fe22364cc848c9435cc60998..fe09f85c2c1cad93b23180d7fce1a848358d5cc6 100644
--- a/doc/man1/openssl-ca.pod.in
+++ b/doc/man1/openssl-ca.pod.in
@@ -852,7 +852,7 @@ L<x509v3_config(5)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in
index 6aca2ae71e534f83b7081f8e5c011ec8fb08e653..fec815e756bc051a97793fd7936ec66b1f41529b 100644
--- a/doc/man1/openssl-cmp.pod.in
+++ b/doc/man1/openssl-cmp.pod.in
@@ -1394,7 +1394,7 @@ The B<-engine option> was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/man1/openssl-dhparam.pod.in b/doc/man1/openssl-dhparam.pod.in
index 7edcdf21ffdc6c7e0b988c78f77078fb04e74724..f896109164129e7010706988e06091b04c2eb7ea 100644
--- a/doc/man1/openssl-dhparam.pod.in
+++ b/doc/man1/openssl-dhparam.pod.in
@@ -137,7 +137,7 @@ The B<-C> option was removed in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-dsa.pod.in b/doc/man1/openssl-dsa.pod.in
index cdcbbc206c59b3ffc9a4e093a8d96fa63d4f3e7a..116cafd71e725cc5267f7a54e3efdd02afcdbd7e 100644
--- a/doc/man1/openssl-dsa.pod.in
+++ b/doc/man1/openssl-dsa.pod.in
@@ -186,7 +186,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-dsaparam.pod.in b/doc/man1/openssl-dsaparam.pod.in
index 87fc97ff5f28e4aea8eac40fc7bb284c96f91889..62d443145757a6d59034f5038c4433caf67a8902 100644
--- a/doc/man1/openssl-dsaparam.pod.in
+++ b/doc/man1/openssl-dsaparam.pod.in
@@ -123,7 +123,7 @@ The B<-C> option was removed in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-ec.pod.in b/doc/man1/openssl-ec.pod.in
index 083a3f6e4274ab4d8515c38a61a7b64426fc05eb..51200076a89b5e0e43b340f64b0941a38d3449e8 100644
--- a/doc/man1/openssl-ec.pod.in
+++ b/doc/man1/openssl-ec.pod.in
@@ -199,7 +199,7 @@ with keys loaded from an engine in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2003-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2003-2023 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
diff --git a/doc/man1/openssl-fipsinstall.pod.in b/doc/man1/openssl-fipsinstall.pod.in
index eab19385f098dbb014af2202d9410bf76a11e5ec..b1768b7f91dbb1f4e5970482f9929303a361c170 100644
--- a/doc/man1/openssl-fipsinstall.pod.in
+++ b/doc/man1/openssl-fipsinstall.pod.in
@@ -280,7 +280,7 @@ L<EVP_MAC(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man1/openssl-gendsa.pod.in b/doc/man1/openssl-gendsa.pod.in
index 41b5a6fbef8de3f4e125add802586f658fd250e3..cfbb305eb3e30d89fa12e62476a3be490f2be937 100644
--- a/doc/man1/openssl-gendsa.pod.in
+++ b/doc/man1/openssl-gendsa.pod.in
@@ -103,7 +103,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-genpkey.pod.in b/doc/man1/openssl-genpkey.pod.in
index a1e0c51f4d6ec7a5043aeee48d47c406997dcbc9..e760d613fe0716e33b33accde4355b626001ba72 100644
--- a/doc/man1/openssl-genpkey.pod.in
+++ b/doc/man1/openssl-genpkey.pod.in
@@ -502,7 +502,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2023 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
diff --git a/doc/man1/openssl-genrsa.pod.in b/doc/man1/openssl-genrsa.pod.in
index 95250bbe3ca91af1fc30921b6bad3ffe4fedc3a1..c75d52ceae78f6b792a0880f345e75b356df0285 100644
--- a/doc/man1/openssl-genrsa.pod.in
+++ b/doc/man1/openssl-genrsa.pod.in
@@ -123,7 +123,7 @@ L<openssl-gendsa(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-kdf.pod.in b/doc/man1/openssl-kdf.pod.in
index 9c89e22c4e28910a62e1457b58fe2538d3c52092..6eed74d70d4c861c3c614ee100458c3fa27245f9 100644
--- a/doc/man1/openssl-kdf.pod.in
+++ b/doc/man1/openssl-kdf.pod.in
@@ -220,7 +220,7 @@ Added in OpenSSL 3.0
 
 =head1 COPYRIGHT
 
-Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man1/openssl-mac.pod.in b/doc/man1/openssl-mac.pod.in
index aa00ebcc8312a27497296ed32f7d9704c88bf222..a820085efa41b449ec0d9a2854d1b1eb1fb6eee8 100644
--- a/doc/man1/openssl-mac.pod.in
+++ b/doc/man1/openssl-mac.pod.in
@@ -164,7 +164,7 @@ L<EVP_MAC-Poly1305(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018-2023 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
diff --git a/doc/man1/openssl-ocsp.pod.in b/doc/man1/openssl-ocsp.pod.in
index d45abab1e054f2baca6e497cccf70f4dd1f02863..29fbd3d04fbdff436b910d2e6624f97ed5472580 100644
--- a/doc/man1/openssl-ocsp.pod.in
+++ b/doc/man1/openssl-ocsp.pod.in
@@ -520,7 +520,7 @@ The -no_alt_chains option was added in OpenSSL 1.1.0.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man1/openssl-pkcs8.pod.in b/doc/man1/openssl-pkcs8.pod.in
index bf87c590c79b7b672b6ad104a85c730a1a767678..08c3272a70afc8ff0fa8ed2a3032277d9633e38a 100644
--- a/doc/man1/openssl-pkcs8.pod.in
+++ b/doc/man1/openssl-pkcs8.pod.in
@@ -285,7 +285,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-pkey.pod.in b/doc/man1/openssl-pkey.pod.in
index 042862b9602058457a6d066cc8a3fcb7876d87e9..884680a4f06e59f4e99423322140f31baf4bc3f4 100644
--- a/doc/man1/openssl-pkey.pod.in
+++ b/doc/man1/openssl-pkey.pod.in
@@ -229,7 +229,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2023 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
diff --git a/doc/man1/openssl-pkeyutl.pod.in b/doc/man1/openssl-pkeyutl.pod.in
index 880cd3548afcbc04976512d98b169889abc61fee..1dae76cc1288b9d60f07eb86847fb3f3503d9ba2 100644
--- a/doc/man1/openssl-pkeyutl.pod.in
+++ b/doc/man1/openssl-pkeyutl.pod.in
@@ -437,7 +437,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2023 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
diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in
index 099582fa7261217f7337b622ca0944ce8792fba2..b0b6fd25ebe7047a1ef1810adc1a699a6c225cd8 100644
--- a/doc/man1/openssl-req.pod.in
+++ b/doc/man1/openssl-req.pod.in
@@ -53,6 +53,7 @@ B<openssl> B<req>
 [B<-vfyopt> I<nm>:I<v>]
 [B<-batch>]
 [B<-verbose>]
+[B<-quiet>]
 {- $OpenSSL::safe::opt_name_synopsis -}
 {- $OpenSSL::safe::opt_r_synopsis -}
 {- $OpenSSL::safe::opt_engine_synopsis -}{- $OpenSSL::safe::opt_provider_synopsis -}
@@ -402,6 +403,12 @@ Non-interactive mode.
 
 Print extra details about the operations being performed.
 
+=item B<-quiet>
+
+Print fewer details about the operations being performed, which may be
+handy during batch scripts or pipelines (specifically "progress dots"
+during key generation are suppressed).
+
 =item B<-keygen_engine> I<id>
 
 Specifies an engine (by its unique I<id> string) which would be used
@@ -787,7 +794,7 @@ and key identifier extensions are included by default.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-rsa.pod.in b/doc/man1/openssl-rsa.pod.in
index 5d7af53d0b6102dad9b3bd37bb94616a06bd017e..faa4872e19e6a09c9a60543671ed75dfcc02b2e7 100644
--- a/doc/man1/openssl-rsa.pod.in
+++ b/doc/man1/openssl-rsa.pod.in
@@ -207,7 +207,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-rsautl.pod.in b/doc/man1/openssl-rsautl.pod.in
index 4f890c689c0e48558803eab46122373f10b4240e..41d0d309dd2e66e69aab680047ffd0d65ce01e23 100644
--- a/doc/man1/openssl-rsautl.pod.in
+++ b/doc/man1/openssl-rsautl.pod.in
@@ -239,7 +239,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-smime.pod.in b/doc/man1/openssl-smime.pod.in
index 1460221e13178004334828a20f430767f295349d..655bf18822b989d20abaad4f427b3652371d3256 100644
--- a/doc/man1/openssl-smime.pod.in
+++ b/doc/man1/openssl-smime.pod.in
@@ -484,7 +484,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-speed.pod.in b/doc/man1/openssl-speed.pod.in
index 38e95720a31dff5f765d7839d150f36feea5ffbe..9e16b2d8d128650d5aef7f3180ee1a8c61b79653 100644
--- a/doc/man1/openssl-speed.pod.in
+++ b/doc/man1/openssl-speed.pod.in
@@ -160,7 +160,7 @@ DSA512 was removed in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-storeutl.pod.in b/doc/man1/openssl-storeutl.pod.in
index 554e1a687b8b1303b2d4457e9e98138b89dfe5df..f5c461e303d963a3adc2a695d8368475b45310a9 100644
--- a/doc/man1/openssl-storeutl.pod.in
+++ b/doc/man1/openssl-storeutl.pod.in
@@ -136,7 +136,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2023 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
diff --git a/doc/man1/openssl-verification-options.pod b/doc/man1/openssl-verification-options.pod
index 2a3fe8849a8166c8478a61762c09d9d249d5c4f8..05bb560d8674ae3fa05c0e0310464b237c86c309 100644
--- a/doc/man1/openssl-verification-options.pod
+++ b/doc/man1/openssl-verification-options.pod
@@ -686,7 +686,7 @@ The checks enabled by B<-x509_strict> have been extended in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl-x509.pod.in b/doc/man1/openssl-x509.pod.in
index 9d1b0bd6bd4033d78a743eecae6fbc861f439318..2d7a1b859ac4a52e8a1e945a9b428d5c6a7633e7 100644
--- a/doc/man1/openssl-x509.pod.in
+++ b/doc/man1/openssl-x509.pod.in
@@ -796,7 +796,7 @@ and key identifier extensions are included by default.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index 3d185bdc272cc5622dae917ef3f157af1749a463..f4274d53b75b6962a16b121042c27e42ad2d44d7 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -875,7 +875,7 @@ that program with no arguments is now equivalent to C<openssl help>.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/ASN1_STRING_new.pod b/doc/man3/ASN1_STRING_new.pod
index 9fec854166d1ef46ee23ba0245f41cf14dbccaa8..642b6f47777b675ebc72b7951ee633bd2b7c53a4 100644
--- a/doc/man3/ASN1_STRING_new.pod
+++ b/doc/man3/ASN1_STRING_new.pod
@@ -42,7 +42,7 @@ L<ERR_get_error(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002-2023 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
diff --git a/doc/man3/ASN1_item_d2i_bio.pod b/doc/man3/ASN1_item_d2i_bio.pod
index 0f391440cee8d3e442fc75f729a45ab176f41493..f8e4678367ef8f97fcbf89387b196ff4eab5bc69 100644
--- a/doc/man3/ASN1_item_d2i_bio.pod
+++ b/doc/man3/ASN1_item_d2i_bio.pod
@@ -105,7 +105,7 @@ The function ASN1_item_unpack_ex() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2021-2023 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
diff --git a/doc/man3/ASYNC_WAIT_CTX_new.pod b/doc/man3/ASYNC_WAIT_CTX_new.pod
index a98635c2a1ed1985f6aa44a4b84b8c29dddf8e67..7621a8b3a166b11b6d84bfb7ab76f43deadbf2ec 100644
--- a/doc/man3/ASYNC_WAIT_CTX_new.pod
+++ b/doc/man3/ASYNC_WAIT_CTX_new.pod
@@ -216,7 +216,7 @@ were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2023 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
diff --git a/doc/man3/BIO_f_ssl.pod b/doc/man3/BIO_f_ssl.pod
index 629aeb5e64517e86bb7a86291d9ea9b1d551ab7d..a6eff2bb4926a30b93c41c6b3cb054e80e289adc 100644
--- a/doc/man3/BIO_f_ssl.pod
+++ b/doc/man3/BIO_f_ssl.pod
@@ -302,7 +302,7 @@ be modified to handle this fix or they may free up an already freed BIO.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/BIO_get_rpoll_descriptor.pod b/doc/man3/BIO_get_rpoll_descriptor.pod
index ce33e23f26e481fdde9fdd7a61f5233555543cac..e5712fb90fa51d12d0e93c48d548fbae2157c66d 100644
--- a/doc/man3/BIO_get_rpoll_descriptor.pod
+++ b/doc/man3/BIO_get_rpoll_descriptor.pod
@@ -102,7 +102,7 @@ added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/BIO_read.pod b/doc/man3/BIO_read.pod
index 5acc5b8906bb7ecb2841676e841641d2388d3d46..f337aab353bb68569d09b5881665d6d51b831828 100644
--- a/doc/man3/BIO_read.pod
+++ b/doc/man3/BIO_read.pod
@@ -119,7 +119,7 @@ I<written> parameter of the function can be NULL since OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/BIO_s_connect.pod b/doc/man3/BIO_s_connect.pod
index 35d67787ffe05b8992fb9f7fc92ccf3c6ce4df7c..bcefbd59f826b1bdb4c49d000a9f6b207728fc5f 100644
--- a/doc/man3/BIO_s_connect.pod
+++ b/doc/man3/BIO_s_connect.pod
@@ -227,7 +227,7 @@ Connect BIOs support BIO_gets() since OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/BIO_s_datagram.pod b/doc/man3/BIO_s_datagram.pod
index 3045536200fe75d9d4978cd308ca82d0cc34f5cf..87d6fb34e7a2924779b7000a5408bed2fbcfb645 100644
--- a/doc/man3/BIO_s_datagram.pod
+++ b/doc/man3/BIO_s_datagram.pod
@@ -260,7 +260,7 @@ L<BIO_sendmmsg(3)>, L<BIO_s_dgram_pair(3)>, L<DTLSv1_listen(3)>, L<bio(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/BIO_s_mem.pod b/doc/man3/BIO_s_mem.pod
index 8d79b818f4ee298b264d02d3e6d1a5129ae463fa..b9bfedcdc65f68aa2d3b73f4d0fd7cb6cb098b1e 100644
--- a/doc/man3/BIO_s_mem.pod
+++ b/doc/man3/BIO_s_mem.pod
@@ -199,7 +199,7 @@ and BUF_MEM structure:
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/BIO_sendmmsg.pod b/doc/man3/BIO_sendmmsg.pod
index 04075dd591940d82b459dd5df3b9b20f142eb326..5c13e566650faaa5b1cda1f139a4d3d0877c13b8 100644
--- a/doc/man3/BIO_sendmmsg.pod
+++ b/doc/man3/BIO_sendmmsg.pod
@@ -219,7 +219,7 @@ These functions were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/CMS_add0_cert.pod b/doc/man3/CMS_add0_cert.pod
index fa19532e2efa7bba521eb19f0c3617534f533c08..c876238fe4e53481f362d6d76c8d2fa8b5f75a0d 100644
--- a/doc/man3/CMS_add0_cert.pod
+++ b/doc/man3/CMS_add0_cert.pod
@@ -74,7 +74,7 @@ not to throw an error if a certificate to be added is already present.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2023 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
diff --git a/doc/man3/CMS_sign.pod b/doc/man3/CMS_sign.pod
index 325b6aac861f0d3488c1f5128e3a05555dbdcbaa..933f89a84bc44b4727afaaebb80d48bfa8e4066c 100644
--- a/doc/man3/CMS_sign.pod
+++ b/doc/man3/CMS_sign.pod
@@ -135,7 +135,7 @@ certificates in their I<certs> argument and no longer throw an error for them.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2023 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
diff --git a/doc/man3/CMS_verify.pod b/doc/man3/CMS_verify.pod
index b3434af9ffaba137e5990b8c0a595e5402d8a716..bd46a1262cffc867482ea1bf991f72b1e5143de8 100644
--- a/doc/man3/CMS_verify.pod
+++ b/doc/man3/CMS_verify.pod
@@ -160,7 +160,7 @@ CMS_SignedData_verify() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2023 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
diff --git a/doc/man3/CRYPTO_THREAD_run_once.pod b/doc/man3/CRYPTO_THREAD_run_once.pod
index b6ca5f1fafad269938a66a368f140d33fea4e837..470b741c109a1ded4a567fc07c6b5ff008b7e277 100644
--- a/doc/man3/CRYPTO_THREAD_run_once.pod
+++ b/doc/man3/CRYPTO_THREAD_run_once.pod
@@ -233,7 +233,7 @@ L<crypto(7)>, L<openssl-threads(7)>.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/DEFINE_STACK_OF.pod b/doc/man3/DEFINE_STACK_OF.pod
index 044228129baa7219b0882eb83a98875a27cf0008..06a0256bacf10380e98bc081c95bbb07edd9e3d0 100644
--- a/doc/man3/DEFINE_STACK_OF.pod
+++ b/doc/man3/DEFINE_STACK_OF.pod
@@ -299,7 +299,7 @@ B<sk_I<TYPE>_sort>() should be called before these find operations.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/DTLSv1_listen.pod b/doc/man3/DTLSv1_listen.pod
index 73b72a66939c4c16a0d65f065deeb7efd972567b..eda8aaf22a27e9a12f72516e5bf8204d4947f28e 100644
--- a/doc/man3/DTLSv1_listen.pod
+++ b/doc/man3/DTLSv1_listen.pod
@@ -146,7 +146,7 @@ The type of "peer" also changed in OpenSSL 1.1.0.
 
 =head1 COPYRIGHT
 
-Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-2023 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
diff --git a/doc/man3/EC_GROUP_copy.pod b/doc/man3/EC_GROUP_copy.pod
index 25c91d731bdfd0c7f213c2bb0879a561aa071906..e525fad0bf6b332260bf241c46e15f01b4eec2fd 100644
--- a/doc/man3/EC_GROUP_copy.pod
+++ b/doc/man3/EC_GROUP_copy.pod
@@ -252,7 +252,7 @@ EC_GROUP_get0_order(), EC_GROUP_order_bits() and EC_GROUP_get0_cofactor() were a
 
 =head1 COPYRIGHT
 
-Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2013-2023 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
diff --git a/doc/man3/EC_GROUP_new.pod b/doc/man3/EC_GROUP_new.pod
index d7f8d001c263a6441120076962c010e75f2bd339..26c0088435f4331cb92ac973790d285413a690cf 100644
--- a/doc/man3/EC_GROUP_new.pod
+++ b/doc/man3/EC_GROUP_new.pod
@@ -236,7 +236,7 @@ instead.
 
 =head1 COPYRIGHT
 
-Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2013-2023 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
diff --git a/doc/man3/EC_KEY_new.pod b/doc/man3/EC_KEY_new.pod
index 3c152d0aadbab3194afd6978ece5d73cae4c0357..d93586b1d01e88b8f348c51b1ba4665dc9f93c99 100644
--- a/doc/man3/EC_KEY_new.pod
+++ b/doc/man3/EC_KEY_new.pod
@@ -235,7 +235,7 @@ For replacement see L<EVP_PKEY-EC(7)>.
 
 =head1 COPYRIGHT
 
-Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2013-2023 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
diff --git a/doc/man3/EC_POINT_add.pod b/doc/man3/EC_POINT_add.pod
index 57f1dd87d083ec031e5b4ca34083628abb8dcaf0..591308be3fc21fb4618b07c9fcb5d27fc2cecd36 100644
--- a/doc/man3/EC_POINT_add.pod
+++ b/doc/man3/EC_POINT_add.pod
@@ -90,7 +90,7 @@ were deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2013-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2013-2023 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
diff --git a/doc/man3/EC_POINT_new.pod b/doc/man3/EC_POINT_new.pod
index fc8643cd6084535e1ceba5a4920a07be592a768d..3bbf8bb089ac045a88c70642839f548101b1aed2 100644
--- a/doc/man3/EC_POINT_new.pod
+++ b/doc/man3/EC_POINT_new.pod
@@ -269,7 +269,7 @@ added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2013-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2013-2023 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
diff --git a/doc/man3/ERR_GET_LIB.pod b/doc/man3/ERR_GET_LIB.pod
index a35165b059f4fed965e167b46aee1ab555ed408c..1d7fa587f9df1a14db73d56addbf51fc4fcb75aa 100644
--- a/doc/man3/ERR_GET_LIB.pod
+++ b/doc/man3/ERR_GET_LIB.pod
@@ -62,7 +62,7 @@ ERR_GET_FUNC() was removed in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/ERR_set_mark.pod b/doc/man3/ERR_set_mark.pod
index add9b232c09df077dbe2628a6e53fab2e079bfc3..b2c0f7de0a18fac6cee19025c88614eea4f58e71 100644
--- a/doc/man3/ERR_set_mark.pod
+++ b/doc/man3/ERR_set_mark.pod
@@ -40,7 +40,7 @@ most recent mark, if any, or the total number of error stack entries.
 
 =head1 COPYRIGHT
 
-Copyright 2003-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2003-2023 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
diff --git a/doc/man3/EVP_DigestInit.pod b/doc/man3/EVP_DigestInit.pod
index 167ebbbad53f3f04beedc3ed36b0aba0952eca51..9b5fda08ee9f4bd326dc64e092cbd095fef94bbb 100644
--- a/doc/man3/EVP_DigestInit.pod
+++ b/doc/man3/EVP_DigestInit.pod
@@ -797,7 +797,7 @@ EVP_MD_CTX_dup() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/EVP_DigestSignInit.pod b/doc/man3/EVP_DigestSignInit.pod
index f38eefcbbf78652f73a75137fdef0e684c8db0ec..07e99db231a2f4abc71add4e5233a90d4768b6bd 100644
--- a/doc/man3/EVP_DigestSignInit.pod
+++ b/doc/man3/EVP_DigestSignInit.pod
@@ -208,7 +208,7 @@ EVP_DigestSignUpdate() was converted from a macro to a function in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2023 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
diff --git a/doc/man3/EVP_DigestVerifyInit.pod b/doc/man3/EVP_DigestVerifyInit.pod
index 0dc8151a90a1395b08956d87097564b8ad5327eb..c927b7e4e82a8c1eb6de2203ffef4fac4bd9a914 100644
--- a/doc/man3/EVP_DigestVerifyInit.pod
+++ b/doc/man3/EVP_DigestVerifyInit.pod
@@ -193,7 +193,7 @@ EVP_DigestVerifyUpdate() was converted from a macro to a function in OpenSSL
 
 =head1 COPYRIGHT
 
-Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2023 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
diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index 3d1a6b5615ca954fd3aa223503cf3a24d7df3d8b..a04e6d102f1ad9ba395da425e8dc14f7e5669803 100644
--- a/doc/man3/EVP_EncryptInit.pod
+++ b/doc/man3/EVP_EncryptInit.pod
@@ -1785,7 +1785,7 @@ EVP_CIPHER_CTX_dup() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/EVP_KDF.pod b/doc/man3/EVP_KDF.pod
index 374318cbcfddad7dd733735b25b1bb8bd46a76f1..31d61b2a3df0a7cd2de2da69a5458cdf50277267 100644
--- a/doc/man3/EVP_KDF.pod
+++ b/doc/man3/EVP_KDF.pod
@@ -304,7 +304,7 @@ This functionality was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/EVP_PKEY_CTX_get0_pkey.pod b/doc/man3/EVP_PKEY_CTX_get0_pkey.pod
index 26eef87cc1cd10a4f17922ac6f7a402e76fe0573..8db726127ec635a3e74205ddba8972b517ecb96a 100644
--- a/doc/man3/EVP_PKEY_CTX_get0_pkey.pod
+++ b/doc/man3/EVP_PKEY_CTX_get0_pkey.pod
@@ -46,7 +46,7 @@ L<EVP_PKEY_derive_set_peer(3)>, L<EVP_PKEY_derive_set_peer_ex(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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.
diff --git a/doc/man3/EVP_PKEY_decapsulate.pod b/doc/man3/EVP_PKEY_decapsulate.pod
index 12339dfb743b231a6f06b345aecfa9458becc6f3..b59aab8bbf9fe268d6965bbd2e6221d85082d5fb 100644
--- a/doc/man3/EVP_PKEY_decapsulate.pod
+++ b/doc/man3/EVP_PKEY_decapsulate.pod
@@ -101,7 +101,7 @@ The function EVP_PKEY_auth_decapsulate_init() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man3/EVP_PKEY_encapsulate.pod b/doc/man3/EVP_PKEY_encapsulate.pod
index df1f948c8dd3c4dc94625e5d49c69dcd2a8e44d9..6874f31cf5b2ccb10191ccb93dc42036009ec71e 100644
--- a/doc/man3/EVP_PKEY_encapsulate.pod
+++ b/doc/man3/EVP_PKEY_encapsulate.pod
@@ -109,7 +109,7 @@ The function EVP_PKEY_auth_encapsulate_init() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man3/EVP_PKEY_get_default_digest_nid.pod b/doc/man3/EVP_PKEY_get_default_digest_nid.pod
index 243268e4e613fa767af64e22ed23228b6d7cb7fa..e22a3e7b4717c18419e424d5e32373004a058d6a 100644
--- a/doc/man3/EVP_PKEY_get_default_digest_nid.pod
+++ b/doc/man3/EVP_PKEY_get_default_digest_nid.pod
@@ -57,7 +57,7 @@ This function was added in OpenSSL 1.0.0.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2023 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
diff --git a/doc/man3/EVP_PKEY_set1_RSA.pod b/doc/man3/EVP_PKEY_set1_RSA.pod
index f2bdede46f67fc02b9f8909b1838149ac2bc9bee..6489b1189403b40acf38523a8b74051db0ee54d4 100644
--- a/doc/man3/EVP_PKEY_set1_RSA.pod
+++ b/doc/man3/EVP_PKEY_set1_RSA.pod
@@ -228,7 +228,7 @@ It was removed in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002-2023 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
diff --git a/doc/man3/EVP_RAND.pod b/doc/man3/EVP_RAND.pod
index 5a50f510a69c5d438b3bddaec0c277c5612892ba..0c79c57b81ef80715603d1c730a60ba6a14188c3 100644
--- a/doc/man3/EVP_RAND.pod
+++ b/doc/man3/EVP_RAND.pod
@@ -411,7 +411,7 @@ The remaining functions were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man3/EVP_SignInit.pod b/doc/man3/EVP_SignInit.pod
index c274ad9917fbdd5de78fd60e85a607c726df5134..553ce0e34778ab97a35cb53b260228e0b320cf8f 100644
--- a/doc/man3/EVP_SignInit.pod
+++ b/doc/man3/EVP_SignInit.pod
@@ -109,7 +109,7 @@ The function EVP_SignFinal_ex() was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/EVP_VerifyInit.pod b/doc/man3/EVP_VerifyInit.pod
index f05b9135bfc1f47b02cc0d30c4aed543438d30c5..04598046712d09b31daff9a4732ab2f8feb602ae 100644
--- a/doc/man3/EVP_VerifyInit.pod
+++ b/doc/man3/EVP_VerifyInit.pod
@@ -104,7 +104,7 @@ The function EVP_VerifyFinal_ex() was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/EVP_aes_128_gcm.pod b/doc/man3/EVP_aes_128_gcm.pod
index a8c1d06b0083cb66dd94dc91c88acdd3cdb89b77..09cae9912950492ce89a743707c4acaf572f56ae 100644
--- a/doc/man3/EVP_aes_128_gcm.pod
+++ b/doc/man3/EVP_aes_128_gcm.pod
@@ -190,7 +190,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_aria_128_gcm.pod b/doc/man3/EVP_aria_128_gcm.pod
index a05c3346c1481e5c678edaafc426bd852dc0032f..92913652630d52d0c027de90dbfe28778a9e3b8a 100644
--- a/doc/man3/EVP_aria_128_gcm.pod
+++ b/doc/man3/EVP_aria_128_gcm.pod
@@ -113,7 +113,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_bf_cbc.pod b/doc/man3/EVP_bf_cbc.pod
index 89fd5c21a4b545ab834afd201fd835067c64f35e..4df98f4bdf47ec1dfb29e1514f9dd1bd7fadcd96 100644
--- a/doc/man3/EVP_bf_cbc.pod
+++ b/doc/man3/EVP_bf_cbc.pod
@@ -58,7 +58,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_blake2b512.pod b/doc/man3/EVP_blake2b512.pod
index cc437325d88c69f33a04e1d00baed3e4b44c96e1..98e1899f6a935d0540e5ca3a13efe73d8e4b9a05 100644
--- a/doc/man3/EVP_blake2b512.pod
+++ b/doc/man3/EVP_blake2b512.pod
@@ -59,7 +59,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_camellia_128_ecb.pod b/doc/man3/EVP_camellia_128_ecb.pod
index c70af300e317fdcae19128dbcfe314dfe6cb77f1..a6b597156a77a9ebf8a456e6710e9be518bac6c8 100644
--- a/doc/man3/EVP_camellia_128_ecb.pod
+++ b/doc/man3/EVP_camellia_128_ecb.pod
@@ -96,7 +96,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_cast5_cbc.pod b/doc/man3/EVP_cast5_cbc.pod
index c8c1c9dabdbb96ff6195758f3f3fe069333157cc..85ff2ad014888f4eca7cbd0eb31626c4525abd56 100644
--- a/doc/man3/EVP_cast5_cbc.pod
+++ b/doc/man3/EVP_cast5_cbc.pod
@@ -58,7 +58,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_chacha20.pod b/doc/man3/EVP_chacha20.pod
index 47b6f9c16fe7af80a09ad14d313f65c103498409..683faa326e145309277cd0e9ec051f86087867f4 100644
--- a/doc/man3/EVP_chacha20.pod
+++ b/doc/man3/EVP_chacha20.pod
@@ -64,7 +64,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_des_cbc.pod b/doc/man3/EVP_des_cbc.pod
index 651622df56a40957187561464ee300463d1fcc96..501216cd6d77b3c22fd63cdb63ea6de693fe97d3 100644
--- a/doc/man3/EVP_des_cbc.pod
+++ b/doc/man3/EVP_des_cbc.pod
@@ -106,7 +106,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_desx_cbc.pod b/doc/man3/EVP_desx_cbc.pod
index e1b48534255de70d9f0dd7ff1e17dfb5f82dc68b..fae827192ee995e7a3c76e12c05cb010af42ff40 100644
--- a/doc/man3/EVP_desx_cbc.pod
+++ b/doc/man3/EVP_desx_cbc.pod
@@ -48,7 +48,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_idea_cbc.pod b/doc/man3/EVP_idea_cbc.pod
index d7e0102c182b21dea709c8583e4157d5903cd13d..5a9adaedc4462c2db84f2b107fd4cfb5149e368b 100644
--- a/doc/man3/EVP_idea_cbc.pod
+++ b/doc/man3/EVP_idea_cbc.pod
@@ -56,7 +56,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_md2.pod b/doc/man3/EVP_md2.pod
index bb01005b87b56904e9e29dfdbab5f72552906b13..0b473887e01b97bdb72d1fc22f6b5f0336a45601 100644
--- a/doc/man3/EVP_md2.pod
+++ b/doc/man3/EVP_md2.pod
@@ -49,7 +49,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_md4.pod b/doc/man3/EVP_md4.pod
index 682937fa87887a24d103b4459adad15215c18371..baaff9e4eaa2ac720b387473b96d91439855d3dd 100644
--- a/doc/man3/EVP_md4.pod
+++ b/doc/man3/EVP_md4.pod
@@ -50,7 +50,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_md5.pod b/doc/man3/EVP_md5.pod
index aec1d8d820b9076981c010e88c7993baab02a3a4..752fdd1f6c37b35b1e2e96366f0c8bcf747320d2 100644
--- a/doc/man3/EVP_md5.pod
+++ b/doc/man3/EVP_md5.pod
@@ -60,7 +60,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_mdc2.pod b/doc/man3/EVP_mdc2.pod
index bc148079f3769e033c14a5a0b6d6ce0fcb469329..e9de6f3c560a61bf1919425734dc640ba5616967 100644
--- a/doc/man3/EVP_mdc2.pod
+++ b/doc/man3/EVP_mdc2.pod
@@ -51,7 +51,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_rc2_cbc.pod b/doc/man3/EVP_rc2_cbc.pod
index 26966e34bb70b6646e11ae05093c5a11208ec246..bf4a13ba45c19c11fc669bfd99280caacf51844a 100644
--- a/doc/man3/EVP_rc2_cbc.pod
+++ b/doc/man3/EVP_rc2_cbc.pod
@@ -72,7 +72,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_rc4.pod b/doc/man3/EVP_rc4.pod
index 9f8e72c00bc42dd3221b4103074d40f023b982f5..f22e88a652147747adb0a7209429a4fe532f0f4f 100644
--- a/doc/man3/EVP_rc4.pod
+++ b/doc/man3/EVP_rc4.pod
@@ -64,7 +64,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_rc5_32_12_16_cbc.pod b/doc/man3/EVP_rc5_32_12_16_cbc.pod
index cbb8d71b8eb576988c8767ebdf1a306f847c1e12..c177b1845196f2bcb68886a62ae42a4deaa168c2 100644
--- a/doc/man3/EVP_rc5_32_12_16_cbc.pod
+++ b/doc/man3/EVP_rc5_32_12_16_cbc.pod
@@ -78,7 +78,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_ripemd160.pod b/doc/man3/EVP_ripemd160.pod
index 46eebf846d43db4f3716f2a190e9a7ffa6e2742f..6ad2d3e0186968236ad0604cef608a446de9a23d 100644
--- a/doc/man3/EVP_ripemd160.pod
+++ b/doc/man3/EVP_ripemd160.pod
@@ -50,7 +50,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_seed_cbc.pod b/doc/man3/EVP_seed_cbc.pod
index 07d03367ed08e90c4f63375d7f0da90cb1e287e1..010607e5740590b70fff5063ab51f5a9364e3f71 100644
--- a/doc/man3/EVP_seed_cbc.pod
+++ b/doc/man3/EVP_seed_cbc.pod
@@ -58,7 +58,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_sha1.pod b/doc/man3/EVP_sha1.pod
index 574b9d8ba8c3992975860bdff7f9401fd4473a14..264ddd1addb717f02d6e8684508608e64022430b 100644
--- a/doc/man3/EVP_sha1.pod
+++ b/doc/man3/EVP_sha1.pod
@@ -49,7 +49,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_sha224.pod b/doc/man3/EVP_sha224.pod
index 1062e0c059bb3bafaabef07e7f1a75f8026fb022..7a50cf9b6c3f15ece50209e004eadc409ea1186a 100644
--- a/doc/man3/EVP_sha224.pod
+++ b/doc/man3/EVP_sha224.pod
@@ -69,7 +69,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_sha3_224.pod b/doc/man3/EVP_sha3_224.pod
index c59b4663ae6a27656214c3440d625778e64da3fa..5bb9ae1b89e55015705f14cbe3a0961e3653fe73 100644
--- a/doc/man3/EVP_sha3_224.pod
+++ b/doc/man3/EVP_sha3_224.pod
@@ -74,7 +74,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/EVP_sm3.pod b/doc/man3/EVP_sm3.pod
index 56cc25c6f319dce633f42dd424b023ce5f7ecb98..4e8112dc0afee2b8548757e0040d18271e238db6 100644
--- a/doc/man3/EVP_sm3.pod
+++ b/doc/man3/EVP_sm3.pod
@@ -48,7 +48,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
 Copyright 2017 Ribose Inc. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/doc/man3/EVP_sm4_cbc.pod b/doc/man3/EVP_sm4_cbc.pod
index d1400ed347dad96a8d95b267810b799631ee7ca7..b67ade549968c5a4df082fb5835ea6412863f109 100644
--- a/doc/man3/EVP_sm4_cbc.pod
+++ b/doc/man3/EVP_sm4_cbc.pod
@@ -62,7 +62,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
 Copyright 2017 Ribose Inc. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/doc/man3/EVP_whirlpool.pod b/doc/man3/EVP_whirlpool.pod
index 3b008ac990b7c226443e5becce6ee53d9cfc5615..a9826e290a4279c1b7cac8716b72271312105b01 100644
--- a/doc/man3/EVP_whirlpool.pod
+++ b/doc/man3/EVP_whirlpool.pod
@@ -51,7 +51,7 @@ L<EVP_DigestInit(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/MD5.pod b/doc/man3/MD5.pod
index 535fb925a312c5845bf17263d73b4a16cca8b7c5..2e01fe8193dd968cb97cfc4e986054a16b2c3023 100644
--- a/doc/man3/MD5.pod
+++ b/doc/man3/MD5.pod
@@ -105,7 +105,7 @@ All of these functions were deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/OPENSSL_s390xcap.pod b/doc/man3/OPENSSL_s390xcap.pod
index a8ade1b612e09fe9bd17a95a448b63b4a0345e0c..d7185530eceab062dbd45c12675ec834cecbeee9 100644
--- a/doc/man3/OPENSSL_s390xcap.pod
+++ b/doc/man3/OPENSSL_s390xcap.pod
@@ -194,7 +194,7 @@ Disables the KM-XTS-AES and the KIMD-SHAKE function codes:
 
 =head1 COPYRIGHT
 
-Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018-2023 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
diff --git a/doc/man3/OSSL_CMP_CTX_new.pod b/doc/man3/OSSL_CMP_CTX_new.pod
index b07d18229df708f7033132c7629ef184f438cba9..32fbc0915813db8895cec539576287898b7b37df 100644
--- a/doc/man3/OSSL_CMP_CTX_new.pod
+++ b/doc/man3/OSSL_CMP_CTX_new.pod
@@ -844,7 +844,7 @@ OSSL_CMP_CTX_set1_serialNumber() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod b/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod
index 882103f4c3b54adda5a2a0d81877753b50aa9056..66f0ac90309d207c20fe5fb322fd285fa195ff48 100644
--- a/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod
+++ b/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod
@@ -88,7 +88,7 @@ were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/OSSL_CMP_MSG_get0_header.pod b/doc/man3/OSSL_CMP_MSG_get0_header.pod
index 653f568d0c82526b592e43c201e20c8998cd87cc..b3175683c782f39c7fc837c556cc2a2e2dcd1d42 100644
--- a/doc/man3/OSSL_CMP_MSG_get0_header.pod
+++ b/doc/man3/OSSL_CMP_MSG_get0_header.pod
@@ -148,7 +148,7 @@ OSSL_CMP_MSG_update_recipNonce() was added in OpenSSL 3.0.9.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/man3/OSSL_CMP_exec_certreq.pod b/doc/man3/OSSL_CMP_exec_certreq.pod
index e752b8e270697853944649c014efa09f551986d5..38aa4abc834b6e30dfa9fc2ba2c89e0c2b31367d 100644
--- a/doc/man3/OSSL_CMP_exec_certreq.pod
+++ b/doc/man3/OSSL_CMP_exec_certreq.pod
@@ -218,7 +218,7 @@ were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod b/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
index 48eda2c2ba8c07333007289de66bfff0c93f4f24..d0769ac61b490438b9e25a988df5ccb534be3036 100644
--- a/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
+++ b/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
@@ -95,7 +95,7 @@ OSSL_CRMF_CERTTEMPLATE_get0_publicKey() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/man3/OSSL_CRMF_MSG_set0_validity.pod b/doc/man3/OSSL_CRMF_MSG_set0_validity.pod
index 4add69c40da629cdeea4065b5b65f9b702fd267e..93185a5528d8490b5544aceab2a0b3486a07404b 100644
--- a/doc/man3/OSSL_CRMF_MSG_set0_validity.pod
+++ b/doc/man3/OSSL_CRMF_MSG_set0_validity.pod
@@ -110,7 +110,7 @@ The OpenSSL CRMF support was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2007-2023 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
diff --git a/doc/man3/OSSL_DECODER_from_bio.pod b/doc/man3/OSSL_DECODER_from_bio.pod
index e9df3c046dce252a935c435c98e7315650c203f1..0cefeb2bf54567d251dcadc0d2eecea83e014c35 100644
--- a/doc/man3/OSSL_DECODER_from_bio.pod
+++ b/doc/man3/OSSL_DECODER_from_bio.pod
@@ -110,7 +110,7 @@ The functions described here were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man3/OSSL_DISPATCH.pod b/doc/man3/OSSL_DISPATCH.pod
index 52b7f3994505fbb8f618174882beeefd1d704eb3..232b6dca826c33d457eee6d66774be930804794c 100644
--- a/doc/man3/OSSL_DISPATCH.pod
+++ b/doc/man3/OSSL_DISPATCH.pod
@@ -72,7 +72,7 @@ B<OSSL_DISPATCH> was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/OSSL_HPKE_CTX_new.pod b/doc/man3/OSSL_HPKE_CTX_new.pod
index c169ee8f5ea64862d7da7de834078bf5d520e0f7..df951d7120e1d1c6e52ff601cc65a86bbd578ae2 100644
--- a/doc/man3/OSSL_HPKE_CTX_new.pod
+++ b/doc/man3/OSSL_HPKE_CTX_new.pod
@@ -561,7 +561,7 @@ This functionality described here was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/OSSL_HTTP_REQ_CTX.pod b/doc/man3/OSSL_HTTP_REQ_CTX.pod
index 932ed4b496deed91eebfb44016ebc399a35cedc6..f74fcb35cea0844d19577e88b999f1d087d2723b 100644
--- a/doc/man3/OSSL_HTTP_REQ_CTX.pod
+++ b/doc/man3/OSSL_HTTP_REQ_CTX.pod
@@ -276,7 +276,7 @@ The functions described here were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-2023 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
diff --git a/doc/man3/OSSL_HTTP_transfer.pod b/doc/man3/OSSL_HTTP_transfer.pod
index bc9ed071367ae8d19b07163144e01363ba5cfddd..e0375377e66c87a82dc0fb5b40a963ba2f7c099f 100644
--- a/doc/man3/OSSL_HTTP_transfer.pod
+++ b/doc/man3/OSSL_HTTP_transfer.pod
@@ -290,7 +290,7 @@ All the functions described here were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/OSSL_PARAM.pod b/doc/man3/OSSL_PARAM.pod
index 18da5bf99a04ac104877e32003d8b333572b8419..1e5bf06cf767a7a339cd309a36d54f04fab1cc53 100644
--- a/doc/man3/OSSL_PARAM.pod
+++ b/doc/man3/OSSL_PARAM.pod
@@ -364,7 +364,7 @@ B<OSSL_PARAM> was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/OSSL_PARAM_int.pod b/doc/man3/OSSL_PARAM_int.pod
index 091a9e9e367079cb77aaef0e119954dd41749196..29cefe673cc34f41aafdf351a5a9fd0d53f2245e 100644
--- a/doc/man3/OSSL_PARAM_int.pod
+++ b/doc/man3/OSSL_PARAM_int.pod
@@ -402,7 +402,7 @@ These APIs were introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/OSSL_PROVIDER.pod b/doc/man3/OSSL_PROVIDER.pod
index 12151021c58279f8c302d53b15fd17b75919503f..2a1531e983b8559c84a4d8a36b82d12d826ae515 100644
--- a/doc/man3/OSSL_PROVIDER.pod
+++ b/doc/man3/OSSL_PROVIDER.pod
@@ -239,7 +239,7 @@ added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/OSSL_QUIC_client_method.pod b/doc/man3/OSSL_QUIC_client_method.pod
index eaae2b049d29430bb95177bfb5b3566cab9f13d6..9d7fbaa20c4fbe06f97a00ff0b1883d55b56d278 100644
--- a/doc/man3/OSSL_QUIC_client_method.pod
+++ b/doc/man3/OSSL_QUIC_client_method.pod
@@ -40,7 +40,7 @@ OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/OSSL_SELF_TEST_new.pod b/doc/man3/OSSL_SELF_TEST_new.pod
index 77eaa9acdbeba2be5867953d921dcc9df8a7262a..4c4b10fca96ad050603042e31a6579e5460f7f92 100644
--- a/doc/man3/OSSL_SELF_TEST_new.pod
+++ b/doc/man3/OSSL_SELF_TEST_new.pod
@@ -165,7 +165,7 @@ The functions described here were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man3/OSSL_sleep.pod b/doc/man3/OSSL_sleep.pod
index 896adb7f1529559e3d988189e787b4cd395c6415..78761d2d196a0448459d33a69d33cce5769af868 100644
--- a/doc/man3/OSSL_sleep.pod
+++ b/doc/man3/OSSL_sleep.pod
@@ -32,7 +32,7 @@ OSSL_sleep() was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/OSSL_trace_enabled.pod b/doc/man3/OSSL_trace_enabled.pod
index 1cc45b11c77daa13e9f3b53163df25d64f5147ba..da78eba234bcb182603214e2cee995e0329d92b1 100644
--- a/doc/man3/OSSL_trace_enabled.pod
+++ b/doc/man3/OSSL_trace_enabled.pod
@@ -315,7 +315,7 @@ were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/OSSL_trace_set_channel.pod b/doc/man3/OSSL_trace_set_channel.pod
index 5b1981c1c3071c74ba70925dcc95c926396921cb..0db38e8db0d29590c56a05ae25419e3d65a1b12e 100644
--- a/doc/man3/OSSL_trace_set_channel.pod
+++ b/doc/man3/OSSL_trace_set_channel.pod
@@ -336,7 +336,7 @@ in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/PEM_read_CMS.pod b/doc/man3/PEM_read_CMS.pod
index 311f40e343d163e9c609523d3e98ba3a5f0553fb..dbccf26cd893ed69620b754d48eb2684b750433e 100644
--- a/doc/man3/PEM_read_CMS.pod
+++ b/doc/man3/PEM_read_CMS.pod
@@ -142,7 +142,7 @@ were deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 1998-2023 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
diff --git a/doc/man3/PKCS12_SAFEBAG_get1_cert.pod b/doc/man3/PKCS12_SAFEBAG_get1_cert.pod
index 25338c4ac70bf048273c930626dbb6b595aa9860..28bed08e3d405aa4765495308c1e91c81fee1150 100644
--- a/doc/man3/PKCS12_SAFEBAG_get1_cert.pod
+++ b/doc/man3/PKCS12_SAFEBAG_get1_cert.pod
@@ -79,7 +79,7 @@ added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man3/PKCS12_create.pod b/doc/man3/PKCS12_create.pod
index 224ae6418063ad293a705964190c5b3f2dcd9e1f..993e50777e1d9bb154a47d2be5ee5900c2c11f2b 100644
--- a/doc/man3/PKCS12_create.pod
+++ b/doc/man3/PKCS12_create.pod
@@ -57,7 +57,8 @@ can all be set to zero and sensible defaults will be used.
 These defaults are: AES password based encryption (PBES2 with PBKDF2 and
 AES-256-CBC) for private keys and certificates, the PBKDF2 and MAC key
 derivation iteration count of B<PKCS12_DEFAULT_ITER> (currently 2048), and
-MAC algorithm HMAC with SHA2-256.
+MAC algorithm HMAC with SHA2-256. The MAC key derivation algorithm used
+for the outer PKCS#12 structure is PKCS12KDF.
 
 The default MAC iteration count is 1 in order to retain compatibility with
 old software which did not interpret MAC iteration counts. If such compatibility
@@ -83,6 +84,8 @@ I<nid_key> or I<nid_cert> can be set to -1 indicating that no encryption
 should be used.
 
 I<mac_iter> can be set to -1 and the MAC will then be omitted entirely.
+This can be useful when running with the FIPS provider as the PKCS12KDF
+is not a FIPS approvable algorithm.
 
 PKCS12_create() makes assumptions regarding the encoding of the given pass
 phrase.
@@ -101,7 +104,9 @@ IETF RFC 7292 (L<https://tools.ietf.org/html/rfc7292>)
 
 =head1 SEE ALSO
 
+L<EVP_KDF-PKCS12KDF(7)>,
 L<d2i_PKCS12(3)>,
+L<OSSL_PROVIDER-FIPS(7)>,
 L<passphrase-encoding(7)>
 
 =head1 HISTORY
diff --git a/doc/man3/PKCS12_gen_mac.pod b/doc/man3/PKCS12_gen_mac.pod
index c4610ecaa47fe189bda3dd41474b10a8935bb60a..07f8855ecf7f62e86fd1b2b5909747bacbea7283 100644
--- a/doc/man3/PKCS12_gen_mac.pod
+++ b/doc/man3/PKCS12_gen_mac.pod
@@ -22,6 +22,7 @@ PKCS12_verify_mac - Functions to create and manipulate a PKCS#12 structure
 
 PKCS12_gen_mac() generates an HMAC over the entire PKCS#12 object using the
 supplied password along with a set of already configured parameters.
+The default key generation mechanism used is PKCS12KDF.
 
 PKCS12_verify_mac() verifies the PKCS#12 object's HMAC using the supplied
 password.
@@ -57,6 +58,7 @@ IETF RFC 7292 (L<https://tools.ietf.org/html/rfc7292>)
 =head1 SEE ALSO
 
 L<d2i_PKCS12(3)>,
+L<EVP_KDF-PKCS12KDF(7)>,
 L<PKCS12_create(3)>,
 L<passphrase-encoding(7)>
 
diff --git a/doc/man3/PKCS7_sign.pod b/doc/man3/PKCS7_sign.pod
index 3ad8cbf3391feabbeccbbe790ea2f1fecaf20ba2..1d997045fe142c5e965d34f7968f2c2147b1e9fa 100644
--- a/doc/man3/PKCS7_sign.pod
+++ b/doc/man3/PKCS7_sign.pod
@@ -122,7 +122,7 @@ The B<PKCS7_STREAM> flag was added in OpenSSL 1.0.0.
 
 =head1 COPYRIGHT
 
-Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002-2023 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
diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod
index b7555b54bf329f76d5b94c00a25e3958ca56aaa0..7ffd731410a0ea6aad6b8b90b99f3ea49883d27d 100644
--- a/doc/man3/SSL_CONF_cmd.pod
+++ b/doc/man3/SSL_CONF_cmd.pod
@@ -780,7 +780,7 @@ added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2012-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2012-2023 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
diff --git a/doc/man3/SSL_CTX_dane_enable.pod b/doc/man3/SSL_CTX_dane_enable.pod
index 1a466020a71131684005c59ecb1ba28de1824705..d558e63895fda6c908f6ff7f18d3fc00cda16462 100644
--- a/doc/man3/SSL_CTX_dane_enable.pod
+++ b/doc/man3/SSL_CTX_dane_enable.pod
@@ -376,7 +376,7 @@ These functions were added in OpenSSL 1.1.0.
 
 =head1 COPYRIGHT
 
-Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2023 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
diff --git a/doc/man3/SSL_CTX_new.pod b/doc/man3/SSL_CTX_new.pod
index fb46cbca75ee936eb247e548b2eaf5faebf17548..f467f93659b575643d66a77cf1085aa102416291 100644
--- a/doc/man3/SSL_CTX_new.pod
+++ b/doc/man3/SSL_CTX_new.pod
@@ -249,7 +249,7 @@ SSL_CTX_new_ex() was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_CTX_set_alpn_select_cb.pod b/doc/man3/SSL_CTX_set_alpn_select_cb.pod
index 5f5872ee672e9103b64b50b8ea39190df8517a1c..05fee2fbecbce8a41cd9abc2f0171632928e7d75 100644
--- a/doc/man3/SSL_CTX_set_alpn_select_cb.pod
+++ b/doc/man3/SSL_CTX_set_alpn_select_cb.pod
@@ -192,7 +192,7 @@ L<SSL_CTX_set_tlsext_servername_arg(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2023 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
diff --git a/doc/man3/SSL_CTX_set_min_proto_version.pod b/doc/man3/SSL_CTX_set_min_proto_version.pod
index 3d269018d0542323ddcc5d1994bdec05739bb344..9a2da37ab72949d8dd31938606ba7696c5922df1 100644
--- a/doc/man3/SSL_CTX_set_min_proto_version.pod
+++ b/doc/man3/SSL_CTX_set_min_proto_version.pod
@@ -67,7 +67,7 @@ were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2023 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
diff --git a/doc/man3/SSL_CTX_set_mode.pod b/doc/man3/SSL_CTX_set_mode.pod
index c0484f190fe20239730fc9ded6b4f5ca8895588d..325e086c54843eb7592bae352e3a2ae33ec13ed6 100644
--- a/doc/man3/SSL_CTX_set_mode.pod
+++ b/doc/man3/SSL_CTX_set_mode.pod
@@ -140,7 +140,7 @@ SSL_MODE_ASYNC was added in OpenSSL 1.1.0.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_CTX_set_msg_callback.pod b/doc/man3/SSL_CTX_set_msg_callback.pod
index bb29761e8d20f063870df576bcd6fae5ebfe9941..7484773afe6534a9fa1e6f4e3fbce6d1bdb7e4d8 100644
--- a/doc/man3/SSL_CTX_set_msg_callback.pod
+++ b/doc/man3/SSL_CTX_set_msg_callback.pod
@@ -174,7 +174,7 @@ B<SSL3_RT_QUIC_FRAME_PADDING> were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index dd30873f3665541601df93a59114325884495612..56695e4abd507da7c42d4ea0ba22357be15e0bbd 100644
--- a/doc/man3/SSL_CTX_set_options.pod
+++ b/doc/man3/SSL_CTX_set_options.pod
@@ -531,7 +531,7 @@ whether these macros are defined or not.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_CTX_set_quiet_shutdown.pod b/doc/man3/SSL_CTX_set_quiet_shutdown.pod
index 867c331a3d87ba9bef805391287acd9a895aec5f..b7c2a32069174c2cff439b1cd54fb2959b3c1331 100644
--- a/doc/man3/SSL_CTX_set_quiet_shutdown.pod
+++ b/doc/man3/SSL_CTX_set_quiet_shutdown.pod
@@ -65,7 +65,7 @@ L<SSL_clear(3)>, L<SSL_free(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_CTX_set_read_ahead.pod b/doc/man3/SSL_CTX_set_read_ahead.pod
index a4c482ee35d2d92cc5b8c8331ca97c772bd94296..9e6409dbbc9cab84489805efa6584defa70053f0 100644
--- a/doc/man3/SSL_CTX_set_read_ahead.pod
+++ b/doc/man3/SSL_CTX_set_read_ahead.pod
@@ -67,7 +67,7 @@ L<ssl(7)>, L<SSL_pending(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-2023 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
diff --git a/doc/man3/SSL_CTX_set_record_padding_callback.pod b/doc/man3/SSL_CTX_set_record_padding_callback.pod
index a3ba8a51183466fd8de46528f591d500e932353f..e91f903b0154a5a89008f9686ce1cc2eb41f3a9a 100644
--- a/doc/man3/SSL_CTX_set_record_padding_callback.pod
+++ b/doc/man3/SSL_CTX_set_record_padding_callback.pod
@@ -98,7 +98,7 @@ changed to int in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/SSL_CTX_set_split_send_fragment.pod b/doc/man3/SSL_CTX_set_split_send_fragment.pod
index e01a696f0d58d08b135ab7e3c8751e8e6ef58a7a..8f92ec1ec76f0066e2c644920816952656240ac6 100644
--- a/doc/man3/SSL_CTX_set_split_send_fragment.pod
+++ b/doc/man3/SSL_CTX_set_split_send_fragment.pod
@@ -187,7 +187,7 @@ and SSL_SESSION_get_max_fragment_length() functions were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2023 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
diff --git a/doc/man3/SSL_CTX_set_ssl_version.pod b/doc/man3/SSL_CTX_set_ssl_version.pod
index 357807187abb1f9cfac4c6da3a876b9991b69771..2de853314325efcefa8cb53e3ee16210469aa4da 100644
--- a/doc/man3/SSL_CTX_set_ssl_version.pod
+++ b/doc/man3/SSL_CTX_set_ssl_version.pod
@@ -83,7 +83,7 @@ SSL_CTX_set_ssl_version() was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod b/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod
index 5cb6b2cc8277b0aadcc6fe416f58a752af58808f..5d1e063f012259741a24f9d26914c46828a717f0 100644
--- a/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod
+++ b/doc/man3/SSL_CTX_set_tlsext_use_srtp.pod
@@ -138,7 +138,7 @@ L<SSL_export_keying_material(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/SSL_CTX_set_verify.pod b/doc/man3/SSL_CTX_set_verify.pod
index c49bb39ff0296f84744d0c681934d5bca0c591d0..ac6a42c191266b5205d622d684fb9994dc5d4849 100644
--- a/doc/man3/SSL_CTX_set_verify.pod
+++ b/doc/man3/SSL_CTX_set_verify.pod
@@ -366,7 +366,7 @@ and SSL_set_post_handshake_auth() functions were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_SESSION_free.pod b/doc/man3/SSL_SESSION_free.pod
index 33475d76b6a6917e46a3fc9f21ce859d5011e875..4af750a358ba2fe1c1d531a56e1b302220f0dc1f 100644
--- a/doc/man3/SSL_SESSION_free.pod
+++ b/doc/man3/SSL_SESSION_free.pod
@@ -79,7 +79,7 @@ The SSL_SESSION_dup() function was added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_alloc_buffers.pod b/doc/man3/SSL_alloc_buffers.pod
index d2d5b1e59b4bff1509b4cad43ed9dfee03608768..8810001df846dfe49ead58fe3c06555a79b8f625 100644
--- a/doc/man3/SSL_alloc_buffers.pod
+++ b/doc/man3/SSL_alloc_buffers.pod
@@ -61,7 +61,7 @@ L<CRYPTO_set_mem_functions(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/SSL_clear.pod b/doc/man3/SSL_clear.pod
index 6b6b11b482603b78f90719d874642ade4f078623..3496213c52d76e68dab69f25cf92165a9fef1b7c 100644
--- a/doc/man3/SSL_clear.pod
+++ b/doc/man3/SSL_clear.pod
@@ -77,7 +77,7 @@ L<SSL_CTX_set_client_cert_cb(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_free.pod b/doc/man3/SSL_free.pod
index 61ce50e9cc9c5b5b04be0b485f71a79e6e0f5d24..7fabaa2159f4e3409d706957c3dd19383f74e372 100644
--- a/doc/man3/SSL_free.pod
+++ b/doc/man3/SSL_free.pod
@@ -76,7 +76,7 @@ L<ssl(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_get_error.pod b/doc/man3/SSL_get_error.pod
index a91acd9836721d422e1624c1d062512a099eac43..27dd584687f307fe18ebbd8e53a0aa09db3d59d7 100644
--- a/doc/man3/SSL_get_error.pod
+++ b/doc/man3/SSL_get_error.pod
@@ -190,7 +190,7 @@ The SSL_ERROR_WANT_CLIENT_HELLO_CB error code was added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_get_event_timeout.pod b/doc/man3/SSL_get_event_timeout.pod
index 8649cb4f03e7547fcedad633c83ee57f0b041919..361f87cbfc1f80095fcc2ea46cf6a5db1d365757 100644
--- a/doc/man3/SSL_get_event_timeout.pod
+++ b/doc/man3/SSL_get_event_timeout.pod
@@ -78,7 +78,7 @@ The SSL_get_event_timeout() function was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/SSL_get_rpoll_descriptor.pod b/doc/man3/SSL_get_rpoll_descriptor.pod
index 0d17bce69866e095d9f9f39a8f4d7dc30ce2348d..5e1879580e82f78822946108fd264fc04c0a1caf 100644
--- a/doc/man3/SSL_get_rpoll_descriptor.pod
+++ b/doc/man3/SSL_get_rpoll_descriptor.pod
@@ -83,7 +83,7 @@ and SSL_net_write_desired() functions were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/SSL_get_verify_result.pod b/doc/man3/SSL_get_verify_result.pod
index ab13e912b11acf38a8cba59b402439903c7997b3..08c46c0576ba2be77270c3d7c6b70b04073ac496 100644
--- a/doc/man3/SSL_get_verify_result.pod
+++ b/doc/man3/SSL_get_verify_result.pod
@@ -63,7 +63,7 @@ L<openssl-verify(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_get_version.pod b/doc/man3/SSL_get_version.pod
index 04b8eea61d4e465fd06d6163be67cd72121f04b8..b8a0f5e3b15de0250beab3787f534351ec3a92ca 100644
--- a/doc/man3/SSL_get_version.pod
+++ b/doc/man3/SSL_get_version.pod
@@ -142,7 +142,7 @@ SSL_is_quic() functions were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_key_update.pod b/doc/man3/SSL_key_update.pod
index f0e535c3135b7d6d6e2a55978231c484bb7aba1a..6238e67649e0334edcbf7d5daa34bcd574237e07 100644
--- a/doc/man3/SSL_key_update.pod
+++ b/doc/man3/SSL_key_update.pod
@@ -118,7 +118,7 @@ OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/SSL_new.pod b/doc/man3/SSL_new.pod
index 309430d9b718e4f694740a1b83efb28962ce57b2..d01996fba14322bf2059e803da5271442c159aa7 100644
--- a/doc/man3/SSL_new.pod
+++ b/doc/man3/SSL_new.pod
@@ -127,7 +127,7 @@ L<ssl(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_read.pod b/doc/man3/SSL_read.pod
index 0c1f1dbf4c49f6c9af00f60480d6b246583158fd..206f06afe0918655ce286e64c763f1b69e43638a 100644
--- a/doc/man3/SSL_read.pod
+++ b/doc/man3/SSL_read.pod
@@ -150,7 +150,7 @@ The SSL_read_ex() and SSL_peek_ex() functions were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_read_early_data.pod b/doc/man3/SSL_read_early_data.pod
index 65015124b2e3a21b8aab4b180a0bbe3429278c0d..ec71c6eba9fbc5fb802cb0eaf7b772072130fe02 100644
--- a/doc/man3/SSL_read_early_data.pod
+++ b/doc/man3/SSL_read_early_data.pod
@@ -370,7 +370,7 @@ All of the functions described above were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man3/SSL_rstate_string.pod b/doc/man3/SSL_rstate_string.pod
index ad1ec0ae28714161f1898d5f84ef4edef9a401ec..d1fa22243d614c6066d9d46a40b24922f757083f 100644
--- a/doc/man3/SSL_rstate_string.pod
+++ b/doc/man3/SSL_rstate_string.pod
@@ -57,7 +57,7 @@ L<ssl(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_set1_initial_peer_addr.pod b/doc/man3/SSL_set1_initial_peer_addr.pod
index d1cdeb0234e6f1ae3c145cdf787027a4d8a389b7..0aec15f770782e728f0b340817a6f0ae9535d1ff 100644
--- a/doc/man3/SSL_set1_initial_peer_addr.pod
+++ b/doc/man3/SSL_set1_initial_peer_addr.pod
@@ -51,7 +51,7 @@ The SSL_set1_initial_peer_addr() function was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/SSL_set_bio.pod b/doc/man3/SSL_set_bio.pod
index 121a955a3ee4701ad77c23f9b6b5cfda02be19f4..5cb2a9a427aa02cef4ba4f5dcf1ab3e53d133da8 100644
--- a/doc/man3/SSL_set_bio.pod
+++ b/doc/man3/SSL_set_bio.pod
@@ -108,7 +108,7 @@ SSL_set0_rbio() and SSL_set0_wbio() were added in OpenSSL 1.1.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_set_blocking_mode.pod b/doc/man3/SSL_set_blocking_mode.pod
index 602045c0efa8d5878d6090f3fe50f81eac6b2ad0..7f5b4baa74b1580e64dc6941275c0b46192d9c28 100644
--- a/doc/man3/SSL_set_blocking_mode.pod
+++ b/doc/man3/SSL_set_blocking_mode.pod
@@ -64,7 +64,7 @@ OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/SSL_set_fd.pod b/doc/man3/SSL_set_fd.pod
index 396777d72174de47e8c00bc5eb6f86333c3841d1..a431183a328bde041511fd95ea974a4ca00f2527 100644
--- a/doc/man3/SSL_set_fd.pod
+++ b/doc/man3/SSL_set_fd.pod
@@ -68,7 +68,7 @@ L<SSL_shutdown(3)>, L<ssl(7)> , L<bio(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_set_shutdown.pod b/doc/man3/SSL_set_shutdown.pod
index 730d819c8ad029d6bff475981ac8122b588972cf..c3b613a247d1e68ab864a3febc01864a799f1181 100644
--- a/doc/man3/SSL_set_shutdown.pod
+++ b/doc/man3/SSL_set_shutdown.pod
@@ -73,7 +73,7 @@ L<SSL_clear(3)>, L<SSL_free(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_shutdown.pod b/doc/man3/SSL_shutdown.pod
index 5d59f677f1de8a0339f62505e3fabc543fb9638b..a9894b717af73c818616db73290270fb57d845b6 100644
--- a/doc/man3/SSL_shutdown.pod
+++ b/doc/man3/SSL_shutdown.pod
@@ -429,7 +429,7 @@ The SSL_shutdown_ex() function was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/SSL_stream_conclude.pod b/doc/man3/SSL_stream_conclude.pod
index 9473ad0b9eea3c11e134c7e439529f51f51e676d..2f6df1986061cf16655df5f136dd31a86703ef7c 100644
--- a/doc/man3/SSL_stream_conclude.pod
+++ b/doc/man3/SSL_stream_conclude.pod
@@ -50,7 +50,7 @@ The SSL_stream_conclude() function was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man3/SSL_want.pod b/doc/man3/SSL_want.pod
index 8a17bdf228af747d6a3b2ad353ad11ffdb87e055..b397fc0521cb2439d75540599bfb06b320d079ef 100644
--- a/doc/man3/SSL_want.pod
+++ b/doc/man3/SSL_want.pod
@@ -114,7 +114,7 @@ were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2023 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
diff --git a/doc/man3/SSL_write.pod b/doc/man3/SSL_write.pod
index b8a7dcbbc71bf4568613702e8f25054b05a11273..46427d7059e9fee42e2264afad179439eca6fb3d 100644
--- a/doc/man3/SSL_write.pod
+++ b/doc/man3/SSL_write.pod
@@ -154,7 +154,7 @@ The SSL_sendfile() function was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man3/X509_STORE_CTX_set_verify_cb.pod b/doc/man3/X509_STORE_CTX_set_verify_cb.pod
index 969856d8f31af1d954fc7b7469f9ecd859a0f85e..845ff8e91b865803352517b9edfd16f28a4265d7 100644
--- a/doc/man3/X509_STORE_CTX_set_verify_cb.pod
+++ b/doc/man3/X509_STORE_CTX_set_verify_cb.pod
@@ -232,7 +232,7 @@ X509_STORE_CTX_print_verify_cb() was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2009-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2009-2023 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
diff --git a/doc/man3/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
index 89d2266cfa2f243d0050256f468809cd761ce0d5..fcbbfc4c306734eaba981837f3c512793ef97b9a 100644
--- a/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
@@ -407,7 +407,7 @@ The documentation was changed to align with the implementation.
 
 =head1 COPYRIGHT
 
-Copyright 2009-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2009-2023 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
diff --git a/doc/man3/X509_get0_notBefore.pod b/doc/man3/X509_get0_notBefore.pod
index 27fd34284c84624bdebd5393f10c6df3793fb439..1ca0a1b128aa82cdf938ad995991437997411d4e 100644
--- a/doc/man3/X509_get0_notBefore.pod
+++ b/doc/man3/X509_get0_notBefore.pod
@@ -95,7 +95,7 @@ X509_get_notBefore() and X509_get_notAfter() were deprecated in OpenSSL
 
 =head1 COPYRIGHT
 
-Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2023 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
diff --git a/doc/man3/X509_get_version.pod b/doc/man3/X509_get_version.pod
index 5d377c91d323ebb26f7e4b169b5cd0621c4e07f3..c5db26c5790ce5b3c62bae777e7005d696af3b7e 100644
--- a/doc/man3/X509_get_version.pod
+++ b/doc/man3/X509_get_version.pod
@@ -75,7 +75,7 @@ functions in OpenSSL 1.1.0, in previous versions they were macros.
 
 =head1 COPYRIGHT
 
-Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-2023 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
diff --git a/doc/man3/X509_sign.pod b/doc/man3/X509_sign.pod
index af21148f67946e016e9f1ac4e6fb85adc90a2c75..7ca8a1a55ecf8d523e83d396dd084ab54d976aa4 100644
--- a/doc/man3/X509_sign.pod
+++ b/doc/man3/X509_sign.pod
@@ -70,7 +70,7 @@ and X509_CRL_sign_ctx() functions were added in OpenSSL 1.0.1.
 
 =head1 COPYRIGHT
 
-Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-2023 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
diff --git a/doc/man3/d2i_RSAPrivateKey.pod b/doc/man3/d2i_RSAPrivateKey.pod
index 5156f0edb27ad52d07bc7f14ac995757cad7a302..b3ea95c692a0dd7d83151d6de386f5d00caee8a5 100644
--- a/doc/man3/d2i_RSAPrivateKey.pod
+++ b/doc/man3/d2i_RSAPrivateKey.pod
@@ -309,7 +309,7 @@ L<i2d_PUBKEY(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man3/d2i_X509.pod b/doc/man3/d2i_X509.pod
index ed9ed062d22198ac6ca1e99422ba16c43f79c199..c79a964e6d7f981aef97b0e2f8e1faa5a08051b7 100644
--- a/doc/man3/d2i_X509.pod
+++ b/doc/man3/d2i_X509.pod
@@ -595,7 +595,7 @@ efficiency reasons.
 
 =head1 COPYRIGHT
 
-Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 1998-2023 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
diff --git a/doc/man5/config.pod b/doc/man5/config.pod
index 364c57c2928991cbad76714e46a757638229bcd7..8d312c661fa099372c7a50004e4fd98d3efe216f 100644
--- a/doc/man5/config.pod
+++ b/doc/man5/config.pod
@@ -575,7 +575,7 @@ L<x509v3_config(5)>.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2023 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
diff --git a/doc/man5/x509v3_config.pod b/doc/man5/x509v3_config.pod
index cf42e9053a58a6c27a0c7d2595cf8a787c71e4ae..2440f23dddc281e1c92d4fca53b3b94e6c71e017 100644
--- a/doc/man5/x509v3_config.pod
+++ b/doc/man5/x509v3_config.pod
@@ -605,7 +605,7 @@ L<ASN1_generate_nconf(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2004-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2004-2023 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
diff --git a/doc/man7/EVP_CIPHER-AES.pod b/doc/man7/EVP_CIPHER-AES.pod
index 04d269295b600b403e32aabd8cce50a948476f3a..fa1eaa843be20f3b6f7bb2ccc380a0ce5c0d801e 100644
--- a/doc/man7/EVP_CIPHER-AES.pod
+++ b/doc/man7/EVP_CIPHER-AES.pod
@@ -73,7 +73,7 @@ The GCM-SIV mode ciphers were added in OpenSSL version 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2021-2023 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
diff --git a/doc/man7/EVP_KDF-ARGON2.pod b/doc/man7/EVP_KDF-ARGON2.pod
index c44250e10e27c3daf6b934f909595cdc668bfafa..e2dfb6edbf7830097ae1022fcb77d6912526391c 100644
--- a/doc/man7/EVP_KDF-ARGON2.pod
+++ b/doc/man7/EVP_KDF-ARGON2.pod
@@ -182,7 +182,7 @@ This functionality was added to OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man7/EVP_KDF-HMAC-DRBG.pod b/doc/man7/EVP_KDF-HMAC-DRBG.pod
index 63a2070e019c8f516df1783327bcf102cb671fff..e4c1ed9d3cb91d4f3a07b4879f1ce50df1b486fa 100644
--- a/doc/man7/EVP_KDF-HMAC-DRBG.pod
+++ b/doc/man7/EVP_KDF-HMAC-DRBG.pod
@@ -61,7 +61,7 @@ The EVP_KDF-HMAC-DRBG functionality was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man7/EVP_KDF-PKCS12KDF.pod b/doc/man7/EVP_KDF-PKCS12KDF.pod
index 7edde1dc9bf7f010e4cd7865df750bbec8ecf492..05d4e902bd30f0b00db1c1f5bdad59f58fde04cd 100644
--- a/doc/man7/EVP_KDF-PKCS12KDF.pod
+++ b/doc/man7/EVP_KDF-PKCS12KDF.pod
@@ -46,6 +46,9 @@ RFC 7292 section B.3.
 
 =head1 NOTES
 
+This algorithm is not available in the FIPS provider as it is not FIPS
+approvable.
+
 A typical application of this algorithm is to derive keying material for an
 encryption algorithm from a password in the "pass", a salt in "salt",
 and an iteration count.
@@ -68,7 +71,8 @@ L<EVP_KDF_CTX_new(3)>,
 L<EVP_KDF_CTX_free(3)>,
 L<EVP_KDF_CTX_set_params(3)>,
 L<EVP_KDF_derive(3)>,
-L<EVP_KDF(3)/PARAMETERS>
+L<EVP_KDF(3)/PARAMETERS>,
+L<OSSL_PROVIDER-FIPS(7)>
 
 =head1 HISTORY
 
diff --git a/doc/man7/EVP_KDF-SS.pod b/doc/man7/EVP_KDF-SS.pod
index fbc4a6acec1a51fe2a098a1f3f57c0b75ddd8d37..7f158e421698ee7f03f7c2053ab0899cf613e735 100644
--- a/doc/man7/EVP_KDF-SS.pod
+++ b/doc/man7/EVP_KDF-SS.pod
@@ -177,7 +177,7 @@ This functionality was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.  Copyright
+Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.  Copyright
 (c) 2019, Oracle and/or its affiliates.  All rights reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/doc/man7/EVP_MD-SHA2.pod b/doc/man7/EVP_MD-SHA2.pod
index ffee7d1231a1ee7ba4c7a61a8a598e130ddca87b..6266bf659e75831215c3c62de49e6315c2175b7c 100644
--- a/doc/man7/EVP_MD-SHA2.pod
+++ b/doc/man7/EVP_MD-SHA2.pod
@@ -71,7 +71,7 @@ L<provider-digest(7)>, L<OSSL_PROVIDER-FIPS(7)>, L<OSSL_PROVIDER-default(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/EVP_PKEY-EC.pod b/doc/man7/EVP_PKEY-EC.pod
index a7254c573621fde276cce1531bf3d4ff0447d3ed..318f2cc8b2d5082a45dbec2645152c54f7f93c1f 100644
--- a/doc/man7/EVP_PKEY-EC.pod
+++ b/doc/man7/EVP_PKEY-EC.pod
@@ -280,7 +280,7 @@ L<EVP_KEYEXCH-ECDH(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/EVP_PKEY-RSA.pod b/doc/man7/EVP_PKEY-RSA.pod
index 1a3f14cc230cac522ac9fc8fa51a4946519b72d7..161e9d4d71d16d13818d27be9dd2ed09aa539174 100644
--- a/doc/man7/EVP_PKEY-RSA.pod
+++ b/doc/man7/EVP_PKEY-RSA.pod
@@ -264,7 +264,7 @@ L<EVP_RSA_gen(3)>, L<EVP_KEYMGMT(3)>, L<EVP_PKEY(3)>, L<provider-keymgmt(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/EVP_RAND-HASH-DRBG.pod b/doc/man7/EVP_RAND-HASH-DRBG.pod
index 97a3ecc684fa47a41670ea989c0b48be4765503d..33330187941d69cd14d7973a11663c8fef7e2e37 100644
--- a/doc/man7/EVP_RAND-HASH-DRBG.pod
+++ b/doc/man7/EVP_RAND-HASH-DRBG.pod
@@ -116,7 +116,7 @@ L<FIPS 140-3 IG D.R|https://csrc.nist.gov/CSRC/media/Projects/cryptographic-modu
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/EVP_RAND-HMAC-DRBG.pod b/doc/man7/EVP_RAND-HMAC-DRBG.pod
index 5b188404f9c0397d511ff0c0cf6b9896a87b69d8..d685f509f9f0e612e7b796f6cbb3af7d5aa875e8 100644
--- a/doc/man7/EVP_RAND-HMAC-DRBG.pod
+++ b/doc/man7/EVP_RAND-HMAC-DRBG.pod
@@ -119,7 +119,7 @@ L<FIPS 140-3 IG D.R|https://csrc.nist.gov/CSRC/media/Projects/cryptographic-modu
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/EVP_SIGNATURE-DSA.pod b/doc/man7/EVP_SIGNATURE-DSA.pod
index 397fd90019e60fc9efbb597bd6d63696ae4c26a5..290041a2dd66e2cadfa98e0d30f55e7e96884bd3 100644
--- a/doc/man7/EVP_SIGNATURE-DSA.pod
+++ b/doc/man7/EVP_SIGNATURE-DSA.pod
@@ -52,7 +52,7 @@ L<provider-signature(7)>,
 
 =head1 COPYRIGHT
 
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/EVP_SIGNATURE-ECDSA.pod b/doc/man7/EVP_SIGNATURE-ECDSA.pod
index ea167f2784ba9e41f225cda2b1d37a612a181486..a19d467c0d758df02a1cd863b147bb239aeafc27 100644
--- a/doc/man7/EVP_SIGNATURE-ECDSA.pod
+++ b/doc/man7/EVP_SIGNATURE-ECDSA.pod
@@ -51,7 +51,7 @@ L<provider-signature(7)>,
 
 =head1 COPYRIGHT
 
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/EVP_SIGNATURE-ED25519.pod b/doc/man7/EVP_SIGNATURE-ED25519.pod
index dbb7de3279d2b388b6eca2442fbc4989bb8b1a0a..aba56f31824936d210b9e719fdbf0a7187a92440 100644
--- a/doc/man7/EVP_SIGNATURE-ED25519.pod
+++ b/doc/man7/EVP_SIGNATURE-ED25519.pod
@@ -156,7 +156,7 @@ L<EVP_DigestVerifyInit(3)>,
 
 =head1 COPYRIGHT
 
-Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-2023 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
diff --git a/doc/man7/OSSL_PROVIDER-FIPS.pod b/doc/man7/OSSL_PROVIDER-FIPS.pod
index 844c14df9e257bdae0f9dcaf83b4528542d5a95f..449d5624e004a2fde878babdcb08974fc41b87e1 100644
--- a/doc/man7/OSSL_PROVIDER-FIPS.pod
+++ b/doc/man7/OSSL_PROVIDER-FIPS.pod
@@ -469,7 +469,7 @@ This functionality was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/OSSL_PROVIDER-default.pod b/doc/man7/OSSL_PROVIDER-default.pod
index 96409ae5ba590f42e7c79069a71e2a899f1efa16..603fd06331bbfb4dbc65b8280eee7c1d2a45de3b 100644
--- a/doc/man7/OSSL_PROVIDER-default.pod
+++ b/doc/man7/OSSL_PROVIDER-default.pod
@@ -280,7 +280,7 @@ All other functionality was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/fips_module.pod b/doc/man7/fips_module.pod
index 9756a89f06ca82650c35f9ac51e16181730c9a27..249588598b03771f9f1c368dcb24917c2a6bdc1b 100644
--- a/doc/man7/fips_module.pod
+++ b/doc/man7/fips_module.pod
@@ -510,7 +510,7 @@ in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2021-2023 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
diff --git a/doc/man7/openssl-quic.pod b/doc/man7/openssl-quic.pod
index e4f73952f5e8713d459d2abac4b3f17c4437e8e2..69db29fdd831a52fcb9b19bc10a4432d7f94215b 100644
--- a/doc/man7/openssl-quic.pod
+++ b/doc/man7/openssl-quic.pod
@@ -836,7 +836,7 @@ L<SSL_set_incoming_stream_policy(3)>, L<SSL_set_default_stream_mode(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2023 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
diff --git a/doc/man7/ossl-guide-introduction.pod b/doc/man7/ossl-guide-introduction.pod
index 9f39288f3b1d2c83f34e034d76f19686313314a7..b6c1f955bb4f23b0c26e8c22e8cdb6f67ab1ef94 100644
--- a/doc/man7/ossl-guide-introduction.pod
+++ b/doc/man7/ossl-guide-introduction.pod
@@ -77,12 +77,16 @@ The pages in the guide are as follows:
 
 =item L<ossl-guide-tls-client-block(7)>: Writing a simple blocking TLS client
 
+=item L<ossl-guide-tls-client-non-block(7)>: Writing a simple nonblocking TLS client
+
 =item L<ossl-guide-quic-introduction(7)>: An introduction to QUIC in OpenSSL
 
 =item L<ossl-guide-quic-client-block(7)>: Writing a simple blocking QUIC client
 
 =item L<ossl-guide-quic-multi-stream(7)>: Writing a simple multi-stream QUIC client
 
+=item L<ossl-guide-quic-client-non-block(7)>: Writing a simple nonblocking QUIC client
+
 =item L<ossl-guide-migration(7)>: Migrating from older OpenSSL versions
 
 =back
diff --git a/doc/man7/ossl-guide-migration.pod b/doc/man7/ossl-guide-migration.pod
index 1042744d66eaa9acaa9d853064bafa27cfcd08fc..fc3acef6d94134c46b1b21cf125ee464373e9d8b 100644
--- a/doc/man7/ossl-guide-migration.pod
+++ b/doc/man7/ossl-guide-migration.pod
@@ -327,6 +327,15 @@ context and property query and will call an extended version of the key/IV
 derivation function which supports these parameters. This includes
 L<EVP_PBE_CipherInit_ex(3)>, L<EVP_PBE_find_ex(3)> and L<EVP_PBE_scrypt_ex(3)>.
 
+=head4 PKCS#12 KDF versus FIPS
+
+Unlike in 1.x.y, the PKCS12KDF algorithm used when a PKCS#12 structure
+is created with a MAC that does not work with the FIPS provider as the PKCS12KDF
+is not a FIPS approvable mechanism.
+
+See L<EVP_KDF-PKCS12KDF(7)>, L<PKCS12_create(3)>, L<openssl-pkcs12(1)>,
+L<OSSL_PROVIDER-FIPS(7)>.
+
 =head4 Windows thread synchronization changes
 
 Windows thread synchronization uses read/write primitives (SRWLock) when
@@ -2474,7 +2483,7 @@ The migration guide was created for OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2021-2023 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
diff --git a/doc/man7/ossl-guide-quic-client-block.pod b/doc/man7/ossl-guide-quic-client-block.pod
index 595135c69668b18c2f780227fd9f110ed0c22e62..fc8912086dae6419dd10f53aa14bc0d2218bf197 100644
--- a/doc/man7/ossl-guide-quic-client-block.pod
+++ b/doc/man7/ossl-guide-quic-client-block.pod
@@ -123,6 +123,7 @@ for TCP).
 
         /* Set to nonblocking mode */
         if (!BIO_socket_nbio(sock, 1)) {
+            BIO_closesocket(sock);
             sock = -1;
             continue;
         }
@@ -164,10 +165,12 @@ associate it with a BIO object:
 
     BIO *bio;
 
-    /* Create a BIO to wrap the socket*/
+    /* Create a BIO to wrap the socket */
     bio = BIO_new(BIO_s_datagram());
-    if (bio == NULL)
+    if (bio == NULL) {
         BIO_closesocket(sock);
+        return NULL;
+    }
 
     /*
      * Associate the newly created BIO with the underlying socket. By
diff --git a/doc/man7/ossl-guide-quic-client-non-block.pod b/doc/man7/ossl-guide-quic-client-non-block.pod
new file mode 100644
index 0000000000000000000000000000000000000000..8187bb9b77d54f0959a3da1257f3c1023d291350
--- /dev/null
+++ b/doc/man7/ossl-guide-quic-client-non-block.pod
@@ -0,0 +1,453 @@
+=pod
+
+=begin comment
+
+NB: Changes to the source code samples in this file should also be reflected in
+demos/guide/quic-client-non-block.c
+
+=end comment
+
+=head1 NAME
+
+ossl-guide-quic-client-non-block
+- OpenSSL Guide: Writing a simple nonblocking QUIC client
+
+=head1 SIMPLE NONBLOCKING QUIC CLIENT EXAMPLE
+
+This page will build on the example developed on the
+L<ossl-guide-quic-client-block(7)> page which demonstrates how to write a simple
+blocking QUIC client. On this page we will amend that demo code so that it
+supports nonblocking functionality.
+
+The complete source code for this example nonblocking QUIC client is available
+in the B<demos/guide> directory of the OpenSSL source distribution in the file
+B<quic-client-non-block.c>. It is also available online at
+L<https://github.com/openssl/openssl/blob/master/demos/guide/quic-client-non-block.c>.
+
+As we saw in the previous example an OpenSSL QUIC application always uses a
+nonblocking socket. However, despite this, the B<SSL> object still has blocking
+behaviour. When the B<SSL> object has blocking behaviour then this means that
+it waits (blocks) until data is available to read if you attempt to read from
+it when there is no data yet. Similarly it waits when writing if the B<SSL>
+object is currently unable to write at the moment. This can simplify the
+development of code because you do not have to worry about what to do in these
+cases. The execution of the code will simply stop until it is able to continue.
+However in many cases you do not want this behaviour. Rather than stopping and
+waiting your application may need to go and do other tasks whilst the B<SSL>
+object is unable to read/write, for example updating a GUI or performing
+operations on some other connection or stream.
+
+We will see later in this tutorial how to change the B<SSL> object so that it
+has nonblocking behaviour. With a nonblocking B<SSL> object, functions such as
+L<SSL_read_ex(3)> or L<SSL_write_ex(3)> will return immediately with a non-fatal
+error if they are currently unable to read or write respectively.
+
+Since this page is building on the example developed on the
+L<ossl-guide-quic-client-block(7)> page we assume that you are familar with it
+and we only explain how this example differs.
+
+=head2 Performing work while waiting for the socket
+
+In a nonblocking application you will need work to perform in the event that
+we want to read or write to the B<SSL> object but we are currently unable to.
+In fact this is the whole point of using a nonblocking B<SSL> object, i.e. to
+give the application the opportunity to do something else. Whatever it is that
+the application has to do, it must also be prepared to come back and retry the
+operation that it previously attempted periodically to see if it can now
+complete. Ideally it would only do this in the event that something has changed
+such that it might succeed on the retry attempt, but this does not have to be
+the case. It can retry at any time.
+
+Note that it is important that you retry exactly the same operation that you
+tried last time. You cannot start something new. For example if you were
+attempting to write the text "Hello World" and the operation failed because the
+B<SSL> object is currently unable to write, then you cannot then attempt to
+write some other text when you retry the operation.
+
+In this demo application we will create a helper function which simulates doing
+other work. In fact, for the sake of simplicity, it will do nothing except wait
+for the state of the underlying socket to change or until a timeout expires
+after which the state of the B<SSL> object might have changed. We will call our
+function C<wait_for_activity()>.
+
+    static void wait_for_activity(SSL *ssl)
+    {
+        fd_set wfds, rfds;
+        int width, sock, isinfinite;
+        struct timeval tv;
+        struct timeval *tvp = NULL;
+
+        /* Get hold of the underlying file descriptor for the socket */
+        sock = SSL_get_fd(ssl);
+
+        FD_ZERO(&wfds);
+        FD_ZERO(&rfds);
+
+        /*
+         * Find out if we would like to write to the socket, or read from it (or
+         * both)
+         */
+        if (SSL_net_write_desired(ssl))
+            FD_SET(sock, &wfds);
+        if (SSL_net_read_desired(ssl))
+            FD_SET(sock, &rfds);
+        width = sock + 1;
+
+        /*
+         * Find out when OpenSSL would next like to be called, regardless of
+         * whether the state of the underlying socket has changed or not.
+         */
+        if (SSL_get_event_timeout(ssl, &tv, &isinfinite) && !isinfinite)
+            tvp = &tv;
+
+        /*
+         * Wait until the socket is writeable or readable. We use select here
+         * for the sake of simplicity and portability, but you could equally use
+         * poll/epoll or similar functions
+         *
+         * NOTE: For the purposes of this demonstration code this effectively
+         * makes this demo block until it has something more useful to do. In a
+         * real application you probably want to go and do other work here (e.g.
+         * update a GUI, or service other connections).
+         *
+         * Let's say for example that you want to update the progress counter on
+         * a GUI every 100ms. One way to do that would be to use the timeout in
+         * the last parameter to "select" below. If the tvp value is greater
+         * than 100ms then use 100ms instead. Then, when select returns, you
+         * check if it did so because of activity on the file descriptors or
+         * because of the timeout. If the 100ms GUI timeout has expired but the
+         * tvp timeout has not then go and update the GUI and then restart the
+         * "select" (with updated timeouts).
+         */
+
+        select(width, &rfds, &wfds, NULL, tvp);
+}
+
+If you are familiar with how to write nonblocking applications in OpenSSL for
+TLS (see L<ossl-guide-tls-client-non-block(7)>) then you should note that there
+is an important difference here between the way a QUIC application and a TLS
+application works. With a TLS application if we try to read or write something
+to the B<SSL> object and we get a "retry" response (B<SSL_ERROR_WANT_READ> or
+B<SSL_ERROR_WANT_WRITE>) then we can assume that is because OpenSSL attempted to
+read or write to the underlying socket and the socket signalled the "retry".
+With QUIC that is not the case. OpenSSL may signal retry as a result of an
+L<SSL_read_ex(3)> or L<SSL_write_ex(3)> (or similar) call which indicates the
+state of the stream. This is entirely independent of whether the underlying
+socket needs to retry or not.
+
+To determine whether OpenSSL currently wants to read or write to the underlying
+socket for a QUIC application we must call the L<SSL_net_read_desired(3)> and
+L<SSL_net_write_desired(3)> functions.
+
+It is also important with QUIC that we periodically call an I/O function (or
+otherwise call the L<SSL_handle_events(3)> function) to ensure that the QUIC
+connection remains healthy. This is particularly important with a nonblocking
+application because you are likely to leave the B<SSL> object idle for a while
+while the application goes off to do other work. The L<SSL_get_event_timeout(3)>
+function can be used to determine what the deadline is for the next time we need
+to call an I/O function (or call L<SSL_handle_events(3)>).
+
+An alternative to using L<SSL_get_event_timeout(3)> to find the next deadline
+that OpenSSL must be called again by is to use "thread assisted" mode. In
+"thread assisted" mode OpenSSL spawns an additional thread which will
+periodically call L<SSL_handle_events(3)> automatically, meaning that the
+application can leave the connection idle safe in the knowledge that the
+connection will still be maintained in a healthy state. See
+L</Creating the SSL_CTX and SSL objects> below for further details about this.
+
+In this example we are using the C<select> function to check the
+readability/writeability of the socket because it is very simple to use and is
+available on most Operating Systems. However you could use any other similar
+function to do the same thing. C<select> waits for the state of the underlying
+socket(s) to become readable/writeable or until the timeout has expired before
+returning.
+
+=head2 Handling errors from OpenSSL I/O functions
+
+A QUIC application that has been configured for nonblocking behaviour will need
+to be prepared to handle errors returned from OpenSSL I/O functions such as
+L<SSL_read_ex(3)> or L<SSL_write_ex(3)>. Errors may be fatal for the stream (for
+example because the stream has been reset or because the underlying connection
+has failed), or non-fatal (for example because we are trying to read from the
+stream but no data has not yet arrived from the peer for that stream).
+
+L<SSL_read_ex(3)> and L<SSL_write_ex(3)> will return 0 to indicate an error and
+L<SSL_read(3)> and L<SSL_write(3)> will return 0 or a negative value to indicate
+an error. L<SSL_shutdown(3)> will return a negative value to incidate an error.
+
+In the event of an error an application should call L<SSL_get_error(3)> to find
+out what type of error has occurred. If the error is non-fatal and can be
+retried then L<SSL_get_error(3)> will return B<SSL_ERROR_WANT_READ> or
+B<SSL_ERROR_WANT_WRITE> depending on whether OpenSSL wanted to read to or write
+from the stream but was unable to. Note that a call to L<SSL_read_ex(3)> or
+L<SSL_read(3)> can still generate B<SSL_ERROR_WANT_WRITE>. Similarly calls to
+L<SSL_write_ex(3)> or L<SSL_write(3)> might generate B<SSL_ERROR_WANT_READ>.
+
+Another type of non-fatal error that may occur is B<SSL_ERROR_ZERO_RETURN>. This
+indicates an EOF (End-Of-File) which can occur if you attempt to read data from
+an B<SSL> object but the peer has indicated that it will not send any more data
+on the stream. In this case you may still want to write data to the stream but
+you will not receive any more data.
+
+Fatal errors that may occur are B<SSL_ERROR_SYSCALL> and B<SSL_ERROR_SSL>. These
+indicate that the stream is no longer usable. For example, this could be because
+the stream has been reset by the peer, or because the underlying connection has
+failed. You can consult the OpenSSL error stack for further details (for example
+by calling L<ERR_print_errors(3)> to print out details of errors that have
+occurred). You can also consult the return value of
+L<SSL_get_stream_read_state(3)> to determine whether the error is local to the
+stream, or whether the underlying connection has also failed. A return value
+of B<SSL_STREAM_STATE_RESET_REMOTE> tells you that the stream has been reset by
+the peer and B<SSL_STREAM_STATE_CONN_CLOSED> tells you that the underlying
+connection has closed.
+
+In our demo application we will write a function to handle these errors from
+OpenSSL I/O functions:
+
+    static int handle_io_failure(SSL *ssl, int res)
+    {
+        switch (SSL_get_error(ssl, res)) {
+        case SSL_ERROR_WANT_READ:
+        case SSL_ERROR_WANT_WRITE:
+            /* Temporary failure. Wait until we can read/write and try again */
+            wait_for_activity(ssl);
+            return 1;
+
+        case SSL_ERROR_ZERO_RETURN:
+            /* EOF */
+            return 0;
+
+        case SSL_ERROR_SYSCALL:
+            return -1;
+
+        case SSL_ERROR_SSL:
+            /*
+             * Some stream fatal error occurred. This could be because of a
+             * stream reset - or some failure occurred on the underlying
+             * connection.
+             */
+            switch (SSL_get_stream_read_state(ssl)) {
+            case SSL_STREAM_STATE_RESET_REMOTE:
+                printf("Stream reset occurred\n");
+                /*
+                 * The stream has been reset but the connection is still
+                 * healthy.
+                 */
+                break;
+
+            case SSL_STREAM_STATE_CONN_CLOSED:
+                printf("Connection closed\n");
+                /* Connection is already closed. */
+                break;
+
+            default:
+                printf("Unknown stream failure\n");
+                break;
+            }
+            /*
+             * If the failure is due to a verification error we can get more
+             * information about it from SSL_get_verify_result().
+             */
+            if (SSL_get_verify_result(ssl) != X509_V_OK)
+                printf("Verify error: %s\n",
+                    X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
+            return -1;
+
+        default:
+            return -1;
+        }
+    }
+
+This function takes as arguments the B<SSL> object that represents the
+connection, as well as the return code from the I/O function that failed. In
+the event of a non-fatal failure, it waits until a retry of the I/O operation
+might succeed (by using the C<wait_for_activity()> function that we developed
+in the previous section). It returns 1 in the event of a non-fatal error
+(except EOF), 0 in the event of EOF, or -1 if a fatal error occurred.
+
+=head2 Creating the SSL_CTX and SSL objects
+
+In order to connect to a server we must create B<SSL_CTX> and B<SSL> objects for
+this. Most of the steps to do this are the same as for a blocking client and are
+explained on the L<ossl-guide-quic-client-block(7)> page. We won't repeat that
+information here.
+
+One key difference is that we must put the B<SSL> object into nonblocking mode
+(the default is blocking mode). To do that we use the
+L<SSL_set_blocking_mode(3)> function:
+
+    /*
+     * The underlying socket is always nonblocking with QUIC, but the default
+     * behaviour of the SSL object is still to block. We set it for nonblocking
+     * mode in this demo.
+     */
+    if (!SSL_set_blocking_mode(ssl, 0)) {
+        printf("Failed to turn off blocking mode\n");
+        goto end;
+    }
+
+Although the demo application that we are developing here does not use it, it is
+possible to use "thread assisted mode" when developing QUIC applications.
+Normally, when writing an OpenSSL QUIC application, it is important that
+L<SSL_handle_events(3)> (or alternatively any I/O function) is called on the
+connection B<SSL> object periodically to maintain the connection in a healthy
+state. See L</Performing work while waiting for the socket> for more discussion
+on this. This is particularly important to keep in mind when writing a
+nonblocking QUIC application because it is common to leave the B<SSL> connection
+object idle for some time when using nonblocking mode. By using "thread assisted
+mode" a separate thread is created by OpenSSL to do this automatically which
+means that the application developer does not need to handle this aspect. To do
+this we must use L<OSSL_QUIC_client_thread_method(3)> when we construct the
+B<SSL_CTX> as shown below:
+
+    ctx = SSL_CTX_new(OSSL_QUIC_client_thread_method());
+    if (ctx == NULL) {
+        printf("Failed to create the SSL_CTX\n");
+        goto end;
+    }
+
+=head2 Performing the handshake
+
+As in the demo for a blocking QUIC client we use the L<SSL_connect(3)> function
+to perform the handshake with the server. Since we are using a nonblocking
+B<SSL> object it is very likely that calls to this function will fail with a
+non-fatal error while we are waiting for the server to respond to our handshake
+messages. In such a case we must retry the same L<SSL_connect(3)> call at a
+later time. In this demo we do this in a loop:
+
+    /* Do the handshake with the server */
+    while ((ret = SSL_connect(ssl)) != 1) {
+        if (handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+        printf("Failed to connect to server\n");
+        goto end; /* Cannot retry: error */
+    }
+
+We continually call L<SSL_connect(3)> until it gives us a success response.
+Otherwise we use the C<handle_io_failure()> function that we created earlier to
+work out what we should do next. Note that we do not expect an EOF to occur at
+this stage, so such a response is treated in the same way as a fatal error.
+
+=head2 Sending and receiving data
+
+As with the blocking QUIC client demo we use the L<SSL_write_ex(3)> function to
+send data to the server. As with L<SSL_connect(3)> above, because we are using
+a nonblocking B<SSL> object, this call could fail with a non-fatal error. In
+that case we should retry exactly the same L<SSL_write_ex(3)> call again. Note
+that the parameters must be I<exactly> the same, i.e. the same pointer to the
+buffer to write with the same length. You must not attempt to send different
+data on a retry. An optional mode does exist
+(B<SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER>) which will configure OpenSSL to allow
+the buffer being written to change from one retry to the next. However, in this
+case, you must still retry exactly the same data - even though the buffer that
+contains that data may change location. See L<SSL_CTX_set_mode(3)> for further
+details.
+
+    /* Write an HTTP GET request to the peer */
+    while (!SSL_write_ex(ssl, request, strlen(request), &written)) {
+        if (handle_io_failure(ssl, 0) == 1)
+            continue; /* Retry */
+        printf("Failed to write HTTP request\n");
+        goto end; /* Cannot retry: error */
+    }
+
+On a write we do not expect to see an EOF response so we treat that case in the
+same way as a fatal error.
+
+Reading a response back from the server is similar:
+
+    do {
+        /*
+         * Get up to sizeof(buf) bytes of the response. We keep reading until
+         * the server closes the connection.
+         */
+        while (!eof && !SSL_read_ex(ssl, buf, sizeof(buf), &readbytes)) {
+            switch (handle_io_failure(ssl, 0)) {
+            case 1:
+                continue; /* Retry */
+            case 0:
+                eof = 1;
+                continue;
+            case -1:
+            default:
+                printf("Failed reading remaining data\n");
+                goto end; /* Cannot retry: error */
+            }
+        }
+        /*
+         * OpenSSL does not guarantee that the returned data is a string or
+         * that it is NUL terminated so we use fwrite() to write the exact
+         * number of bytes that we read. The data could be non-printable or
+         * have NUL characters in the middle of it. For this simple example
+         * we're going to print it to stdout anyway.
+         */
+        if (!eof)
+            fwrite(buf, 1, readbytes, stdout);
+    } while (!eof);
+    /* In case the response didn't finish with a newline we add one now */
+    printf("\n");
+
+The main difference this time is that it is valid for us to receive an EOF
+response when trying to read data from the server. This will occur when the
+server closes down the connection after sending all the data in its response.
+
+In this demo we just print out all the data we've received back in the response
+from the server. We continue going around the loop until we either encounter a
+fatal error, or we receive an EOF (indicating a graceful finish).
+
+=head2 Shutting down the connection
+
+As in the QUIC blocking example we must shutdown the connection when we are
+finished with it.
+
+Even though we have received EOF on the stream that we were reading from above,
+this tell us nothing about the state of the underlying connection. Our demo
+application will initiate the connection shutdown process via
+L<SSL_shutdown(3)>.
+
+Since our application is initiating the shutdown then we might expect to see
+L<SSL_shutdown(3)> give a return value of 0, and then we should continue to call
+it until we recieve a return value of 1 (meaning we have successfully completed
+the shutdown). Since we are using a nonblocking B<SSL> object we might expect to
+have to retry this operation several times. If L<SSL_shutdown(3)> returns a
+negative result then we must call L<SSL_get_error(3)> to work out what to do
+next. We use our handle_io_failure() function that we developed earlier for
+this:
+
+    /*
+     * Repeatedly call SSL_shutdown() until the connection is fully
+     * closed.
+     */
+    while ((ret = SSL_shutdown(ssl)) != 1) {
+        if (ret < 0 && handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+    }
+
+=head2 Final clean up
+
+As with the blocking QUIC client example, once our connection is finished with
+we must free it. The steps to do this for this example are the same as for the
+blocking example, so we won't repeat it here.
+
+=head1 FURTHER READING
+
+See L<ossl-guide-quic-client-block(7)> to read a tutorial on how to write a
+blocking QUIC client. See L<ossl-guide-quic-multi-stream(7)> to see how to write
+a multi-stream QUIC client.
+
+=head1 SEE ALSO
+
+L<ossl-guide-introduction(7)>, L<ossl-guide-libraries-introduction(7)>,
+L<ossl-guide-libssl-introduction(7)>, L<ossl-guide-quic-introduction(7)>,
+L<ossl-guide-quic-client-block(7)>, L<ossl-guide-quic-multi-stream(7)>
+
+=head1 COPYRIGHT
+
+Copyright 2023 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
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man7/ossl-guide-quic-multi-stream.pod b/doc/man7/ossl-guide-quic-multi-stream.pod
index 4291c30fa72ce3732c3a0889b5261badc4fe8ae2..4e4d852b035e2e4e59e659dddf0e099ec7a625a6 100644
--- a/doc/man7/ossl-guide-quic-multi-stream.pod
+++ b/doc/man7/ossl-guide-quic-multi-stream.pod
@@ -166,7 +166,10 @@ is for demonstration purposes only.
 We will build on the example code for the simple blocking QUIC client that is
 covered on the L<ossl-guide-quic-client-block(7)> page and we assume that you
 are familiar with it. We will only describe the differences between the simple
-blocking QUIC client and the multi-stream QUIC client.
+blocking QUIC client and the multi-stream QUIC client. Although the example code
+uses blocking B<SSL> objects, you can equally use nonblocking B<SSL> objects.
+See L<ossl-guide-quic-client-non-block(7)> for more information about writing a
+nonblocking QUIC client.
 
 The complete source code for this example multi-stream QUIC client is available
 in the C<demos/guide> directory of the OpenSSL source distribution in the file
diff --git a/doc/man7/ossl-guide-tls-client-block.pod b/doc/man7/ossl-guide-tls-client-block.pod
index 8f04ec6428af7e97589c8f41ad2cba11ef8e759f..865a5353b3fa3322519e324f1531099c6cbb9f4e 100644
--- a/doc/man7/ossl-guide-tls-client-block.pod
+++ b/doc/man7/ossl-guide-tls-client-block.pod
@@ -222,10 +222,12 @@ BIO object:
 
     BIO *bio;
 
-    /* Create a BIO to wrap the socket*/
+    /* Create a BIO to wrap the socket */
     bio = BIO_new(BIO_s_socket());
-    if (bio == NULL)
+    if (bio == NULL) {
         BIO_closesocket(sock);
+        return NULL;
+    }
 
     /*
      * Associate the newly created BIO with the underlying socket. By
@@ -546,13 +548,17 @@ intermediate CAs, or the issuer is simply unrecognised).
 
 =head1 FURTHER READING
 
+See L<ossl-guide-tls-client-non-block(7)> to read a tutorial on how to modify
+the client devloped on this page to support a nonblocking socket.
+
 See L<ossl-guide-quic-client-block(7)> to read a tutorial on how to modify the
 client developed on this page to support QUIC instead of TLS.
 
 =head1 SEE ALSO
 
 L<ossl-guide-introduction(7)>, L<ossl-guide-libraries-introduction(7)>,
-L<ossl-guide-libssl-introduction(7)>, L<ossl-guide-tls-introduction(7)>
+L<ossl-guide-libssl-introduction(7)>, L<ossl-guide-tls-introduction(7)>,
+L<ossl-guide-tls-client-non-block(7)>, L<ossl-guide-quic-client-block(7)>
 
 =head1 COPYRIGHT
 
diff --git a/doc/man7/ossl-guide-tls-client-non-block.pod b/doc/man7/ossl-guide-tls-client-non-block.pod
new file mode 100644
index 0000000000000000000000000000000000000000..ea5e40bd1cadb5714a22500bcb50a152574d2411
--- /dev/null
+++ b/doc/man7/ossl-guide-tls-client-non-block.pod
@@ -0,0 +1,369 @@
+=pod
+
+=begin comment
+
+NB: Changes to the source code samples in this file should also be reflected in
+demos/guide/tls-client-non-block.c
+
+=end comment
+
+=head1 NAME
+
+ossl-guide-tls-client-non-block
+- OpenSSL Guide: Writing a simple nonblocking TLS client
+
+=head1 SIMPLE NONBLOCKING TLS CLIENT EXAMPLE
+
+This page will build on the example developed on the
+L<ossl-guide-tls-client-block(7)> page which demonstrates how to write a simple
+blocking TLS client. On this page we will amend that demo code so that it
+supports a nonblocking socket.
+
+The complete source code for this example nonblocking TLS client is available
+in the B<demos/guide> directory of the OpenSSL source distribution in the file
+B<tls-client-non-block.c>. It is also available online at
+L<https://github.com/openssl/openssl/blob/master/demos/guide/tls-client-non-block.c>.
+
+As we saw in the previous example a blocking socket is one which waits (blocks)
+until data is available to read if you attempt to read from it when there is no
+data yet. Similarly it waits when writing if the socket is currently unable to
+write at the moment. This can simplify the development of code because you do
+not have to worry about what to do in these cases. The execution of the code
+will simply stop until it is able to continue. However in many cases you do not
+want this behaviour. Rather than stopping and waiting your application may need
+to go and do other tasks whilst the socket is unable to read/write, for example
+updating a GUI or performing operations on some other socket.
+
+With a nonblocking socket attempting to read or write to a socket that is
+currently unable to read or write will return immediately with a non-fatal
+error. Although OpenSSL does the reading/writing to the socket this nonblocking
+behaviour is propagated up to the application so that OpenSSL I/O functions such
+as L<SSL_read_ex(3)> or L<SSL_write_ex(3)> will not block.
+
+Since this page is building on the example developed on the
+L<ossl-guide-tls-client-block(7)> page we assume that you are familar with it
+and we only explain how this example differs.
+
+=head2 Setting the socket to be nonblocking
+
+The first step in writing an application that supports nonblocking is to set
+the socket into nonblocking mode. A socket will be default be blocking. The
+exact details on how to do this can differ from one platform to another.
+Fortunately OpenSSL offers a portable function that will do this for you:
+
+    /* Set to nonblocking mode */
+    if (!BIO_socket_nbio(sock, 1)) {
+        sock = -1;
+        continue;
+    }
+
+You do not have to use OpenSSL's function for this. You can of course directly
+call whatever functions that your Operating System provides for this purpose on
+your platform.
+
+=head2 Performing work while waiting for the socket
+
+In a nonblocking application you will need work to perform in the event that
+we want to read or write to the socket, but we are currently unable to. In fact
+this is the whole point of using a nonblocking socket, i.e. to give the
+application the opportunity to do something else. Whatever it is that the
+application has to do, it must also be prepared to come back and retry the
+operation that it previously attempted periodically to see if it can now
+complete. Ideally it would only do this in the event that the state of the
+underlying socket has actually changed (e.g. become readable where it wasn't
+before), but this does not have to be the case. It can retry at any time.
+
+Note that it is important that you retry exactly the same operation that you
+tried last time. You cannot start something new. For example if you were
+attempting to write the text "Hello World" and the operation failed because the
+socket is currently unable to write, then you cannot then attempt to write
+some other text when you retry the operation.
+
+In this demo application we will create a helper function which simulates doing
+other work. In fact, for the sake of simplicity, it will do nothing except wait
+for the state of the socket to change.
+
+We call our function C<wait_for_activity()> because all it does is wait until
+the underlying socket has become readable or writeable when it wasn't before.
+
+    static void wait_for_activity(SSL *ssl, int write)
+    {
+        fd_set fds;
+        int width, sock;
+
+        /* Get hold of the underlying file descriptor for the socket */
+        sock = SSL_get_fd(ssl);
+
+        FD_ZERO(&fds);
+        FD_SET(sock, &fds);
+        width = sock + 1;
+
+        /*
+         * Wait until the socket is writeable or readable. We use select here
+         * for the sake of simplicity and portability, but you could equally use
+         * poll/epoll or similar functions
+         *
+         * NOTE: For the purposes of this demonstration code this effectively
+         * makes this demo block until it has something more useful to do. In a
+         * real application you probably want to go and do other work here (e.g.
+         * update a GUI, or service other connections).
+         *
+         * Let's say for example that you want to update the progress counter on
+         * a GUI every 100ms. One way to do that would be to add a 100ms timeout
+         * in the last parameter to "select" below. Then, when select returns,
+         * you check if it did so because of activity on the file descriptors or
+         * because of the timeout. If it is due to the timeout then update the
+         * GUI and then restart the "select".
+         */
+        if (write)
+            select(width, NULL, &fds, NULL, NULL);
+        else
+            select(width, &fds, NULL, NULL, NULL);
+    }
+
+In this example we are using the C<select> function because it is very simple
+to use and is available on most Operating Systems. However you could use any
+other similar function to do the same thing. C<select> waits for the state of
+the underlying socket(s) to become readable/writeable before returning. It also
+supports a "timeout" (as do most other similar functions) so in your own
+applications you can make use of this to periodically wake up and perform work
+while waiting for the socket state to change. But we don't use that timeout
+capability in this example for the sake of simplicity.
+
+=head2 Handling errors from OpenSSL I/O functions
+
+An application that uses a nonblocking socket will need to be prepared to
+handle errors returned from OpenSSL I/O functions such as L<SSL_read_ex(3)> or
+L<SSL_write_ex(3)>. Errors may be fatal (for example because the underlying
+connection has failed), or non-fatal (for example because we are trying to read
+from the underlying socket but the data has not yet arrived from the peer).
+
+L<SSL_read_ex(3)> and L<SSL_write_ex(3)> will return 0 to indicate an error and
+L<SSL_read(3)> and L<SSL_write(3)> will return 0 or a negative value to indicate
+an error. L<SSL_shutdown(3)> will return a negative value to incidate an error.
+
+In the event of an error an application should call L<SSL_get_error(3)> to find
+out what type of error has occurred. If the error is non-fatal and can be
+retried then L<SSL_get_error(3)> will return B<SSL_ERROR_WANT_READ> or
+B<SSL_ERROR_WANT_WRITE> depending on whether OpenSSL wanted to read to or write
+from the socket but was unable to. Note that a call to L<SSL_read_ex(3)> or
+L<SSL_read(3)> can still generate B<SSL_ERROR_WANT_WRITE> because OpenSSL
+may need to write protocol messages (such as to update cryptographic keys) even
+if the application is only trying to read data. Similarly calls to
+L<SSL_write_ex(3)> or L<SSL_write(3)> might generate B<SSL_ERROR_WANT_READ>.
+
+Another type of non-fatal error that may occur is B<SSL_ERROR_ZERO_RETURN>. This
+indicates an EOF (End-Of-File) which can occur if you attempt to read data from
+an B<SSL> object but the peer has indicated that it will not send any more data
+on it. In this case you may still want to write data to the connection but you
+will not receive any more data.
+
+Fatal errors that may occur are B<SSL_ERROR_SYSCALL> and B<SSL_ERROR_SSL>. These
+indicate that the underlying connection has failed. You should not attempt to
+shut it down with L<SSL_shutdown(3)>. B<SSL_ERROR_SYSCALL> indicates that
+OpenSSL attempted to make a syscall that failed. You can consult B<errno> for
+further details. B<SSL_ERROR_SSL> indicates that some OpenSSL error occured. You
+can consult the OpenSSL error stack for further details (for example by calling
+L<ERR_print_errors(3)> to print out details of errors that have occurred).
+
+In our demo application we will write a function to handle these errors from
+OpenSSL I/O functions:
+
+    static int handle_io_failure(SSL *ssl, int res)
+    {
+        switch (SSL_get_error(ssl, res)) {
+        case SSL_ERROR_WANT_READ:
+            /* Temporary failure. Wait until we can read and try again */
+            wait_for_activity(ssl, 0);
+            return 1;
+
+        case SSL_ERROR_WANT_WRITE:
+            /* Temporary failure. Wait until we can write and try again */
+            wait_for_activity(ssl, 1);
+            return 1;
+
+        case SSL_ERROR_ZERO_RETURN:
+            /* EOF */
+            return 0;
+
+        case SSL_ERROR_SYSCALL:
+            return -1;
+
+        case SSL_ERROR_SSL:
+            /*
+            * If the failure is due to a verification error we can get more
+            * information about it from SSL_get_verify_result().
+            */
+            if (SSL_get_verify_result(ssl) != X509_V_OK)
+                printf("Verify error: %s\n",
+                    X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
+            return -1;
+
+        default:
+            return -1;
+        }
+    }
+
+This function takes as arguments the B<SSL> object that represents the
+connection, as well as the return code from the I/O function that failed. In
+the event of a non-fatal failure, it waits until a retry of the I/O operation
+might succeed (by using the C<wait_for_activity()> function that we developed
+in the previous section). It returns 1 in the event of a non-fatal error
+(except EOF), 0 in the event of EOF, or -1 if a fatal error occurred.
+
+=head2 Creating the SSL_CTX and SSL objects
+
+In order to connect to a server we must create B<SSL_CTX> and B<SSL> objects for
+this. The steps do this are the same as for a blocking client and are explained
+on the L<ossl-guide-tls-client-block(7)> page. We won't repeat that information
+here.
+
+=head2 Performing the handshake
+
+As in the demo for a blocking TLS client we use the L<SSL_connect(3)> function
+to perform the TLS handshake with the server. Since we are using a nonblocking
+socket it is very likely that calls to this function will fail with a non-fatal
+error while we are waiting for the server to respond to our handshake messages.
+In such a case we must retry the same L<SSL_connect(3)> call at a later time.
+In this demo we this in a loop:
+
+    /* Do the handshake with the server */
+    while ((ret = SSL_connect(ssl)) != 1) {
+        if (handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+        printf("Failed to connect to server\n");
+        goto end; /* Cannot retry: error */
+    }
+
+We continually call L<SSL_connect(3)> until it gives us a success response.
+Otherwise we use the C<handle_io_failure()> function that we created earlier to
+work out what we should do next. Note that we do not expect an EOF to occur at
+this stage, so such a response is treated in the same way as a fatal error.
+
+=head2 Sending and receiving data
+
+As with the blocking TLS client demo we use the L<SSL_write_ex(3)> function to
+send data to the server. As with L<SSL_connect(3)> above, because we are using
+a nonblocking socket, this call could fail with a non-fatal error. In that case
+we should retry exactly the same L<SSL_write_ex(3)> call again. Note that the
+parameters must be I<exactly> the same, i.e. the same pointer to the buffer to
+write with the same length. You must not attempt to send different data on a
+retry. An optional mode does exist (B<SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER>)
+which will configure OpenSSL to allow the buffer being written to change from
+one retry to the next. However, in this case, you must still retry exactly the
+same data - even though the buffer that contains that data may change location.
+See L<SSL_CTX_set_mode(3)> for further details.
+
+    /* Write an HTTP GET request to the peer */
+    while (!SSL_write_ex(ssl, request, strlen(request), &written)) {
+        if (handle_io_failure(ssl, 0) == 1)
+            continue; /* Retry */
+        printf("Failed to write HTTP request\n");
+        goto end; /* Cannot retry: error */
+    }
+
+On a write we do not expect to see an EOF response so we treat that case in the
+same way as a fatal error.
+
+Reading a response back from the server is similar:
+
+    do {
+        /*
+         * Get up to sizeof(buf) bytes of the response. We keep reading until
+         * the server closes the connection.
+         */
+        while (!eof && !SSL_read_ex(ssl, buf, sizeof(buf), &readbytes)) {
+            switch (handle_io_failure(ssl, 0)) {
+            case 1:
+                continue; /* Retry */
+            case 0:
+                eof = 1;
+                continue;
+            case -1:
+            default:
+                printf("Failed reading remaining data\n");
+                goto end; /* Cannot retry: error */
+            }
+        }
+        /*
+         * OpenSSL does not guarantee that the returned data is a string or
+         * that it is NUL terminated so we use fwrite() to write the exact
+         * number of bytes that we read. The data could be non-printable or
+         * have NUL characters in the middle of it. For this simple example
+         * we're going to print it to stdout anyway.
+         */
+        if (!eof)
+            fwrite(buf, 1, readbytes, stdout);
+    } while (!eof);
+    /* In case the response didn't finish with a newline we add one now */
+    printf("\n");
+
+The main difference this time is that it is valid for us to receive an EOF
+response when trying to read data from the server. This will occur when the
+server closes down the connection after sending all the data in its response.
+
+In this demo we just print out all the data we've received back in the response
+from the server. We continue going around the loop until we either encounter a
+fatal error, or we receive an EOF (indicating a graceful finish).
+
+=head2 Shutting down the connection
+
+As in the TLS blocking example we must shutdown the connection when we are
+finished with it.
+
+If our application was initiating the shutdown then we would expect to see
+L<SSL_shutdown(3)> give a return value of 0, and then we would continue to call
+it until we recieved a return value of 1 (meaning we have successfully completed
+the shutdown). In this particular example we don't expect SSL_shutdown() to
+return 0 because we have already received EOF from the server indicating that it
+has shutdown already. So we just keep calling it until SSL_shutdown() returns 1.
+Since we are using a nonblocking socket we might expect to have to retry this
+operation several times. If L<SSL_shutdown(3)> returns a negative result then we
+must call L<SSL_get_error(3)> to work out what to do next. We use our
+handle_io_failure() function that we developed earlier for this:
+
+    /*
+     * The peer already shutdown gracefully (we know this because of the
+     * SSL_ERROR_ZERO_RETURN (i.e. EOF) above). We should do the same back.
+     */
+    while ((ret = SSL_shutdown(ssl)) != 1) {
+        if (ret < 0 && handle_io_failure(ssl, ret) == 1)
+            continue; /* Retry */
+        /*
+         * ret == 0 is unexpected here because that means "we've sent a
+         * close_notify and we're waiting for one back". But we already know
+         * we got one from the peer because of the SSL_ERROR_ZERO_RETURN
+         * (i.e. EOF) above.
+         */
+        printf("Error shutting down\n");
+        goto end; /* Cannot retry: error */
+    }
+
+=head2 Final clean up
+
+As with the blocking TLS client example, once our connection is finished with we
+must free it. The steps to do this for this example are the same as for the
+blocking example, so we won't repeat it here.
+
+=head1 FURTHER READING
+
+See L<ossl-guide-tls-client-block(7)> to read a tutorial on how to write a
+blocking TLS client. See L<ossl-guide-quic-client-block(7)> to see how to do the
+same thing for a QUIC client.
+
+=head1 SEE ALSO
+
+L<ossl-guide-introduction(7)>, L<ossl-guide-libraries-introduction(7)>,
+L<ossl-guide-libssl-introduction(7)>, L<ossl-guide-tls-introduction(7)>,
+L<ossl-guide-tls-client-block(7)>, L<ossl-guide-quic-client-block(7)>
+
+=head1 COPYRIGHT
+
+Copyright 2023 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
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man7/property.pod b/doc/man7/property.pod
index bc57a6764814077aabd841823579527a45497880..eb0f6b176ccb9ab0f7845f10e85cea2ba44f362b 100644
--- a/doc/man7/property.pod
+++ b/doc/man7/property.pod
@@ -167,7 +167,7 @@ Properties were added in OpenSSL 3.0
 
 =head1 COPYRIGHT
 
-Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/provider-asym_cipher.pod b/doc/man7/provider-asym_cipher.pod
index 137bc21d9278bf40fc0ab486b1f339a752b757f2..e3f11d8543997e3485af73e4132342d9f1220949 100644
--- a/doc/man7/provider-asym_cipher.pod
+++ b/doc/man7/provider-asym_cipher.pod
@@ -267,7 +267,7 @@ The provider ASYM_CIPHER interface was introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/provider-base.pod b/doc/man7/provider-base.pod
index c015b549671233b5750fb53947fcb0c2d10f459c..33d7fe7f55140aaa77905e809da714071cacc9c5 100644
--- a/doc/man7/provider-base.pod
+++ b/doc/man7/provider-base.pod
@@ -935,7 +935,7 @@ introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/provider-cipher.pod b/doc/man7/provider-cipher.pod
index cb79c18b9f72aa156b76f5fd999f62f8eff02fb3..14ff581c72c492f47f3a49fca951eb6b34cd5379 100644
--- a/doc/man7/provider-cipher.pod
+++ b/doc/man7/provider-cipher.pod
@@ -237,7 +237,7 @@ The provider CIPHER interface was introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/provider-decoder.pod b/doc/man7/provider-decoder.pod
index bde8c7038b0a7226c4661dd0ebeb32c7f18017ad..e968e661f7cf735f56b09edca2f94ac574d58209 100644
--- a/doc/man7/provider-decoder.pod
+++ b/doc/man7/provider-decoder.pod
@@ -302,7 +302,7 @@ The DECODER interface was introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/provider-digest.pod b/doc/man7/provider-digest.pod
index 62307c8a5fdea20b083c7a0d04cbd4aa99bde84c..2c99b8b3fb24352ba8b7781b624ff884acc6bd02 100644
--- a/doc/man7/provider-digest.pod
+++ b/doc/man7/provider-digest.pod
@@ -277,7 +277,7 @@ The provider DIGEST interface was introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/provider-kem.pod b/doc/man7/provider-kem.pod
index fbbf5a5feee9c9e44f36b5c4ce43128919cdcb01..970105a269a5785daa2d538cf5e89fcd3968c9b3 100644
--- a/doc/man7/provider-kem.pod
+++ b/doc/man7/provider-kem.pod
@@ -223,7 +223,7 @@ were added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2023 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
diff --git a/doc/man7/provider-keymgmt.pod b/doc/man7/provider-keymgmt.pod
index 0f692f6f62c172fe26d0d9e6bcf5700d28cf5443..d5c628a93d18e601e47f9fa934c326f1e860fae4 100644
--- a/doc/man7/provider-keymgmt.pod
+++ b/doc/man7/provider-keymgmt.pod
@@ -462,7 +462,7 @@ were added with OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/doc/man7/provider-signature.pod b/doc/man7/provider-signature.pod
index fc0b2ed7ee169b3f7746339ce1abac17d7f17197..3e900677d319f394cc1218834046c44b3c73aa17 100644
--- a/doc/man7/provider-signature.pod
+++ b/doc/man7/provider-signature.pod
@@ -438,7 +438,7 @@ The provider SIGNATURE interface was introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2023 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
diff --git a/engines/asm/e_padlock-x86.pl b/engines/asm/e_padlock-x86.pl
index bb2b14468982cbb989326458231c8b6703a8b349..3e9a22fca4bf09e8074e4374fe4e4e5d0bfe2279 100644
--- a/engines/asm/e_padlock-x86.pl
+++ b/engines/asm/e_padlock-x86.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2011-2023 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
diff --git a/engines/asm/e_padlock-x86_64.pl b/engines/asm/e_padlock-x86_64.pl
index 2622e272db287b00337554fb26ab3c84efe8af52..b147868851d52c520cb338a3fca3a443dca2570c 100644
--- a/engines/asm/e_padlock-x86_64.pl
+++ b/engines/asm/e_padlock-x86_64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2011-2023 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
diff --git a/engines/e_capi.txt b/engines/e_capi.txt
index dab3471be46ce005a91cc27e5c17a1604ee3bd2f..58f4a15962311004c0c0d90561ae5f0475cad24c 100644
--- a/engines/e_capi.txt
+++ b/engines/e_capi.txt
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2023 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
diff --git a/engines/e_capi_err.c b/engines/e_capi_err.c
index bf4648523490c5be9b6a9a5cf4046fe0e0079a35..2588c15304468d50f2de58957497f21fa274a453 100644
--- a/engines/e_capi_err.c
+++ b/engines/e_capi_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 9781085587a0d1e99f2b82dc477595a866786b8e..63b13d3d45035c0818593ddf9bd3f075d6a1f35c 100644
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
@@ -519,7 +519,7 @@ static void dummy_pause_job(void) {
     ASYNC_JOB *job;
     ASYNC_WAIT_CTX *waitctx;
     ASYNC_callback_fn callback;
-    void * callback_arg;
+    void *callback_arg;
     OSSL_ASYNC_FD pipefds[2] = {0, 0};
     OSSL_ASYNC_FD *writefd;
 #if defined(ASYNC_WIN)
diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index 92c8f0e3568fdd98d57db28c042912023d207056..3a4082d22bb53d379769a2b60601f66a63520b1e 100644
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c
index f87bd921d0177c5ee4d89a229756f92944b3145f..84dff6e2c305a468eecab259095932f498dcf3ac 100644
--- a/engines/e_loader_attic.c
+++ b/engines/e_loader_attic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index 989e53df31bbb8634451a23dbecea38c44bb62ee..7e0cfc21fc9b89329d14292133f338975ad323a8 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/fuzz/corpora b/fuzz/corpora
index 084348da0956ea0451a3aaf9a6f9f024db0cc00d..7bdc71fa62c88173b8f818dd1646ac59b0eadebe 160000
--- a/fuzz/corpora
+++ b/fuzz/corpora
@@ -1 +1 @@
-Subproject commit 084348da0956ea0451a3aaf9a6f9f024db0cc00d
+Subproject commit 7bdc71fa62c88173b8f818dd1646ac59b0eadebe
diff --git a/fuzz/fuzz_rand.c b/fuzz/fuzz_rand.c
index af9df7b22d31a976be6064ba82f09e15d3629873..d3351147ec8cd05b924c6f77dcf0b1c4d78dbf55 100644
--- a/fuzz/fuzz_rand.c
+++ b/fuzz/fuzz_rand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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.
diff --git a/fuzz/pem.c b/fuzz/pem.c
index 4b2cf701e711ab1c34b4c6fbe82a176091f14867..cc2969f6bedb85493654ef89c7981a316f589def 100644
--- a/fuzz/pem.c
+++ b/fuzz/pem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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.
diff --git a/fuzz/x509.c b/fuzz/x509.c
index 6293f1a5c547a55f2ef05b2cfcea326d8cbe4ef4..e2d2639164c01d0eda79d74329b078abfd80b0ca 100644
--- a/fuzz/x509.c
+++ b/fuzz/x509.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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.
diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h
index 17cd9e3238345724fbbbd501584138a665bc7384..cbc035926e036268397f1464a987afd3cb9fe031 100644
--- a/include/crypto/aes_platform.h
+++ b/include/crypto/aes_platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -121,29 +121,29 @@ void gcm_ghash_p8(u64 Xi[2],const u128 Htable[16],const u8 *inp, size_t len);
                                 (gctx)->gcm.funcs.ghash==gcm_ghash_v8)
 /* The [unroll8_eor3_]aes_gcm_(enc|dec)_(128|192|256)_kernel() functions
  * take input length in BITS and return number of BYTES processed */
-size_t aes_gcm_enc_128_kernel(const uint8_t * plaintext, uint64_t plaintext_length, uint8_t * ciphertext,
+size_t aes_gcm_enc_128_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t aes_gcm_enc_192_kernel(const uint8_t * plaintext, uint64_t plaintext_length, uint8_t * ciphertext,
+size_t aes_gcm_enc_192_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t aes_gcm_enc_256_kernel(const uint8_t * plaintext, uint64_t plaintext_length, uint8_t * ciphertext,
+size_t aes_gcm_enc_256_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t aes_gcm_dec_128_kernel(const uint8_t * ciphertext, uint64_t plaintext_length, uint8_t * plaintext,
+size_t aes_gcm_dec_128_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t aes_gcm_dec_192_kernel(const uint8_t * ciphertext, uint64_t plaintext_length, uint8_t * plaintext,
+size_t aes_gcm_dec_192_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t aes_gcm_dec_256_kernel(const uint8_t * ciphertext, uint64_t plaintext_length, uint8_t * plaintext,
+size_t aes_gcm_dec_256_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t unroll8_eor3_aes_gcm_enc_128_kernel(const uint8_t * plaintext, uint64_t plaintext_length, uint8_t * ciphertext,
+size_t unroll8_eor3_aes_gcm_enc_128_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t unroll8_eor3_aes_gcm_enc_192_kernel(const uint8_t * plaintext, uint64_t plaintext_length, uint8_t * ciphertext,
+size_t unroll8_eor3_aes_gcm_enc_192_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t unroll8_eor3_aes_gcm_enc_256_kernel(const uint8_t * plaintext, uint64_t plaintext_length, uint8_t * ciphertext,
+size_t unroll8_eor3_aes_gcm_enc_256_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t unroll8_eor3_aes_gcm_dec_128_kernel(const uint8_t * ciphertext, uint64_t plaintext_length, uint8_t * plaintext,
+size_t unroll8_eor3_aes_gcm_dec_128_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t unroll8_eor3_aes_gcm_dec_192_kernel(const uint8_t * ciphertext, uint64_t plaintext_length, uint8_t * plaintext,
+size_t unroll8_eor3_aes_gcm_dec_192_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
-size_t unroll8_eor3_aes_gcm_dec_256_kernel(const uint8_t * ciphertext, uint64_t plaintext_length, uint8_t * plaintext,
+size_t unroll8_eor3_aes_gcm_dec_256_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
                               uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t armv8_aes_gcm_encrypt(const unsigned char *in, unsigned char *out, size_t len, const void *key,
                              unsigned char ivec[16], u64 *Xi);
diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h
index 7636510c12d85b8c8383e2c6e20131f48d320d04..180238526b92d7827618193a266c86aabdca6d08 100644
--- a/include/crypto/asn1.h
+++ b/include/crypto/asn1.h
@@ -142,9 +142,9 @@ X509_ALGOR *ossl_x509_algor_mgf1_decode(X509_ALGOR *alg);
 int ossl_x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md);
 int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags);
 
-EVP_PKEY * ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a,
-                                      const unsigned char **pp, long length,
-                                      OSSL_LIB_CTX *libctx, const char *propq);
+EVP_PKEY *ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a,
+                                     const unsigned char **pp, long length,
+                                     OSSL_LIB_CTX *libctx, const char *propq);
 X509_ALGOR *ossl_X509_ALGOR_from_nid(int nid, int ptype, void *pval);
 
 time_t ossl_asn1_string_to_time_t(const char *asn1_string);
diff --git a/include/crypto/bn.h b/include/crypto/bn.h
index 58271179fa86669e349868dd85335367f55a5dd9..33f979ce91767f487144717ced5cfed829ddd0b4 100644
--- a/include/crypto/bn.h
+++ b/include/crypto/bn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2023 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
diff --git a/include/crypto/decoder.h b/include/crypto/decoder.h
index b7b91209df1f61573273478dfb7ee42ca824ca2c..a0d5de65211eb7b0b9ed4decd056507ef0368718 100644
--- a/include/crypto/decoder.h
+++ b/include/crypto/decoder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/include/crypto/ecx.h b/include/crypto/ecx.h
index 5f100ef16c14cb78ab1aa4cbcfb88be1e8946c6b..f35b875fb64f42e3b40bbab159c37c93ec0a1879 100644
--- a/include/crypto/ecx.h
+++ b/include/crypto/ecx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/include/crypto/evp.h b/include/crypto/evp.h
index 9605c9daa53fffcaa0a337939bfabc03d36df290..473b95514a0ada8d307236f81f2b25051962be1d 100644
--- a/include/crypto/evp.h
+++ b/include/crypto/evp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/include/crypto/punycode.h b/include/crypto/punycode.h
index 554819a2809e09267908c9b896fed55bde06b802..2e1c85c1f74faae146531397952fdf1c6412b693 100644
--- a/include/crypto/punycode.h
+++ b/include/crypto/punycode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/crypto/riscv_arch.h b/include/crypto/riscv_arch.h
index 0e0f946ddcc4ff7f05c410c7d170a5e1dbdf75ea..95185841115e820c11ba4248614810c90a6fb665 100644
--- a/include/crypto/riscv_arch.h
+++ b/include/crypto/riscv_arch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/crypto/rsa.h b/include/crypto/rsa.h
index c9f9f84cea80bec3ffb3de29e841b711439de64d..8eddc168f6d684180b8fa33b090736c42933b80a 100644
--- a/include/crypto/rsa.h
+++ b/include/crypto/rsa.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/crypto/sha.h b/include/crypto/sha.h
index 3f32e96086fc2d2bfa812dbf0d1054a1b547c428..99bcf0ff88355a93e5c26b88d8a9ba60b089a599 100644
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2018, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h
index a37dc5f6d37ba0a12ab3d44dd1fbb6781077d7bc..8a26885097b38a3f363ff19de1d3ebf4f1ae9155 100644
--- a/include/crypto/sm4_platform.h
+++ b/include/crypto/sm4_platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/crypto/types.h b/include/crypto/types.h
index 0a75f03a3f93308088fa87b11fc7f3d65d0dbd81..ad17f052e45f5047ad498fa1c55538ee33bc93c4 100644
--- a/include/crypto/types.h
+++ b/include/crypto/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/include/internal/bio_tfo.h b/include/internal/bio_tfo.h
index fc907e6c2ceca533c354b8dd1de02d7e5810342f..64c0d4c327243de9b762f842a4438e09777ddf58 100644
--- a/include/internal/bio_tfo.h
+++ b/include/internal/bio_tfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
@@ -54,7 +54,7 @@
  * Some options are purposely NOT defined per-platform
  *
  * OSSL_TFO_SYSCTL
- *     Defined as a sysctlbyname() option to to determine if
+ *     Defined as a sysctlbyname() option to determine if
  *     TFO is enabled in the kernel (macOS, FreeBSD)
  *
  * OSSL_TFO_SERVER_SOCKOPT
@@ -86,7 +86,7 @@
 /*
  * NO WINDOWS SUPPORT
  *
- * But this is is what would be used on the server:
+ * But this is what would be used on the server:
  *
  * define OSSL_TFO_SERVER_SOCKOPT       TCP_FASTOPEN
  * define OSSL_TFO_SERVER_SOCKOPT_VALUE 1
diff --git a/include/internal/common.h b/include/internal/common.h
index ce4a4e3086021cf98c09d11cda219214df43512b..15666f11108c8c92eda92604ea33f6e21446a572 100644
--- a/include/internal/common.h
+++ b/include/internal/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index fd2eb5d56c7392ae5fc290328c5c7d9705d2ddd6..843a720b8f149b2eab9cbc4d78027366039e7efb 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/internal/e_os.h b/include/internal/e_os.h
index df5d0b058406ddd304c177389401c7a876e6c32f..d0e903f653ed62044863a84cfc586131d84bc612 100644
--- a/include/internal/e_os.h
+++ b/include/internal/e_os.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -152,7 +152,7 @@ static __inline unsigned int _strlen31(const char *str)
 #     undef stdin
 #     undef stdout
 #     undef stderr
-FILE *__iob_func();
+FILE *__iob_func(void);
 #     define stdin  (&__iob_func()[0])
 #     define stdout (&__iob_func()[1])
 #     define stderr (&__iob_func()[2])
@@ -304,12 +304,12 @@ struct servent *getservbyname(const char *name, const char *proto);
 #  define gethostbyname(name)                gethostbyname((char*)name)
 #  define ioctlsocket(a,b,c)	ioctl(a,b,c)
 #  ifdef NO_GETPID
-inline int nssgetpid();
+inline int nssgetpid(void);
 #   ifndef NSSGETPID_MACRO
 #    define NSSGETPID_MACRO
 #    include <cextdecs.h(PROCESSHANDLE_GETMINE_)>
 #    include <cextdecs.h(PROCESSHANDLE_DECOMPOSE_)>
-       inline int nssgetpid()
+       inline int nssgetpid(void)
        {
          short phandle[10]={0};
          union pseudo_pid {
diff --git a/include/internal/endian.h b/include/internal/endian.h
index eb43eade17a27bebed6852091cf7fe27a28c196c..7d5a73b1bb1fa6d0c096b7605bd368b9d03d48ee 100644
--- a/include/internal/endian.h
+++ b/include/internal/endian.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/internal/event_queue.h b/include/internal/event_queue.h
index 7027378307e09fab3cb7931e1ce647d96d5b66a2..bda1ee6ad46d9048554550ee91e08de55423c29b 100644
--- a/include/internal/event_queue.h
+++ b/include/internal/event_queue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/ffc.h b/include/internal/ffc.h
index 3a6d9f67bb423f0233a046bd979540ac0e3f2562..01b8a4f9d30a69119a3f5569e4c64b3977b1c4d2 100644
--- a/include/internal/ffc.h
+++ b/include/internal/ffc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/internal/numbers.h b/include/internal/numbers.h
index 4f4d3306d5da80dfb21ef4e9b5fb2fc9598b4bec..47fb167709f52ca043b3e9bf2fb8ad199312e10f 100644
--- a/include/internal/numbers.h
+++ b/include/internal/numbers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
@@ -61,6 +61,31 @@
 #  define UINT64_MAX __MAXUINT__(uint64_t)
 # endif
 
+/*
+ * 64-bit processor with LP64 ABI
+ */
+# ifdef SIXTY_FOUR_BIT_LONG
+#  ifndef UINT32_C
+#   define UINT32_C(c) (c)
+#  endif
+#  ifndef UINT64_C
+#   define UINT64_C(c) (c##UL)
+#  endif
+# endif
+
+/*
+ * 64-bit processor other than LP64 ABI
+ */
+# ifdef SIXTY_FOUR_BIT
+#  ifndef UINT32_C
+#   define UINT32_C(c) (c##UL)
+#  endif
+#  ifndef UINT64_C
+#   define UINT64_C(c) (c##ULL)
+#  endif
+# endif
+
+
 # ifndef INT128_MAX
 #  if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16
 typedef __int128_t int128_t;
diff --git a/include/internal/packet.h b/include/internal/packet.h
index e35281d700e05156d9f72254ceeb8040105132bc..7abc6b8b1bc971f011c4f772518bfc77d5386bf6 100644
--- a/include/internal/packet.h
+++ b/include/internal/packet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/include/internal/packet_quic.h b/include/internal/packet_quic.h
index e75b81e4222817af36df6b0c3804c80f3339f445..5173b4675d8df02a7d14c01be13a39136f8b1603 100644
--- a/include/internal/packet_quic.h
+++ b/include/internal/packet_quic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/provider.h b/include/internal/provider.h
index 88a16062c77e4b1fc74c262f2ade5ec49a124886..ab41d643df0612f85a76f796883fb537be7eb3f2 100644
--- a/include/internal/provider.h
+++ b/include/internal/provider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/internal/quic_ackm.h b/include/internal/quic_ackm.h
index 96673303bd2bb244c9b0cb8c5116cad4018f7387..03fc6088678454f66303ce3ace1cf0cb2a1569b6 100644
--- a/include/internal/quic_ackm.h
+++ b/include/internal/quic_ackm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
@@ -225,7 +225,7 @@ int ossl_ackm_is_ack_desired(OSSL_ACKM *ackm, int pkt_space);
  * the RFC.
  *
  * The return value of this function transitions from 1 to 0 for a given PN once
- * that PN is passed to ossl_ackm_on_rx_packet, thus thus function must be used
+ * that PN is passed to ossl_ackm_on_rx_packet, thus this function must be used
  * before calling ossl_ackm_on_rx_packet.
  */
 int ossl_ackm_is_rx_pn_processable(OSSL_ACKM *ackm, QUIC_PN pn, int pkt_space);
diff --git a/include/internal/quic_cc.h b/include/internal/quic_cc.h
index d3b74e8cbdde92f65afc28a7291b9f7ee9d9d210..60c710b0bdaae2ee449ecb862140ebbed890dbf1 100644
--- a/include/internal/quic_cc.h
+++ b/include/internal/quic_cc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_cfq.h b/include/internal/quic_cfq.h
index 2256f2f0a3e636290c5c7d970c3c75cca10e3cb4..22c436dc0746a2739928d500243946fa7e71645a 100644
--- a/include/internal/quic_cfq.h
+++ b/include/internal/quic_cfq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h
index 1624870865c74fb2b7a685f044170490b722558b..0841001c23da97aed31a512c09132e3d05aa5e6a 100644
--- a/include/internal/quic_channel.h
+++ b/include/internal/quic_channel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_demux.h b/include/internal/quic_demux.h
index 81077425fe02d8693fa82854ad884d96376ba53f..444249e728881df336be539403548024bc1f5203 100644
--- a/include/internal/quic_demux.h
+++ b/include/internal/quic_demux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_error.h b/include/internal/quic_error.h
index 4c68350f4954d32c5a0e78cd1f98664b56ba95e1..ae195a5f88e01633b8afd7b88150860a5083423e 100644
--- a/include/internal/quic_error.h
+++ b/include/internal/quic_error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_fc.h b/include/internal/quic_fc.h
index 06a7cc1db0d8d034909a1bc6c94bb61eab65c13c..7a8273d54288f03215e2e51596a1d7aa668a76e1 100644
--- a/include/internal/quic_fc.h
+++ b/include/internal/quic_fc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_fifd.h b/include/internal/quic_fifd.h
index b395865f2ebd65cd08b28bd7aee3cfc45b559126..a260ec4471d14476f6bb6f5c4bd839af4cb995ff 100644
--- a/include/internal/quic_fifd.h
+++ b/include/internal/quic_fifd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_reactor.h b/include/internal/quic_reactor.h
index 2ca32f17ac4392ef10afd218dc0f3df3ea0d9279..57bb551e27a222871758e09ebba4d2e74bd142e2 100644
--- a/include/internal/quic_reactor.h
+++ b/include/internal/quic_reactor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_record_rx.h b/include/internal/quic_record_rx.h
index ed5cdefb2f9871608a4b971d43e204765f9b8371..e26fd35600d665ed6364fdd17e122e5fc7a5f556 100644
--- a/include/internal/quic_record_rx.h
+++ b/include/internal/quic_record_rx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_record_tx.h b/include/internal/quic_record_tx.h
index 20fc5e268b4e118c99b23a7bb24c54462a04c7fc..f3b798fea06ce5414c9c8dc0efa58dd86e42266b 100644
--- a/include/internal/quic_record_tx.h
+++ b/include/internal/quic_record_tx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_record_util.h b/include/internal/quic_record_util.h
index 4ef5016b18fcf5232403789c02b0a43e9f7179d5..97e630d924e0c0e374c27456dc264465fe97db8e 100644
--- a/include/internal/quic_record_util.h
+++ b/include/internal/quic_record_util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_rx_depack.h b/include/internal/quic_rx_depack.h
index f69e0703117a948e37add814d49377f46ade79b4..c90964a7c16c1432b04cabcc68da10208f9f3213 100644
--- a/include/internal/quic_rx_depack.h
+++ b/include/internal/quic_rx_depack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_sf_list.h b/include/internal/quic_sf_list.h
index 2583ae28112dc341db369e4d47bee5a9ce1f66ae..8ed1dcb137e38c3e14617522cf5c3b7ac93109af 100644
--- a/include/internal/quic_sf_list.h
+++ b/include/internal/quic_sf_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h
index 77ff85a022cd4e333a298fb2b41bf70fde76b482..260cef87b97632560bbffa5ed4fd8dce53659f99 100644
--- a/include/internal/quic_ssl.h
+++ b/include/internal/quic_ssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_statm.h b/include/internal/quic_statm.h
index 4ea60ff7610292ba767ac3b3aa51910e78d8a750..5b33551b06cabb99378548a575557efa7ed88abf 100644
--- a/include/internal/quic_statm.h
+++ b/include/internal/quic_statm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_stream.h b/include/internal/quic_stream.h
index ad76488e8bab59334d009d2ae917db78e24ac4eb..0da8febd5a8c8ac8f72770bbb5785b10857810de 100644
--- a/include/internal/quic_stream.h
+++ b/include/internal/quic_stream.h
@@ -1,5 +1,5 @@
 /*
-* Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+* Copyright 2022-2023 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
diff --git a/include/internal/quic_stream_map.h b/include/internal/quic_stream_map.h
index cc071dba4c7732ef9ca1893d62d9f3e2a9f5e082..ae7490619bb165670f1f5419f3e59b7d371999bf 100644
--- a/include/internal/quic_stream_map.h
+++ b/include/internal/quic_stream_map.h
@@ -1,5 +1,5 @@
 /*
-* Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+* Copyright 2022-2023 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
diff --git a/include/internal/quic_tls.h b/include/internal/quic_tls.h
index 30a521a7a8b3c4d67901e82b3027f3269197d29b..0e4a9d339b74f8519b7c2971fa4b570a1a37c1c3 100644
--- a/include/internal/quic_tls.h
+++ b/include/internal/quic_tls.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_tserver.h b/include/internal/quic_tserver.h
index b1415d5edf78eb54bcca7ac87af1275f052db708..9213f60666aa6ac8392fd3480d15ed3736e8b46d 100644
--- a/include/internal/quic_tserver.h
+++ b/include/internal/quic_tserver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h
index b2dbb85f9249851150db6076a1a9ab66e1bd6252..64efedc27f385e8b754f04bc6987aba8ed227d6c 100644
--- a/include/internal/quic_txp.h
+++ b/include/internal/quic_txp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_txpim.h b/include/internal/quic_txpim.h
index 0f1f11c63095c246b88dc8394032b0af04847776..ed6e3875c47b2def02a9c81ba3648a337f36377b 100644
--- a/include/internal/quic_txpim.h
+++ b/include/internal/quic_txpim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_types.h b/include/internal/quic_types.h
index f3509da2fbf9ffdc8697d1207a1291c7ed6f809d..d42164ba56115dc274504dad1322ca1f4138b962 100644
--- a/include/internal/quic_types.h
+++ b/include/internal/quic_types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/quic_vlint.h b/include/internal/quic_vlint.h
index 77e7b592817d052c95777f444d7b0e6eb850c07a..d4b70b229c32303f3a0ba569b10ef6c48f1e9ce0 100644
--- a/include/internal/quic_vlint.h
+++ b/include/internal/quic_vlint.h
@@ -1,5 +1,5 @@
 /*
-* Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+* Copyright 2022-2023 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
diff --git a/include/internal/quic_wire.h b/include/internal/quic_wire.h
index 35fc298ea19b9558108ce1bff64e2d43a5c5ee90..cd01feb0362858683ca9e831e096d8edeae760fe 100644
--- a/include/internal/quic_wire.h
+++ b/include/internal/quic_wire.h
@@ -1,5 +1,5 @@
 /*
-* Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+* Copyright 2022-2023 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
diff --git a/include/internal/quic_wire_pkt.h b/include/internal/quic_wire_pkt.h
index b505bc0cf37a8744b5a2e778c5e42701a2842cac..18a483fc2cc688a6725d854693f5ea870c152025 100644
--- a/include/internal/quic_wire_pkt.h
+++ b/include/internal/quic_wire_pkt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/recordmethod.h b/include/internal/recordmethod.h
index 23eee7956648e409e1f62f6afc92a0f8c3f484d7..53bd4ca6d2b11cb956c40b75dc1ff9599f3ce3fb 100644
--- a/include/internal/recordmethod.h
+++ b/include/internal/recordmethod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
@@ -228,7 +228,7 @@ struct ossl_record_method_st {
      * remain available until all the bytes from record are released via one or
      * more release_record calls.
      *
-     * Internally the the OSSL_RECORD_METHOD the implementation may read/process
+     * Internally the OSSL_RECORD_METHOD implementation may read/process
      * multiple records in one go and buffer them.
      */
     int (*read_record)(OSSL_RECORD_LAYER *rl, void **rechandle, int *rversion,
diff --git a/include/internal/refcount.h b/include/internal/refcount.h
index b82fba89ae4d60c8f39b0e75896351b41063e305..4c9ab266d3d3f6630386f00e6d6f63ffd7a8ffbe 100644
--- a/include/internal/refcount.h
+++ b/include/internal/refcount.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/include/internal/ring_buf.h b/include/internal/ring_buf.h
index 85a8d309bae6a70f8536d8cec127b2f12cd9f304..436f1ca1462849d7a39fcfed8b475c430ccdceb7 100644
--- a/include/internal/ring_buf.h
+++ b/include/internal/ring_buf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 100e34629768b304482c012711f8ed0c74b6ef04..2550c56bd0ed9c3c6368667ac3f36c7da3cfa64f 100644
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -89,6 +89,9 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #  endif
 
 #  include <netdb.h>
+#  if defined(OPENSSL_SYS_VMS)
+typedef size_t socklen_t;        /* Currently appears to be missing on VMS */
+#  endif
 #  if defined(OPENSSL_SYS_VMS_NODECC)
 #   include <socket.h>
 #   include <in.h>
@@ -114,7 +117,9 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #  endif
 
 #  ifdef OPENSSL_SYS_UNIX
-#    include <poll.h>
+#    ifndef OPENSSL_SYS_TANDEM
+#     include <poll.h>
+#    endif
 #    include <errno.h>
 #  endif
 
diff --git a/include/internal/ssl3_cbc.h b/include/internal/ssl3_cbc.h
index 3843696ffee70832463cd6c997fa434bac9a8b95..4fb5da1906e2f62ca70c4ecb05460434b60b4889 100644
--- a/include/internal/ssl3_cbc.h
+++ b/include/internal/ssl3_cbc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/internal/statem.h b/include/internal/statem.h
index db0b214a3259b3536e39817f4f8ea44aed576a1e..136e6523660a53466bb6e46d6d520de3c2aa0184 100644
--- a/include/internal/statem.h
+++ b/include/internal/statem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/include/internal/thread_arch.h b/include/internal/thread_arch.h
index 24280d9706527f957cbea65db821d073ce2377da..1bfc0ebb3d3773e5b139f4884a6112f3d71d139e 100644
--- a/include/internal/thread_arch.h
+++ b/include/internal/thread_arch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/internal/time.h b/include/internal/time.h
index 968ebbe6bdcf8af768ee8846f202b17837c3df9f..9bc5e545129cb47151462a9b583337d3533238fe 100644
--- a/include/internal/time.h
+++ b/include/internal/time.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/openssl/asn1.h.in b/include/openssl/asn1.h.in
index beeac1b37f6f92695ae5497ea6c59613e83af1ea..798b22115ccc4987fb1cbd7c1cc995775b2729a9 100644
--- a/include/openssl/asn1.h.in
+++ b/include/openssl/asn1.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
index 735361b17b1d070f5b2e71db608fb4a24b9572df..8aad1414460d9533ab1e43f5d67852011da5387a 100644
--- a/include/openssl/bio.h.in
+++ b/include/openssl/bio.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/openssl/cmp.h.in b/include/openssl/cmp.h.in
index d7f2354b3a9740d1235b512c5c9bebbf5c8c96fb..e6af016c7fe4d74052fcb34c968b193b292df693 100644
--- a/include/openssl/cmp.h.in
+++ b/include/openssl/cmp.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/include/openssl/core.h b/include/openssl/core.h
index b35392656cb843925e52d10077ad947381a388c5..18c199182e34ada576358d4b49eeffc90a12c3c8 100644
--- a/include/openssl/core.h
+++ b/include/openssl/core.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h
index 92767e413fda2904c0b285a1372e45d354d6ae7e..7c48bd7f863d4a61f8a351841f93cf1f666a6f6f 100644
--- a/include/openssl/core_dispatch.h
+++ b/include/openssl/core_dispatch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/openssl/core_names.h.in b/include/openssl/core_names.h.in
index da1767d1e95eb10148e1f960192ac5b3af9ab24d..c14520fe2868cd0253eb4dd9620e18d0cf923c4d 100644
--- a/include/openssl/core_names.h.in
+++ b/include/openssl/core_names.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/openssl/crmf.h.in b/include/openssl/crmf.h.in
index f5fe1ace4ed4ee5e4a2c564c331d9e8d822d4860..43411fa42f66fed2a1389202cd01f2f8861bc964 100644
--- a/include/openssl/crmf.h.in
+++ b/include/openssl/crmf.h.in
@@ -1,7 +1,7 @@
 /*-
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/include/openssl/crypto.h.in b/include/openssl/crypto.h.in
index fb672811337fd293ec86c6eeb11487a2f89bc608..b2d691b90f0ec2ffea36b7e4a5eb75816afc3853 100644
--- a/include/openssl/crypto.h.in
+++ b/include/openssl/crypto.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index da6e7b06c879a8d62ff4bc2a39a9686b37403a69..8bc17448a0817e992fd69f8017a108741f212264 100644
--- a/include/openssl/dh.h
+++ b/include/openssl/dh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 42edbb923bdf5c034a3cd623447d9130508452d3..e01f62751da55dbd19e71dacf311e707a29951bf 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index 85ec5e3bb12bdfe588841f825bf415dc8aae96cf..e1cbe982287b6de3a5d520248eb2eef3e5fdd7a1 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -1127,7 +1127,7 @@ OSSL_DEPRECATEDIN_3_0 int EC_KEY_check_key(const EC_KEY *key);
 
 /** Indicates if an EC_KEY can be used for signing.
  *  \param  eckey  the EC_KEY object
- *  \return 1 if can can sign and 0 otherwise.
+ *  \return 1 if can sign and 0 otherwise.
  */
 OSSL_DEPRECATEDIN_3_0 int EC_KEY_can_sign(const EC_KEY *eckey);
 
diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in
index a28afa885fe232dc6d25da4a4d6365db33131d06..1ef09de02e02ecc4738e810cc6d414b557138d9b 100644
--- a/include/openssl/err.h.in
+++ b/include/openssl/err.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index e10c0617a486031844973b3e42d25ad5857d4368..f343eccbffa199e308edac6a80562e2c3089d7fe 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/openssl/fips_names.h b/include/openssl/fips_names.h
index 67aa1c7e42e78262d0170372c915222ad48e58e8..5c77f6d69122340fcd5d139aa08b84ab314db3c0 100644
--- a/include/openssl/fips_names.h
+++ b/include/openssl/fips_names.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/openssl/hpke.h b/include/openssl/hpke.h
index e39a485023d064c0aa881d713ba090b89a970275..1bb9ada3c4a08c612b1c8baa8069d22683cc8273 100644
--- a/include/openssl/hpke.h
+++ b/include/openssl/hpke.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/openssl/http.h b/include/openssl/http.h
index aa4dac1c1d58eeeaaecc45280f0ca58f248ecde9..a3cbf15f5a0f66a0afe1985ddeb9684aec9c8d7f 100644
--- a/include/openssl/http.h
+++ b/include/openssl/http.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Siemens AG 2018-2020
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 55b825a1f1fbc3f035a28f9765d467ea94f7a90c..66fa4eec2e730f8ee79a3e33aaedb1497f314250 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/openssl/pkcs12.h.in b/include/openssl/pkcs12.h.in
index ad235391e06c6d17efbe0af49ba698af3da75ec6..35759d4deadc3de1d0de8ac7d9d639a599ba7e2f 100644
--- a/include/openssl/pkcs12.h.in
+++ b/include/openssl/pkcs12.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/include/openssl/prov_ssl.h b/include/openssl/prov_ssl.h
index b120ca4be47b156bbff1f09042726a90ad4d28c8..76d01e1eb89c4970eea2362fbc83f4f30b3bc40c 100644
--- a/include/openssl/prov_ssl.h
+++ b/include/openssl/prov_ssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/include/openssl/provider.h b/include/openssl/provider.h
index 80e6db7bb2f857cd68d44576c3ce219b0deaa1db..24ec0827bd6bbf65afb8f682ab9f5943ee042563 100644
--- a/include/openssl/provider.h
+++ b/include/openssl/provider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/openssl/quic.h b/include/openssl/quic.h
index a8798a9a44951b581b6919b17c05870747846229..74a6345d5df73309d3efcdd6d434f4e8c5f6de4d 100644
--- a/include/openssl/quic.h
+++ b/include/openssl/quic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/include/openssl/sha.h b/include/openssl/sha.h
index 67f89da8f0697c74bbbf1d4cdab4ddd2b8871427..163a7d588af931f6a513fbd0458779bb0158a00d 100644
--- a/include/openssl/sha.h
+++ b/include/openssl/sha.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h
index 3f72835a3e5b0936f55f50e1c30537e77ce1a969..4f076c6c9dfb9745f8e588f1578915faf9bd54fb 100644
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/include/openssl/store.h b/include/openssl/store.h
index 3c1445e0e6ac5498c6ff910aa1dcbb052aa9a670..dafb16fd90d3ec11c3d2c98aab0daa588d88b483 100644
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -345,7 +345,7 @@ int OSSL_STORE_LOADER_set_close(OSSL_STORE_LOADER *loader,
 OSSL_DEPRECATEDIN_3_0
 const ENGINE *OSSL_STORE_LOADER_get0_engine(const OSSL_STORE_LOADER *loader);
 OSSL_DEPRECATEDIN_3_0
-const char * OSSL_STORE_LOADER_get0_scheme(const OSSL_STORE_LOADER *loader);
+const char *OSSL_STORE_LOADER_get0_scheme(const OSSL_STORE_LOADER *loader);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_register_loader(OSSL_STORE_LOADER *loader);
 OSSL_DEPRECATEDIN_3_0
diff --git a/include/openssl/thread.h b/include/openssl/thread.h
index d34aa5ba949e90fbb69886a0afc62913054708bc..3926ce54d78b53ed5c31c4469a542185ca1a857b 100644
--- a/include/openssl/thread.h
+++ b/include/openssl/thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index dbd2ffdf5ec82085b210957f0e111e338ed42f9e..9a5b56ea5fc4b52e9305cd303181586165c2f24c 100644
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in
index d74f944bdc5c27f9f088620bbccbdecd6ba3b7e1..72103913053b0542b137079aa931a9c288841afb 100644
--- a/include/openssl/x509.h.in
+++ b/include/openssl/x509.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/include/openssl/x509v3.h.in b/include/openssl/x509v3.h.in
index 2d7164e3a24cdfc3c698e5f1fa686f28e36bd771..569680378dfd035d4e476c1e77d7391836f499a8 100644
--- a/include/openssl/x509v3.h.in
+++ b/include/openssl/x509v3.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/ms/applink.c b/ms/applink.c
index af9462a2b9c7d1fad31e4d07796cd0910f0e8aa9..601d016633a119dd27a2fb01bde9a118923398d4 100644
--- a/ms/applink.c
+++ b/ms/applink.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2023 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
diff --git a/providers/baseprov.c b/providers/baseprov.c
index 9705314261d2a966e641b7ced98c00c408ea0bfd..2e5dbe410feceee69da5f21e304cf3a0957f66c9 100644
--- a/providers/baseprov.c
+++ b/providers/baseprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/common/include/prov/securitycheck.h b/providers/common/include/prov/securitycheck.h
index 62e60cc0103f0f3b21ee3e2fbfc5eb3f8038de73..611c6d531b13693050dd7cdb16d015620d4321c6 100644
--- a/providers/common/include/prov/securitycheck.h
+++ b/providers/common/include/prov/securitycheck.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/common/securitycheck.c b/providers/common/securitycheck.c
index 2dc43334de4d78de266b30ca480f6668f2aaf390..0d3acdbe56e2ff7435926890daeadd5813df6ef0 100644
--- a/providers/common/securitycheck.c
+++ b/providers/common/securitycheck.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/common/securitycheck_default.c b/providers/common/securitycheck_default.c
index 63c875ecd0b7170484c011d2cbca45ea39a03a9c..246323493eafeab26cdf6c60af4ceae69d8a9b9f 100644
--- a/providers/common/securitycheck_default.c
+++ b/providers/common/securitycheck_default.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/common/securitycheck_fips.c b/providers/common/securitycheck_fips.c
index a6711b42c1b9555950b211980c3dfca657567047..d1262d8795387b9c98763c99e7d68ed2204ee909 100644
--- a/providers/common/securitycheck_fips.c
+++ b/providers/common/securitycheck_fips.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/decoders.inc b/providers/decoders.inc
index f0bbad807cfa9da0c95382e77faa177395a4b2e7..0191aa771ea6cec63bdd8cc23c1cd2120a522ee5 100644
--- a/providers/decoders.inc
+++ b/providers/decoders.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/defltprov.c b/providers/defltprov.c
index fa4165b365792dba18e0b222c1682be037410c6b..f02e04835ddf00bdb152d2cc8586d91f8142e99f 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/encoders.inc b/providers/encoders.inc
index e36b99957f198c6ec6542967fa032b36d4bba91a..cd0d1137bb697858fd943f2d98098fb581236107 100644
--- a/providers/encoders.inc
+++ b/providers/encoders.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/fips-sources.checksums b/providers/fips-sources.checksums
index c337becad6d3b9531f56f307fb15a61dd731fdb2..db0dda5af6d5c66c35cb49de124b31967185159c 100644
--- a/providers/fips-sources.checksums
+++ b/providers/fips-sources.checksums
@@ -26,16 +26,16 @@ f3a8f3c960c0f47aaa8fc2633d18b14e7c7feeccc536b0115a08bc58333122b6  crypto/aes/asm
 e397a5781893e97dd90a5a52049633be12a43f379ec5751bca2a6350c39444c8  crypto/aes/asm/aest4-sparcv9.pl
 030dd54699b6ab0d71db5a436489ef3265d358337259798ef9d0ee690c182386  crypto/aes/asm/aesv8-armx.pl
 5e8005fdb6641df465bdda20c3476f7176e6bcd63d5073044a0c02a327c7f172  crypto/aes/asm/bsaes-armv7.pl
-cebab3945a6c4921ebc12b922362c3f65299876a8401eb99770aa981d1311fed  crypto/aes/asm/bsaes-armv8.pl
+9b9c9d7541edb49dcb9fe331f91fca1b6a1e14cc204c07b8cc2b530da8719279  crypto/aes/asm/bsaes-armv8.pl
 0726a2c4c15c27a12b2f7d5e16863df4a1b1daa7b7d9b728f621b2b224d290e6  crypto/aes/asm/bsaes-x86_64.pl
 762cadf988080f45d1a2f1232058688ac3f5afe76767649d15513a7a5eedcf38  crypto/aes/asm/vpaes-armv8.pl
-4b723628a4ea14a763c3b21afa2439534ccf9d21480f2d0e3a0f5ee270169c23  crypto/aes/asm/vpaes-loongarch64.pl
+14146589f53dc898fa86aeffd0e0ba36737b04da26ab0b14c1da09a28836c8f8  crypto/aes/asm/vpaes-loongarch64.pl
 c3541865cd02d81101cdbab4877ed82772e6980d2c677b9008b38fa1b26d36d4  crypto/aes/asm/vpaes-ppc.pl
 3ec24185750a995377516bc2fb2eae8b1c52094c6fff093bff591837fc12d6c3  crypto/aes/asm/vpaes-x86.pl
 060bb6620f50af9afecdf97df051b45b9a50be9daf343dfec1cbb29693ce00a4  crypto/aes/asm/vpaes-x86_64.pl
 2bc67270155e2d6c7da87d9070e005ee79cea18311004907edfd6a078003532a  crypto/alphacpuid.pl
 269e52f8867c13ca75d2f88ec1f89b692cb8c6c3ee89abe2fd3c1821925191d8  crypto/arm64cpuid.pl
-7144d95f74d8f84b5c32fe5b343c1d6d958a96ffcf9d0374a343cd82e599d753  crypto/armcap.c
+5d8595338d4ae8bbaba81dab36c00b325abccf5c4a51b7d1b6c622ac893792de  crypto/armcap.c
 b0f528db5658d7c98657eb322bf78e326202f43da88f7c56ada053a494be9977  crypto/armv4cpuid.pl
 16739d54200fb81ca7835b5814f965022a2ab41589c7787e2697e3ea72d4fafa  crypto/asn1_dsa.c
 819c9fd2b0cae9aab81c3cbd1815c2e22949d75f132f649b5883812d0bbaa39a  crypto/bn/asm/alpha-mont.pl
@@ -84,13 +84,13 @@ da7f7780d27eed164797e5334cd45b35d9c113e86afaca051463aef9a8fd787c  crypto/bn/asm/
 f53d3804456b787be45ace2b33b7a323e5e4fb6cfbe3aa3b6696e3ce0a640baa  crypto/bn/bn_ctx.c
 d94295953ab91469fe2b9da2a542b8ea11ac38551ecde8f8202b7f645c2dea16  crypto/bn/bn_dh.c
 74b63a4515894592b7241fb30b91b21510beaa3d397809e3d74bc9a73e879d18  crypto/bn/bn_div.c
-98f5d5ac4bb7cc9ba4326ff48eca6830763c72efe13c97f523714aed082be860  crypto/bn/bn_exp.c
+569dd0efeac8ced359c96732c694cab8ed8f75e2e6a0e34997c0a4b60e31d0d3  crypto/bn/bn_exp.c
 ec2b6e3af6df473a23e7f1a8522f2554cb0eb5d34e3282458c4a66d242278434  crypto/bn/bn_exp2.c
 7af02a3a30897311fee695fc42af67091ea4cd03abe6d911cf3381d5dbc05f58  crypto/bn/bn_gcd.c
 e37be15f771ab0b1da741266b0081190436edc9b7eb5298be4a0aca0d4c47ada  crypto/bn/bn_gf2m.c
 73ee247467879d4ec984c9900dfe7761233c5b889b8762be37c7e8fdd6d1d210  crypto/bn/bn_intern.c
 602ed46fbfe12c899dfb7d9d99ff0dbfff96b454fce3cd02817f3e2488dd9192  crypto/bn/bn_kron.c
-633eb61f39d047ea3373c96667ef3ca72771ea2a6735ee2870fd63159d43ffb9  crypto/bn/bn_lib.c
+18840c8a7996b619a871efdc834d28556e210b8bddddef606a901f094c45fe81  crypto/bn/bn_lib.c
 d5beb9fbac2ff5dc3ccbdfa4d1aabca7225c778cff4e3b05b6d6c63e182637f5  crypto/bn/bn_local.h
 b76134e0b4cff3e706cfd018b038439de6f69b75015d8c276a2831c0a9c1623e  crypto/bn/bn_mod.c
 7ddcb7b9b2b008d6f31783c7697d77dd3188d9f643ca948cf49a805d770c3a14  crypto/bn/bn_mont.c
@@ -100,23 +100,23 @@ b76134e0b4cff3e706cfd018b038439de6f69b75015d8c276a2831c0a9c1623e  crypto/bn/bn_m
 5377e9596c3b9a3153ce75004599dce1f0fef23612d4e086cc936a87d4d5fa99  crypto/bn/bn_prime.c
 c56ad3073108a0de21c5820a48beae2bccdbf5aa8075ec21738878222eb9adc3  crypto/bn/bn_prime.h
 3dd5ce6ddea13d04a9470625af35328319d1a5f3a963183095edf3add314b7e0  crypto/bn/bn_rand.c
-6a6bb2ca178e1d5415c9b0e7933930009127e6ec5ffb6d8992cbc0a68880865b  crypto/bn/bn_recp.c
+b5cc902624b3af2149c9ea91f9d18bea56302144e87dfe49105ec6789b73764b  crypto/bn/bn_recp.c
 669a157968afe07588507a2e9e35c1c4df9c2b0a95cd9c21404b0bfa21be0d37  crypto/bn/bn_rsa_fips186_4.c
 704b0b4723e5c9e9bae5f3e35f9ae8ae8dca3383929e954de9e5169845abfdb2  crypto/bn/bn_shift.c
 622e90766b29e0d25f46474429aebda8eba2246835b9e85dc26da7cdbd49334f  crypto/bn/bn_sqr.c
 42c8ce944c889abcfcf089d0ad2744b7587696d8d7785efa91b3f7ec53dc062a  crypto/bn/bn_sqrt.c
 24e62baa56e02f2db6454e10168b7c7fa7638db9221b9acda1803d43f38f36e0  crypto/bn/bn_word.c
-be27115efd36f0077a3ec26b1ff1f586b0b8969ba05d8ffa34b2ff4badf227bf  crypto/bn/rsaz_exp.c
+ec684bfc01a74492150e930fe6d6cc5586be48b9674bbd7a492efa517d04c340  crypto/bn/rsaz_exp.c
 c4d64da1cdc732ea918fccd6a7bb2746b03365dd26f7ba1e74e08c307ca4c58e  crypto/bn/rsaz_exp.h
 55266c387202fd4f90bebfe7bb93c550b23b78dc3a90edcc668e5dbf480f916c  crypto/bn/rsaz_exp_x2.c
 834db8ff36006e5cb53e09ca6c44290124bd23692f4341ea6563b66fcade4cea  crypto/bsearch.c
 82117f6a7cfc31fc86ecd9629bd3bf614126b8e8b2c23717a03ff5c1db7c3c5c  crypto/buffer/buffer.c
 5f43844b5d8665de9ab895f93599150a327d73ec2674bbf7d7c512d30163022d  crypto/c64xpluscpuid.pl
-019439681d6611d4cb56e62bf27ea110a3fa57f6ee3b11dfc7014cb0b2511c88  crypto/cmac/cmac.c
-d211d34a4378198e772765972425571b1b3b497169166c6a602980efb6dfa553  crypto/context.c
+40bd11fbe3de4c0fcf16639a3dcfe0f26e3bf447c79f59ec59d7dfc77350a956  crypto/cmac/cmac.c
+a6e8cf30340ffaec8aec41dfbef7341afe21e7b13e48899403c529368c0ec6fa  crypto/context.c
 67c2367871b9350a7f7af5be903d6bcca9ebdbff0e9a9bd9f61b56bef5b76696  crypto/core_algorithm.c
 f0fd9eb38bf7f196bbb4d26ce8fdf86d0a4f9db219157e66b2c0ffefb4f42005  crypto/core_fetch.c
-b2fda5598c9709aa294bf05f94558672ab152ae144c7cb2255e025ae7712b0e0  crypto/core_namemap.c
+2f03908edadddc55a61e4cfb4d76751a342f61aad564971df37a6b90c7b2a26f  crypto/core_namemap.c
 fe83e1d30a9ef0aa86c1342b4228380dea7e90f9f3cc8d28f5423dfbc1ded011  crypto/cpuid.c
 a6732e22ccb49cf51fc9dbf23f6059774b70ecc3d7e848c5df112a2d3c179027  crypto/cryptlib.c
 66dbfc58916709d5a6913777346083247942a8d9458ee9b2bf443f0ea4988d64  crypto/ctype.c
@@ -134,17 +134,18 @@ c117ac4fd24369c7813ac9dc9685640700a82bb32b0f7e038e85afd6c8db75c7  crypto/dh/dh_g
 6b17861887b2535159b9e6ca4f927767dad3e71b6e8be50055bc784f78e92d64  crypto/dh/dh_group_params.c
 a539a8930035fee3b723d74a1d13e931ff69a2b523c83d4a2d0d9db6c78ba902  crypto/dh/dh_kdf.c
 dbb82807f63ef2d9b3cc7b18165091b7c1b90f01b53e03090e4327edcac82001  crypto/dh/dh_key.c
-3d9d0cd47a81e69303ebf1a93b4fa9f198fd23cb8edb4730bc8faa11cd751fa6  crypto/dh/dh_lib.c
+518edbe8171bd80102869826640abdab5430c47c4cb3f2ad4dfb7c4118833721  crypto/dh/dh_lib.c
 8300775d88db0a1aa26a77eb49d6c4f7252e7fee69e1440de4c40edadc9da044  crypto/dh/dh_local.h
 bbcf4fc3067ac462a27d7277973180b7dc140df9262a686c7fbe4318ca01f7b8  crypto/dsa/dsa_backend.c
 b9c5992089203123c3fae46e39bb4d05e19854087bca7a30ad1f82a3505deec7  crypto/dsa/dsa_check.c
 ae727bf6319eb57e682de35d75ea357921987953b3688365c710e7fba51c7c58  crypto/dsa/dsa_gen.c
 9978d27e9fc8ff152830ebb781f71338e56a5e116f29c1c2d59a5a112d86362a  crypto/dsa/dsa_key.c
-0934d01d96dcec39b59ee3d1ec0235ee3829048db73fed3da0882d1da57d5725  crypto/dsa/dsa_lib.c
+e67efe8c8e93681ba18e9f9cacf2ca71c36455ffe983df366b585dd453668038  crypto/dsa/dsa_lib.c
 f261f9d4f83ecc51ab58de89083e9af4ba4a4c922ccd06b0d628f4b60fc104ec  crypto/dsa/dsa_local.h
 f44f24a3f41c58067d49a80f15f314583522d86bcd741b4dd88b78582df3f748  crypto/dsa/dsa_ossl.c
 9776be9ac89d4ea1ed33c2055166a12bff474bc6669660b24da61a63a137cc1b  crypto/dsa/dsa_sign.c
 53fa10cc87ac63e35df661882852dc46ae68e6fee83b842f1aeefe00b8900ee1  crypto/dsa/dsa_vrf.c
+62fbc4465a5b37dc794bee277dd216d77917e715c2bb5d37a7e1735e80ad0f8d  crypto/ec/asm/ecp_nistp384-ppc64.pl
 d9722ad8c6b6e209865a921f3cda831d09bf54a55cacd1edd9802edb6559190a  crypto/ec/asm/ecp_nistp521-ppc64.pl
 78ad06b88fcc8689a3a846b82f9ee01546e5734acd1bccf2494e523b71dc74d1  crypto/ec/asm/ecp_nistz256-armv4.pl
 598da295053253578d5461892098b74ec9dcd02c1eb99d537e14e0c5e958c7b9  crypto/ec/asm/ecp_nistz256-armv8.pl
@@ -152,21 +153,22 @@ d9722ad8c6b6e209865a921f3cda831d09bf54a55cacd1edd9802edb6559190a  crypto/ec/asm/
 cfe7e75a2fddc87a7251684469a8808b9da82b2f5725eafad5806920f89932bd  crypto/ec/asm/ecp_nistz256-sparcv9.pl
 922725c4761cfa567af6ed9ecab04f2c7729ae2595f2fc0fa46dc67879dc87b0  crypto/ec/asm/ecp_nistz256-x86.pl
 ac327475c7ec828d11aa05628b4e3b81ec3b1400f30fe7bec01daf3cf71f2dc9  crypto/ec/asm/ecp_nistz256-x86_64.pl
+fc1eff2296d843eec4487321daec0cfb733bbb3ba91d34e75cbefabdad5705c7  crypto/ec/asm/ecp_sm2p256-armv8.pl
 cc727533130f5f1a29229929b3d4e8454585d647be25d6344f3c6a0240998368  crypto/ec/asm/x25519-ppc64.pl
 ee897e230964511baa0d1bf95fb938312407a40a88ebe01476879c2763e5f732  crypto/ec/asm/x25519-x86_64.pl
 5fe1cfb5bb13a1aa838453101f5a9783cd6cdd0c5f904d5372a74750ac43c302  crypto/ec/curve25519.c
-ebd47dd501b147a53ea3c0a0cca18789ac14e2ee4b94e2eed54248992763d454  crypto/ec/curve448/arch_32/f_impl32.c
+5daf9f524cd63dd95a2136535b27f2b3d90966562ea5766f4b2d1cd4fccf2502  crypto/ec/curve448/arch_32/f_impl32.c
 063dac1e4a9573c47532123e9e03e3532a7473cc3e146521ba9ec6f486ddf3b1  crypto/ec/curve448/arch_64/arch_intrinsics.h
 43423b7ee85a5c740c1d81499ee06f4a17732c7731a598e7429d5e402ee77cf4  crypto/ec/curve448/arch_64/f_impl.h
-6b01b404354822a5d9cee5ab26f015c362b8ea64be373236e6526bfa67380b51  crypto/ec/curve448/arch_64/f_impl64.c
-b35976955a49414313e3823144a898bc58873b755f4e3a772d520cdd63099581  crypto/ec/curve448/curve448.c
+c3146bb6777776d39b89647e3dd3e8afc3d19338c75ff294d6986289cef59c40  crypto/ec/curve448/arch_64/f_impl64.c
+a3803940dcb1e53358edac1bc05fe8777b8007668d5aa11af5812b97d4f94c63  crypto/ec/curve448/curve448.c
 a6c70707c520234ccd111562f012e1abf83c43b20b3b36c339ef1ea0369a9e5f  crypto/ec/curve448/curve448_local.h
 178fb9863c33174b633c2e7607160b1bedb506d66cc06d53382d87431441f306  crypto/ec/curve448/curve448_tables.c
 f30e13bba5a136ab9ba5225c98b9b94c2cd73fb3aef60f9dcde3cd471cfa1ca4  crypto/ec/curve448/curve448utils.h
 4a45e7828831fbe9f282f933cda54b12cd393ec9bffe5c0ace8e4d1c4d5d6358  crypto/ec/curve448/ed448.h
 498fda3e0f2d261ab9729ae4de05ff1b496af4582aa019f507570f852d5a2726  crypto/ec/curve448/eddsa.c
-560f59ae21672e90d20dd1560cf32e914ffa67b2b5c5353a829267402105c810  crypto/ec/curve448/f_generic.c
-0f0515def4bd6625a6bd230cd52256056c622f3ba6c94674067176b023aa041b  crypto/ec/curve448/field.h
+9f712e7397b10f1dc88a6d18ff38dcda13d09c02775f3682f2b8698715b1095a  crypto/ec/curve448/f_generic.c
+070daafb9a532ebb8bc0af8b1341254f0cd3e8932a8c8a2dca7baeef6678768b  crypto/ec/curve448/field.h
 2ad8331e893b5db33198e27603891587686c0dfdab29706dc52a7097c5d6f219  crypto/ec/curve448/point_448.h
 1ff6e467d72530c71d21c310180d04a24f0a9cb41168fba94b43309ecdda3888  crypto/ec/curve448/scalar.c
 3052a044afae2e91b677542fc8b34b3ec9d033e0c6562b0d43098cfb34ab3c9d  crypto/ec/curve448/word.h
@@ -175,13 +177,13 @@ ae1637d89287c9d22a34bdc0d67f6e01262a2f8dcef9b61369dba8c334f5a80d  crypto/ec/ec2_
 a1f22814f501780591da20de5e724895438094824fce440fd026850c46ad8149  crypto/ec/ec_asn1.c
 29783240b377e98006d21b13e984545aa296b26070fd74e77f7d75c01d2616f3  crypto/ec/ec_backend.c
 7f19cebad4a94db291464b0d93006a87d15ccec93b94f725052a1037107a96be  crypto/ec/ec_check.c
-fe690c2e9563813c523eedd4ebe80dc055591699c72058eb04ffbb898c571ad2  crypto/ec/ec_curve.c
+c85f4885f2892dcf074451b137efe0828e486ff5ceadae1fac9b2543fa2114a1  crypto/ec/ec_curve.c
 8cfd0dcfb5acbf6105691a2d5e2826dba1ff3906707bc9dd6ff9bffcc306468f  crypto/ec/ec_cvt.c
-9d6f41b7d7b2aaa0fcb06be833a5d0994f45d377e599107cd2f084275ba5e815  crypto/ec/ec_key.c
-8528e8a2329ad6dcc0a90f8d8ba2a89065c6fd5dd01ad0b4af37a4e2136b5d94  crypto/ec/ec_kmeth.c
-f4585fe3cf728b73f8c96e6e12317863e6a97694d6b456ce0e57956601eaad33  crypto/ec/ec_lib.c
-a8a4690e42b4af60aad822aa8b16196df337906af53ea4db926707f7b596ff27  crypto/ec/ec_local.h
-0565e3b0d3ae0aa5e27397d67fdcdc026840273fd20b51f8ba94111c40db3a7c  crypto/ec/ec_mult.c
+f4b1f679ca6da3e54121109d4f40b0c46a2366ef48bbf17d8e769f8baaa35f5f  crypto/ec/ec_key.c
+93f35d2e21d49bb6780d200fda8486edd4a7123956337ba535720bb547a47c4a  crypto/ec/ec_kmeth.c
+1829428993aa5c51c6322d7d800cb13ccd566bf1f9e38d271f618f1a2315c3c5  crypto/ec/ec_lib.c
+eb2f08624819f5d5d865b954a1123a833bc18e9024980f5701125f230e6406b1  crypto/ec/ec_local.h
+7417037d376a99498b3044982d72fbe07bcd2cc5b78f73c3665e87c9202af418  crypto/ec/ec_mult.c
 5ad8b7c52f91416c5e93b96e1d19f6c0ba1bb8f99d1e382ac43025e8d060a278  crypto/ec/ec_oct.c
 c7fba2f2c33f67dafa23caef8c3abd12f5336274a9a07d412b83be0366969ee6  crypto/ec/ecdh_kdf.c
 b86a943ae62145438a7214539ceb3e0de5a30e17a6e59742c6e30991db730ab6  crypto/ec/ecdh_ossl.c
@@ -190,37 +192,37 @@ b6baa42b16e8df69a12e0ab101033100cddc808ec2682ba1574373e6ec86ae93  crypto/ec/ecds
 f686cea8c8a3259d95c1e6142813d9da47b6d624c62f26c7e4a16d5607cddb35  crypto/ec/ecdsa_vrf.c
 141cfc1459214555b623517a054a9e8d5e4065a11301237b7247be2c6f397a0a  crypto/ec/ecp_mont.c
 13b30f34aeeb0c98747239bfe91b5f0f14e91b2c1f11db62ebb5950c7219daa0  crypto/ec/ecp_nist.c
-c31fa62261bfb2bebe336067b6e3a662b5b0bb3d30f8ad7d47b72b99429a45be  crypto/ec/ecp_nistz256.c
+b19d2ffc6a21405c125e7831a9c1385acad8eea283f52c6b57ac6c8728233ccf  crypto/ec/ecp_nistz256.c
 51cb98e7e9c241e33261589f0d74103238baaa850e333c61ff1da360e127518a  crypto/ec/ecp_oct.c
 9cf3bacc8a990f6dffe369c28f2f47b192c8d17178185acec601e3fee5b05fac  crypto/ec/ecp_smpl.c
-8de7a1fbe71eef60696ce8feb77515d18ed5b890f3276dd2b13ee0286966fa3f  crypto/ec/ecx_backend.c
+aeb2c57685fd610dd1a9d176b70b42cd8d91a252a1e54d3b90b07406d9570883  crypto/ec/ecx_backend.c
 5ee19c357c318b2948ff5d9118a626a6207af2b2eade7d8536051d4a522668d3  crypto/ec/ecx_backend.h
-30e7f80d6b1947ab2eafdd60209763dda059f77dff395ac5d7e430924fb571d6  crypto/ec/ecx_key.c
-ce0c8dc6215a0180bc3163c232944baaeda19d6f2e19482fe89e657d5469e3f6  crypto/evp/asymcipher.c
+72caa2b7d2a54165fb35fea5ec7f5f230a3e9746fa71d56cb345e809bfdaf0a0  crypto/ec/ecx_key.c
+64d0ed4018f874f6f88f60eea7b8cc093ebd2495172132603f759445d0bf0edc  crypto/evp/asymcipher.c
 0e75a058dcbbb62cfe39fec6c4a85385dc1a8fce794e4278ce6cebb29763b82b  crypto/evp/dh_support.c
-4cd4a0eb50c5d8997711dbd05cd447db48ae985274307badaadff4b6bbea6ea1  crypto/evp/digest.c
+d418a565008404e44f1b4324902cf57384dee9b1e01e897eaa072f7dcafce0cb  crypto/evp/digest.c
 838277f228cd3025cf95a9cd435e5606ad1fb5d207bbb057aa29892e6a657c55  crypto/evp/ec_support.c
-8bd1c1241fa9f47295df137ddefbeabd0438ea958044bf0de91996edbd1c497d  crypto/evp/evp_enc.c
-619bd698996d7fd369ce9b859b783238a36c5eaa6ce4007f2f78cefa0d607b74  crypto/evp/evp_fetch.c
-ce982249442688249f7c53d0824ae6affb1cf89281f35fbd68c1e0c4c57217d3  crypto/evp/evp_lib.c
-785035bcf2f91d6cde921c344c2c5d535c1ec11b5061c6d2352d1a0ade44368f  crypto/evp/evp_local.h
-4012e1fb755b64dbc3655fda83beeecdf8e9fb09fb15ad2ed0d31aa8bd7b285c  crypto/evp/evp_rand.c
+3e724128a7589dd7cd354993493d6b38f95c64a5fb018c63058e0a7591623a63  crypto/evp/evp_enc.c
+2531ea569aeb8805180a963373ed7eac52acc5eb45d12bda03316bb8a1a8ed47  crypto/evp/evp_fetch.c
+f70344599d39e667978e939c553abd3a3dd6660541378d44e1c438f31f5d71a6  crypto/evp/evp_lib.c
+33c1282761af93b4a17565dd30f8f031729ef09fc3d643b2a812f8c4ef0df570  crypto/evp/evp_local.h
+cf82d0376e9550c0e5bfdddc8c1d6ebd0e9055c4ed3c70458cdf5a96ffee653c  crypto/evp/evp_rand.c
 2a128617ec0178e9eeacbe41d75a5530755f41ea524cd124607543cf73456a0c  crypto/evp/evp_utils.c
-25453a1f3eb3c2771cfabc301319fd7aadfc6567a1c309a79f20e924ca49b0d7  crypto/evp/exchange.c
+a9e940b29f3064e771eeafe9d4d0e6d1f7258cd61a57258faabdbe8121764986  crypto/evp/exchange.c
 294284ad040fe4b74845f91b1903c961c757e1ef3fcc2ffa35f43f37f1655e64  crypto/evp/kdf_lib.c
-20289ff0abde47be4d99cbe97605e2174077a8f0dcbce28650664f1102334299  crypto/evp/kdf_meth.c
-7a9c03d559bf9e1f88348b52bb07084eb5db29b7907a2ab57a472827b41a2659  crypto/evp/kem.c
-eae211e3333b1048d84532c625aab7e2014519c09b0a52495fedc4d05b2b057f  crypto/evp/keymgmt_lib.c
-9ffc3c7f01afc1d311485aa726c7b83de4b669c6b384f577b999d5eb85ec5342  crypto/evp/keymgmt_meth.c
+9328c7ea06e0719aaff2d59c959d1b7907b9e6a337f784680e2e289e8c3e4328  crypto/evp/kdf_meth.c
+c67d90f42c4d2294ecd103bdb02296a13248ead4aebadc3aead0cb964e171d81  crypto/evp/kem.c
+c4c8a30541a51d50872f03994829419a72d52c8207f9047fdc6fd28dfd43c057  crypto/evp/keymgmt_lib.c
+43a8d931d2abceea1c009b62f93bd720fa33e261491d395ec6857462db4bef77  crypto/evp/keymgmt_meth.c
 41f2e8d9fca78dfce6116e659fdefbdeb590cee567d5f9681eb2c028c0b5c424  crypto/evp/m_sigver.c
 2a1207fc3108d1aef4fc10f5d450dc344214f3cfff7a6e9688468c12846d4b64  crypto/evp/mac_lib.c
-1fff35c066fa6fc5acb81492efaf8153b265f64ab01675a5e4e8cf5319ffb4f6  crypto/evp/mac_meth.c
-1bdbe938aa6d8b5fa74cbc24dfec9b2222554ae9b6bc70f7b89ce22f046b7028  crypto/evp/p_lib.c
+036307223518ec03a93c9e519cbad9903341bf105642b6b694a791d31a1f232c  crypto/evp/mac_meth.c
+91acfeae1ee4ac6ee1760a820d8ca6688087e77756e09e151e3bc17c76b12064  crypto/evp/p_lib.c
 3b4228b92eebd04616ecc3ee58684095313dd5ffd1b43cf698a7d6c202cb4622  crypto/evp/pmeth_check.c
 759573aea2a4cc7b6f763b440e6868bfcfcb7ca94d812fa61ab24a194be2cb36  crypto/evp/pmeth_gn.c
 7d9dfc974d15a2b7e2c1c6c54a594f0a14ccdfe5e2e1afe84a3a52130ac8097b  crypto/evp/pmeth_lib.c
-dfac9cb90864156a3e6aa59b1f105f0420d7f3d36a2dac54ba5e29978af38865  crypto/evp/signature.c
-ab5734306605c9b83c1041084d7e3af619b15ade78da92b4151e09d80a79f88e  crypto/ex_data.c
+76d005962440945c127571ca3b3ece7c55944828b41d48c0bd1b819bd40408ab  crypto/evp/signature.c
+49059c31a933b2cc173ea0e3b5778e3cde9cf209fff624827c0915dc9f0324d7  crypto/ex_data.c
 d986ec74995b05ff65a68df320ab45894ba35d7be4906f8d78ca5fca294a4e6c  crypto/ffc/ffc_backend.c
 a12af33e605315cdddd6d759e70cd9632f0f33682b9aa7103ed1ecd354fc7e55  crypto/ffc/ffc_dh.c
 854378f57707e31ad02cca6eec94369f91f327288d3665713e249c12f7b13211  crypto/ffc/ffc_key_generate.c
@@ -235,9 +237,9 @@ c9c635805b26d85e8c0c7720592fb04b674cde4339fcd94712a4403e8677cb41  crypto/ffc/ffc
 6259c0e543faadc1c06a16095df38e9e4ce74a25b74e2951e601f9d4ea9bfb77  crypto/lhash/lhash.c
 5d49ce00fc06df1b64cbc139ef45c71e0faf08a33f966bc608c82d574521a49e  crypto/lhash/lhash_local.h
 a4f8f200ca749db91da97735c107836dfb2b623424b15c020ec6e48d874f4564  crypto/loongarch64cpuid.pl
-fcb2f1770dbf603134efec340ffd577524b7b9874d7c84372c0644d20ac75ada  crypto/loongarchcap.c
+460a7af09cde89a820b091522ada1310cfcec99c60aee505f94c48c35e9a29e8  crypto/loongarchcap.c
 f866aafae928db1b439ac950dc90744a2397dfe222672fe68b3798396190c8b0  crypto/mem_clr.c
-9abccd2f35b3b2419efb58b1d77950f8020754b452999a84476c32b65743b5ce  crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
+36e24eae5d38cc9666ae40e4e8a2dc12328e1159fea68447cb19dab174d25adf  crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
 580b90b1a2b4324afbe680c3ff59d58d0eff0b59511e5cf56fb119d2634c9a3b  crypto/modes/asm/aes-gcm-armv8_64.pl
 4fc1e83482ecc5c6cd01f1e1ccb7b84aa39993f1445e529062b7d4041a7eb190  crypto/modes/asm/aes-gcm-avx512.pl
 400a202abf66c6a3430965c38f7164ac297c856e8585862f59e3ff188bb35a6b  crypto/modes/asm/aes-gcm-ppc.pl
@@ -265,20 +267,21 @@ e55a816c356b2d526bc6e40c8b81afa02576e4d44c7d7b6bbe444fb8b01aad41  crypto/modes/w
 fb874ea18e9754dde11ef1c2993818074ff7cd8a74a981598745f7e11317bb91  crypto/modes/xts128gb.c
 e49f44c0c91789015fd45f9260eafe3139e6b73ca2af612df4aa21b71c637ca1  crypto/o_str.c
 b0decda3aae1d3e07cf3cbe9153cdde9deafe65fae346cd208951b4d7dec512e  crypto/packet.c
-83e09119c8dccfa6b562af2b04744fac46306a26a53826cf9007382a1de8eee4  crypto/param_build.c
+fb60966da0d636a59921c7eeadebedb79caa9667eb1622330ab7e1f31a8d24eb  crypto/param_build.c
 fa2062acdb901c9b15904b5c8f805247bba8b0eaa935c35fdfbe8d53ff463a7a  crypto/param_build_set.c
-e8ca4fc583eed166620ae3d8493407842525f1824cd747aadc0b4810cb27b257  crypto/params.c
+a267f41a7dead2b1f7ea35ad7d2d04db50cb75d0fb20fbc2fa72ba7ea4dc34a0  crypto/params.c
 bb7b79b5a070050f5e7dfc66b5635f0891bc278e3e24eec3583b769b33bef657  crypto/params_dup.c
 b2bd2b5cf3de2fe130223470da22fe4c1b08e75f0c10fcb7d0c089c9f9851f78  crypto/params_from_text.c
+e7bdda0dcbf7aa6d4b9d55efd7c59e78bc68aca644d64a7c316a044bccf20505  crypto/params_idx.c
 c27b8c1659274be74e2d6e9fd76980df499d1331c0c2d51f41b3ad547ba88d59  crypto/ppccap.c
 46fa4994a6234a98a2845d9337475913f6bc229f1928abc82224de7edf2784b8  crypto/ppccpuid.pl
 467c416422ecf61e3b713c5eb259fdbcb4aa73ae8dee61804d0b85cfd3fff4f7  crypto/property/defn_cache.c
-1fb5cf16e5e1bd0bef77585660ed70b9f472ecec127f5ae1aca23c1d3a6e57c5  crypto/property/property.c
+289f8d0569123201d700934663fabf7215079731a4ea2f5db7944a6cb80d9868  crypto/property/property.c
 66da4f28d408133fb544b14aeb9ad4913e7c5c67e2826e53f0dc5bf4d8fada26  crypto/property/property_local.h
 988e14f794b50729aa9e809e1160d7c52cc77bc891df037ac19cefa946df20cc  crypto/property/property_parse.c
 a7cefda6a117550e2c76e0f307565ce1e11640b11ba10c80e469a837fd1212a3  crypto/property/property_query.c
 20e69b9d594dfc443075eddbb0e6bcc0ed36ca51993cd50cc5a4f86eb31127f8  crypto/property/property_string.c
-adb76fa39fbf34ac261af97b8d03322995b07cd2ef11a0e6979870cf84dd11ba  crypto/provider_core.c
+bf5e9f8e49672afc09f4130ba300844d4412f9e3467985f693da70e34f1a4f3a  crypto/provider_core.c
 d0af10d4091b2032aac1b7db80f8c2e14fa7176592716b25b9437ab6b53c0a89  crypto/provider_local.h
 5ba2e1c74ddcd0453d02e32612299d1eef18eff8493a7606c15d0dc3738ad1d9  crypto/provider_predefined.c
 ba5c07983cb1d18e6d3e97f8ea16f99175c5461efe99d160051c6bd2886c0217  crypto/rand/rand_lib.c
@@ -291,27 +294,27 @@ f0c8792a99132e0b9c027cfa7370f45594a115934cdc9e8f23bdd64abecaf7fd  crypto/rsa/rsa
 38a102cd1da1f6ca5a46e6a22f018237964336274385f5c70cbedcaa6997647e  crypto/rsa/rsa_chk.c
 e762c599b17d5c89f4b1c9eb7d0ca1f04a95d815c86a3e72c30b231ce57fb199  crypto/rsa/rsa_crpt.c
 e995da1c2e5007bd7f5907f369fe45ed15f4e657143a85078c755bd5e6863d0b  crypto/rsa/rsa_gen.c
-98854736de2bc5cb1d092f116969f7121b6d56a0d7b00a51310c930caddeec32  crypto/rsa/rsa_lib.c
+b8e4d0aca3bcf9290163a5ef19a8de92552ab70ce4fe28cf2a4ee04211289f6f  crypto/rsa/rsa_lib.c
 a65e85be5269d8cb88e86b3413c978fa8994419a671092cbf104ff1a08fda23b  crypto/rsa/rsa_local.h
 cf0b75cd54b61b9b9a290ef18d0ddce9fb26a029a54eb3f720d9b25188440f00  crypto/rsa/rsa_mp_names.c
 5c60f6e05db82e13178d805deb1947b8eee4a905e6e77523d3b288da70a46bb5  crypto/rsa/rsa_none.c
 d0538475c5ebd2b2c585dc33fdcfb9a7a2f59f623b7ab0f8a09344a439082dfc  crypto/rsa/rsa_oaep.c
-2e00c4f957b3e8bf08ffc79f9da349750f10b7c16d8cc4d5f804a99e45e15f95  crypto/rsa/rsa_ossl.c
-b99b1133abf85c69d631498aed886d360ad5883c727f3108f807a0b6f370e204  crypto/rsa/rsa_pk1.c
+6adc9202558e531f4d78c75920882e916be27395dca386044a91adae5b331c64  crypto/rsa/rsa_ossl.c
+54446a41065d85d22ed521285196bf285427a071d32d00d070b2248723c2a914  crypto/rsa/rsa_pk1.c
 cdf66a4964152e16b7da5b6631f31bd2d90bf730b5a46c2622d5279abdecabe1  crypto/rsa/rsa_pss.c
 bf6d300b7e7e9e512a47c5bd1f8713806ae3033a140d83dfae4a16ad58d11170  crypto/rsa/rsa_schemes.c
 58db0509f34d970a2f206d468f718c17513970315d5d5ec92822fe6f4b6523fa  crypto/rsa/rsa_sign.c
 740c022caff3b2487c5838b581cdddcc7de2ceabb504aad72dc0dd70a67bf7cf  crypto/rsa/rsa_sp800_56b_check.c
 8eee673d98a640e30a245556ea046080d4272d20832f0c29157ec9a23cc43d3a  crypto/rsa/rsa_sp800_56b_gen.c
 1c1c2aeeb18bf1d69e8f134315b7e50d8f43d30eb1aa5bf42983eec9136a2fdc  crypto/rsa/rsa_x931.c
-8f9bf9d8d51032960441bc0143bd800051f9eb5d8475da0a5ba18049e751dcad  crypto/s390xcap.c
+4bf7f5cbbf7bf0e6c904b8c4988d077842cdd6aed0ad184cbfa4d4b3bfee79af  crypto/s390xcap.c
 22205848cfb55116ebf999dced8331b575886a609ce29e6886e6267b2310c337  crypto/s390xcpuid.pl
 465f850c3d6f2e9410f2e1ee9604b1b5b80f99bae1f6c581161c2f7ebc2c6e41  crypto/self_test_core.c
 05c533fde7fdba0c76103e97d881b7224c8427451b453e2f6413552996063e31  crypto/sha/asm/keccak1600-armv4.pl
 e32c7d698a6f156544aa42443e359af67076097471d9a171177afc668e9ebc74  crypto/sha/asm/keccak1600-armv8.pl
-ef575a7fb4956cc3be4ef10a6aeaa10702eadfc92c86167880690320ce942b26  crypto/sha/asm/keccak1600-avx2.pl
-f1dcf75789dfb0c5d7cd35988cb8046f60097bbaf1fbdab32a9269fa5492214c  crypto/sha/asm/keccak1600-avx512.pl
-63e547b100562d1142512d5b54e16efc276ecb6c743c27873dbcdd7cb917c828  crypto/sha/asm/keccak1600-avx512vl.pl
+12b7acce2fba0bc0e1ca07842ec84be6a022f141c86e077abb42c864af1d8d9c  crypto/sha/asm/keccak1600-avx2.pl
+faf0cccb685d5abc807e08db194f847c67b940da2fc3c235c210dc31d73a5334  crypto/sha/asm/keccak1600-avx512.pl
+be1e7dd9998e3f31cfa6e1b17bc198aeec584a8b76820e38f71d51b05f8a9f2a  crypto/sha/asm/keccak1600-avx512vl.pl
 33bdcc6f7668460c3bdf779633e43bfad62b937042a73acb007b462fc5b0a034  crypto/sha/asm/keccak1600-c64x.pl
 09fc831dd39bd90a701e9b16d9e9987cc215252a22e1e0355f5da6c495fca35a  crypto/sha/asm/keccak1600-mmx.pl
 bd0157f1a5741e0d23f3d84a8dad5a939f8d3c6182573ba2446187dd0d195233  crypto/sha/asm/keccak1600-ppc64.pl
@@ -351,7 +354,7 @@ f64d16c1e5c3fa4a7969de494a8372127502171a517c14be7a1e3a43a7308699  crypto/sha/asm
 8725cabb8d695c576619f19283b034074a3fa0f1c0be952a9dbe9793be15b907  crypto/sha/asm/sha512p8-ppc.pl
 b69b8a21115f4167641ef94f30846e367f479a2153a5de2991f0a34c564ce4b1  crypto/sha/keccak1600.c
 306cacd3f86e5cacaca74c58ef862516515e5c0cafaff48636d537fd84f1c2fb  crypto/sha/sha1dgst.c
-58f6bacfa26273c9cf1b7b11dd2456253f44f20958905f7cb9d0f8eaf40f9591  crypto/sha/sha256.c
+af4756bfeeabca490834f51e45e3fd726b5bbb35bb682b73d857a8c2e080c64f  crypto/sha/sha256.c
 3d972a11be18bfbfcd45790028635d63548bfe0a2e45d2fc56b6051b759d22f0  crypto/sha/sha3.c
 dc89d6740cfb58729e3276e03d290ae8319c6b081bfeaf21a0aa15ffb9839e17  crypto/sha/sha512.c
 6c6f0e6069ac98e407a5810b84deace2d1396d252c584703bcd154d1a015c3ea  crypto/sha/sha_local.h
@@ -362,17 +365,17 @@ cd677fd62171621d5e6b142df164aa847149ef4a01f6e3cea4516dcb137824e7  crypto/stack/s
 c0c4fd0f112465c6766072e25268c2f9019430e2c08c3c0a4271603d24d79f04  crypto/thread/api.c
 e298c753be277ad9a2ac0132d9897cb4c85607dbb2d11cfefd0c98e0f6a723d9  crypto/thread/arch.c
 5c02ff77d290ca0deb19672c1ed6fc0f47a0d630f61398a204a2684a7d418f0a  crypto/thread/arch/thread_none.c
-021d73b0a8789e138b1f5858b15409f3aff0bdae342ddc949b2d7631562abab4  crypto/thread/arch/thread_posix.c
-541f31c5666eb389eba59581cf1d5e3705ceba3f24845914b7dc3615db1f7379  crypto/thread/arch/thread_win.c
+1506ddf108b99cd192b70dbb00154fbb5e632527fa0ef56796bda4c68f833464  crypto/thread/arch/thread_posix.c
+a00e16963e1e2a0126c6a8e62da8a14f98de9736027654c925925dadd0ca3cc1  crypto/thread/arch/thread_win.c
 27ec0090f4243c96e4fbe1babfd4320c2a16615ffa368275433217d50a1ef76c  crypto/thread/internal.c
 67ba8d87fbbb7c9a9e438018e7ecfd1cedd4d00224be05755580d044f5f1317a  crypto/threads_lib.c
-6822fc32ea6765728f8e077454b4c12b9f2270eb6d85a31227db7a633f76f33a  crypto/threads_none.c
-37b270126b6a2eed21f11149f9ea5f22a4aec2736761c059944fd8d787826c45  crypto/threads_pthread.c
-5ba10c7b18169b6db216bb043c3930f75da3feda0bff72e211edc91ddd1b42da  crypto/threads_win.c
+5128f6ff98a37b6f9266c6b776020a62e536d8e9e05212c600f42150f32d3d23  crypto/threads_none.c
+e29e0fc64feaa71c68da6e5f2fa8a00853f9b2d6a8b516eb474bde51e23065f6  crypto/threads_pthread.c
+88b1a6c282ea8e6d3eff5c0808894b49e4b4883847ed45ed448e99249dacf499  crypto/threads_win.c
 8b45f948303045d8f753858b1b892e3da13bebe1bdac500db91fbb54a0ac07da  crypto/time.c
 fd6c27cf7c6b5449b17f2b725f4203c4c10207f1973db09fd41571efe5de08fd  crypto/x86_64cpuid.pl
 bbec287bb9bf35379885f8f8998b7fd9e8fc22efee9e1b299109af0f33a7ee16  crypto/x86cpuid.pl
-bfbd591ebc5c9cd46cd03f1f76cc4e77ebacb522e3f017422d3cc85a3a3aecee  include/crypto/aes_platform.h
+f24620e63469b36f9e015841fdabde2af35982268e61183fafcbd6fbdeeeca1d  include/crypto/aes_platform.h
 99e3f29e2f7f78a4f43f634c5c56a74e3b64b05ad077249eba64976bc47d6d37  include/crypto/asn1.h
 8c6f308c1ca774e6127e325c3b80511dbcdc99631f032694d8db53a5c02364ee  include/crypto/asn1_dsa.h
 d95af0a278bc2edef9c3e1129fc6e7b1577b1ea95249b05ef39c4a4847e9ddac  include/crypto/bn.h
@@ -381,12 +384,13 @@ d95af0a278bc2edef9c3e1129fc6e7b1577b1ea95249b05ef39c4a4847e9ddac  include/crypto
 9a7c2ed3703a83e14d25440dc63ef933b21a7225dfc28314a2a23e31706153e9  include/crypto/context.h
 e69b2b20fb415e24b970941c84a62b752b5d0175bc68126e467f7cc970495504  include/crypto/cryptlib.h
 6c72cfa9e59d276c1debcfd36a0aff277539b43d2272267147fad4165d72747c  include/crypto/ctype.h
+09a27585de4638577b482ec9102a0e70d843dee6297a2d45e27d888f6de5e27f  include/crypto/decoder.h
 89693e0a7528a9574e1d2f80644b29e3b895d3684111dd07c18cc5bed28b45b7  include/crypto/des_platform.h
 daf508bb7ed5783f1c8c622f0c230e179244dd3f584e1223a19ab95930fbcb4f  include/crypto/dh.h
 679f6e52d9becdf51fde1649478083d18fa4f5a6ece21eeb1decf70f739f49d5  include/crypto/dsa.h
 c7aafee54cc3ace0c563f15aa5af2cdce13e2cfc4f9a9a133952825fb7c8faf5  include/crypto/ec.h
-35bf6ad4d804544d8ae56b63a5bf8958dfa76b9a62e02b64cc6b3791e964b78d  include/crypto/ecx.h
-e11a5d3e68e01fc1e94ed054bc3924b613fc916f2fe30a6347847057ea7cef19  include/crypto/evp.h
+2d8cba492193c170d1f759508556188a568cabe5960020b9a889b69838adbfa4  include/crypto/ecx.h
+4c3aab5edf9ffc34908a8f74c1263f02573e2ca0ed805e1208ec389e4089867c  include/crypto/evp.h
 bbe5e52d84e65449a13e42cd2d6adce59b8ed6e73d6950917aa77dc1f3f5dff6  include/crypto/lhash.h
 906bc2316e4f4651e5db7a8273ec3bb4bcbfb55f0f484bebdae4f6d0ce033bdf  include/crypto/md32_common.h
 6e7762e7fb63f56d25b24f70209f4dc834c59a87f74467531ec81646f565dbe3  include/crypto/modes.h
@@ -394,14 +398,14 @@ bbe5e52d84e65449a13e42cd2d6adce59b8ed6e73d6950917aa77dc1f3f5dff6  include/crypto
 90930fc8788d6e04e57829346e0405293ac7a678c3cef23d0692c742e9586d09  include/crypto/rand_pool.h
 2f502340909e531a9a7c71451400eb68a53bf62015c17b0169b1efffb0703882  include/crypto/rsa.h
 32f0149ab1d82fddbdfbbc44e3078b4a4cc6936d35187e0f8d02cc0bc19f2401  include/crypto/security_bits.h
-0f743762f646656b5480648c05632575fe8acc7506460c63e0fcdf42cf20c08a  include/crypto/sha.h
+80338f3865b7c74aab343879432a6399507b834e2f55dd0e9ee7a5eeba11242a  include/crypto/sha.h
 7676b02824b2d68df6bddeb251e9b8a8fa2e35a95dad9a7ebeca53f9ab8d2dad  include/crypto/sparse_array.h
 7ad02c7de77304c3b298deeb038ab2550cf8b2bce03021994477c6c43dbcf86e  include/crypto/types.h
 27d13538d9303b1c2f0b2ce9b6d376097ce7661354fbefbde24b7ef07206ea45  include/internal/bio.h
-704a7b439036f517df08fe2cab9b92ca5bf60457ae1902b965bdc0f74358a8aa  include/internal/common.h
+92c4187dc051dbab777271e6976eb10bc90197abfd9b0d6f20bc17503f54564d  include/internal/common.h
 92aacb3e49288f91b44f97e41933e88fe455706e1dd21a365683c2ab545db131  include/internal/constant_time.h
 c5bb97f654984130c8b44c09a52395bce0b22985d5dbc9c4d9377d86283f11f8  include/internal/core.h
-e5711c7480f6d1818d9eba2ba379961446f9cc24def2368dfe8171e077854d3d  include/internal/cryptlib.h
+3e4700edd79786624a6a4ea00b609290f70ad89325e220eae8a5c7fe7b0a7d99  include/internal/cryptlib.h
 9571cfd3d5666749084b354a6d65adee443deeb5713a58c098c7b03bc69dbc63  include/internal/deprecated.h
 dc5afb955d810feb5af9f8d25cd8a92118abef320fee95c07b04f301c4e0d96c  include/internal/der.h
 8059e715f981fbe02b5731610ed24bb6ae617a55e90b03f4260cbb6ccd71e8de  include/internal/deterministic_nonce.h
@@ -412,14 +416,15 @@ f144daebef828a5bd4416466257a50f06b894e0ce0adf1601aa381f34f25a9e7  include/intern
 19b0b6356921484359c2e5e7839ffc476fe48a31fbae31595545a58c920ae224  include/internal/ffc.h
 55c4102496ed5ab16de11afe38c328a1396c3b6e2c7e44add4a38855103c19da  include/internal/namemap.h
 b02701592960eb4608bb83b297eed90184004828c7fc03ea81568062f347623d  include/internal/nelem.h
-ae41a2fb41bf592bbb47e4855cf4efd9ef85fc11f910a7e195ceef78fb4321dc  include/internal/numbers.h
+3363405b2d6afab68f7e13921385ccb648fe7f77522bd0aa5fdf2d7af0b87660  include/internal/numbers.h
 66f7c420e531383e8a93c1daccbdc4ab64d11e0ed167af1b7f7be54bd61329aa  include/internal/packet.h
 f42d4a6108a18ade3eb99682c072adf83889b6ba3fc80ee3e20929ed8d0f7137  include/internal/param_build_set.h
+5c6c98b1a642b999c909c7cfb91e7925422fbd0b9eca56210ea745bc20668783  include/internal/param_names.h.in
 46d7980258a8d11353af3e3dab87c368eec054e46ac8a0facec68b23ba94d91b  include/internal/params.h
 d4ac19b28ea61f03383364cfad1e941cac44fc36787d80882c5b76ecc9d34e29  include/internal/property.h
 727326afb3d33fdffdf26471e313f27892708318c0934089369e4b28267e2635  include/internal/propertyerr.h
-9a73c9ac02eb93a8399381862397bc27fbf8abb7523b07e9f1da9f2e66a913ae  include/internal/provider.h
-80d7d12b8b3d9945bde3991cb0d1413d120a58a04b17ac673549789e3f37b18a  include/internal/refcount.h
+811eff73f789e535530cf23ea6037d4da6cde53398e0e7063e60c68b8923a9b5  include/internal/provider.h
+9b7d51e4bcf7375dff3ef2d815443c36f19b4a48bcf89a5805a55dfac30505f8  include/internal/refcount.h
 5f48b2caa1986f85fc31d1f96621684736c27964291b3718dd35f3a15534fa99  include/internal/safe_math.h
 11ee9893f7774c83fcfdee6e0ca593af3d28b779107883553facdbfdae3a68f5  include/internal/sha3.h
 494ab5c802716bf38032986674fb094dde927a21752fe395d82e6044d81801d1  include/internal/sizes.h
@@ -435,7 +440,7 @@ ef96b731db0e0998c11a297d601f5b37c02525774d532fb4f92160e9069c7dfc  include/intern
 47fd81a330f042baf3675f4154c6276ab7a8cf76efaf01288abe41f119ec5588  include/openssl/asn1.h.in
 d4733dcd490b3a2554eaf859d1ea964fe76f7d24f78e42be1094bdad6dee7429  include/openssl/asn1err.h
 1550474ee05423896ec4abfb6346f1bc44c7be22329efac9ea25de10e81d549c  include/openssl/asn1t.h.in
-7942aecc6a5459c7ab0afc09ddfb60dcc89734026b760a20fedee5999d0ea919  include/openssl/bio.h.in
+96c3b90a890f5dce1c9186c8d5bc26769bb8e1f0254d304fc9f1ae018344b497  include/openssl/bio.h.in
 fe5ab4bc904b7c77e5411c4b7dda6d29595eb60a87f00e30ab32f48391f98b44  include/openssl/bioerr.h
 9caa80699882befcce556446a45e5ffde5aa938aa2aae0e8ecd46c9c6a3fe419  include/openssl/bn.h
 9ad8b04764797f5138f01f549ba18b44cf698ffc7fe795fef42c1822d84a6ff4  include/openssl/bnerr.h
@@ -448,12 +453,14 @@ f20c3c845129a129f5e0b1dae970d86a5c96ab49f2e3f6f364734521e9e1abe3  include/openss
 6b3810dac6c9d6f5ee36a10ad6d895a5e4553afdfb9641ce9b7dc5db7eef30b7  include/openssl/conftypes.h
 28c6f0ede39c821dcf4abeeb4e41972038ebb3e3c9d0a43ffdf28edb559470e1  include/openssl/core.h
 99d507e9aa0b4ad94b191b1aba2cb5d426b8fe130910e6f9c86a8ca62f42f8cc  include/openssl/core_dispatch.h
-f61a4730da115ebb967d9515412226030b94902d05e96b685f2579adda629fe1  include/openssl/core_names.h
-bdd4f653c09f762e89fd498f4e597789d1e491967910591f8504684dc79ed593  include/openssl/crypto.h.in
+8b4027cf19ce2a7cbad506cde61552123818b6eae62d5fbdae34e9f68660e6f8  include/openssl/core_names.h.in
+371413ef13841f1245a225c8ec1cec463629c42bfc33254f979d2a8672112f9a  include/openssl/crypto.h.in
 2f9570c2514b4d1b2a86fbdf30ced879e5c52e62f1d3691cb3da37ce4f6a98dd  include/openssl/cryptoerr.h
 bbc82260cbcadd406091f39b9e3b5ea63146d9a4822623ead16fa12c43ab9fc6  include/openssl/cryptoerr_legacy.h
+83af275af84cf88c4e420030a9ea07c38d1887009c8f471874ed1458a4b1cda7  include/openssl/decoder.h
+503b45367b035ddf6e54587125c2100ceec324d646e6f3df92c12513185e977c  include/openssl/decodererr.h
 fa3e6b6c2e6222424b9cd7005e3c5499a2334c831cd5d6a29256ce945be8cb1d  include/openssl/des.h
-0558a131214f508cd0619658a33af1d62579d94d50df5348994a1de12371b98e  include/openssl/dh.h
+0837b1ec7074b37d2e1d5ac46d6003c3fc4f1ff10f2e44c64b5709b0bacec4e8  include/openssl/dh.h
 8db02ada121100704950b2199c8129daf7562b9ad2812121e20fcf50d7ba7c3d  include/openssl/dherr.h
 3cfb7211419c5dcc98b9a20713e2245befa0182a10615edb89a5ce0a0725a787  include/openssl/dsa.h
 276d1f6e111ba933bc708e6a0670047cbe0d0b67aabe31807abbbc231de4d8cf  include/openssl/dsaerr.h
@@ -463,7 +470,7 @@ bc9ec2be442a4f49980ba2c63c8f0da701de1f6e23d7db35d781658f833dd7b9  include/openss
 7aa8c5bee779af59d4733f6a50f7f6be39f1eb43409e5b3357440f9a7d0ca115  include/openssl/ecerr.h
 61c76ee3f12ed0e42503a56421ca00f1cb9a0f4caa5f9c4421c374bcd45917d7  include/openssl/encoder.h
 69dd983f45b8ccd551f084796519446552963a18c52b70470d978b597c81b2dc  include/openssl/encodererr.h
-c6ee8f17d7252bdd0807a124dc6d50a95c32c04e17688b7c2e061998570b7028  include/openssl/err.h.in
+d4d376d2251df847f8c8aaf164834787332802ff3ce0c9263be3de952cf00ea4  include/openssl/err.h.in
 644cb0cb1d8a6f94395088d5f628a5771513f58708893839647894f4875f5278  include/openssl/evp.h
 5bd1b5dcd14067a1fe490d49df911002793c0b4f0bd4492cd8f71cfed7bf9f2a  include/openssl/evperr.h
 3085bc5a77ea3776619bf9c748632a3a23f1d8dcad5239ba0f48939f375fb0e8  include/openssl/fips_names.h
@@ -471,9 +478,9 @@ b1d41beba560a41383f899a361b786e04f889106fb5960ec831b0af7996c9783  include/openss
 47a088c98ad536ea99f2c6a9333e372507cb61b9bdffb930c586ed52f8f261eb  include/openssl/hmac.h
 faab8accc9520269dd874126ae164a43526d5784e6280521c7ab3772c02b0a0c  include/openssl/kdf.h
 a09630e7aaf5862aa9f1dc8aaa8e9b9326606ccf3f4adf250d156d79c886da8b  include/openssl/lhash.h.in
-7326b7d7849ff7aed85a2da3ef382d930a72b8ee6b027aba9bc59bfe88c039c6  include/openssl/macros.h
+1368eab024d7d2bf9297ed08dce20ed1a57bbc6ab423b026c46d855ba870a6cb  include/openssl/macros.h
 9184207c562fd1fa7bd3a4f1fadcb984130561279818f0cdfcf3e9c55be8a7d1  include/openssl/modes.h
-186f94274cb36d40bda9a8815aa87e85a19a7844d8391e2c3aca5200dee01112  include/openssl/obj_mac.h
+290ff74354553fc9746e4725bc5cfd9de59dad691fda3f3f5880cb0d767b08df  include/openssl/obj_mac.h
 157797b450215f973eb10be96a04e58048ab9c131ad29427e80d0e37e230ed98  include/openssl/objects.h
 d25537af264684dff033dd8ae62b0348f868fcfec4aa51fa8f07bcfa4bd807ad  include/openssl/objectserr.h
 fe6acd42c3e90db31aaafc2236a7d30ebfa53c4c07ea4d8265064c7fcb951970  include/openssl/opensslconf.h
@@ -482,17 +489,17 @@ fe6acd42c3e90db31aaafc2236a7d30ebfa53c4c07ea4d8265064c7fcb951970  include/openss
 30085f4d1b4934bb25ffe7aa9a30859966318a1b4d4dcea937c426e90e6e1984  include/openssl/params.h
 ed785c451189aa5f7299f9f32a841e7f25b67c4ee937c8de8491a39240f5bd9d  include/openssl/prov_ssl.h
 08980b1dbc01e2926fc59707d867030fc7a3d37dc625c0e1edf2d31bdf71b2fb  include/openssl/proverr.h
-7d9830aba8090cbf9daec67ac6127e22486b3b2fdccdc465f1cd231cae38006e  include/openssl/provider.h
+03bda8974476f0f038a7cfa0cb30f0b8210d55c74c6e7e853fd1564dca3e2b14  include/openssl/provider.h
 e512ab2e492d968a9bf8b2b048f79ac5dfe11bddf3c00f2eec6e9c6ecc57d330  include/openssl/rand.h
 108966f56c82fedff53df76a4aa7861c82be4db1fd1ddafb59dc086ea155831c  include/openssl/randerr.h
 2f4f0106e9b2db6636491dbe3ef81b80dbf01aefe6f73d19663423b7fcd54466  include/openssl/rsa.h
 2f339ba2f22b8faa406692289a6e51fdbbb04b03f85cf3ca849835e58211ad23  include/openssl/rsaerr.h
 6586f2187991731835353de0ffad0b6b57609b495e53d0f32644491ece629eb2  include/openssl/safestack.h.in
 676015d7541e7929c8ecbea648665f869d7edf50f9e7292a401b18c63a7ffe05  include/openssl/self_test.h
-2964274ab32b1ba8578a06b06663db2eda4317ae806369271d889176bb5a7d04  include/openssl/sha.h
+a435cb5d87a37c05921afb2d68f581018ec9f62fd9b3194ab651139b24f616d2  include/openssl/sha.h
 c169a015d7be52b7b99dd41c418a48d97e52ad21687c39c512a83a7c3f3ddb70  include/openssl/stack.h
 22d7584ad609e30e818b54dca1dfae8dea38913fffedd25cd540c550372fb9a6  include/openssl/symhacks.h
-f25d4ab79482051e723115aa7bdb6d6aa3ed23c0192d4a0f2ba2b7e58d05b440  include/openssl/thread.h
+8acd8147402a816c835b4240e18972072bab41d3fb6ee364fc17e543d6a854f6  include/openssl/thread.h
 a99dcb756a27eb019c9e3f5c49bd55ca39def82684aea891bac011e9e99f9b8d  include/openssl/trace.h
 a22bb862d4e1e7bb41b4199f81fc6737dc0a277534b17f9e22b102ea297532c1  include/openssl/types.h
 c0a9551efccf43f3dd748d4fd8ec897ddaabbc629c00ec1ad76ce983e1195a13  providers/common/bio_prov.c
@@ -528,15 +535,15 @@ c2b4301a9f835c0b3776ad3afba7121d00cd7ae6387fe11c96269a37da08027c  providers/comm
 3f5656c405ec57a261df7af940c1512990555361f69488a28d65e16f6b865a1d  providers/common/provider_err.c
 2f334bf2292bc394778eacaec57e7419e62d0918c166098cc65a09e8c3f5171e  providers/common/provider_seeding.c
 6e833d259d04cdedc007e6cda52fd706527edcf4b4432dbd88cbf45c3f7a4442  providers/common/provider_util.c
-ba345b0d71f74c9e3d752579e16d11cc70b4b00faa329cc674bc43dd2620e044  providers/common/securitycheck.c
+5b94312727ca33e4f5c038f4caaae8417bf584cfde22df83d91f3c55c30c81ee  providers/common/securitycheck.c
 bc4370324c4c8791ea6de8641d255073c6745ee984e18912d535e155d9815244  providers/common/securitycheck_fips.c
 abd5997bc33b681a4ab275978b92aebca0806a4a3f0c2f41dacf11b3b6f4e101  providers/fips/fips_entry.c
-7578ad47066b4c8f9aaec36cd2c41db2217e0cf605b2aa9dc295f22b2bfb97e2  providers/fips/fipsprov.c
-2ceef6e94dfef12be887cfaeda47dff780c44acbb45564b779c3e1823cb22eb8  providers/fips/self_test.c
+5d4c2e93c2aef3f74aea56e6680bc1735081f680102f09d7d0b22d1df53767fb  providers/fips/fipsprov.c
+bf247e11ce05e274ab668e80e6e86ed3747b2848570e20b993e68b54559334a3  providers/fips/self_test.c
 f822a03138e8b83ccaa910b89d72f31691da6778bf6638181f993ec7ae1167e3  providers/fips/self_test.h
 551631b909f8d173eafcccac782a44c8aed92bb8463bfccdb936b7f3aee2a48b  providers/fips/self_test_data.inc
 ed6dc106e223a422b133f774f94079fcd404899d7fad624179dd152354dbb500  providers/fips/self_test_kats.c
-1346a7f28880d7c74b9daf560e629ff8a21111b81371e9de8c9ea5b885105012  providers/implementations/asymciphers/rsa_enc.c
+4428a56f5d195547348c743df0c14ac9c97cd7b60ce09b76cffe5e7c9296daec  providers/implementations/asymciphers/rsa_enc.c
 c2f1b12c64fc369dfc3b9bc9e76a76de7280e6429adaee55d332eb1971ad1879  providers/implementations/ciphers/cipher_aes.c
 f9d4b30e7110c90064b990c07430bb79061f4436b06ccaa981b25c306cfbfaa2  providers/implementations/ciphers/cipher_aes.h
 480c1f44157dff5fc65369f5c29a5369528061576c00a6454f3e54b37f9f8af1  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
@@ -550,7 +557,7 @@ f9d4b30e7110c90064b990c07430bb79061f4436b06ccaa981b25c306cfbfaa2  providers/impl
 a8eaca99a71521ff8ac4ffcf08315e59220f7e0b7f505ecddad04fadd021ec14  providers/implementations/ciphers/cipher_aes_cts.inc
 710ee60704dd9dffa2a11e2e96596af1f7f84f915cedcedeec7292e0d978317a  providers/implementations/ciphers/cipher_aes_gcm.c
 79f5a732820d2512a7f4fc2a99ece7e6e2523a51e62561eb67a4b70d5538b0c4  providers/implementations/ciphers/cipher_aes_gcm.h
-590557c6baad5e4e01d3730898b1fc48d62609be686f6726aee0b31db65b558f  providers/implementations/ciphers/cipher_aes_gcm_hw.c
+986450da9f87b3cea00880c5bb5b0908b201ba27f68942b9f8bfff393610b3bb  providers/implementations/ciphers/cipher_aes_gcm_hw.c
 be18c20e0197f25fe7b9e0268657a2271a69d216b89cb100f082fa5fcaad1e07  providers/implementations/ciphers/cipher_aes_gcm_hw_aesni.inc
 26b55801b80128e60fa4cd4fb2b7a81a8741fc78142b0b670b09483ada592f0d  providers/implementations/ciphers/cipher_aes_gcm_hw_vaes_avx512.inc
 4dea01dde337e6416db6217ae4a64a0681187c38325a27bc449160f8de7580bb  providers/implementations/ciphers/cipher_aes_hw.c
@@ -573,13 +580,13 @@ db10699b91e2634ac5de4f42661a15e1f718823c092301d862088bae267bc212  providers/impl
 ab9a2edb23aa61cf31da6addd8674a6028f93399eceeeee35a56ee770338fd6c  providers/implementations/ciphers/ciphercommon_block.c
 4b4106f85e36eb2c07acc5a3ca5ccd77b736b3ac46cc4af786cf57405ecd54b2  providers/implementations/ciphers/ciphercommon_ccm.c
 8b6828f188c2590c7d9c6cac13fa0eb6d38a522b0f2859e7c8a766580fa9b66e  providers/implementations/ciphers/ciphercommon_ccm_hw.c
-3b83f58d6ff1ae77de1ae8bee8a44ea2e5e4491c802b156fa77783ddebd44598  providers/implementations/ciphers/ciphercommon_gcm.c
+90a727b88ae6cdef8b93a9e5a326f3647087d137dc21b99921a8c5a463fc4d21  providers/implementations/ciphers/ciphercommon_gcm.c
 bb67eaa7a98494ca938726f9218213870fc97dd87b56bda950626cc794baf20b  providers/implementations/ciphers/ciphercommon_gcm_hw.c
 23fd89e3239e596c325a8c5d23eb1fe157a8d23aa4d90ed2c574bf06dfabd693  providers/implementations/ciphers/ciphercommon_hw.c
 c4b1cb143de15acc396ce2e03fdd165defd25ebc831de9cdfacf408ea883c666  providers/implementations/ciphers/ciphercommon_local.h
 39b47b6ef9d71852964c26e07ef0e9b23f04c7493b1b16ba7c3dba7074b6b70d  providers/implementations/digests/digestcommon.c
 5f41dd1bf77bd08d287a875f9d6e5a423bf286524694ae7ee133cdd03ee763c0  providers/implementations/digests/sha2_prov.c
-b733ad7e1b5cff37753436a133a6fbd53402285455bc3b2bd6834b4bce001fdd  providers/implementations/digests/sha3_prov.c
+9aa1ab14059f0b3db8091c7bb900e5f1487c0d0e925a71d79d7575f4a7a60444  providers/implementations/digests/sha3_prov.c
 4b774bf9267ebe05bf90076bc18e19a21e03ee2716bdb8fc4e6458774e9a820c  providers/implementations/exchange/dh_exch.c
 b2d80c38dd62b46f2dd71e81a5684f54f43200d3ddbb86178081760ecc93525c  providers/implementations/exchange/ecdh_exch.c
 4994df237719649b086a032bd64c1cf38ceb4e67dd8ec98da20edf5bc3eadb0b  providers/implementations/exchange/ecx_exch.c
@@ -591,12 +598,12 @@ a07b9c86346100feef15c9abb57e48a6099bc9fa782724a2283f17910ef192fb  providers/impl
 b9a61ce951c1904d8315b1bb26c0ab0aaadb47e71d4ead5df0a891608c728c4b  providers/implementations/include/prov/digestcommon.h
 1baf1c06b20a0eb8ec271452544922d67c1cc168dbe9853b259191de4bd99918  providers/implementations/include/prov/ecx.h
 062b49fc5cfa405fbcb184b1b48c9141db22531493bf828ba8543d24b0b72692  providers/implementations/include/prov/hmac_drbg.h
-41969ce8fef1535648dbc8ce441dc904c420d5f53cc749cae9ef86be4ed680f4  providers/implementations/include/prov/implementations.h
-5f09fc71874b00419d71646714f21ebbdcceda277463b6f77d3d3ea6946914e8  providers/implementations/include/prov/kdfexchange.h
-c95ce5498e724b9b3d58e3c2f4723e7e3e4beb07f9bea9422e43182cbadb43af  providers/implementations/include/prov/macsignature.h
-24ad9d90469cdab5fc0445e9bd9d2a5d147d335354790ec8a4185d033fd1878c  providers/implementations/include/prov/names.h
+a6879c2e107597c49efa07fae48f0554ffbea9814c31d186bf0ce9f83e1ec9d2  providers/implementations/include/prov/implementations.h
+05eedab6b16c80025f72281fa619d9480c437b800cb821b761fe4c05bc9d3af0  providers/implementations/include/prov/kdfexchange.h
+4014246d44fa3f34aad5372c75d3f7eea528f1cf1798e30d5627e7620a356631  providers/implementations/include/prov/macsignature.h
+27e57358e8ad201e382b50d5760f010badd9d6253deb34e6fb93a2af35450d9a  providers/implementations/include/prov/names.h
 b9f8781167f274ccd8b643b3bb6c4e1108fb27b2aae588518261af9415228dae  providers/implementations/include/prov/seeding.h
-5f7326910bc9ce663c9bd8509f555c0a68c1b2577b6122ef20da3d1d6884122e  providers/implementations/kdfs/hkdf.c
+976a18396364387b36b83d1cb723b530dce37ffc57fa066567fe730853f84444  providers/implementations/kdfs/hkdf.c
 0d0c153bbb7234a98cd95fb802bed6bfc00a6002dd61a7fe77a44433a3cd9181  providers/implementations/kdfs/kbkdf.c
 03b3dffd32a2b8f94e7d39b97f3d7b36f00cd0177ee5e7329a39aeca20ed4baf  providers/implementations/kdfs/pbkdf2.c
 c0778565abff112c0c5257329a7750ec4605e62f26cc36851fa1fbee6e03c70c  providers/implementations/kdfs/pbkdf2.h
@@ -606,24 +613,24 @@ da5fa36d4fbb2816221560f5cd1c1710b59b8f948c1b9d2a37ee8e30a07b04f2  providers/impl
 7aab45293d8cb6d6a778f6d8fb243a679d98a73a26ac7c681ff280a8d5e06664  providers/implementations/kdfs/tls1_prf.c
 1664cb4137073e9c0e202b82ca251e8620dbc83aa3d3d6b85de440183288ea61  providers/implementations/kdfs/x942kdf.c
 bb7ad10481d496f3227897c00b2a9d516ce8e0a6627f4addeabd9c72d9cf825f  providers/implementations/kem/rsa_kem.c
-de1c027137ec0d647b29f33b87a183c80033a8a39fbead0c42712b40033c6d05  providers/implementations/keymgmt/dh_kmgmt.c
-e2df47ce7eacbfd3884c9a0505eaa4c76e5351197983b7bf1cc9f544d514f93f  providers/implementations/keymgmt/dsa_kmgmt.c
+ae4bb64d67e22df2ea43345af50b3c205781aff9f677a7436e35c00c5c3b99ff  providers/implementations/keymgmt/dh_kmgmt.c
+2d229f89413d3a3c945f5862145258cadf24bfdde37b637a1bf51d683308873d  providers/implementations/keymgmt/dsa_kmgmt.c
 3964a23ac071b0d6e54ea12c382e98abe1becfd9890194d94804715002b2b5b8  providers/implementations/keymgmt/ec_kmgmt.c
 258ae17bb2dd87ed1511a8eb3fe99eed9b77f5c2f757215ff6b3d0e8791fc251  providers/implementations/keymgmt/ec_kmgmt_imexport.inc
-e1562e8c964920f24ac51dacebbc108aff5bf2a55017be209048ed5b16bb0a66  providers/implementations/keymgmt/ecx_kmgmt.c
-61dd255d3bd029fe923bda46371a85d58ec9d4ca078727c47ebca86e26a2b13e  providers/implementations/keymgmt/kdf_legacy_kmgmt.c
-c6a9144e1bfbd53b3a44dc9aaa8d4c96dcb1db417439de10d3bcfe8057f98f70  providers/implementations/keymgmt/mac_legacy_kmgmt.c
+02bcd47c626b65ef7eba3be418bd6c77b1949f1feb3fe99869fad33ebb6ca475  providers/implementations/keymgmt/ecx_kmgmt.c
+daf35a7ab961ef70aefca981d80407935904c5da39dca6692432d6e6bc98759d  providers/implementations/keymgmt/kdf_legacy_kmgmt.c
+91832fb65cc8ee591989fcf0f039ad04ba463008b5be9549a2b0ae6882b257ab  providers/implementations/keymgmt/mac_legacy_kmgmt.c
 9034a66a4bae1a15e127a5eca94bcec2ecaa971b205e945fcf7fba6b6bb8e47d  providers/implementations/keymgmt/rsa_kmgmt.c
 7a94dfdf6c0ea272b49a52191f1aaaa74b88cc9d08efa7789c1984be22a2052f  providers/implementations/macs/cmac_prov.c
 f29f282463f5bc432129850619edc427fe1d6cc8aa107b5703b11858b48790da  providers/implementations/macs/gmac_prov.c
 47065d5f3460bedc344376754debec56d0e83b8cab94018db77f899c403115bd  providers/implementations/macs/hmac_prov.c
 145f3d5d5ebd5fb3bbe32705d7d71ff03e35b776f1c77d2f43781263ccc6a808  providers/implementations/macs/kmac_prov.c
 3034074f99b02db045f2ccecc8782322e876dad07a3c169bdb24168b6b1f8cbd  providers/implementations/rands/crngt.c
-fd5dcaaf50ce7bf583bb6b5412007d1f15b42408304c94763027deba7d600556  providers/implementations/rands/drbg.c
-b366405d17c53b904951342d00c8c302109b88558933de33374f4c9d53b49581  providers/implementations/rands/drbg_ctr.c
-4a659ef3301020e68f89d43a6519e01905dd0dd62c2e8770e4b63507ee156f6a  providers/implementations/rands/drbg_hash.c
-e60130d3131684913a370f674165a5b1d511fff93ca8753eeac4fc0e68fbf4da  providers/implementations/rands/drbg_hmac.c
-e1c1c2554adb92d29b035015c1114512e6b8a6781ed31861d812a8a5bb9b34ec  providers/implementations/rands/drbg_local.h
+51688b34a8ba14234cf91c318ce9f97b8a54dbb501d6f56aa53d472f877d3660  providers/implementations/rands/drbg.c
+b436b9f1c5525884e9adcc941726e0cf4bb135517f4dc403f24fec128c9cae8c  providers/implementations/rands/drbg_ctr.c
+118c2f62f765c0324695cb286670ae024cbeaacd989666da8e3daa8d0ec44c65  providers/implementations/rands/drbg_hash.c
+3096525926ee80fec225c16e89fc9d58867de5f63b1e7a0736ed56ca09f19f2b  providers/implementations/rands/drbg_hmac.c
+e65a6972711303a71636ee7e31cab6dfd1734a97e25b4dce119060c1487bbe33  providers/implementations/rands/drbg_local.h
 26d86b55837f515684865cb0e327aea435a9b7f27bf296287d44209f9a5df6ff  providers/implementations/rands/test_rng.c
 a9aa31d091df5b8f6710dd36761dfe7d32b6da1881f8581bed85ad4e171b0969  providers/implementations/signature/dsa_sig.c
 6c8b5f325c997014bd71331c9eb6c185838cd81c10c3ad74dd65289ae923d629  providers/implementations/signature/ecdsa_sig.c
diff --git a/providers/fips.checksum b/providers/fips.checksum
index aab7df72271e6f1308510b0bcb3bf5999bde1f5e..5697105a43261fb1d77b8cc2c23b0bd2da7d618f 100644
--- a/providers/fips.checksum
+++ b/providers/fips.checksum
@@ -1 +1 @@
-d36d84f3f9dfbb0127f6b2462583ecabcc1956c60d2f8c19425c6854f5934e3b  providers/fips-sources.checksums
+91f820645394cd8895d6fef399ee8e0df13817aa5430eda3ce8fbfb14ccfd3fc  providers/fips-sources.checksums
diff --git a/providers/fips.module.sources b/providers/fips.module.sources
index 9613a4aa87a53612836247fce68ab15e31126066..3ab2c245d8ec9a0b4b02a4d26c7f1e53acfd3871 100644
--- a/providers/fips.module.sources
+++ b/providers/fips.module.sources
@@ -145,6 +145,7 @@ crypto/dsa/dsa_local.h
 crypto/dsa/dsa_ossl.c
 crypto/dsa/dsa_sign.c
 crypto/dsa/dsa_vrf.c
+crypto/ec/asm/ecp_nistp384-ppc64.pl
 crypto/ec/asm/ecp_nistp521-ppc64.pl
 crypto/ec/asm/ecp_nistz256-armv4.pl
 crypto/ec/asm/ecp_nistz256-armv8.pl
@@ -152,6 +153,7 @@ crypto/ec/asm/ecp_nistz256-ppc64.pl
 crypto/ec/asm/ecp_nistz256-sparcv9.pl
 crypto/ec/asm/ecp_nistz256-x86.pl
 crypto/ec/asm/ecp_nistz256-x86_64.pl
+crypto/ec/asm/ecp_sm2p256-armv8.pl
 crypto/ec/asm/x25519-ppc64.pl
 crypto/ec/asm/x25519-x86_64.pl
 crypto/ec/curve25519.c
@@ -270,6 +272,7 @@ crypto/param_build_set.c
 crypto/params.c
 crypto/params_dup.c
 crypto/params_from_text.c
+crypto/params_idx.c
 crypto/ppccap.c
 crypto/ppccpuid.pl
 crypto/property/defn_cache.c
@@ -381,6 +384,7 @@ include/crypto/bn_dh.h
 include/crypto/context.h
 include/crypto/cryptlib.h
 include/crypto/ctype.h
+include/crypto/decoder.h
 include/crypto/des_platform.h
 include/crypto/dh.h
 include/crypto/dsa.h
@@ -415,6 +419,7 @@ include/internal/nelem.h
 include/internal/numbers.h
 include/internal/packet.h
 include/internal/param_build_set.h
+include/internal/param_names.h.in
 include/internal/params.h
 include/internal/property.h
 include/internal/propertyerr.h
@@ -448,10 +453,12 @@ include/openssl/configuration.h.in
 include/openssl/conftypes.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
-include/openssl/core_names.h
+include/openssl/core_names.h.in
 include/openssl/crypto.h.in
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
+include/openssl/decoder.h
+include/openssl/decodererr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index fb64633b7e26e429205bbfb8534685a241bf3224..0a95d2364d43e9039e1f847d3fb1a4dcf5a529f5 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c
index 0a0046389aa6fc7e24c429710261b3f9d1e6a1ef..0be314692e8872a53a7d4924cbdaa942ea6b27f3 100644
--- a/providers/fips/self_test.c
+++ b/providers/fips/self_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/fips/self_test_data.inc b/providers/fips/self_test_data.inc
index 8bbe3121490f24ef3d2f4d5ca0947eb56a6dbff7..2057378d3d8c4653b741dd03f074516a3c153531 100644
--- a/providers/fips/self_test_data.inc
+++ b/providers/fips/self_test_data.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c
index be7952510074eaac2cc8e648736be03805d4ed4e..497d69edd47c5f8d5b6f34dbca7758499228df32 100644
--- a/providers/implementations/asymciphers/rsa_enc.c
+++ b/providers/implementations/asymciphers/rsa_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/asymciphers/sm2_enc.c b/providers/implementations/asymciphers/sm2_enc.c
index 707f1aa9e67051b76f167416e0a38b8feabb865d..a9d652be307ee737a670579d9035fe9bf9447d53 100644
--- a/providers/implementations/asymciphers/sm2_enc.c
+++ b/providers/implementations/asymciphers/sm2_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
index 4ca4459218b1720645a3f5ad18834b61d3db726b..f0ebfb6836732df6825180832920244f88a99556 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw.c b/providers/implementations/ciphers/cipher_aes_ccm_hw.c
index a7e9fb4a21396aab872208513d01fdd5b63e1f86..575a8ba88d8e34c75456349ddf89e628cbb94c5b 100644
--- a/providers/implementations/ciphers/cipher_aes_ccm_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_ccm_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw_rv32i.inc b/providers/implementations/ciphers/cipher_aes_ccm_hw_rv32i.inc
index a09a1e8dd8c8c73106c4f7d27e3f312bdb75a6fc..7cfe0fc4ce8b626a31c42502efbacafc9bcf6a53 100644
--- a/providers/implementations/ciphers/cipher_aes_ccm_hw_rv32i.inc
+++ b/providers/implementations/ciphers/cipher_aes_ccm_hw_rv32i.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw_rv64i.inc b/providers/implementations/ciphers/cipher_aes_ccm_hw_rv64i.inc
index f37c36118caa370ffc8b99f1c22c3805914172c6..203664e62e41e30127fcc162e6407792caf9195d 100644
--- a/providers/implementations/ciphers/cipher_aes_ccm_hw_rv64i.inc
+++ b/providers/implementations/ciphers/cipher_aes_ccm_hw_rv64i.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw.c b/providers/implementations/ciphers/cipher_aes_gcm_hw.c
index 38d8115f24e1f48691c5e2eb69ad6f67b1869320..4830cdc1b2d66caf0e1a114391d3fe7b81d3d4e3 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw_rv32i.inc b/providers/implementations/ciphers/cipher_aes_gcm_hw_rv32i.inc
index 32abd05210dae70a95cbdd279b30b4763b1c8c98..bf3f98df163147a0c686e125ced16fd69689de3d 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_hw_rv32i.inc
+++ b/providers/implementations/ciphers/cipher_aes_gcm_hw_rv32i.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw_rv64i.inc b/providers/implementations/ciphers/cipher_aes_gcm_hw_rv64i.inc
index a89ab1781185a3bd4f5be063eaee93d8ba4f1a65..7387adfdeddf372558c65ee1541fa9cb75608bad 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_hw_rv64i.inc
+++ b/providers/implementations/ciphers/cipher_aes_gcm_hw_rv64i.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_siv.c b/providers/implementations/ciphers/cipher_aes_gcm_siv.c
index dd2fdb64a48ed71f3a203b5a56f131b56dd22117..64f7f95039b66e488982a3191c7ebecbf8e5d1a9 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_siv.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm_siv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -296,7 +296,7 @@ static int ossl_##alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])
     return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,                             \
                                           flags, kbits, blkbits, ivbits);                               \
 }                                                                                                       \
-static void * ossl_##alg##kbits##_##lc##_newctx(void *provctx)                                          \
+static void *ossl_##alg##kbits##_##lc##_newctx(void *provctx)                                          \
 {                                                                                                       \
     return ossl_##alg##_##lc##_newctx(provctx, kbits);                                                  \
 }                                                                                                       \
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c b/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c
index 1b82e0f194a896a86978492a97c3a3188ad28210..fead51dd36f705412f6a41d7d6487588eb2a7614 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_hw.c b/providers/implementations/ciphers/cipher_aes_hw.c
index 1a59f24d352d4850bf83b51e15c5391e5d927714..0a1243a5fc031c5fe160754fd1d3aae523024970 100644
--- a/providers/implementations/ciphers/cipher_aes_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_hw_rv32i.inc b/providers/implementations/ciphers/cipher_aes_hw_rv32i.inc
index a23c08ac9e172504820e951637b0731bb539571e..f6c652c32d9b338219bfc84a631f8762c6e91415 100644
--- a/providers/implementations/ciphers/cipher_aes_hw_rv32i.inc
+++ b/providers/implementations/ciphers/cipher_aes_hw_rv32i.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_hw_rv64i.inc b/providers/implementations/ciphers/cipher_aes_hw_rv64i.inc
index 3cf3c8e3a41bee8cf226a50b71a2eb842e55bb1b..7ebf52f97149e9ed46bae8a35c9243efb0c9cdb4 100644
--- a/providers/implementations/ciphers/cipher_aes_hw_rv64i.inc
+++ b/providers/implementations/ciphers/cipher_aes_hw_rv64i.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c
index 3044faa306ae03cd98d49e1f96ea8405aa01f29a..3f3cc6efbb3c79a0fd09d70621aa1a9192d4d05c 100644
--- a/providers/implementations/ciphers/cipher_aes_ocb.c
+++ b/providers/implementations/ciphers/cipher_aes_ocb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_ocb_hw.c b/providers/implementations/ciphers/cipher_aes_ocb_hw.c
index 62d762d49b8f133c5b4c290b953ea05a7b327b90..2672b92ec4712733b6d983fd034cd6ce58e312f1 100644
--- a/providers/implementations/ciphers/cipher_aes_ocb_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_ocb_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c
index 01d02b14874cff18a5e4e124a01470408d67b37e..bcbc17a48a93d5ee6e9655454699e148c1b9e665 100644
--- a/providers/implementations/ciphers/cipher_aes_siv.c
+++ b/providers/implementations/ciphers/cipher_aes_siv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -271,7 +271,7 @@ static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])              \
     return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
                                           flags, 2*kbits, blkbits, ivbits);    \
 }                                                                              \
-static void * alg##kbits##lc##_newctx(void *provctx)                           \
+static void *alg##kbits##lc##_newctx(void *provctx)                            \
 {                                                                              \
     return alg##_##lc##_newctx(provctx, 2*kbits, EVP_CIPH_##UCMODE##_MODE,     \
                                flags);                                         \
diff --git a/providers/implementations/ciphers/cipher_aes_wrp.c b/providers/implementations/ciphers/cipher_aes_wrp.c
index b3737e34d9b76d030ee40229777e3a41a80187dc..ecebf213e2631d4873a11a6cdb9b6f90cc52850f 100644
--- a/providers/implementations/ciphers/cipher_aes_wrp.c
+++ b/providers/implementations/ciphers/cipher_aes_wrp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c
index f5a97bf0bb9dd9b818296ea130c6fffa60e52324..cce2537ea778fb0980c0368921bc83337ff38e20 100644
--- a/providers/implementations/ciphers/cipher_aes_xts.c
+++ b/providers/implementations/ciphers/cipher_aes_xts.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c
index 223b49b0b98f16f58b6f8d2a318aba80492c2c00..564d6d67645e034c05c1a8962dcd63422d4be0b8 100644
--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c
index 49e36ba1a9777896859f9fb843a9101a78ff268a..5e2ad91445e7eca180d4037b8ff77f9df4ad6c57 100644
--- a/providers/implementations/ciphers/cipher_chacha20.c
+++ b/providers/implementations/ciphers/cipher_chacha20.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c b/providers/implementations/ciphers/cipher_chacha20_poly1305.c
index 50fdd15bdc172ad9739ea231e4ce15ca40bed713..662b4e03e54246b3d69a6758ce7becbb8529dbac 100644
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.h b/providers/implementations/ciphers/cipher_chacha20_poly1305.h
index 9a5ce34e7bc3a4b8a099c5d5c1cb811cd696bcf0..f2ea26a77f3a42358695eca087af3bd799ca6658 100644
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305.h
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c b/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
index 421380e86ebb74aa5917fc3221cebd23692f7b60..8173663e5e7eec9f82aecf8a534af71ff8c2f8a9 100644
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_cts.h b/providers/implementations/ciphers/cipher_cts.h
index d52c99f1ac40cbb7db40949bd0ef4999756a7ce8..a26e5a9e0719e9f7fa7866be36c161ccfe128432 100644
--- a/providers/implementations/ciphers/cipher_cts.h
+++ b/providers/implementations/ciphers/cipher_cts.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/ciphers/cipher_des.c b/providers/implementations/ciphers/cipher_des.c
index 1cbf677b27e8672ac47055d7fa1e70b22a0bf66f..ca2a924a917381c3d99db297eb765922c3d5a97d 100644
--- a/providers/implementations/ciphers/cipher_des.c
+++ b/providers/implementations/ciphers/cipher_des.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c
index 0bd2bcbb1488f883e806b4178546de1c2fba4c86..c911049e2d0b7b1643decb5c3070725145a6793a 100644
--- a/providers/implementations/ciphers/cipher_null.c
+++ b/providers/implementations/ciphers/cipher_null.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/ciphers/cipher_rc2.c b/providers/implementations/ciphers/cipher_rc2.c
index 34e6375a7d0935de1b790a3141e9790dfb77a42d..a4cd6bd533b3914c3f530d9af20fae25c111292a 100644
--- a/providers/implementations/ciphers/cipher_rc2.c
+++ b/providers/implementations/ciphers/cipher_rc2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -226,7 +226,7 @@ static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])          \
                                           flags, kbits, blkbits, ivbits);      \
 }                                                                              \
 static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;           \
-static void * alg##_##kbits##_##lcmode##_newctx(void *provctx)                 \
+static void *alg##_##kbits##_##lcmode##_newctx(void *provctx)                  \
 {                                                                              \
      PROV_##UCALG##_CTX *ctx;                                                  \
      if (!ossl_prov_is_running())                                              \
diff --git a/providers/implementations/ciphers/cipher_rc4.c b/providers/implementations/ciphers/cipher_rc4.c
index 4672c3fe53ca01dd93164db364a914fff47d4cf7..733524d36f5a2bc93dca3f0248e38587a115722c 100644
--- a/providers/implementations/ciphers/cipher_rc4.c
+++ b/providers/implementations/ciphers/cipher_rc4.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -76,7 +76,7 @@ static int alg##_##kbits##_get_params(OSSL_PARAM params[])                     \
                                      kbits, blkbits, ivbits);                  \
 }                                                                              \
 static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_newctx;                      \
-static void * alg##_##kbits##_newctx(void *provctx)                            \
+static void *alg##_##kbits##_newctx(void *provctx)                             \
 {                                                                              \
      PROV_##UCALG##_CTX *ctx;                                                  \
      if (!ossl_prov_is_running())                                              \
diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
index 053bcda6536f6f51c7ebd7aa89733792fe819ffd..99d5dd716926f071b2aeb19ddd418779300312c2 100644
--- a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
+++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.h b/providers/implementations/ciphers/cipher_rc4_hmac_md5.h
index c79e5ad6dfb0f3c57d5fcd6c2e057874f9832dae..4a1d154a7ceb1c8112fab7565610ccf5ed38d485 100644
--- a/providers/implementations/ciphers/cipher_rc4_hmac_md5.h
+++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_rc5.c b/providers/implementations/ciphers/cipher_rc5.c
index 3d6aa0e24bdafc1d8f0cc5ec5a1ab7f0cef9603a..090b0488e5ff9b8ba58e2ea38ff8fdc20b396e8d 100644
--- a/providers/implementations/ciphers/cipher_rc5.c
+++ b/providers/implementations/ciphers/cipher_rc5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -136,7 +136,7 @@ static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])          \
                                           flags, kbits, blkbits, ivbits);      \
 }                                                                              \
 static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;           \
-static void * alg##_##kbits##_##lcmode##_newctx(void *provctx)                 \
+static void *alg##_##kbits##_##lcmode##_newctx(void *provctx)                  \
 {                                                                              \
      PROV_##UCALG##_CTX *ctx;                                                  \
      if (!ossl_prov_is_running())                                              \
diff --git a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
index 468c1f3b8b927df5370d0cd8fe5f7ceba040949d..537024b09c02b9b1bd98d65d3559021b194d4b0e 100644
--- a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
index 508280998237ac197a28f4796f579c7e6cf180f7..432e3589ed86dbf88fbd34242bb92c5970306761 100644
--- a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/providers/implementations/ciphers/cipher_sm4_hw.c b/providers/implementations/ciphers/cipher_sm4_hw.c
index d8bc5a1e856eac2e6f06449cba30b3b73be5894e..7419744a46c5106cffa6a9e644edbf619f18af1e 100644
--- a/providers/implementations/ciphers/cipher_sm4_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_sm4_xts.c b/providers/implementations/ciphers/cipher_sm4_xts.c
index 24b0771f2b602d42cb8a9d173f177f035cbf220a..e8c28e266044ceb280d48976bb5445516d1d0033 100644
--- a/providers/implementations/ciphers/cipher_sm4_xts.c
+++ b/providers/implementations/ciphers/cipher_sm4_xts.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_sm4_xts.h b/providers/implementations/ciphers/cipher_sm4_xts.h
index cfca596979cc81f9929806ddc664598a442a8d8b..43d9a212e55fd9c0e54acd95613f46913a09cee9 100644
--- a/providers/implementations/ciphers/cipher_sm4_xts.h
+++ b/providers/implementations/ciphers/cipher_sm4_xts.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_sm4_xts_hw.c b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
index 67a9923d94084b4d266c4ee6e775b0f7c9c744de..44af243a6924165fb565eb0b1daf4288365ba8af 100644
--- a/providers/implementations/ciphers/cipher_sm4_xts_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/ciphers/cipher_tdes.h b/providers/implementations/ciphers/cipher_tdes.h
index 88987d76fb6051b361e33fbbf87e4ceac5dad26f..3c98ed241d39babf1c61f423f0a76abfe3c13339 100644
--- a/providers/implementations/ciphers/cipher_tdes.h
+++ b/providers/implementations/ciphers/cipher_tdes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_tdes_common.c b/providers/implementations/ciphers/cipher_tdes_common.c
index c688b990a0db26473117e603a5b0d33c91109d82..ceaa0f9821a76b6a59b87f1e308a2e8825fbcc44 100644
--- a/providers/implementations/ciphers/cipher_tdes_common.c
+++ b/providers/implementations/ciphers/cipher_tdes_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/cipher_tdes_wrap.c b/providers/implementations/ciphers/cipher_tdes_wrap.c
index dbaf4890ac8454ec3a19307d3797edfece31367c..391383b550d7d0a72d1c389ae8e973cb9c49eecf 100644
--- a/providers/implementations/ciphers/cipher_tdes_wrap.c
+++ b/providers/implementations/ciphers/cipher_tdes_wrap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/providers/implementations/ciphers/ciphercommon_block.c b/providers/implementations/ciphers/ciphercommon_block.c
index ccc3dfb2d70998e8fa23998e376e0d61815773fb..cfc78e07709fba9a775fa372a5046e44dbcfc968 100644
--- a/providers/implementations/ciphers/ciphercommon_block.c
+++ b/providers/implementations/ciphers/ciphercommon_block.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/ciphers/ciphercommon_gcm.c b/providers/implementations/ciphers/ciphercommon_gcm.c
index dac123f0c66e1eb7e60b17bef972c9bf299db8e4..cd7852a547aa9f7b4ebdaa8f579897fa4f6b55d7 100644
--- a/providers/implementations/ciphers/ciphercommon_gcm.c
+++ b/providers/implementations/ciphers/ciphercommon_gcm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/digests/blake2_prov.c b/providers/implementations/digests/blake2_prov.c
index aa6ddace39e9098f7109338db27064a0021cd4db..2288286bbe44ecfcbcb837c0c7a2abf172cddd19 100644
--- a/providers/implementations/digests/blake2_prov.c
+++ b/providers/implementations/digests/blake2_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/digests/blake2b_prov.c b/providers/implementations/digests/blake2b_prov.c
index 109a6ce1c8082c252cc1708ec4de40c066d36049..8125dab41f415dc46357063e7f500c738d74a3d8 100644
--- a/providers/implementations/digests/blake2b_prov.c
+++ b/providers/implementations/digests/blake2b_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c
index 039c616095667c5e5c613aa00a8437b9155d1cf7..60f1912cc4fa883799855adcccfc84106694bb4a 100644
--- a/providers/implementations/digests/sha2_prov.c
+++ b/providers/implementations/digests/sha2_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c
index 7bb0bff851946c51e70a815df68762db79744270..0c643f82382842bd1e30a622351d6af1eff05890 100644
--- a/providers/implementations/digests/sha3_prov.c
+++ b/providers/implementations/digests/sha3_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/encode_decode/decode_der2key.c b/providers/implementations/encode_decode/decode_der2key.c
index 45b39ed35848ba2d1a1ba82618c88f4968855fe4..b0d4e0ecf6a35280d0ef024e5de4c6756bc1b9b1 100644
--- a/providers/implementations/encode_decode/decode_der2key.c
+++ b/providers/implementations/encode_decode/decode_der2key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/decode_epki2pki.c b/providers/implementations/encode_decode/decode_epki2pki.c
index 5dd13f5a928ec3481a424a6bc7d74679d3b074ff..37d9bd1858ffd00d3f00fae529f63630fa7501a3 100644
--- a/providers/implementations/encode_decode/decode_epki2pki.c
+++ b/providers/implementations/encode_decode/decode_epki2pki.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/decode_msblob2key.c b/providers/implementations/encode_decode/decode_msblob2key.c
index 7c4f993b899eb161d95e88d215e78912dc7ef865..df327210f1140e36adaf2d49acf332c6f5c5370a 100644
--- a/providers/implementations/encode_decode/decode_msblob2key.c
+++ b/providers/implementations/encode_decode/decode_msblob2key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/decode_pem2der.c b/providers/implementations/encode_decode/decode_pem2der.c
index 4423c1e5a584cb4fafa2f74878c373fa37ca95fa..ea6eb7f9610f1d2958371df3dab3f00410895465 100644
--- a/providers/implementations/encode_decode/decode_pem2der.c
+++ b/providers/implementations/encode_decode/decode_pem2der.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/decode_pvk2key.c b/providers/implementations/encode_decode/decode_pvk2key.c
index 5355cf11d6f7052d388b42db2b26cb016cf4b44b..ea4585d93c5c77c47ba94716040bfe589a59f838 100644
--- a/providers/implementations/encode_decode/decode_pvk2key.c
+++ b/providers/implementations/encode_decode/decode_pvk2key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/decode_spki2typespki.c b/providers/implementations/encode_decode/decode_spki2typespki.c
index 11f5426661b0dd023fb6b0369d136088fd0e435a..7074be93d6b3c80459efb859e24e63027d17784d 100644
--- a/providers/implementations/encode_decode/decode_spki2typespki.c
+++ b/providers/implementations/encode_decode/decode_spki2typespki.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c
index df0b0fd608f853f7bff3f30483d1bc8ff4f5370b..c1b0dea7803e4204f601d4897aca998028970a94 100644
--- a/providers/implementations/encode_decode/encode_key2any.c
+++ b/providers/implementations/encode_decode/encode_key2any.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/encode_key2blob.c b/providers/implementations/encode_decode/encode_key2blob.c
index ae1612aaf1d71812e95296329c7bbe59cbeaec0e..29e72faa63defc61efd1286c684ea301243af5a5 100644
--- a/providers/implementations/encode_decode/encode_key2blob.c
+++ b/providers/implementations/encode_decode/encode_key2blob.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/providers/implementations/encode_decode/encode_key2ms.c b/providers/implementations/encode_decode/encode_key2ms.c
index d11affbfa9765124b7c2d0edf05ab2310adb0c0a..1f21a5129615aa166accda204420d303aacdc6d5 100644
--- a/providers/implementations/encode_decode/encode_key2ms.c
+++ b/providers/implementations/encode_decode/encode_key2ms.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c
index 4c8ca992d3687372fb82a5edc3028365fd6cfdfa..f335870a4cf5dceb1cbcc833b48c14e915a7d67f 100644
--- a/providers/implementations/encode_decode/encode_key2text.c
+++ b/providers/implementations/encode_decode/encode_key2text.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/exchange/dh_exch.c b/providers/implementations/exchange/dh_exch.c
index 7d77e6aae8b18f18e3fcc760d6ee8718f0f8b63c..20b8fa0078c907b070e75713690ff1db92cc4e22 100644
--- a/providers/implementations/exchange/dh_exch.c
+++ b/providers/implementations/exchange/dh_exch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/exchange/ecdh_exch.c b/providers/implementations/exchange/ecdh_exch.c
index 164417abc8b2f3c4e2f0751065d22648fb4e88df..5b8412aba16dfb9f07a6495056bfab0d9df81ee5 100644
--- a/providers/implementations/exchange/ecdh_exch.c
+++ b/providers/implementations/exchange/ecdh_exch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/exchange/ecx_exch.c b/providers/implementations/exchange/ecx_exch.c
index 335ec6f7630aa552403bcb5fb36feadf742f128f..ccf39462eddc35eec316fbf660843f9b335240d9 100644
--- a/providers/implementations/exchange/ecx_exch.c
+++ b/providers/implementations/exchange/ecx_exch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/exchange/kdf_exch.c b/providers/implementations/exchange/kdf_exch.c
index b1be99f2e22813834e7f8930d750d886bbd30572..4aaf67339828c0c8a808ca79bb1e19ff56179d96 100644
--- a/providers/implementations/exchange/kdf_exch.c
+++ b/providers/implementations/exchange/kdf_exch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/include/prov/blake2.h b/providers/implementations/include/prov/blake2.h
index 379dfedc0bcc9e767757e9c5fe5c0200716f463a..4ec780c21f50b8cba6e2eeb34d52480b6fcea864 100644
--- a/providers/implementations/include/prov/blake2.h
+++ b/providers/implementations/include/prov/blake2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/include/prov/ciphercommon.h b/providers/implementations/include/prov/ciphercommon.h
index 62903b16bb3430020475b41c365c1145619d99bc..2a7a059086fb9152c3058f9b3303b19972e2beaa 100644
--- a/providers/implementations/include/prov/ciphercommon.h
+++ b/providers/implementations/include/prov/ciphercommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/include/prov/ciphercommon_aead.h b/providers/implementations/include/prov/ciphercommon_aead.h
index face9c9e3642e13aa90d0b0c7c10288c8856d68e..0dd63cbe5343d4a11700dae988a64dc127efedfd 100644
--- a/providers/implementations/include/prov/ciphercommon_aead.h
+++ b/providers/implementations/include/prov/ciphercommon_aead.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/include/prov/implementations.h b/providers/implementations/include/prov/implementations.h
index 1c7bb4ab8d8676bb80e7edeff73e759803663115..80b544c4297ae462aadcb40b38a09415f92848c2 100644
--- a/providers/implementations/include/prov/implementations.h
+++ b/providers/implementations/include/prov/implementations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/include/prov/kdfexchange.h b/providers/implementations/include/prov/kdfexchange.h
index 8d95a99438d37bab66512bd1ba8b648b5cdca344..cf08f785ee0cff7b192d4267c19e42dac5f396aa 100644
--- a/providers/implementations/include/prov/kdfexchange.h
+++ b/providers/implementations/include/prov/kdfexchange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/include/prov/macsignature.h b/providers/implementations/include/prov/macsignature.h
index 45a50c36f25804b440799e678eac51937e78bca9..e13ff362ce00e7ee0c9064779179bb375f4f9998 100644
--- a/providers/implementations/include/prov/macsignature.h
+++ b/providers/implementations/include/prov/macsignature.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/include/prov/names.h b/providers/implementations/include/prov/names.h
index af7e45a3f6e3a06300da01cfeeb82c62582e02d6..f0ad4353460d2cdff5ec62f99f397c83afaa30ac 100644
--- a/providers/implementations/include/prov/names.h
+++ b/providers/implementations/include/prov/names.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/providers/implementations/kdfs/argon2.c b/providers/implementations/kdfs/argon2.c
index ffeb810fbc0163a281a5a225a735f43d85698885..323b0f3ab6b87c018b2696e940c1a9521bc01c9b 100644
--- a/providers/implementations/kdfs/argon2.c
+++ b/providers/implementations/kdfs/argon2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c
index 7f42f426479f308f3b777021d78e228c6c9d6ce3..a83e2982278bf9a0edf208488088d4b52c41c773 100644
--- a/providers/implementations/kdfs/hkdf.c
+++ b/providers/implementations/kdfs/hkdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/providers/implementations/kdfs/hmacdrbg_kdf.c b/providers/implementations/kdfs/hmacdrbg_kdf.c
index 1ffb368d01ea86fe6cd14fd73b35513889d5245d..30f1dfbd2439fd95be1217c41dabc8fd079d7a7e 100644
--- a/providers/implementations/kdfs/hmacdrbg_kdf.c
+++ b/providers/implementations/kdfs/hmacdrbg_kdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c
index 2460236b31936c7cdfadf04ae55931587b6baf4b..e6855d573240410ac299c66539908cff7a4006e0 100644
--- a/providers/implementations/kdfs/kbkdf.c
+++ b/providers/implementations/kdfs/kbkdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2019 Red Hat, Inc.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c
index 5143462f4fdddbf9ecb2eccab448a588325bbbdd..b6cf0e3a2bcf3e649334ee46009fe97b0fc62b85 100644
--- a/providers/implementations/kdfs/krb5kdf.c
+++ b/providers/implementations/kdfs/krb5kdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/kdfs/pbkdf1.c b/providers/implementations/kdfs/pbkdf1.c
index 713d51d597dbcfb8bb83b5924747d39e41c04e26..6f95df071b35999a5cb7530e5d65e1e111b83f9a 100644
--- a/providers/implementations/kdfs/pbkdf1.c
+++ b/providers/implementations/kdfs/pbkdf1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c
index fb2cd87fb70456b7b562daea3a5dc5d5eb3ceb9e..f2d190c308f6aca2d74bf589390801816395d9e9 100644
--- a/providers/implementations/kdfs/pbkdf2.c
+++ b/providers/implementations/kdfs/pbkdf2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/kdfs/pkcs12kdf.c b/providers/implementations/kdfs/pkcs12kdf.c
index 38303a7464b29219fed70c2720e1fe3d8bcb9fec..0679c05f931be90e753860acaeabf16683d78162 100644
--- a/providers/implementations/kdfs/pkcs12kdf.c
+++ b/providers/implementations/kdfs/pkcs12kdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/providers/implementations/kdfs/pvkkdf.c b/providers/implementations/kdfs/pvkkdf.c
index 7e7cf36b0018bb34c3fd35765d9bca8be6048495..85a250ff7c13cba33a656618784fff7d45741300 100644
--- a/providers/implementations/kdfs/pvkkdf.c
+++ b/providers/implementations/kdfs/pvkkdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c
index 94d06f29eea855be55775c2f6a8b91135cc9993e..ee2d4a7d321c9697f746761dbb11325246e6cb02 100644
--- a/providers/implementations/kdfs/scrypt.c
+++ b/providers/implementations/kdfs/scrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/providers/implementations/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c
index 50d2943204c8e793927a3c712c9f3d8f1fbe6db1..90986bc7622eb39c1e00bf85236da5300b39b449 100644
--- a/providers/implementations/kdfs/sshkdf.c
+++ b/providers/implementations/kdfs/sshkdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c
index ca5042b22de7f01427a1a714dff22188464829bd..db750a4f23366dc2ef185e93e51130c55b42c0fa 100644
--- a/providers/implementations/kdfs/sskdf.c
+++ b/providers/implementations/kdfs/sskdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c
index 32662360e9c44d6bbd0ae3421d70930081c72e1a..ff305579c324954d772c568839f79f112032b413 100644
--- a/providers/implementations/kdfs/tls1_prf.c
+++ b/providers/implementations/kdfs/tls1_prf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c
index 4539c44872f7e39b5569603442968beb03b7dbcd..19b54493efca0d3b9fcdf7e443ea64e01dcaac2c 100644
--- a/providers/implementations/kdfs/x942kdf.c
+++ b/providers/implementations/kdfs/x942kdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/providers/implementations/kem/ec_kem.c b/providers/implementations/kem/ec_kem.c
index 6a7abbc75c8f193014117dab88ad36d3200a209c..b82f9036623882b954becbeaeee37ed12b2099a3 100644
--- a/providers/implementations/kem/ec_kem.c
+++ b/providers/implementations/kem/ec_kem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/kem/ecx_kem.c b/providers/implementations/kem/ecx_kem.c
index 87ec09c50ffaef798fb3014b34995f520cb42633..4a762f21534ffddafb1c8fa660450f6adb486d9c 100644
--- a/providers/implementations/kem/ecx_kem.c
+++ b/providers/implementations/kem/ecx_kem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c
index f0a3462f8e069040ab2455b05b0c5575e829bbe8..ff22ddffcf6c653fe48ada64a64fbc745bfd7e96 100644
--- a/providers/implementations/kem/rsa_kem.c
+++ b/providers/implementations/kem/rsa_kem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c
index eaca876bb9d133f3de2671cbcf4312a87cc4dd6a..1d6b1f3730277bc0a1ad49338defdb1e57a5f5f5 100644
--- a/providers/implementations/keymgmt/dh_kmgmt.c
+++ b/providers/implementations/keymgmt/dh_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -699,7 +699,7 @@ static void *dh_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
         return NULL;
 
     /*
-     * If a group name is selected then the type is group regardless of what the
+     * If a group name is selected then the type is group regardless of what
      * the user selected. This overrides rather than errors for backwards
      * compatibility.
      */
diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c
index c2400e4602ddd860f984dd3827cfeb15acea6d0d..a89d20822bf1270d6c7ea01d22c9d5cfcdb20c98 100644
--- a/providers/implementations/keymgmt/dsa_kmgmt.c
+++ b/providers/implementations/keymgmt/dsa_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c
index d9c585cd3b4ed3b6163c9739163a68038e1bf8d9..93909353942fd38306aa864e156318d375c3b1f6 100644
--- a/providers/implementations/keymgmt/ec_kmgmt.c
+++ b/providers/implementations/keymgmt/ec_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c
index 0a354ea721d02aae89229d674d25713db0b6182b..8a9fe1b21b813fdd8712f5804eb342cb204a6352 100644
--- a/providers/implementations/keymgmt/ecx_kmgmt.c
+++ b/providers/implementations/keymgmt/ecx_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/keymgmt/kdf_legacy_kmgmt.c b/providers/implementations/keymgmt/kdf_legacy_kmgmt.c
index a2303f2e193faa3465f4f44b68a53f9e4c9b02e7..deb49600066d99ae27b08b676c777bc76466841c 100644
--- a/providers/implementations/keymgmt/kdf_legacy_kmgmt.c
+++ b/providers/implementations/keymgmt/kdf_legacy_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c
index 9b37027a966e7b15b6023f41efc0409a4a25a36c..f952ebb2277ab9dcf421970d32a6f3089e2d401f 100644
--- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c
+++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c
index 41b5390bf57ee6060091a5b17791ae0a31abe5ba..c24cb8da88ea603c744601e078515595a3fd200d 100644
--- a/providers/implementations/keymgmt/rsa_kmgmt.c
+++ b/providers/implementations/keymgmt/rsa_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c
index e52544fc5baf4081b2dc86983647decaaf622c93..ec22e607a0467b5c92f75bb2fe1c6f759c643b79 100644
--- a/providers/implementations/macs/blake2_mac_impl.c
+++ b/providers/implementations/macs/blake2_mac_impl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c
index 5a2421ccfc746a867ea2c338d2ec89ed2c7b3f51..1b3893598d888b9b128ba750a80ea45361fc5c45 100644
--- a/providers/implementations/macs/cmac_prov.c
+++ b/providers/implementations/macs/cmac_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c
index 5455ffc490d6d01a40311834eb0d6a0f0fe5ae07..122df5f60907019819ca19e2ad8c4d09371f2a7f 100644
--- a/providers/implementations/macs/gmac_prov.c
+++ b/providers/implementations/macs/gmac_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c
index 32940e6a0b48571c64c94379908f3f66f2dc32b3..a1f3c2db84d65b9999c63cba54ee9cc6b21454e1 100644
--- a/providers/implementations/macs/hmac_prov.c
+++ b/providers/implementations/macs/hmac_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c
index b38dba2d7d99b3686bde0af168cf0ca697c65a58..4d920c249a74e3b13ea073f3bc3cb53d7abbf6f6 100644
--- a/providers/implementations/macs/kmac_prov.c
+++ b/providers/implementations/macs/kmac_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c
index 2d10d10521c60aac2d0bc29696db79adda73389c..19974f9289b166a3535aa57504ae3f07b092e9b7 100644
--- a/providers/implementations/macs/poly1305_prov.c
+++ b/providers/implementations/macs/poly1305_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c
index ded324acb63486682d35b0d443fac85467344029..a54def3b8572725979675932780d4aa1af24ec53 100644
--- a/providers/implementations/macs/siphash_prov.c
+++ b/providers/implementations/macs/siphash_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/providers/implementations/rands/drbg.c b/providers/implementations/rands/drbg.c
index 7a4854f0d7cc4c7f59da74b3c2de4e9bc1eb95a4..348d5f50808edb19a0b4ea51407da50833e7e3c5 100644
--- a/providers/implementations/rands/drbg.c
+++ b/providers/implementations/rands/drbg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/providers/implementations/rands/drbg_ctr.c b/providers/implementations/rands/drbg_ctr.c
index c303d03eb0ad298a9a176ee57ed4a4500c1f4123..2dc51d03c16533bed2f9bf1b9d66a1b517c046c4 100644
--- a/providers/implementations/rands/drbg_ctr.c
+++ b/providers/implementations/rands/drbg_ctr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/providers/implementations/rands/drbg_hash.c b/providers/implementations/rands/drbg_hash.c
index b2395b61c8d87e72d583ac8e6e5cd2d9a42c214c..246aab58c96c07658cb7aebcccef0e435fed298d 100644
--- a/providers/implementations/rands/drbg_hash.c
+++ b/providers/implementations/rands/drbg_hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/providers/implementations/rands/drbg_hmac.c b/providers/implementations/rands/drbg_hmac.c
index 3df0c2ac2b007d412a42e9ccdc18d1281f1b1dcd..ca190a740e4ca57e36f2ac8c2b44591fee8b1038 100644
--- a/providers/implementations/rands/drbg_hmac.c
+++ b/providers/implementations/rands/drbg_hmac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/providers/implementations/rands/drbg_local.h b/providers/implementations/rands/drbg_local.h
index 4c815ae2e67b7354c80012dd581f75dd25a73ae1..dd46593a5f0967dd00b857227031c2195a9d9a47 100644
--- a/providers/implementations/rands/drbg_local.h
+++ b/providers/implementations/rands/drbg_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/providers/implementations/rands/seed_src.c b/providers/implementations/rands/seed_src.c
index ee7dfc35b285f04d7b9c4dff80b36cbd0e1e597a..e57c9c4d4160f7204bd3f2ae5ab2aebd0f626e59 100644
--- a/providers/implementations/rands/seed_src.c
+++ b/providers/implementations/rands/seed_src.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c
index a6d246ad235e859679a4cee87341706db5a4d919..9a936d800d418388f8601cb9bd2cb6cfbe93d774 100644
--- a/providers/implementations/rands/seeding/rand_unix.c
+++ b/providers/implementations/rands/seeding/rand_unix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
@@ -510,7 +510,7 @@ static int wait_random_seeded(void)
  * So the handle might have been closed or even reused for opening
  * another file.
  */
-static int check_random_device(struct random_device * rd)
+static int check_random_device(struct random_device *rd)
 {
     struct stat st;
 
@@ -528,7 +528,7 @@ static int check_random_device(struct random_device * rd)
 static int get_random_device(size_t n)
 {
     struct stat st;
-    struct random_device * rd = &random_devices[n];
+    struct random_device *rd = &random_devices[n];
 
     /* reuse existing file descriptor if it is (still) valid */
     if (check_random_device(rd))
@@ -557,7 +557,7 @@ static int get_random_device(size_t n)
  */
 static void close_random_device(size_t n)
 {
-    struct random_device * rd = &random_devices[n];
+    struct random_device *rd = &random_devices[n];
 
     if (check_random_device(rd))
         close(rd->fd);
diff --git a/providers/implementations/rands/test_rng.c b/providers/implementations/rands/test_rng.c
index 46d18f28c567b4614f085f659d21e10fec433c16..bbea11cd6baf06a3a03fc8b76c0f6864d18360d0 100644
--- a/providers/implementations/rands/test_rng.c
+++ b/providers/implementations/rands/test_rng.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/signature/dsa_sig.c b/providers/implementations/signature/dsa_sig.c
index c840032ef41f5c5698c981cf1a9dde27bd0778cb..b89a0f6836b2b4222b967f3e0c83bd0171bb1697 100644
--- a/providers/implementations/signature/dsa_sig.c
+++ b/providers/implementations/signature/dsa_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/signature/ecdsa_sig.c b/providers/implementations/signature/ecdsa_sig.c
index ec01b741732da07d4d24ada02a5beea87c253bb0..fe65ed8dc6454275009bc5afe643d564fab56799 100644
--- a/providers/implementations/signature/ecdsa_sig.c
+++ b/providers/implementations/signature/ecdsa_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/signature/eddsa_sig.c b/providers/implementations/signature/eddsa_sig.c
index acc6f5e4e70bcaf3ee996d95ae8f7a1dcd802dfd..8594af39e140d92068e155a1128c8918a69b3dd6 100644
--- a/providers/implementations/signature/eddsa_sig.c
+++ b/providers/implementations/signature/eddsa_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/signature/mac_legacy_sig.c b/providers/implementations/signature/mac_legacy_sig.c
index d3172f86b3787b6cb6f695ccd2cd334bf1ac975c..b25a74506ab02b5c18a52a2ef9e046a0c83834af 100644
--- a/providers/implementations/signature/mac_legacy_sig.c
+++ b/providers/implementations/signature/mac_legacy_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
index e4c08617d28279e51f4497b86a9997a2eb0c3b1a..b8648b54bf6062eed7408c4aa845a5c13849cb07 100644
--- a/providers/implementations/signature/rsa_sig.c
+++ b/providers/implementations/signature/rsa_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/implementations/signature/sm2_sig.c b/providers/implementations/signature/sm2_sig.c
index aef9aa0d3104d182bdd8bc32e9e83b75943b54c3..a61fd0864f1416e4bcccfde63644a47d45f14234 100644
--- a/providers/implementations/signature/sm2_sig.c
+++ b/providers/implementations/signature/sm2_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c
index e7added1a9f51662aedfd1d3a07dbf8c0722d794..171c74d581aebf4473c9745db4bae2a17c655dc6 100644
--- a/providers/implementations/storemgmt/file_store.c
+++ b/providers/implementations/storemgmt/file_store.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/storemgmt/file_store_any2obj.c b/providers/implementations/storemgmt/file_store_any2obj.c
index bcf175fff2ef8c4010ffb3dd0f3862fd0d137e8b..b8fa591085600ac0649432ddfc9579a55707c6fc 100644
--- a/providers/implementations/storemgmt/file_store_any2obj.c
+++ b/providers/implementations/storemgmt/file_store_any2obj.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/providers/implementations/storemgmt/winstore_store.c b/providers/implementations/storemgmt/winstore_store.c
index 5e873a183fe50b5142cf5363993a251f5c12a9df..e230101d73c43c3f305b75e11bc6c8b4fc68d56d 100644
--- a/providers/implementations/storemgmt/winstore_store.c
+++ b/providers/implementations/storemgmt/winstore_store.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/providers/legacyprov.c b/providers/legacyprov.c
index 690c3a8bda737e0dcc7708ab8b46251f6f2abd10..16e3639e76f180c2596741dcb4cf0c21ef000627 100644
--- a/providers/legacyprov.c
+++ b/providers/legacyprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/providers/nullprov.c b/providers/nullprov.c
index c79ffccff4739044ba556ffd4171b1f6e9995076..bace75af15763e1c40855316d22efab1ec0a224f 100644
--- a/providers/nullprov.c
+++ b/providers/nullprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index b342c846daa03b88d5b82e9eb4cb6730cbfd3399..68dd48a5ef3be899e57cfa5abad93a8ea3c6ce82 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index f1ad5e39552a499d0bf920fc403ba69afc2b6e93..8bbabd8f413ef0ce45380c3825809fbb865af4b3 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
@@ -256,7 +256,7 @@ long dtls1_ctrl(SSL *ssl, int cmd, long larg, void *parg)
     return ret;
 }
 
-static void dtls1_bio_set_next_timeout(BIO * bio, const DTLS1_STATE *d1)
+static void dtls1_bio_set_next_timeout(BIO *bio, const DTLS1_STATE *d1)
 {
     struct timeval tv = ossl_time_to_timeval(d1->next_timeout);
 
diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c
index 23cfa150fc99030e41c8a5f97f0f316e61e079bc..b1e1fad16d9e47a5d34cda82f55d5d244b031f54 100644
--- a/ssl/d1_msg.c
+++ b/ssl/d1_msg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index 6228fe1871e71add5eccc414677e9bc50778b573..5ca135d9703700bc358f5d4bce850f8b92b6e3ef 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2023 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
diff --git a/ssl/event_queue.c b/ssl/event_queue.c
index f2169ec3abd00ef6e1177ad5755bad59cf7e81eb..49890a36b505f643e4c1b80800d8f8cdfb694215 100644
--- a/ssl/event_queue.c
+++ b/ssl/event_queue.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/priority_queue.c b/ssl/priority_queue.c
index c34f21830b8d1d0018613506c1948d66f36c0328..ab2442aeae72ab611c662c030c89569ba8415390 100644
--- a/ssl/priority_queue.c
+++ b/ssl/priority_queue.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_ackm.c b/ssl/quic/quic_ackm.c
index aa035da91268e528e02e62e99d6f85b1fb6ab2ad..728a186d3b057c759c12e1609406e6cda8086953 100644
--- a/ssl/quic/quic_ackm.c
+++ b/ssl/quic/quic_ackm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_cfq.c b/ssl/quic/quic_cfq.c
index 25ac36e348274eee0ba1cc0403f206a212e14ffe..9b9999a823dc7de7de4c0f7dfc7e238321d535b2 100644
--- a/ssl/quic/quic_cfq.c
+++ b/ssl/quic/quic_cfq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
@@ -8,6 +8,7 @@
  */
 
 #include "internal/quic_cfq.h"
+#include "internal/numbers.h"
 
 typedef struct quic_cfq_item_ex_st QUIC_CFQ_ITEM_EX;
 
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index 78aaabef525253b5fa9234919efdef7fbf5b84c6..ce938b70f06a647359032efee913ffa32eb4c632 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_demux.c b/ssl/quic/quic_demux.c
index bc2cde726b9a5f2885305aab0e2df4761b486df5..88135fe5b9e444a2b9b8aa590d17f5ce6be37b86 100644
--- a/ssl/quic/quic_demux.c
+++ b/ssl/quic/quic_demux.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_fc.c b/ssl/quic/quic_fc.c
index 6cb5834c259f5be070c160a14eeffa2f750e4339..1a9c5890f80a985c81dafbb6f0206d1db29e97b1 100644
--- a/ssl/quic/quic_fc.c
+++ b/ssl/quic/quic_fc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_fifd.c b/ssl/quic/quic_fifd.c
index 5a69e0e8ff8c045da9f54918a3cd1ad5985352a6..a3dd1db978a960c7c498fb499a8185764af4f808 100644
--- a/ssl/quic/quic_fifd.c
+++ b/ssl/quic/quic_fifd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index c43f8a7fc866cbbcd722c318578f0e9780cfe655..ca4ef0ebbbbda5c91475f56deff82380ee9ee306 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_local.h b/ssl/quic/quic_local.h
index f492dc656b902315c3ba6179ca470858666b3f69..517904d90f7750b6d0610db2dc7688ca4dd65013 100644
--- a/ssl/quic/quic_local.h
+++ b/ssl/quic/quic_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_method.c b/ssl/quic/quic_method.c
index 118f5a07c57cd50eabde3030d2b0b6b15969b22b..2882a40f3f482a63a627c741ee8e5e112e53f7ee 100644
--- a/ssl/quic/quic_method.c
+++ b/ssl/quic/quic_method.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c
index 9aea218d27d012c64e3783b4acacedbc745153c2..3975b87717ad89d114a578633a874f13ad5ae7c4 100644
--- a/ssl/quic/quic_reactor.c
+++ b/ssl/quic/quic_reactor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_record_rx.c b/ssl/quic/quic_record_rx.c
index e4705a1cce85ab290302541b5a39c33a9640331b..31c1f8fffdf5b635f1a501cd810be086c199f6d0 100644
--- a/ssl/quic/quic_record_rx.c
+++ b/ssl/quic/quic_record_rx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_record_tx.c b/ssl/quic/quic_record_tx.c
index 044c19da38ea667ae3c1831536bd7576be782f11..d450470366db33234411eea1f734164d5b9d8cc1 100644
--- a/ssl/quic/quic_record_tx.c
+++ b/ssl/quic/quic_record_tx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_record_util.c b/ssl/quic/quic_record_util.c
index 008500f724325e75f8a9cda494500de12e07304f..e95a84c39b5df87b6ae634e3b8630d5e8574f838 100644
--- a/ssl/quic/quic_record_util.c
+++ b/ssl/quic/quic_record_util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_rstream.c b/ssl/quic/quic_rstream.c
index c51bc2014c09fde94df17a9332a52a8a3f8a3db1..dd3dbf756b447523443a559afabea6b105eafaae 100644
--- a/ssl/quic/quic_rstream.c
+++ b/ssl/quic/quic_rstream.c
@@ -1,5 +1,5 @@
 /*
-* Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+* Copyright 2022-2023 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
diff --git a/ssl/quic/quic_rx_depack.c b/ssl/quic/quic_rx_depack.c
index f7f8bf6ea3ddaf5fc633ae19eb1ea8b7c3cb5584..f2a564862b9ac8996cf5799f39046ea044ca7a38 100644
--- a/ssl/quic/quic_rx_depack.c
+++ b/ssl/quic/quic_rx_depack.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_sf_list.c b/ssl/quic/quic_sf_list.c
index 7f3fc9b84253145bf92fcc5c3922a28bf29de278..0541a2ab6371fc275a453251b57066dcb87e28f2 100644
--- a/ssl/quic/quic_sf_list.c
+++ b/ssl/quic/quic_sf_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_sstream.c b/ssl/quic/quic_sstream.c
index b6cf311cfc6c128a1a7f1a2923c2ebda7b02ea32..a5ae234a8e817881d66a46af43d7a81f44bafca7 100644
--- a/ssl/quic/quic_sstream.c
+++ b/ssl/quic/quic_sstream.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_statm.c b/ssl/quic/quic_statm.c
index 4e24fc11db5de9cb845eb72d5d8fda65d43487b9..f1e0f659141176397dc1f83aedc46d27adddae3c 100644
--- a/ssl/quic/quic_statm.c
+++ b/ssl/quic/quic_statm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_stream_map.c b/ssl/quic/quic_stream_map.c
index 4b595f50e7c821887407313034495ee3037653ff..0f41b03da58d61d2ad44ade4aa99ccee5c245107 100644
--- a/ssl/quic/quic_stream_map.c
+++ b/ssl/quic/quic_stream_map.c
@@ -1,5 +1,5 @@
 /*
-* Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+* Copyright 2022-2023 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
diff --git a/ssl/quic/quic_tls.c b/ssl/quic/quic_tls.c
index ff4c8dac0bc28b46d0cd7d4ca104a0047f1b31d6..a1bcedbfb071642a7a9cf2050f09b7cc2c8b03fa 100644
--- a/ssl/quic/quic_tls.c
+++ b/ssl/quic/quic_tls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_tserver.c b/ssl/quic/quic_tserver.c
index a3359c21c022fd72857a9ad59544ef70418d9822..788d4780d8e38c037f1db96638104ea3bf76f238 100644
--- a/ssl/quic/quic_tserver.c
+++ b/ssl/quic/quic_tserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index 97cba812e767c4c9e9456184394e829a92e5ebad..0f1e9b8f25618bde8ddf31cead956293d0211bb1 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
@@ -1984,7 +1984,7 @@ static int txp_generate_crypto_frames(OSSL_QUIC_TX_PACKETISER *txp,
 
         /*
          * Ensure we have enough iovecs allocated (1 for the header, up to 2 for
-         * the the stream data.)
+         * the stream data.)
          */
         if (!txp_el_ensure_iovec(&txp->el[enc_level], h->num_iovec + 3))
             return 0; /* alloc error */
@@ -2234,7 +2234,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
 
         /*
          * Ensure we have enough iovecs allocated (1 for the header, up to 2 for
-         * the the stream data.)
+         * the stream data.)
          */
         if (!txp_el_ensure_iovec(&txp->el[enc_level], h->num_iovec + 3))
             goto err; /* alloc error */
diff --git a/ssl/quic/quic_txpim.c b/ssl/quic/quic_txpim.c
index 716a0141ab5646e11c6d51cd3eeaa604f96a5d4b..04b25ee47a0466c43cf2a3eee0f406cbc24b2a33 100644
--- a/ssl/quic/quic_txpim.c
+++ b/ssl/quic/quic_txpim.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_wire.c b/ssl/quic/quic_wire.c
index a38efa758a6a71338c54dd4fa5aea127370bc901..6f8da05124b6f98534d58c981f0e7810e2aff378 100644
--- a/ssl/quic/quic_wire.c
+++ b/ssl/quic/quic_wire.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/quic_wire_pkt.c b/ssl/quic/quic_wire_pkt.c
index 069f0c8fa5e6993f2f01a944e0e30cd42a523c36..136c40e7ad8539e25f47d4c1ccd76add9282588f 100644
--- a/ssl/quic/quic_wire_pkt.c
+++ b/ssl/quic/quic_wire_pkt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/quic/uint_set.c b/ssl/quic/uint_set.c
index 3649e7eec2434ddbf3246350d5c1a4ac9b11f425..faca906003b02074880ecf379284cb60c14fd1d6 100644
--- a/ssl/quic/uint_set.c
+++ b/ssl/quic/uint_set.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/record/methods/dtls_meth.c b/ssl/record/methods/dtls_meth.c
index c5477b9b75e36ff9487b4531c0f094ebc9e02e95..fd89038eb0c469f4975125b96571b69e5f9f9cc0 100644
--- a/ssl/record/methods/dtls_meth.c
+++ b/ssl/record/methods/dtls_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/ssl/record/methods/ktls_meth.c b/ssl/record/methods/ktls_meth.c
index ff8d7218597cb62d20e29f5da036c32e79b3ab50..af91455c2914ce60774ab05a3eb659cf622584fa 100644
--- a/ssl/record/methods/ktls_meth.c
+++ b/ssl/record/methods/ktls_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/ssl/record/methods/recmethod_local.h b/ssl/record/methods/recmethod_local.h
index bd893b5e4c08988e6d9528d1c3435928ddec3ccb..300b146a7b07f4d95adf8a5be7002d4be23604cf 100644
--- a/ssl/record/methods/recmethod_local.h
+++ b/ssl/record/methods/recmethod_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/record/methods/ssl3_cbc.c b/ssl/record/methods/ssl3_cbc.c
index b42f5a39ff1cfc75947771c2be18b9bf64c7da9d..a8282989ed39e60e02b433ae359c540c64371061 100644
--- a/ssl/record/methods/ssl3_cbc.c
+++ b/ssl/record/methods/ssl3_cbc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-2023 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
diff --git a/ssl/record/methods/ssl3_meth.c b/ssl/record/methods/ssl3_meth.c
index a38fccae7bba71092d591a400b90694979ef44ca..76a108e44328fbce925a878a86b6f2d887d3f3b2 100644
--- a/ssl/record/methods/ssl3_meth.c
+++ b/ssl/record/methods/ssl3_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/record/methods/tls13_meth.c b/ssl/record/methods/tls13_meth.c
index 8704c7260354f8feab09eb804dc5bd416c4c7970..ec22f1ee49e40014a6c5fa0017dc77914bf54d92 100644
--- a/ssl/record/methods/tls13_meth.c
+++ b/ssl/record/methods/tls13_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/record/methods/tls1_meth.c b/ssl/record/methods/tls1_meth.c
index 6112c349a1798f5d5074e216df924c4870047949..46a83ad8f42aa2218e38a1da5f877bf2d3c89259 100644
--- a/ssl/record/methods/tls1_meth.c
+++ b/ssl/record/methods/tls1_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
index 6ea090df244ba2f94bb40f5ef063e4c65a663069..423777c18dd40fa13671c6718958a352783c38fb 100644
--- a/ssl/record/methods/tls_common.c
+++ b/ssl/record/methods/tls_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/record/methods/tls_multib.c b/ssl/record/methods/tls_multib.c
index 8aa89f86b28437bd9cb72266f145a72a53270df0..3c2c30ef162a6ec7c19f8bd87c6567f4c8b9cbd6 100644
--- a/ssl/record/methods/tls_multib.c
+++ b/ssl/record/methods/tls_multib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/record/methods/tls_pad.c b/ssl/record/methods/tls_pad.c
index d326a7608a895e469a247228dad7e6996a564e12..23198f3a4935b76d4cec5e2843564fe18ccecb91 100644
--- a/ssl/record/methods/tls_pad.c
+++ b/ssl/record/methods/tls_pad.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 5dc8d12e76a983391575a8b857736145f6be256e..87b588b84bed9ddd6227fc9017090ed6ef9ee3f3 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 29c5de88d418b98b987762993c80e71c8ec41f74..260d163a50d932c694ce7006b5884abb3856b8da 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/ssl/record/record.h b/ssl/record/record.h
index e4d1e34036299ca2de5d7efdce7aa6ddb8cfa0ad..6fb579fe19f1406dc3c6292b534a46d0d91050e1 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index d13a28697e60f7a513655dce16a6a1946f0cff5b..54c47dd3f9bc811209949f0cc312e62162c7aed7 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index ae97e394203572efa9548ffa8cc0103d4fb25253..29af55bc61e8fa06dc50bdbbb4a57940f384e5ec 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
diff --git a/ssl/ssl_cert_comp.c b/ssl/ssl_cert_comp.c
index ebc92b00390d061592fd81a29c8ccee1b7a42e26..639610a5f77e2c9afadfa86f6bf174b790d4a5f0 100644
--- a/ssl/ssl_cert_comp.c
+++ b/ssl/ssl_cert_comp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/ssl/ssl_cert_table.h b/ssl/ssl_cert_table.h
index e70d9d624e1672080e566d3bc5120f98fc8009d4..28918b976751c3b0179e4c78faca0195a1770071 100644
--- a/ssl/ssl_cert_table.h
+++ b/ssl/ssl_cert_table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 18b9c6d10e1c8fb4dd5aa56240486d837dba6fd5..35949f2dcc3c872a01bc6bdf8cbe1000291dd6c2 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -114,7 +114,7 @@ static const ssl_cipher_table ssl_cipher_table_auth[] = {
 /* *INDENT-ON* */
 
 /* Utility function for table lookup */
-static int ssl_cipher_info_find(const ssl_cipher_table * table,
+static int ssl_cipher_info_find(const ssl_cipher_table *table,
                                 size_t table_cnt, uint32_t mask)
 {
     size_t i;
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 45c74119076a7fdb2f89998bf33e495db6e0ac39..3142370016846e0458ed19c4a511d85f3dfb5161 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-2023 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
@@ -855,7 +855,7 @@ static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)
 }
 
 /* Determine if a command is allowed according to cctx flags */
-static int ssl_conf_cmd_allowed(SSL_CONF_CTX *cctx, const ssl_conf_cmd_tbl * t)
+static int ssl_conf_cmd_allowed(SSL_CONF_CTX *cctx, const ssl_conf_cmd_tbl *t)
 {
     unsigned int tfl = t->flags;
     unsigned int cfl = cctx->flags;
@@ -893,7 +893,7 @@ static const ssl_conf_cmd_tbl *ssl_conf_cmd_lookup(SSL_CONF_CTX *cctx,
     return NULL;
 }
 
-static int ctrl_switch_option(SSL_CONF_CTX *cctx, const ssl_conf_cmd_tbl * cmd)
+static int ctrl_switch_option(SSL_CONF_CTX *cctx, const ssl_conf_cmd_tbl *cmd)
 {
     /* Find index of command in table */
     size_t idx = cmd - ssl_conf_cmds;
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index cef57356c592eb070aa9b838277a322a2e1087ac..a2d759508955983c317abc28e7dc2cce8d05fbea 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -88,7 +88,7 @@ static void ssl_library_stop(void)
  * called prior to any threads making calls to any OpenSSL functions,
  * i.e. passing a non-null settings value is assumed to be single-threaded.
  */
-int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS * settings)
+int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
 {
     static int stoperrset = 0;
 
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 5bfd8cc4cef0fa23947126793c7939f76ca9732a..b7fa9d78f70a92437ab3cf29e1db30c54e76d802 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -6197,13 +6197,13 @@ const STACK_OF(SCT) *SSL_get0_peer_scts(SSL *s)
     return NULL;
 }
 
-static int ct_permissive(const CT_POLICY_EVAL_CTX * ctx,
+static int ct_permissive(const CT_POLICY_EVAL_CTX *ctx,
                          const STACK_OF(SCT) *scts, void *unused_arg)
 {
     return 1;
 }
 
-static int ct_strict(const CT_POLICY_EVAL_CTX * ctx,
+static int ct_strict(const CT_POLICY_EVAL_CTX *ctx,
                      const STACK_OF(SCT) *scts, void *unused_arg)
 {
     int count = scts != NULL ? sk_SCT_num(scts) : 0;
@@ -6424,7 +6424,7 @@ int SSL_CTX_set_ctlog_list_file(SSL_CTX *ctx, const char *path)
     return CTLOG_STORE_load_file(ctx->ctlog_store, path);
 }
 
-void SSL_CTX_set0_ctlog_store(SSL_CTX *ctx, CTLOG_STORE * logs)
+void SSL_CTX_set0_ctlog_store(SSL_CTX *ctx, CTLOG_STORE *logs)
 {
     CTLOG_STORE_free(ctx->ctlog_store);
     ctx->ctlog_store = logs;
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 1df087abd1a278fdc0ec3b7e8f73594c6cd72c83..c245c24080f36a377041fc2a408b2b28883f7908 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index f2dec2fc0fd445e68a8290648bb12d8568b10fce..92c00ce4ae5aa95dc04b844244975778821c537d 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -3373,7 +3373,7 @@ int ossl_gost18_cke_cipher_nid(const SSL_CONNECTION *s)
 
 int ossl_gost_ukm(const SSL_CONNECTION *s, unsigned char *dgst_buf)
 {
-    EVP_MD_CTX * hash = NULL;
+    EVP_MD_CTX *hash = NULL;
     unsigned int md_len;
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
     const EVP_MD *md = ssl_evp_md_fetch(sctx->libctx, NID_id_GostR3411_2012_256,
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index 31dc9f3511ea2985607220057414454a55cf689f..a88b0dfeac61af992b9c28e6289c2f1c4f45d937 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2023 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
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 67865b85fa0bb8cd283871969de364743061f047..853af8c0aa9f93a43839b6fc6558537b9daa62bd 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2353,7 +2353,7 @@ WORK_STATE tls_post_process_client_hello(SSL_CONNECTION *s, WORK_STATE wst)
          * we now have the following setup.
          * client_random
          * cipher_list          - our preferred list of ciphers
-         * ciphers              - the clients preferred list of ciphers
+         * ciphers              - the client's preferred list of ciphers
          * compression          - basically ignored right now
          * ssl version is set   - sslv3
          * s->session           - The ssl session has been setup.
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 712a784a0d73943ec68a00f565d540018437e672..673a53ad36a4bb0d1d0b3f88cbe74c397a8bfd9a 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index 30fcfe8861f3945c2a606a142902ce09f5383caa..772a6fc17383941cab9eb673ec288e5b47c3da15 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/afalgtest.c b/test/afalgtest.c
index 02947c1ed3655f306940cc39ac810b77676f41fd..429e2da3c9e46aa6ea54cc800fe53073487b096f 100644
--- a/test/afalgtest.c
+++ b/test/afalgtest.c
@@ -112,7 +112,7 @@ static int test_afalg_aes_cbc(int keysize_idx)
 static int test_pr16743(void)
 {
     int ret = 0;
-    const EVP_CIPHER * cipher;
+    const EVP_CIPHER *cipher;
     EVP_CIPHER_CTX *ctx;
 
     if (!TEST_true(ENGINE_init(e)))
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index f91e21cb545063cdb0f2eeaddeaab5f069c48454..3c2222d988dfb66f6e369bbc2e671aa49c9735d4 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/test/bio_core_test.c b/test/bio_core_test.c
index e3d66253823664bb69d4e9526a9a8d5187993889..be2ae49932e7790d9ce8d78ebfbae1669ef5dbd4 100644
--- a/test/bio_core_test.c
+++ b/test/bio_core_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/test/bio_dgram_test.c b/test/bio_dgram_test.c
index 5aafe389f70569abf943a7c4e21e098542cf7699..f6c3e30c149255232bbb3dcf61b8f1e860891bb5 100644
--- a/test/bio_dgram_test.c
+++ b/test/bio_dgram_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/bntest.c b/test/bntest.c
index 35471ac3bb408cbe4333ebebd34221e30cb96e59..9c0633d7f16c5ddfed8e3a4a17077ce1f0fce595 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/test/build_wincrypt_test.c b/test/build_wincrypt_test.c
index 0c0a54652767bf384b99509a9c055ad5fc110f21..550e600b488549db83dd7c99c499871d7f582a4a 100644
--- a/test/build_wincrypt_test.c
+++ b/test/build_wincrypt_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/cc_dummy.c b/test/cc_dummy.c
index 0331a7cdcf58052797ad23d4299d00e54697abd5..4b2bc041998eddf622fa37fae1f43276a670aea9 100644
--- a/test/cc_dummy.c
+++ b/test/cc_dummy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/certs/mkcert.sh b/test/certs/mkcert.sh
index 5bba5893580fd28fd8280fbfb60ae5240b44a678..1cb4a9000c69266327932a3b4ddf517cdc1cc8a7 100755
--- a/test/certs/mkcert.sh
+++ b/test/certs/mkcert.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright (c) 2016 Viktor Dukhovni <openssl-users@dukhovni.org>.
 # All rights reserved.
 #
diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index 878bd752e054bb70d56c9fd4ddd590154afba3eb..d52479b6584d893ee1b976140ed727ef49220597 100644
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -181,7 +181,7 @@ static int test_cha_cha_internal(int n)
 
 int setup_tests(void)
 {
-#ifdef CPUID_OBJ
+#ifdef OPENSSL_CPUID_OBJ
     OPENSSL_cpuid_setup();
 #endif
 
diff --git a/test/cmp_asn_test.c b/test/cmp_asn_test.c
index 6dab3944b9a23828c795d90bc7e0e79c5d37842d..786bd3296e0f73fb0327c384f985a61c217714db 100644
--- a/test/cmp_asn_test.c
+++ b/test/cmp_asn_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c
index 5782a91868e6bf87070ef65ce27a2f9c944df215..44c369bc907f61e783cfa5515217168d451889ef 100644
--- a/test/cmp_client_test.c
+++ b/test/cmp_client_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c
index 485e0e47f1e295f1a715de927b23268e4d178c51..137f67331b068386107b2f9099d74a47c16e2f7c 100644
--- a/test/cmp_ctx_test.c
+++ b/test/cmp_ctx_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/test/cmp_hdr_test.c b/test/cmp_hdr_test.c
index c4cab22f5f7e53126806d1dd8088939668d30320..69f75a24e2a4a1c1dc48b7febb903e1b995d8c3a 100644
--- a/test/cmp_hdr_test.c
+++ b/test/cmp_hdr_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/test/cmp_msg_test.c b/test/cmp_msg_test.c
index 4438b53cb3c1381ac05a7738ce021841c03728a1..e98b5624285b533bfd178da875942723bca776d5 100644
--- a/test/cmp_msg_test.c
+++ b/test/cmp_msg_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c
index b8a50d3157b25228cf2643ab57869ff503c29472..0d2311fc29c7399daef440ad4d750d3d9925c702 100644
--- a/test/cmp_protect_test.c
+++ b/test/cmp_protect_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
@@ -12,6 +12,7 @@
 #include "helpers/cmp_testlib.h"
 
 static const char *ir_protected_f;
+static const char *genm_prot_Ed_f;
 static const char *ir_unprotected_f;
 static const char *ip_PBM_f;
 
@@ -62,10 +63,13 @@ static CMP_PROTECT_TEST_FIXTURE *set_up(const char *const test_case_name)
     return fixture;
 }
 
-static EVP_PKEY *loadedprivkey = NULL;
-static EVP_PKEY *loadedpubkey = NULL;
-static EVP_PKEY *loadedkey = NULL;
-static X509 *cert = NULL;
+static EVP_PKEY *prot_RSA_key = NULL;
+#ifndef OPENSSL_NO_ECX
+static EVP_PKEY *prot_Ed_key = NULL;
+static OSSL_CMP_MSG *genm_protected_Ed;
+#endif
+static EVP_PKEY *server_key = NULL;
+static X509 *server_cert = NULL;
 static unsigned char rand_data[OSSL_CMP_TRANSACTIONID_LENGTH];
 static OSSL_CMP_MSG *ir_unprotected, *ir_protected;
 static X509 *endentity1 = NULL, *endentity2 = NULL,
@@ -94,33 +98,20 @@ static int execute_calc_protection_pbmac_test(CMP_PROTECT_TEST_FIXTURE *fixture)
 }
 
 /*
- * This function works similarly to parts of CMP_verify_signature in cmp_vfy.c,
- * but without the need for an OSSL_CMP_CTX or a X509 certificate
+ * This function works similarly to parts of verify_signature in cmp_vfy.c,
+ * but without the need for an OSSL_CMP_CTX or an X509 certificate.
  */
 static int verify_signature(OSSL_CMP_MSG *msg,
                             ASN1_BIT_STRING *protection,
                             EVP_PKEY *pkey, EVP_MD *digest)
 {
     OSSL_CMP_PROTECTEDPART prot_part;
-    unsigned char *prot_part_der = NULL;
-    int len;
-    EVP_MD_CTX *ctx = NULL;
-    int res;
 
     prot_part.header = OSSL_CMP_MSG_get0_header(msg);
     prot_part.body = msg->body;
-    len = i2d_OSSL_CMP_PROTECTEDPART(&prot_part, &prot_part_der);
-    res =
-        TEST_int_ge(len, 0)
-        && TEST_ptr(ctx = EVP_MD_CTX_new())
-        && TEST_true(EVP_DigestVerifyInit(ctx, NULL, digest, NULL, pkey))
-        && TEST_int_eq(EVP_DigestVerify(ctx, protection->data,
-                                        protection->length,
-                                        prot_part_der, len), 1);
-    /* cleanup */
-    EVP_MD_CTX_free(ctx);
-    OPENSSL_free(prot_part_der);
-    return res;
+    return ASN1_item_verify_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART),
+                               msg->header->protectionAlg, protection,
+                               &prot_part, NULL, pkey, libctx, NULL) > 0;
 }
 
 /* Calls OSSL_CMP_calc_protection and compares and verifies signature */
@@ -130,11 +121,9 @@ static int execute_calc_protection_signature_test(CMP_PROTECT_TEST_FIXTURE *
     ASN1_BIT_STRING *protection =
         ossl_cmp_calc_protection(fixture->cmp_ctx, fixture->msg);
     int ret = (TEST_ptr(protection)
-                   && TEST_true(ASN1_STRING_cmp(protection,
-                                                fixture->msg->protection) == 0)
-                   && TEST_true(verify_signature(fixture->msg, protection,
-                                                 fixture->pubkey,
-                                                 fixture->cmp_ctx->digest)));
+               && TEST_true(verify_signature(fixture->msg, protection,
+                                             fixture->pubkey,
+                                             fixture->cmp_ctx->digest)));
 
     ASN1_BIT_STRING_free(protection);
     return ret;
@@ -157,9 +146,9 @@ static int test_cmp_calc_protection_no_key_no_secret(void)
 static int test_cmp_calc_protection_pkey(void)
 {
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
-    fixture->pubkey = loadedpubkey;
-    if (!TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, loadedprivkey))
-            || !TEST_ptr(fixture->msg = load_pkimsg(ir_protected_f, libctx))) {
+    fixture->pubkey = prot_RSA_key;
+    if (!TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, prot_RSA_key))
+        || !TEST_ptr(fixture->msg = load_pkimsg(ir_protected_f, libctx))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -167,6 +156,21 @@ static int test_cmp_calc_protection_pkey(void)
     return result;
 }
 
+#ifndef OPENSSL_NO_ECX
+static int test_cmp_calc_protection_pkey_Ed(void)
+{
+    SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
+    fixture->pubkey = prot_Ed_key;
+    if (!TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, prot_Ed_key))
+        || !TEST_ptr(fixture->msg = load_pkimsg(genm_prot_Ed_f, libctx))) {
+        tear_down(fixture);
+        fixture = NULL;
+    }
+    EXECUTE_TEST(execute_calc_protection_signature_test, tear_down);
+    return result;
+}
+#endif
+
 static int test_cmp_calc_protection_pbmac(void)
 {
     unsigned char sec_insta[] = { 'i', 'n', 's', 't', 'a' };
@@ -236,8 +240,9 @@ static int test_MSG_protect_with_certificate_and_key(void)
     if (!TEST_ptr(fixture->msg =
                   OSSL_CMP_MSG_dup(ir_unprotected))
             || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))
-            || !TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, loadedkey))
-            || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx, cert))) {
+            || !TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, server_key))
+            || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx,
+                                                 server_cert))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -255,11 +260,11 @@ static int test_MSG_protect_certificate_based_without_cert(void)
     if (!TEST_ptr(fixture->msg =
                   OSSL_CMP_MSG_dup(ir_unprotected))
             || !TEST_true(SET_OPT_UNPROTECTED_SEND(ctx, 0))
-            || !TEST_true(OSSL_CMP_CTX_set0_newPkey(ctx, 1, loadedkey))) {
+            || !TEST_true(OSSL_CMP_CTX_set0_newPkey(ctx, 1, server_key))) {
         tear_down(fixture);
         fixture = NULL;
     }
-    EVP_PKEY_up_ref(loadedkey);
+    EVP_PKEY_up_ref(server_key);
     EXECUTE_TEST(execute_MSG_protect_test, tear_down);
     return result;
 }
@@ -517,10 +522,13 @@ static int test_X509_STORE_only_self_issued(void)
 
 void cleanup_tests(void)
 {
-    EVP_PKEY_free(loadedprivkey);
-    EVP_PKEY_free(loadedpubkey);
-    EVP_PKEY_free(loadedkey);
-    X509_free(cert);
+    EVP_PKEY_free(prot_RSA_key);
+#ifndef OPENSSL_NO_ECX
+    EVP_PKEY_free(prot_Ed_key);
+    OSSL_CMP_MSG_free(genm_protected_Ed);
+#endif
+    EVP_PKEY_free(server_key);
+    X509_free(server_cert);
     X509_free(endentity1);
     X509_free(endentity2);
     X509_free(root);
@@ -532,14 +540,16 @@ void cleanup_tests(void)
     OSSL_LIB_CTX_free(libctx);
 }
 
-#define USAGE "server.pem IR_protected.der IR_unprotected.der IP_PBM.der " \
+#define USAGE "prot_RSA.pem IR_protected.der prot_Ed.pem " \
+    "GENM_protected_Ed.der IR_unprotected.der IP_PBM.der " \
     "server.crt server.pem EndEntity1.crt EndEntity2.crt Root_CA.crt " \
     "Intermediate_CA.crt module_name [module_conf_file]\n"
 OPT_TEST_DECLARE_USAGE(USAGE)
 
 int setup_tests(void)
 {
-    char *server_f;
+    char *prot_RSA_f;
+    char *prot_Ed_f;
     char *server_key_f;
     char *server_cert_f;
     char *endentity1_f;
@@ -553,32 +563,39 @@ int setup_tests(void)
     }
 
     RAND_bytes(rand_data, OSSL_CMP_TRANSACTIONID_LENGTH);
-    if (!TEST_ptr(server_f = test_get_argument(0))
+    if (!TEST_ptr(prot_RSA_f = test_get_argument(0))
             || !TEST_ptr(ir_protected_f = test_get_argument(1))
-            || !TEST_ptr(ir_unprotected_f = test_get_argument(2))
-            || !TEST_ptr(ip_PBM_f = test_get_argument(3))
-            || !TEST_ptr(server_cert_f = test_get_argument(4))
-            || !TEST_ptr(server_key_f = test_get_argument(5))
-            || !TEST_ptr(endentity1_f = test_get_argument(6))
-            || !TEST_ptr(endentity2_f = test_get_argument(7))
-            || !TEST_ptr(root_f = test_get_argument(8))
-            || !TEST_ptr(intermediate_f = test_get_argument(9))) {
+            || !TEST_ptr(prot_Ed_f = test_get_argument(2))
+            || !TEST_ptr(genm_prot_Ed_f = test_get_argument(3))
+            || !TEST_ptr(ir_unprotected_f = test_get_argument(4))
+            || !TEST_ptr(ip_PBM_f = test_get_argument(5))
+            || !TEST_ptr(server_cert_f = test_get_argument(6))
+            || !TEST_ptr(server_key_f = test_get_argument(7))
+            || !TEST_ptr(endentity1_f = test_get_argument(8))
+            || !TEST_ptr(endentity2_f = test_get_argument(9))
+            || !TEST_ptr(root_f = test_get_argument(10))
+            || !TEST_ptr(intermediate_f = test_get_argument(11))) {
         TEST_error("usage: cmp_protect_test %s", USAGE);
         return 0;
     }
 
-    if (!test_arg_libctx(&libctx, &default_null_provider, &provider, 10, USAGE))
+    if (!test_arg_libctx(&libctx, &default_null_provider, &provider, 12, USAGE))
         return 0;
 
-    if (!TEST_ptr(loadedkey = load_pkey_pem(server_key_f, libctx))
-            || !TEST_ptr(cert = load_cert_pem(server_cert_f, libctx)))
+    if (!TEST_ptr(server_key = load_pkey_pem(server_key_f, libctx))
+            || !TEST_ptr(server_cert = load_cert_pem(server_cert_f, libctx)))
         return 0;
 
-    if (!TEST_ptr(loadedprivkey = load_pkey_pem(server_f, libctx)))
+    if (!TEST_ptr(prot_RSA_key = load_pkey_pem(prot_RSA_f, libctx)))
         return 0;
-    if (TEST_true(EVP_PKEY_up_ref(loadedprivkey)))
-        loadedpubkey = loadedprivkey;
+#ifndef OPENSSL_NO_ECX
+    if (!TEST_ptr(prot_Ed_key = load_pkey_pem(prot_Ed_f, libctx)))
+        return 0;
+#endif
     if (!TEST_ptr(ir_protected = load_pkimsg(ir_protected_f, libctx))
+#ifndef OPENSSL_NO_ECX
+        || !TEST_ptr(genm_protected_Ed = load_pkimsg(genm_prot_Ed_f, libctx))
+#endif
         || !TEST_ptr(ir_unprotected = load_pkimsg(ir_unprotected_f, libctx)))
         return 0;
     if (!TEST_ptr(endentity1 = load_cert_pem(endentity1_f, libctx))
@@ -592,6 +609,9 @@ int setup_tests(void)
     /* Message protection tests */
     ADD_TEST(test_cmp_calc_protection_no_key_no_secret);
     ADD_TEST(test_cmp_calc_protection_pkey);
+#ifndef OPENSSL_NO_ECX
+    ADD_TEST(test_cmp_calc_protection_pkey_Ed);
+#endif
     ADD_TEST(test_cmp_calc_protection_pbmac);
 
     ADD_TEST(test_MSG_protect_with_msg_sig_alg_protection_plus_rsa_key);
diff --git a/test/cmp_vfy_test.c b/test/cmp_vfy_test.c
index 26f2015e8e8f8859f47c0360c01740099cbb6052..4ce309992fce4f1033311b697c6778b535669aba 100644
--- a/test/cmp_vfy_test.c
+++ b/test/cmp_vfy_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
diff --git a/test/cmsapitest.c b/test/cmsapitest.c
index ecb5e1054db6db9ab19fbc47d9bd2c118a7a020c..5839eb74310aad1d89659eadb7701dec59bd0cf6 100644
--- a/test/cmsapitest.c
+++ b/test/cmsapitest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c
index 226c870607081fc18053b180f80e06555f95b39e..c0b3ae3c80c3b6c7bba32cb1b8375984f12f0fb2 100644
--- a/test/curve448_internal_test.c
+++ b/test/curve448_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/test/destest.c b/test/destest.c
index 41977ff6e020e35e823cacab78d7db37b3b761e1..d5f00fa691ff72c6658ba089a415b57543a7a4f4 100644
--- a/test/destest.c
+++ b/test/destest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/test/dhkem_test.inc b/test/dhkem_test.inc
index b9562c887948d9d6c039463b0ba931a7ca6f99e8..8b4d36bbd01b0cb5995eda7f987a6ce2588a40ee 100644
--- a/test/dhkem_test.inc
+++ b/test/dhkem_test.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/dhtest.c b/test/dhtest.c
index 14b00f0d3dd928840be95932ab3eb137153bc157..bef706909c734688bd303fb7709ed99f2762cbc4 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/test/drbgtest.c b/test/drbgtest.c
index 29583b568f0e5bf5f5ea1c7ec41dd4b256fd5c94..bb2a9f1b99a688df8df2b9713023a8d7814cf42a 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -299,7 +299,7 @@ typedef struct drbg_fork_result_st {
  * This simplifies finding duplicate random output and makes
  * the printout in case of an error more readable.
  */
-static int compare_drbg_fork_result(const void * left, const void * right)
+static int compare_drbg_fork_result(const void *left, const void *right)
 {
     int result;
     const drbg_fork_result *l = left;
@@ -322,7 +322,7 @@ static int compare_drbg_fork_result(const void * left, const void * right)
  *
  * Used for finding collisions in two-byte chunks
  */
-static int compare_rand_chunk(const void * left, const void * right)
+static int compare_rand_chunk(const void *left, const void *right)
 {
     return memcmp(left, right, 2);
 }
diff --git a/test/dsatest.c b/test/dsatest.c
index 49966088e5e078eb0560420297aae6da8efd775e..5fa83020f87a22826d9dbcdea5c1b6fcf973bf23 100644
--- a/test/dsatest.c
+++ b/test/dsatest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/test/dtlstest.c b/test/dtlstest.c
index 79cd37f45e8c39f8e2ae14f49c4183d74808479f..011d8775c15788c2b8594fd5bfbfe8179adfd926 100644
--- a/test/dtlstest.c
+++ b/test/dtlstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index 0954239684dae36e5077c1a7ebebfd90786c89ac..33a52eb1b5624d80d0e0d9f019f5e5744be85ca6 100644
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/test/ectest.c b/test/ectest.c
index f93fd768114f0a02e24d04d32aea08c611ea2bc4..70df89ee2f8779aef36f5e15b67c3f645570f76b 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -2457,7 +2457,7 @@ static int ec_point_hex2point_test(int id)
     EC_GROUP *group = NULL;
     const EC_POINT *G = NULL;
     EC_POINT *P = NULL;
-    BN_CTX * bnctx = NULL;
+    BN_CTX *bnctx = NULL;
 
     /* Do some setup */
     nid = curves[id].nid;
diff --git a/test/endecode_test.c b/test/endecode_test.c
index b334d427ebe12bca694bc8773ee44a775181a673..e28fd41b7558b6069e4c05a606a4acc2ac57462f 100644
--- a/test/endecode_test.c
+++ b/test/endecode_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/test/errtest.c b/test/errtest.c
index 93e6ebbd4777cd365e4ed7e2e424cb5ad6c56b05..dbf07f8a72cd8342432d9d2b5964887be954f3e1 100644
--- a/test/errtest.c
+++ b/test/errtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 0b61d5c9e8e0beaf589440da0277010b1c13c60e..bec16144f994a8ac34f85272c7b2ae20fc07b23a 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/test/evp_extra_test2.c b/test/evp_extra_test2.c
index db33ead3ee813b9e1aff1a1ce3885abbfc10219a..a06bd697941e894d4dc4dfbc75dd3d3ccb1a64dc 100644
--- a/test/evp_extra_test2.c
+++ b/test/evp_extra_test2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/test/evp_kdf_test.c b/test/evp_kdf_test.c
index fb30fca1ef929036f7437c729e29e430ff35e35a..85bae39988b3062702b6694ede31a1059a10fe51 100644
--- a/test/evp_kdf_test.c
+++ b/test/evp_kdf_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2018-2020, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/test/evp_pkey_dhkem_test.c b/test/evp_pkey_dhkem_test.c
index a99b6b913b4355a50e010e0c52e429be2dc646f8..97d40a27723c82a07cd81822ea11269aeaaef185 100644
--- a/test/evp_pkey_dhkem_test.c
+++ b/test/evp_pkey_dhkem_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c
index 47363e0bfdb13416648c0eab6f1b47bc20d8b7fd..02e7aa727c6ab42d75111658ffac5e450054c320 100644
--- a/test/evp_pkey_provided_test.c
+++ b/test/evp_pkey_provided_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/test/evp_test.c b/test/evp_test.c
index 0a33ed3ba860e4abcb0b0e6d59e6980345f6c845..ea1ca65bcde1e857a4fcdb124880fc75c02919fb 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
@@ -52,13 +52,13 @@ struct evp_test_method_st {
     /* Name of test as it appears in file */
     const char *name;
     /* Initialise test for "alg" */
-    int (*init) (EVP_TEST * t, const char *alg);
+    int (*init) (EVP_TEST *t, const char *alg);
     /* Clean up method */
-    void (*cleanup) (EVP_TEST * t);
+    void (*cleanup) (EVP_TEST *t);
     /* Test specific name value pair processing */
-    int (*parse) (EVP_TEST * t, const char *name, const char *value);
+    int (*parse) (EVP_TEST *t, const char *name, const char *value);
     /* Run the test itself */
-    int (*run_test) (EVP_TEST * t);
+    int (*run_test) (EVP_TEST *t);
 };
 
 /* Linked list of named keys. */
diff --git a/test/exptest.c b/test/exptest.c
index ac2e6d3756defe5556e63515705ec98156dbd068..143dfa99581ab0962819a0102722cb162b557799 100644
--- a/test/exptest.c
+++ b/test/exptest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/test/ext_internal_test.c b/test/ext_internal_test.c
index b86f82ebf98bc7cc6d4072c55393fca893319989..20cf708de27a311623d8602facea4cf8a65fd610 100644
--- a/test/ext_internal_test.c
+++ b/test/ext_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 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
diff --git a/test/fake_rsaprov.c b/test/fake_rsaprov.c
index 501da0b53be39b7d8cd4dfba20d05d252d48eb90..a4f81be0232ea2f6ab1da23ccdafdf36e456ac0e 100644
--- a/test/fake_rsaprov.c
+++ b/test/fake_rsaprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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.
diff --git a/test/ffc_internal_test.c b/test/ffc_internal_test.c
index 58064f6dc261ec429c6341d1037167d730f5991c..0332e777c0aec39727cc9de3d316e952c8c0799a 100644
--- a/test/ffc_internal_test.c
+++ b/test/ffc_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019-2020, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/test/filterprov.c b/test/filterprov.c
index c7cda32261095ff6debdfbc60cb7091ad3c6476e..ea6583be1b52e60898d6ae212f730fe58c7889f1 100644
--- a/test/filterprov.c
+++ b/test/filterprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2023 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
diff --git a/test/helpers/quictestlib.c b/test/helpers/quictestlib.c
index 2fcb4bdb6f83e0773777333c1d821a2f46fdf3e6..f0955559dcac251fdd172771b1f5699502fbea9e 100644
--- a/test/helpers/quictestlib.c
+++ b/test/helpers/quictestlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/helpers/quictestlib.h b/test/helpers/quictestlib.h
index fb1c5d88b534de5bdc741c37ee39ce01f69644c8..45f6ebec7918e231bb9f40bef4e85f2c53481d1d 100644
--- a/test/helpers/quictestlib.h
+++ b/test/helpers/quictestlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/helpers/ssl_test_ctx.c b/test/helpers/ssl_test_ctx.c
index c7777f8f075167020ff1dc864ad975eb91dba930..ec2c7885ba7c7255e2f0108d97995beb24a5540c 100644
--- a/test/helpers/ssl_test_ctx.c
+++ b/test/helpers/ssl_test_ctx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/helpers/ssl_test_ctx.h b/test/helpers/ssl_test_ctx.h
index 982d15a5c30a42596785c81cd1e8576425a83154..017d2d1121514419fdb027125b1de3eb22c75a64 100644
--- a/test/helpers/ssl_test_ctx.h
+++ b/test/helpers/ssl_test_ctx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c
index 01a51ac41d3275861d48f6010279dd32f577d1a1..94a170b9a52f440a2a0364880938195215359392 100644
--- a/test/helpers/ssltestlib.c
+++ b/test/helpers/ssltestlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/helpers/ssltestlib.h b/test/helpers/ssltestlib.h
index defcb35115958b72c9cdfeccacf627ce59767d03..c8dcb8a82d28d269d1b4bda47bc3f2cf4108277b 100644
--- a/test/helpers/ssltestlib.h
+++ b/test/helpers/ssltestlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/hpke_test.c b/test/hpke_test.c
index 891560d2dcaa7d42d53385d721d163d0377bde26..4ca67682a3fef9b4470ef41d21fb37db8d2610bb 100644
--- a/test/hpke_test.c
+++ b/test/hpke_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/membio_test.c b/test/membio_test.c
index 254f71b9c52053bdef65b38f12851c0788cbcc11..f566184af7e0626c30e5c73033115f35907787d7 100644
--- a/test/membio_test.c
+++ b/test/membio_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/ocspapitest.c b/test/ocspapitest.c
index bc0c965d853b9e588f59c0a023d7fc7613d8303f..a448731380ecc1ec403591d245c0dd4b999d5f7b 100644
--- a/test/ocspapitest.c
+++ b/test/ocspapitest.c
@@ -193,7 +193,7 @@ static int test_ocsp_url_svcloc_new(void)
     };
 
     X509 *issuer = NULL;
-    X509_EXTENSION * ext = NULL;
+    X509_EXTENSION *ext = NULL;
     int ret = 0;
 
     if (!TEST_true(get_cert(&issuer)))
diff --git a/test/p_test.c b/test/p_test.c
index fc9f179310189f18244219dbf695a20e4e84ef06..b27a38c13e30e48007bc2a15500575abff39878b 100644
--- a/test/p_test.c
+++ b/test/p_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/test/packettest.c b/test/packettest.c
index ac37c10baede28f590a8c10687e4372856dab5ea..40b68d310a7246e2649fb10336c2a9ed8b7964c8 100644
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/test/param_build_test.c b/test/param_build_test.c
index d67df3c311e03b475d41bb7420a2145f7a1151b8..f693b4b11bf616778730aa9f06fb077e59e14e4d 100644
--- a/test/param_build_test.c
+++ b/test/param_build_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -16,7 +16,7 @@
 
 static const OSSL_PARAM params_empty[] = { OSSL_PARAM_END };
 
-static int template_public_single_zero_test(void)
+static int template_public_single_zero_test(int idx)
 {
     OSSL_PARAM_BLD *bld = NULL;
     OSSL_PARAM *params = NULL, *params_blt = NULL, *p;
@@ -25,7 +25,8 @@ static int template_public_single_zero_test(void)
 
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_ptr(zbn = BN_new())
-        || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, "zeronumber", zbn))
+        || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, "zeronumber",
+                                             idx == 0 ? zbn : NULL))
         || !TEST_ptr(params_blt = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
 
@@ -550,7 +551,7 @@ err:
 
 int setup_tests(void)
 {
-    ADD_TEST(template_public_single_zero_test);
+    ADD_ALL_TESTS(template_public_single_zero_test, 2);
     ADD_ALL_TESTS(template_public_test, 5);
     /* Only run the secure memory testing if we have secure memory available */
     if (CRYPTO_secure_malloc_init(1<<16, 16)) {
diff --git a/test/pbetest.c b/test/pbetest.c
index 7bf0680785d80e76fd89215d092ba661e598c606..cfffc2b9323327ccca7fba49ccbf21264c93f9eb 100644
--- a/test/pbetest.c
+++ b/test/pbetest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/test/pemtest.c b/test/pemtest.c
index 171d238533c83cc45a13b430cdf375e11b748922..bf9709836544391095c71e5d2f41aedd1353fc21 100644
--- a/test/pemtest.c
+++ b/test/pemtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/test/pkcs12_api_test.c b/test/pkcs12_api_test.c
index da023f364d08b2410c10900d23d6cf78df4594f4..5afef5a16ad3aa5da3ae82b9c3c43b1a56952b8c 100644
--- a/test/pkcs12_api_test.c
+++ b/test/pkcs12_api_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/property_test.c b/test/property_test.c
index cd89958a01b7017da9902d7bdbf0c38ed421680b..45b1db3e855b6a4b19d12c06c4f622c6b1d7abdd 100644
--- a/test/property_test.c
+++ b/test/property_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/test/provfetchtest.c b/test/provfetchtest.c
index 12f744a68809185543c9cc2c82442eded773b8dc..d8c9307ddd177acdafe333df83db666197058d6a 100644
--- a/test/provfetchtest.c
+++ b/test/provfetchtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c
index 6c333f85dbb23671e8eb3e2331600252b0276224..9998e6bf973fa6804ee9760e0bfdd578e3ab026b 100644
--- a/test/provider_internal_test.c
+++ b/test/provider_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/test/provider_pkey_test.c b/test/provider_pkey_test.c
index 3b190baa5e65591badb44028a791d8885378288e..7e69f4bbd50b0faae07f6323cbce8db094c35828 100644
--- a/test/provider_pkey_test.c
+++ b/test/provider_pkey_test.c
@@ -93,7 +93,7 @@ static int test_pkey_sig(void)
         /*
          * If this picks the wrong signature without realizing it
          * we can get a segfault or some internal error. At least watch
-         * whether fake-rsa sign_init is is exercised by calling sign.
+         * whether fake-rsa sign_init is exercised by calling sign.
          */
         if (!TEST_int_eq(EVP_PKEY_sign_init(ctx), 1))
             goto end;
diff --git a/test/provider_test.c b/test/provider_test.c
index d1fe71f46d957cfc4c7b63b4a7c94ff6093df333..3268a287a2f6d6dfcb09af52d913d29a05de7a28 100644
--- a/test/provider_test.c
+++ b/test/provider_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
diff --git a/test/punycode_test.c b/test/punycode_test.c
index 8a4ea0dc41717bd37c1e6ada81042d4284a7b7a4..00a21bb78e5b5ddbb1a4fccd8c8b14e477eabd9e 100644
--- a/test/punycode_test.c
+++ b/test/punycode_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_ackm_test.c b/test/quic_ackm_test.c
index b5019ccb829bcc00c60e4fa931633200977fa357..0f26e9d38a0e8a587dff689f8a9672ff7298db24 100644
--- a/test/quic_ackm_test.c
+++ b/test/quic_ackm_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_cc_test.c b/test/quic_cc_test.c
index 17290ba7dac892c8a45f8537eade70a7ac980e39..e1f750e412c4df5efe7ba3677bf275b3a24e8f7e 100644
--- a/test/quic_cc_test.c
+++ b/test/quic_cc_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_cfq_test.c b/test/quic_cfq_test.c
index 44705b3507735cb7764a5e7f99664174f5f4e20c..f6af23d9084339b1092ae85abedee70bf886ec13 100644
--- a/test/quic_cfq_test.c
+++ b/test/quic_cfq_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_fc_test.c b/test/quic_fc_test.c
index 56ea103a422fc821b9361677847c0ec6a4a49b1c..e624d81b7344c1614f092d9c49f4749f05688cbc 100644
--- a/test/quic_fc_test.c
+++ b/test/quic_fc_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_fifd_test.c b/test/quic_fifd_test.c
index de3188a929541a230539ac2b93192407d502543a..4e0f252fa48370724a41bbf04acc5bf7661aa1a0 100644
--- a/test/quic_fifd_test.c
+++ b/test/quic_fifd_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
index 895a6d74a70bcc3367618a21092570e136c51363..bc0ae12cdb17ea09ca1da79833e40abfc16395b8 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -18,6 +18,7 @@
 #if defined(OPENSSL_THREADS)
 # include "internal/thread_arch.h"
 #endif
+#include "internal/numbers.h"  /* UINT64_C */
 
 static const char *certfile, *keyfile;
 
@@ -32,6 +33,7 @@ struct child_thread_args {
     CRYPTO_MUTEX *m;
     int testresult;
     int done;
+    int s_checked_out;
 };
 #endif
 
@@ -46,8 +48,16 @@ DEFINE_LHASH_OF_EX(STREAM_INFO);
 struct helper {
     int                     s_fd;
     BIO                     *s_net_bio, *s_net_bio_own, *s_qtf_wbio, *s_qtf_wbio_own;
+    /* The BIO_ADDR used for BIO_bind() */
+    BIO_ADDR                *s_net_bio_orig_addr;
+    /* The resulting address, which is the one to connect to */
     BIO_ADDR                *s_net_bio_addr;
-    QUIC_TSERVER            *s;
+
+    /*
+     * When doing a blocking mode test run, s_priv always points to the TSERVER
+     * and s is NULL when the main thread should not be touching s_priv.
+     */
+    QUIC_TSERVER            *s, *s_priv;
     LHASH_OF(STREAM_INFO)   *s_streams;
 
     int                     c_fd;
@@ -59,6 +69,8 @@ struct helper {
 #if defined(OPENSSL_THREADS)
     struct child_thread_args    *threads;
     size_t                      num_threads;
+    CRYPTO_MUTEX		*misc_m;
+    CRYPTO_CONDVAR		*misc_cv;
 #endif
 
     OSSL_TIME       start_time;
@@ -84,19 +96,29 @@ struct helper {
                            BIO_MSG *m, size_t stride);
     uint64_t inject_word0, inject_word1;
     uint64_t scratch0, scratch1, fail_count;
+#if defined(OPENSSL_THREADS)
+    struct {
+        CRYPTO_THREAD   *t;
+        CRYPTO_MUTEX    *m;
+        CRYPTO_CONDVAR  *c;
+        int             ready, stop;
+    } server_thread;
+    int s_checked_out;
+#endif
 };
 
 struct helper_local {
     struct helper           *h;
     LHASH_OF(STREAM_INFO)   *c_streams;
     int                     thread_idx;
+    const struct script_op  *check_op;
 };
 
 struct script_op {
     uint32_t        op;
     const void      *arg0;
     size_t          arg1;
-    int             (*check_func)(struct helper *h, const struct script_op *op);
+    int             (*check_func)(struct helper *h, struct helper_local *hl);
     const char      *stream_name;
     uint64_t        arg2;
     int             (*qtf_packet_plain_cb)(struct helper *h, QUIC_PKT_HDR *hdr,
@@ -311,23 +333,28 @@ static OSSL_TIME get_time(void *arg)
     return t;
 }
 
-static int skip_time_ms(struct helper *h, const struct script_op *op)
+static int skip_time_ms(struct helper *h, struct helper_local *hl)
 {
     if (!TEST_true(CRYPTO_THREAD_write_lock(h->time_lock)))
         return 0;
 
-    h->time_slip = ossl_time_add(h->time_slip, ossl_ms2time(op->arg2));
+    h->time_slip = ossl_time_add(h->time_slip, ossl_ms2time(hl->check_op->arg2));
 
     CRYPTO_THREAD_unlock(h->time_lock);
     return 1;
 }
 
-static int check_rejected(struct helper *h, const struct script_op *op)
+static QUIC_TSERVER *s_lock(struct helper *h, struct helper_local *hl);
+static void s_unlock(struct helper *h, struct helper_local *hl);
+
+#define ACQUIRE_S() s_lock(h, hl)
+
+static int check_rejected(struct helper *h, struct helper_local *hl)
 {
-    uint64_t stream_id = op->arg2;
+    uint64_t stream_id = hl->check_op->arg2;
 
-    if (!ossl_quic_tserver_stream_has_peer_stop_sending(h->s, stream_id, NULL)
-        || !ossl_quic_tserver_stream_has_peer_reset_stream(h->s, stream_id, NULL)) {
+    if (!ossl_quic_tserver_stream_has_peer_stop_sending(ACQUIRE_S(), stream_id, NULL)
+        || !ossl_quic_tserver_stream_has_peer_reset_stream(ACQUIRE_S(), stream_id, NULL)) {
         h->check_spin_again = 1;
         return 0;
     }
@@ -335,11 +362,11 @@ static int check_rejected(struct helper *h, const struct script_op *op)
     return 1;
 }
 
-static int check_stream_reset(struct helper *h, const struct script_op *op)
+static int check_stream_reset(struct helper *h, struct helper_local *hl)
 {
-    uint64_t stream_id = op->arg2, aec = 0;
+    uint64_t stream_id = hl->check_op->arg2, aec = 0;
 
-    if (!ossl_quic_tserver_stream_has_peer_reset_stream(h->s, stream_id, &aec)) {
+    if (!ossl_quic_tserver_stream_has_peer_reset_stream(ACQUIRE_S(), stream_id, &aec)) {
         h->check_spin_again = 1;
         return 0;
     }
@@ -347,11 +374,11 @@ static int check_stream_reset(struct helper *h, const struct script_op *op)
     return TEST_uint64_t_eq(aec, 42);
 }
 
-static int check_stream_stopped(struct helper *h, const struct script_op *op)
+static int check_stream_stopped(struct helper *h, struct helper_local *hl)
 {
-    uint64_t stream_id = op->arg2;
+    uint64_t stream_id = hl->check_op->arg2;
 
-    if (!ossl_quic_tserver_stream_has_peer_stop_sending(h->s, stream_id, NULL)) {
+    if (!ossl_quic_tserver_stream_has_peer_stop_sending(ACQUIRE_S(), stream_id, NULL)) {
         h->check_spin_again = 1;
         return 0;
     }
@@ -359,15 +386,15 @@ static int check_stream_stopped(struct helper *h, const struct script_op *op)
     return 1;
 }
 
-static int override_key_update(struct helper *h, const struct script_op *op)
+static int override_key_update(struct helper *h, struct helper_local *hl)
 {
     QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
 
-    ossl_quic_channel_set_txku_threshold_override(ch, op->arg2);
+    ossl_quic_channel_set_txku_threshold_override(ch, hl->check_op->arg2);
     return 1;
 }
 
-static int trigger_key_update(struct helper *h, const struct script_op *op)
+static int trigger_key_update(struct helper *h, struct helper_local *hl)
 {
     if (!TEST_true(SSL_key_update(h->c_conn, SSL_KEY_UPDATE_REQUESTED)))
         return 0;
@@ -375,7 +402,7 @@ static int trigger_key_update(struct helper *h, const struct script_op *op)
     return 1;
 }
 
-static int check_key_update_ge(struct helper *h, const struct script_op *op)
+static int check_key_update_ge(struct helper *h, struct helper_local *hl)
 {
     QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
     int64_t txke = (int64_t)ossl_quic_channel_get_tx_key_epoch(ch);
@@ -390,19 +417,19 @@ static int check_key_update_ge(struct helper *h, const struct script_op *op)
         return 0;
 
     /* Caller specifies a minimum number of RXKEs which must have happened. */
-    if (!TEST_uint64_t_ge((uint64_t)rxke, op->arg2))
+    if (!TEST_uint64_t_ge((uint64_t)rxke, hl->check_op->arg2))
         return 0;
 
     return 1;
 }
 
-static int check_key_update_lt(struct helper *h, const struct script_op *op)
+static int check_key_update_lt(struct helper *h, struct helper_local *hl)
 {
     QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
     uint64_t txke = ossl_quic_channel_get_tx_key_epoch(ch);
 
     /* Caller specifies a maximum number of TXKEs which must have happened. */
-    if (!TEST_uint64_t_lt(txke, op->arg2))
+    if (!TEST_uint64_t_lt(txke, hl->check_op->arg2))
         return 0;
 
     return 1;
@@ -460,12 +487,109 @@ static int join_threads(struct child_thread_args *threads, size_t num_threads)
 
     return ok;
 }
+
+static int join_server_thread(struct helper *h)
+{
+    CRYPTO_THREAD_RETVAL rv;
+
+    if (h->server_thread.t == NULL)
+        return 1;
+
+    ossl_crypto_mutex_lock(h->server_thread.m);
+    h->server_thread.stop = 1;
+    ossl_crypto_mutex_unlock(h->server_thread.m);
+    ossl_crypto_condvar_signal(h->server_thread.c);
+
+    ossl_crypto_thread_native_join(h->server_thread.t, &rv);
+    ossl_crypto_thread_native_clean(h->server_thread.t);
+    h->server_thread.t = NULL;
+    return 1;
+}
+
+/* Ensure the server-state lock is currently held. Idempotent. */
+static int *s_checked_out_p(struct helper *h, int thread_idx)
+{
+    return (thread_idx < 0) ? &h->s_checked_out
+        : &h->threads[thread_idx].s_checked_out;
+}
+
+static QUIC_TSERVER *s_lock(struct helper *h, struct helper_local *hl)
+{
+    int *p_checked_out = s_checked_out_p(h, hl->thread_idx);
+
+    if (h->server_thread.m == NULL || *p_checked_out)
+        return h->s;
+
+    ossl_crypto_mutex_lock(h->server_thread.m);
+    h->s = h->s_priv;
+    *p_checked_out = 1;
+    return h->s;
+}
+
+/* Ensure the server-state lock is currently not held. Idempotent. */
+static void s_unlock(struct helper *h, struct helper_local *hl)
+{
+    int *p_checked_out = s_checked_out_p(h, hl->thread_idx);
+
+    if (h->server_thread.m == NULL || !*p_checked_out)
+        return;
+
+    *p_checked_out = 0;
+    h->s = NULL;
+    ossl_crypto_mutex_unlock(h->server_thread.m);
+}
+
+static unsigned int server_helper_thread(void *arg)
+{
+    struct helper *h = arg;
+
+    ossl_crypto_mutex_lock(h->server_thread.m);
+
+    for (;;) {
+        int ready, stop;
+
+        ready   = h->server_thread.ready;
+        stop    = h->server_thread.stop;
+
+        if (stop)
+            break;
+
+        if (!ready) {
+            ossl_crypto_condvar_wait(h->server_thread.c, h->server_thread.m);
+            continue;
+        }
+
+        ossl_quic_tserver_tick(h->s_priv);
+        ossl_crypto_mutex_unlock(h->server_thread.m);
+        /*
+         * Give the main thread an opportunity to get the mutex, which is
+         * sometimes necessary in some script operations.
+         */
+        OSSL_sleep(1);
+        ossl_crypto_mutex_lock(h->server_thread.m);
+    }
+
+    ossl_crypto_mutex_unlock(h->server_thread.m);
+    return 1;
+}
+
+#else
+
+static QUIC_TSERVER *s_lock(struct helper *h, struct helper_local *hl)
+{
+    return h->s;
+}
+
+static void s_unlock(struct helper *h, struct helper_local *hl)
+{}
+
 #endif
 
 static void helper_cleanup(struct helper *h)
 {
 #if defined(OPENSSL_THREADS)
     join_threads(h->threads, h->num_threads);
+    join_server_thread(h);
     OPENSSL_free(h->threads);
     h->threads = NULL;
     h->num_threads = 0;
@@ -486,8 +610,8 @@ static void helper_cleanup(struct helper *h)
     }
 
     helper_cleanup_streams(&h->s_streams);
-    ossl_quic_tserver_free(h->s);
-    h->s = NULL;
+    ossl_quic_tserver_free(h->s_priv);
+    h->s_priv = h->s = NULL;
 
     BIO_free(h->s_net_bio_own);
     h->s_net_bio_own = NULL;
@@ -513,24 +637,35 @@ static void helper_cleanup(struct helper *h)
 
     BIO_ADDR_free(h->s_net_bio_addr);
     h->s_net_bio_addr = NULL;
+    BIO_ADDR_free(h->s_net_bio_orig_addr);
+    h->s_net_bio_orig_addr = NULL;
 
     SSL_CTX_free(h->c_ctx);
     h->c_ctx = NULL;
 
     CRYPTO_THREAD_lock_free(h->time_lock);
     h->time_lock = NULL;
+
+#if defined(OPENSSL_THREADS)
+    ossl_crypto_mutex_free(&h->misc_m);
+    ossl_crypto_condvar_free(&h->misc_cv);
+    ossl_crypto_mutex_free(&h->server_thread.m);
+    ossl_crypto_condvar_free(&h->server_thread.c);
+#endif
 }
 
-static int helper_init(struct helper *h, int free_order, int need_injector)
+static int helper_init(struct helper *h, int free_order, int blocking,
+                       int need_injector)
 {
-    short port = 8186;
     struct in_addr ina = {0};
     QUIC_TSERVER_ARGS s_args = {0};
+    union BIO_sock_info_u info;
 
     memset(h, 0, sizeof(*h));
     h->c_fd = -1;
     h->s_fd = -1;
     h->free_order = free_order;
+    h->blocking = blocking;
     h->need_injector = need_injector;
     h->time_slip = ossl_time_zero();
 
@@ -554,14 +689,19 @@ static int helper_init(struct helper *h, int free_order, int need_injector)
     if (!TEST_true(BIO_socket_nbio(h->s_fd, 1)))
         goto err;
 
-    if (!TEST_ptr(h->s_net_bio_addr = BIO_ADDR_new()))
+    if (!TEST_ptr(h->s_net_bio_orig_addr = BIO_ADDR_new())
+        || !TEST_ptr(h->s_net_bio_addr = BIO_ADDR_new()))
         goto err;
 
-    if (!TEST_true(BIO_ADDR_rawmake(h->s_net_bio_addr, AF_INET, &ina, sizeof(ina),
-                                    htons(port))))
+    if (!TEST_true(BIO_ADDR_rawmake(h->s_net_bio_orig_addr, AF_INET,
+                                    &ina, sizeof(ina), 0)))
         goto err;
 
-    if (!TEST_true(BIO_bind(h->s_fd, h->s_net_bio_addr, 0)))
+    if (!TEST_true(BIO_bind(h->s_fd, h->s_net_bio_orig_addr, 0)))
+        goto err;
+
+    info.addr = h->s_net_bio_addr;
+    if (!TEST_true(BIO_sock_info(h->s_fd, BIO_SOCK_INFO_ADDRESS, &info)))
         goto err;
 
     if (!TEST_int_gt(BIO_ADDR_rawport(h->s_net_bio_addr), 0))
@@ -592,11 +732,14 @@ static int helper_init(struct helper *h, int free_order, int need_injector)
     s_args.now_cb_arg   = h;
     s_args.ctx          = NULL;
 
-    if (!TEST_ptr(h->s = ossl_quic_tserver_new(&s_args, certfile, keyfile)))
+    if (!TEST_ptr(h->s_priv = ossl_quic_tserver_new(&s_args, certfile, keyfile)))
         goto err;
 
+    if (!blocking)
+        h->s = h->s_priv;
+
     if (need_injector) {
-        h->qtf = qtest_create_injector(h->s);
+        h->qtf = qtest_create_injector(h->s_priv);
         if (!TEST_ptr(h->qtf))
             goto err;
 
@@ -640,8 +783,33 @@ static int helper_init(struct helper *h, int free_order, int need_injector)
 
     SSL_set0_wbio(h->c_conn, h->c_net_bio);
 
-    if (!TEST_true(SSL_set_blocking_mode(h->c_conn, 0)))
+    if (!TEST_true(SSL_set_blocking_mode(h->c_conn, h->blocking)))
+        goto err;
+
+#if defined(OPENSSL_THREADS)
+    if (!TEST_ptr(h->misc_m = ossl_crypto_mutex_new()))
+      goto err;
+    if (!TEST_ptr(h->misc_cv = ossl_crypto_condvar_new()))
+      goto err;
+#endif
+
+    if (h->blocking) {
+#if defined(OPENSSL_THREADS)
+        if (!TEST_ptr(h->server_thread.m = ossl_crypto_mutex_new()))
+            goto err;
+
+        if (!TEST_ptr(h->server_thread.c = ossl_crypto_condvar_new()))
+            goto err;
+
+        h->server_thread.t
+            = ossl_crypto_thread_native_start(server_helper_thread, h, 1);
+        if (!TEST_ptr(h->server_thread.t))
+            goto err;
+#else
+        TEST_error("cannot support blocking mode without threads");
         goto err;
+#endif
+    }
 
     h->start_time   = ossl_time_now();
     h->init         = 1;
@@ -843,21 +1011,41 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
     int end_wait_warning = 0;
 #endif
     OSSL_TIME op_start_time = ossl_time_zero(), op_deadline = ossl_time_zero();
-    struct helper_local hl;
+    struct helper_local hl_, *hl = &hl_;
 #define REPEAT_SLOTS 8
     size_t repeat_stack_idx[REPEAT_SLOTS], repeat_stack_done[REPEAT_SLOTS];
     size_t repeat_stack_limit[REPEAT_SLOTS];
     size_t repeat_stack_len = 0;
 
-    if (!TEST_true(helper_local_init(&hl, h, thread_idx)))
+    if (!TEST_true(helper_local_init(hl, h, thread_idx)))
         goto out;
 
-#define SPIN_AGAIN() { OSSL_sleep(1); no_advance = 1; continue; }
+#define COMMON_SPIN_AGAIN()                             \
+    {                                                   \
+        no_advance = 1;                                 \
+        continue;                                       \
+    }
+#define S_SPIN_AGAIN()                                  \
+    {                                                   \
+        s_lock(h, hl);                                  \
+        ossl_quic_tserver_tick(h->s);                   \
+        COMMON_SPIN_AGAIN();                            \
+    }
+#define C_SPIN_AGAIN()                                  \
+    {                                                   \
+        if (h->blocking) {                              \
+            TEST_error("spin again in blocking mode");  \
+            goto out;                                   \
+        }                                               \
+        COMMON_SPIN_AGAIN();                            \
+    }
 
     for (;;) {
         SSL *c_tgt              = h->c_conn;
         uint64_t s_stream_id    = UINT64_MAX;
 
+        s_unlock(h, hl);
+
         if (no_advance) {
             no_advance = 0;
         } else {
@@ -878,15 +1066,28 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
         op = &script[op_idx];
 
         if (op->stream_name != NULL) {
-            c_tgt = helper_local_get_c_stream(&hl, op->stream_name);
+            c_tgt = helper_local_get_c_stream(hl, op->stream_name);
             if (thread_idx < 0)
                 s_stream_id = helper_get_s_stream(h, op->stream_name);
             else
                 s_stream_id = UINT64_MAX;
         }
 
-        if (thread_idx < 0)
-            ossl_quic_tserver_tick(h->s);
+        if (thread_idx < 0) {
+            if (!h->blocking) {
+                ossl_quic_tserver_tick(h->s);
+            }
+#if defined(OPENSSL_THREADS)
+            else if (h->blocking && !h->server_thread.ready) {
+                ossl_crypto_mutex_lock(h->server_thread.m);
+                h->server_thread.ready = 1;
+                ossl_crypto_mutex_unlock(h->server_thread.m);
+                ossl_crypto_condvar_signal(h->server_thread.c);
+            }
+            if (h->blocking)
+                assert(h->s == NULL);
+#endif
+        }
 
         if (thread_idx >= 0 || connect_started)
             SSL_handle_events(h->c_conn);
@@ -895,6 +1096,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             /* Only allow certain opcodes on child threads. */
             switch (op->op) {
                 case OPK_END:
+                case OPK_CHECK:
                 case OPK_C_ACCEPT_STREAM_WAIT:
                 case OPK_C_NEW_STREAM:
                 case OPK_C_READ_EXPECT:
@@ -942,7 +1144,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                             end_wait_warning = 1;
                         }
 
-                        SPIN_AGAIN();
+                        S_SPIN_AGAIN();
                     }
                 }
             }
@@ -989,10 +1191,15 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
 
         case OPK_CHECK:
             {
-                int ok = op->check_func(h, op);
-                if (h->check_spin_again) {
+                int ok;
+
+                hl->check_op = op;
+                ok = op->check_func(h, hl);
+                hl->check_op = NULL;
+
+                if (thread_idx < 0 && h->check_spin_again) {
                     h->check_spin_again = 0;
-                    SPIN_AGAIN();
+                    S_SPIN_AGAIN();
                 }
 
                 if (!TEST_true(ok))
@@ -1033,7 +1240,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                     goto out;
                 if (ret != 1) {
                     if (!h->blocking && is_want(h->c_conn, ret))
-                        SPIN_AGAIN();
+                        C_SPIN_AGAIN();
 
                     if (op->arg1 == 0 && !TEST_int_eq(ret, 1))
                         goto out;
@@ -1064,7 +1271,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
                     goto out;
 
-                if (!TEST_true(ossl_quic_tserver_write(h->s, s_stream_id,
+                if (!TEST_true(ossl_quic_tserver_write(ACQUIRE_S(), s_stream_id,
                                                        op->arg0, op->arg1,
                                                        &bytes_written))
                     || !TEST_size_t_eq(bytes_written, op->arg1))
@@ -1084,7 +1291,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
                     goto out;
 
-                ossl_quic_tserver_conclude(h->s, s_stream_id);
+                ossl_quic_tserver_conclude(ACQUIRE_S(), s_stream_id);
             }
             break;
 
@@ -1098,7 +1305,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
 
                 if (!SSL_peek_ex(c_tgt, buf, sizeof(buf), &bytes_read)
                     || bytes_read == 0)
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
             }
             break;
 
@@ -1117,11 +1324,11 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                     goto out;
 
                 if (!r)
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
 
                 if (bytes_read + offset != op->arg1) {
                     offset += bytes_read;
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
                 }
 
                 if (op->arg1 > 0
@@ -1144,7 +1351,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                     && !TEST_ptr(tmp_buf = OPENSSL_malloc(op->arg1)))
                     goto out;
 
-                if (!TEST_true(ossl_quic_tserver_read(h->s, s_stream_id,
+                if (!TEST_true(ossl_quic_tserver_read(ACQUIRE_S(), s_stream_id,
                                                       tmp_buf + offset,
                                                       op->arg1 - offset,
                                                       &bytes_read)))
@@ -1152,7 +1359,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
 
                 if (bytes_read + offset != op->arg1) {
                     offset += bytes_read;
-                    SPIN_AGAIN();
+                    S_SPIN_AGAIN();
                 }
 
                 if (op->arg1 > 0
@@ -1177,7 +1384,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                     goto out;
 
                 if (is_want(c_tgt, 0))
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
 
                 if (!TEST_int_eq(SSL_get_error(c_tgt, 0),
                                  SSL_ERROR_ZERO_RETURN))
@@ -1193,8 +1400,8 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
                     goto out;
 
-                if (!ossl_quic_tserver_has_read_ended(h->s, s_stream_id))
-                    SPIN_AGAIN();
+                if (!ossl_quic_tserver_has_read_ended(ACQUIRE_S(), s_stream_id))
+                    S_SPIN_AGAIN();
             }
             break;
 
@@ -1211,7 +1418,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_ptr(c_stream = ossl_quic_detach_stream(h->c_conn)))
                     goto out;
 
-                if (!TEST_true(helper_local_set_c_stream(&hl, op->stream_name, c_stream)))
+                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, c_stream)))
                     goto out;
             }
             break;
@@ -1227,7 +1434,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_true(ossl_quic_attach_stream(h->c_conn, c_tgt)))
                     goto out;
 
-                if (!TEST_true(helper_local_set_c_stream(&hl, op->stream_name, NULL)))
+                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, NULL)))
                     goto out;
             }
             break;
@@ -1264,7 +1471,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                                          op->arg2))
                     goto out;
 
-                if (!TEST_true(helper_local_set_c_stream(&hl, op->stream_name, c_stream)))
+                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, c_stream)))
                     goto out;
             }
             break;
@@ -1279,7 +1486,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_ptr(op->stream_name))
                     goto out;
 
-                if (!TEST_true(ossl_quic_tserver_stream_new(h->s,
+                if (!TEST_true(ossl_quic_tserver_stream_new(ACQUIRE_S(),
                                                             op->arg1 > 0,
                                                             &stream_id)))
                     goto out;
@@ -1305,9 +1512,9 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                     goto out;
 
                 if ((c_stream = SSL_accept_stream(h->c_conn, 0)) == NULL)
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
 
-                if (!TEST_true(helper_local_set_c_stream(&hl, op->stream_name,
+                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name,
                                                           c_stream)))
                     goto out;
             }
@@ -1323,9 +1530,9 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_ptr(op->stream_name))
                     goto out;
 
-                new_stream_id = ossl_quic_tserver_pop_incoming_stream(h->s);
+                new_stream_id = ossl_quic_tserver_pop_incoming_stream(ACQUIRE_S());
                 if (new_stream_id == UINT64_MAX)
-                    SPIN_AGAIN();
+                    S_SPIN_AGAIN();
 
                 if (!TEST_true(helper_set_s_stream(h, op->stream_name, new_stream_id)))
                     goto out;
@@ -1336,7 +1543,8 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             {
                 SSL *c_stream;
 
-                if (!TEST_ptr_null(c_stream = SSL_accept_stream(h->c_conn, 0))) {
+                if (!TEST_ptr_null(c_stream = SSL_accept_stream(h->c_conn,
+                                                                SSL_ACCEPT_STREAM_NO_BLOCK))) {
                     SSL_free(c_stream);
                     goto out;
                 }
@@ -1352,7 +1560,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_ptr(op->stream_name))
                     goto out;
 
-                if (!TEST_true(helper_local_set_c_stream(&hl, op->stream_name, NULL)))
+                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, NULL)))
                     goto out;
 
                 SSL_free(c_tgt);
@@ -1399,13 +1607,13 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                     goto out;
 
                 if (ret == 0)
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
             }
             break;
 
         case OPK_S_SHUTDOWN:
             {
-                ossl_quic_tserver_shutdown(h->s, op->arg1);
+                ossl_quic_tserver_shutdown(ACQUIRE_S(), op->arg1);
             }
             break;
 
@@ -1419,8 +1627,14 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_ptr(c_tgt))
                     goto out;
 
+                if (h->blocking
+                    && !TEST_true(SSL_shutdown_ex(c_tgt,
+                                                  SSL_SHUTDOWN_FLAG_WAIT_PEER,
+                                                  NULL, 0)))
+                    goto out;
+
                 if (!SSL_get_conn_close_info(c_tgt, &cc_info, sizeof(cc_info)))
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
 
                 if (!TEST_int_eq(expect_app,
                                  (cc_info.flags
@@ -1440,12 +1654,12 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 int expect_remote = (op->arg1 & EXPECT_CONN_CLOSE_REMOTE) != 0;
                 uint64_t error_code = op->arg2;
 
-                if (!ossl_quic_tserver_is_term_any(h->s)) {
-                    ossl_quic_tserver_ping(h->s);
-                    SPIN_AGAIN();
+                if (!ossl_quic_tserver_is_term_any(ACQUIRE_S())) {
+                    ossl_quic_tserver_ping(ACQUIRE_S());
+                    S_SPIN_AGAIN();
                 }
 
-                if (!TEST_ptr(tc = ossl_quic_tserver_get_terminate_cause(h->s)))
+                if (!TEST_ptr(tc = ossl_quic_tserver_get_terminate_cause(ACQUIRE_S())))
                     goto out;
 
                 if (!TEST_uint64_t_eq(error_code, tc->error_code)
@@ -1503,7 +1717,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
                     goto out;
 
-                if (!TEST_false(ossl_quic_tserver_write(h->s, s_stream_id,
+                if (!TEST_false(ossl_quic_tserver_write(ACQUIRE_S(), s_stream_id,
                                                        (const unsigned char *)"apple", 5,
                                                        &bytes_written)))
                     goto out;
@@ -1543,7 +1757,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                     goto out;
 
                 if (is_want(c_tgt, 0))
-                    SPIN_AGAIN();
+                    C_SPIN_AGAIN();
             }
             break;
 
@@ -1555,7 +1769,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
                     goto out;
 
-                if (!TEST_false(ossl_quic_tserver_read(h->s, s_stream_id,
+                if (!TEST_false(ossl_quic_tserver_read(ACQUIRE_S(), s_stream_id,
                                                       buf, sizeof(buf),
                                                       &bytes_read)))
                     goto out;
@@ -1690,6 +1904,11 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             break;
 
         case OPK_SET_INJECT_WORD:
+            /*
+             * Must hold server tick lock - callbacks can be called from other
+             * thread when running test in blocking mode (tsan).
+             */
+            ACQUIRE_S();
             h->inject_word0 = op->arg1;
             h->inject_word1 = op->arg2;
             break;
@@ -1712,7 +1931,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             break;
 
         case OPK_S_NEW_TICKET:
-            if (!TEST_true(ossl_quic_tserver_new_ticket(h->s)))
+            if (!TEST_true(ossl_quic_tserver_new_ticket(ACQUIRE_S())))
                 goto out;
             break;
 
@@ -1723,6 +1942,7 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
     }
 
 out:
+    s_unlock(h, hl); /* idempotent */
     if (!testresult) {
         size_t i;
 
@@ -1737,18 +1957,19 @@ out:
     }
 
     OPENSSL_free(tmp_buf);
-    helper_local_cleanup(&hl);
+    helper_local_cleanup(hl);
     return testresult;
 }
 
 static int run_script(const struct script_op *script,
                       const char *script_name,
-                      int free_order)
+                      int free_order,
+                      int blocking)
 {
     int testresult = 0;
     struct helper h;
 
-    if (!TEST_true(helper_init(&h, free_order, 1)))
+    if (!TEST_true(helper_init(&h, free_order, blocking, 1)))
         goto out;
 
     if (!TEST_true(run_script_worker(&h, script, script_name, -1)))
@@ -2380,11 +2601,62 @@ static const struct script_op script_19[] = {
 };
 
 /* 20. Multiple threads accept stream with socket forcibly closed (error test) */
+static int script_20_trigger(struct helper *h, volatile uint64_t *counter)
+{
+#if defined(OPENSSL_THREADS)
+    ossl_crypto_mutex_lock(h->misc_m);
+    ++*counter;
+    ossl_crypto_mutex_unlock(h->misc_m);
+    ossl_crypto_condvar_broadcast(h->misc_cv);
+#endif
+    return 1;
+}
+
+static int script_20_wait(struct helper *h, volatile uint64_t *counter, uint64_t threshold)
+{
+#if defined(OPENSSL_THREADS)
+    int stop = 0;
+
+    ossl_crypto_mutex_lock(h->misc_m);
+    while (!stop) {
+        stop = (*counter >= threshold);
+        if (stop)
+            break;
+
+        ossl_crypto_condvar_wait(h->misc_cv, h->misc_m);
+    }
+
+    ossl_crypto_mutex_unlock(h->misc_m);
+#endif
+    return 1;
+}
+
+static int script_20_trigger1(struct helper *h, struct helper_local *hl)
+{
+    return script_20_trigger(h, &h->scratch0);
+}
+
+static int script_20_wait1(struct helper *h, struct helper_local *hl)
+{
+    return script_20_wait(h, &h->scratch0, hl->check_op->arg2);
+}
+
+static int script_20_trigger2(struct helper *h, struct helper_local *hl)
+{
+    return script_20_trigger(h, &h->scratch1);
+}
+
+static int script_20_wait2(struct helper *h, struct helper_local *hl)
+{
+    return script_20_wait(h, &h->scratch1, hl->check_op->arg2);
+}
+
 static const struct script_op script_20_child[] = {
     OP_C_ACCEPT_STREAM_WAIT (a)
     OP_C_READ_EXPECT        (a, "foo", 3)
 
-    OP_SLEEP                (500)
+    OP_CHECK                (script_20_trigger1, 0)
+    OP_CHECK                (script_20_wait2, 1)
 
     OP_C_READ_FAIL_WAIT     (a)
     OP_C_EXPECT_SSL_ERR     (a, SSL_ERROR_SYSCALL)
@@ -2410,9 +2682,10 @@ static const struct script_op script_20[] = {
 
     OP_END_REPEAT           ()
 
-    OP_SLEEP                (100)
+    OP_CHECK                (script_20_wait1, 5)
 
     OP_C_CLOSE_SOCKET       ()
+    OP_CHECK                (script_20_trigger2, 0)
 
     OP_END
 };
@@ -3010,7 +3283,7 @@ static int script_39_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
     size_t i, written;
     uint64_t seq_no = 0, retire_prior_to = 0;
     QUIC_CONN_ID new_cid = {0};
-    QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(h->s);
+    QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(h->s_priv);
 
     switch (h->inject_word1) {
     case 0:
@@ -3219,13 +3492,13 @@ static void script_41_trace(int write_p, int version, int content_type,
    ++h->scratch0;
 }
 
-static int script_41_setup(struct helper *h, const struct script_op *op)
+static int script_41_setup(struct helper *h, struct helper_local *hl)
 {
-    ossl_quic_tserver_set_msg_callback(h->s, script_41_trace, h);
+    ossl_quic_tserver_set_msg_callback(ACQUIRE_S(), script_41_trace, h);
     return 1;
 }
 
-static int script_41_check(struct helper *h, const struct script_op *op)
+static int script_41_check(struct helper *h, struct helper_local *hl)
 {
     /* At least one valid challenge/response echo? */
     if (!TEST_uint64_t_gt(h->scratch0, 0))
@@ -3392,21 +3665,21 @@ static const struct script_op script_44[] = {
 };
 
 /* 45. PING must generate ACK */
-static int force_ping(struct helper *h, const struct script_op *op)
+static int force_ping(struct helper *h, struct helper_local *hl)
 {
-    QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(h->s);
+    QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(ACQUIRE_S());
 
     h->scratch0 = ossl_quic_channel_get_diag_num_rx_ack(ch);
 
-    if (!TEST_true(ossl_quic_tserver_ping(h->s)))
+    if (!TEST_true(ossl_quic_tserver_ping(ACQUIRE_S())))
         return 0;
 
     return 1;
 }
 
-static int wait_incoming_acks_increased(struct helper *h, const struct script_op *op)
+static int wait_incoming_acks_increased(struct helper *h, struct helper_local *hl)
 {
-    QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(h->s);
+    QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(ACQUIRE_S());
     uint16_t count;
 
     count = ossl_quic_channel_get_diag_num_rx_ack(ch);
@@ -3996,7 +4269,7 @@ static const struct script_op script_59[] = {
 /* 60. Connection close reason truncation */
 static char long_reason[2048];
 
-static int init_reason(struct helper *h, const struct script_op *op)
+static int init_reason(struct helper *h, struct helper_local *hl)
 {
     memset(long_reason, '~', sizeof(long_reason));
     memcpy(long_reason, "This is a long reason string.", 29);
@@ -4004,9 +4277,9 @@ static int init_reason(struct helper *h, const struct script_op *op)
     return 1;
 }
 
-static int check_shutdown_reason(struct helper *h, const struct script_op *op)
+static int check_shutdown_reason(struct helper *h, struct helper_local *hl)
 {
-    const QUIC_TERMINATE_CAUSE *tc = ossl_quic_tserver_get_terminate_cause(h->s);
+    const QUIC_TERMINATE_CAUSE *tc = ossl_quic_tserver_get_terminate_cause(ACQUIRE_S());
 
     if (tc == NULL) {
         h->check_spin_again = 1;
@@ -4396,11 +4669,11 @@ static const struct script_op script_69[] = {
     OP_END
 };
 
-static int set_max_early_data(struct helper *h, const struct script_op *op)
+static int set_max_early_data(struct helper *h, struct helper_local *hl)
 {
 
-    if (!TEST_true(ossl_quic_tserver_set_max_early_data(h->s,
-                                                        (uint32_t)op->arg2)))
+    if (!TEST_true(ossl_quic_tserver_set_max_early_data(ACQUIRE_S(),
+                                                        (uint32_t)hl->check_op->arg2)))
         return 0;
 
     return 1;
@@ -4446,7 +4719,7 @@ static const struct script_op script_71[] = {
 };
 
 /* 72. Test that APL stops handing out streams after limit reached (bidi) */
-static int script_72_check(struct helper *h, const struct script_op *op)
+static int script_72_check(struct helper *h, struct helper_local *hl)
 {
     if (!TEST_uint64_t_ge(h->fail_count, 50))
         return 0;
@@ -4465,7 +4738,7 @@ static const struct script_op script_72[] = {
      */
     OP_BEGIN_REPEAT         (200)
 
-    OP_C_NEW_STREAM_BIDI_EX (a, ANY_ID, ALLOW_FAIL)
+    OP_C_NEW_STREAM_BIDI_EX (a, ANY_ID, ALLOW_FAIL | SSL_STREAM_FLAG_NO_BLOCK)
     OP_C_SKIP_IF_UNBOUND    (a, 2)
     OP_C_WRITE              (a, "apple", 5)
     OP_C_FREE_STREAM        (a)
@@ -4489,7 +4762,7 @@ static const struct script_op script_73[] = {
      */
     OP_BEGIN_REPEAT         (200)
 
-    OP_C_NEW_STREAM_UNI_EX  (a, ANY_ID, ALLOW_FAIL)
+    OP_C_NEW_STREAM_UNI_EX  (a, ANY_ID, ALLOW_FAIL | SSL_STREAM_FLAG_NO_BLOCK)
     OP_C_SKIP_IF_UNBOUND    (a, 2)
     OP_C_WRITE              (a, "apple", 5)
     OP_C_FREE_STREAM        (a)
@@ -4598,10 +4871,12 @@ static const struct script_op script_75[] = {
     OP_END
 };
 
-/* 74. Test peer-initiated shutdown wait */
-static int script_76_check(struct helper *h, const struct script_op *op)
+/* 76. Test peer-initiated shutdown wait */
+static int script_76_check(struct helper *h, struct helper_local *hl)
 {
-    if (!TEST_false(SSL_shutdown_ex(h->c_conn, SSL_SHUTDOWN_FLAG_WAIT_PEER,
+    if (!TEST_false(SSL_shutdown_ex(h->c_conn,
+                                    SSL_SHUTDOWN_FLAG_WAIT_PEER
+                                    | SSL_SHUTDOWN_FLAG_NO_BLOCK,
                                     NULL, 0)))
         return 0;
 
@@ -4710,14 +4985,32 @@ static const struct script_op *const scripts[] = {
 
 static int test_script(int idx)
 {
-    int script_idx = idx >> 1;
-    int free_order = idx & 1;
+    int script_idx, free_order, blocking;
     char script_name[64];
 
+    free_order = idx % 2;
+    idx /= 2;
+
+    blocking = idx % 2;
+    idx /= 2;
+
+    script_idx = idx;
+
+    if (blocking && free_order)
+        return 1; /* don't need to test free_order twice */
+
+#if !defined(OPENSSL_THREADS)
+    if (blocking) {
+        TEST_skip("cannot test in blocking mode without threads");
+        return 1;
+    }
+#endif
+
     snprintf(script_name, sizeof(script_name), "script %d", script_idx + 1);
 
-    TEST_info("Running script %d (order=%d)", script_idx + 1, free_order);
-    return run_script(scripts[script_idx], script_name, free_order);
+    TEST_info("Running script %d (order=%d, blocking=%d)", script_idx + 1,
+              free_order, blocking);
+    return run_script(scripts[script_idx], script_name, free_order, blocking);
 }
 
 /* Dynamically generated tests. */
@@ -4801,7 +5094,7 @@ static ossl_unused int test_dyn_frame_types(int idx)
     snprintf(script_name, sizeof(script_name),
              "dyn script %d", idx);
 
-    return run_script(dyn_frame_types_script, script_name, 0);
+    return run_script(dyn_frame_types_script, script_name, 0, 0);
 }
 
 OPT_TEST_DECLARE_USAGE("certfile privkeyfile\n")
@@ -4818,6 +5111,6 @@ int setup_tests(void)
         return 0;
 
     ADD_ALL_TESTS(test_dyn_frame_types, OSSL_NELEM(forbidden_frame_types));
-    ADD_ALL_TESTS(test_script, OSSL_NELEM(scripts) * 2);
+    ADD_ALL_TESTS(test_script, OSSL_NELEM(scripts) * 2 * 2);
     return 1;
 }
diff --git a/test/quic_record_test.c b/test/quic_record_test.c
index a2144744a3fe2959407409ee7311c09a8766b76a..5966b937301288179c06eb41cb3bc209b0d9be85 100644
--- a/test/quic_record_test.c
+++ b/test/quic_record_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_record_test_util.h b/test/quic_record_test_util.h
index 8c6f68bc1d2c4fafc5dded2475bce095f21b6b81..fba4bf21d671aa73f35028effadd67191a1cffb7 100644
--- a/test/quic_record_test_util.h
+++ b/test/quic_record_test_util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_stream_test.c b/test/quic_stream_test.c
index 627e630a3e3ca0ee08574affce1333875232f145..c80a4bf0494c4f29619d522d6e407d7de1defa18 100644
--- a/test/quic_stream_test.c
+++ b/test/quic_stream_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_tserver_test.c b/test/quic_tserver_test.c
index 452d523d0ee2876ee04496828dfa0d25dca8e25f..3d1249863b2ae1b43e339cecdefc3c65d16ebc37 100644
--- a/test/quic_tserver_test.c
+++ b/test/quic_tserver_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_txp_test.c b/test/quic_txp_test.c
index 7c3e84b41a5e5888781df4ef0b9bd703fae625de..4682483acc3d10bbc56c3fc8358371d8dbab830d 100644
--- a/test/quic_txp_test.c
+++ b/test/quic_txp_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quic_wire_test.c b/test/quic_wire_test.c
index 5691be7dd59b2bb0335851de18a26ce738e8026c..69f4cf2977d764bee09f53a662836f9ed8cafa5a 100644
--- a/test/quic_wire_test.c
+++ b/test/quic_wire_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quicapitest.c b/test/quicapitest.c
index 5eff924527ee65394c4002bced74b79c83db2194..87c134eb88bf36527282f3443844984cfe674465 100644
--- a/test/quicapitest.c
+++ b/test/quicapitest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/quicfaultstest.c b/test/quicfaultstest.c
index 76887527424f2b6158f3b013a717f3f566308735..3b80385584b6539361c94edbe5d192788dc5e4da 100644
--- a/test/quicfaultstest.c
+++ b/test/quicfaultstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/recipes/00-prep_fipsmodule_cnf.t b/test/recipes/00-prep_fipsmodule_cnf.t
index bf1b0c8081ae30a5854ee55a77c65c9bc5201bc8..4e3a6d85e83933cb2de75c04f389d090bb19e9aa 100644
--- a/test/recipes/00-prep_fipsmodule_cnf.t
+++ b/test/recipes/00-prep_fipsmodule_cnf.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index 4e0a9a384268b543a6a83450068d25f10bbf7165..9efa9f8d2d6eb7a785a7edc5c8ab653164672cbc 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl
 # -*- mode: Perl -*-
-# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t
index 1e933c94874f5b56ee2d6480c0ff7cd2ed51efec..b8b136d110bb7bddfc0485c696f0e4c62cd02f83 100644
--- a/test/recipes/03-test_fipsinstall.t
+++ b/test/recipes/03-test_fipsinstall.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2019-2023 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
diff --git a/test/recipes/03-test_internal_curve448.t b/test/recipes/03-test_internal_curve448.t
index a67a419a2c230895263315187293c1d0b9949f11..0497d4d2c537555cfdb81fa0093da7c69643886d 100644
--- a/test/recipes/03-test_internal_curve448.t
+++ b/test/recipes/03-test_internal_curve448.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/04-test_encoder_decoder.t b/test/recipes/04-test_encoder_decoder.t
index 817c95ee64a4edf21d2916f5a5f56a8b821bbc7b..8e7ed629bea536912e6c2de16fba8f9a3010df84 100644
--- a/test/recipes/04-test_encoder_decoder.t
+++ b/test/recipes/04-test_encoder_decoder.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
@@ -50,10 +50,10 @@ unless ($no_fips) {
 
     my $no_des = disabled("des");
 SKIP: {
-    skip "DES disabled", 2 if disabled("des");
-    ok(run(app([ 'openssl', 'genrsa', '-des3', '-out', 'epki.pem',
-                 '-passout', 'pass:pass' ])),
-       "rsa encrypt using a non fips algorithm");
+    skip "MD5 disabled", 2 if disabled("md5");
+    ok(run(app([ 'openssl', 'genrsa', '-aes128', '-out', 'epki.pem',
+                 '-traditional', '-passout', 'pass:pass' ])),
+       "rsa encrypted using a non fips algorithm MD5 in pbe");
 
     my $conf2 = srctop_file("test", "default-and-fips.cnf");
     ok(run(test(['decoder_propq_test', '-config', $conf2,
diff --git a/test/recipes/06-test_algorithmid.t b/test/recipes/06-test_algorithmid.t
index 0a8fe44ed65228c3897ce4c3d2af6bb9c5252081..d73794aa62bfbecd38f2c219cf9f75b5e0b23355 100644
--- a/test/recipes/06-test_algorithmid.t
+++ b/test/recipes/06-test_algorithmid.t
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl
 
-# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2018-2023 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
diff --git a/test/recipes/15-test_ec.t b/test/recipes/15-test_ec.t
index a7a7caadd3eda81f57804e22fb015b4c27533e88..c953fad9f1ec4f8d935375853355c001c7fb8434 100644
--- a/test/recipes/15-test_ec.t
+++ b/test/recipes/15-test_ec.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/15-test_gendsa.t b/test/recipes/15-test_gendsa.t
index b4bb9b29ca9e913faad057626feda0565b2f75a4..4bc460784b4612b231e9d65915c8d4325d6bf35d 100644
--- a/test/recipes/15-test_gendsa.t
+++ b/test/recipes/15-test_gendsa.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/15-test_genpkey.t b/test/recipes/15-test_genpkey.t
index 866d6e977ea47d14216d88d0b3e85478dd11439e..b918f73f9fe061d1cf9b83fb8d803190870cf6f8 100644
--- a/test/recipes/15-test_genpkey.t
+++ b/test/recipes/15-test_genpkey.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/15-test_genrsa.t b/test/recipes/15-test_genrsa.t
index 5632efe5fc5c230fdb3705778115b0c7048bbaa3..83196031d776a0e2079dd649a9db2e78101825b7 100644
--- a/test/recipes/15-test_genrsa.t
+++ b/test/recipes/15-test_genrsa.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/15-test_mp_rsa.t b/test/recipes/15-test_mp_rsa.t
index ffaf36cd52ffde902822b5b26a269748670be90d..956626de00eaf9111eb283d98f4ebd864f090d12 100644
--- a/test/recipes/15-test_mp_rsa.t
+++ b/test/recipes/15-test_mp_rsa.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright 2017 BaishanCloud. All rights reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t
index c3c0bc34d6de897f97a0972704dca0fbd4cfdedb..e0ac15772a5bdd519704ae5b016f3241c6ba7404 100644
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/15-test_rsapss.t b/test/recipes/15-test_rsapss.t
index cea1c605d1e339cac25458bcd2ea22c1c317aeeb..35be4784fce89a3f650ad03d0b9b3340fb798827 100644
--- a/test/recipes/15-test_rsapss.t
+++ b/test/recipes/15-test_rsapss.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
@@ -16,7 +16,7 @@ use OpenSSL::Test::Utils;
 
 setup("test_rsapss");
 
-plan tests => 16;
+plan tests => 18;
 
 #using test/testrsa.pem which happens to be a 512 bit RSA
 ok(run(app(['openssl', 'dgst', '-sign', srctop_file('test', 'testrsa.pem'), '-sha1',
@@ -124,3 +124,11 @@ ok(run(app(['openssl', 'dgst', '-prverify', srctop_file('test', 'testrsa.pem'),
 ok(!run(app([ 'openssl', 'rsa',
              '-in' => data_file('negativesaltlen.pem')],
              '-out' => 'badout')));
+
+ok(run(app(['openssl', 'genpkey', '-algorithm', 'RSA-PSS', '-pkeyopt', 'rsa_keygen_bits:1024',
+            '-pkeyopt', 'rsa_pss_keygen_md:SHA256', '-pkeyopt', 'rsa_pss_keygen_saltlen:10',
+            '-out', 'testrsapss.pem'])),
+   "openssl genpkey RSA-PSS with pss parameters");
+ok(run(app(['openssl', 'pkey', '-in', 'testrsapss.pem', '-pubout', '-text'])),
+   "openssl pkey, execute rsa_pub_encode with pss parameters");
+unlink 'testrsapss.pem';
diff --git a/test/recipes/20-test_app.t b/test/recipes/20-test_app.t
index 2560b20fc45a56d48678d2960d1f34f3a007fda3..29ce3e6e486f5fa0289f2b52d9ccf0a9db9583e3 100644
--- a/test/recipes/20-test_app.t
+++ b/test/recipes/20-test_app.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
diff --git a/test/recipes/20-test_cli_fips.t b/test/recipes/20-test_cli_fips.t
index 3e2d745f44f37ec9aa54f38752ff66cad58d2678..d4b4d4ca51c68f34aaab92cc2386520ee185515b 100644
--- a/test/recipes/20-test_cli_fips.t
+++ b/test/recipes/20-test_cli_fips.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
diff --git a/test/recipes/20-test_dgst.t b/test/recipes/20-test_dgst.t
index cf5e20d2234e817320c7131f79405d2da39b2187..d1b2ccf5c7bd41b499543fd35ab8592fd3b49ff2 100644
--- a/test/recipes/20-test_dgst.t
+++ b/test/recipes/20-test_dgst.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t
index d16d73e64a9e9434c4c55913e041e891a644a267..2b430b74fcb66f5ae5c807962c8fe410d08428fd 100644
--- a/test/recipes/20-test_enc.t
+++ b/test/recipes/20-test_enc.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/20-test_pkeyutl.t b/test/recipes/20-test_pkeyutl.t
index adfe9e366eea520c2f5df420f7712397e1eacaf0..76e4f0a869459db121728698c872895fe92b0bc2 100644
--- a/test/recipes/20-test_pkeyutl.t
+++ b/test/recipes/20-test_pkeyutl.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2018-2023 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
diff --git a/test/recipes/25-test_pkcs7.t b/test/recipes/25-test_pkcs7.t
index cdbcf3869c84d1442540d977a34a9d6afb8278bd..23f1c8a7645dd897cd348c44c90421fa6accd3a1 100644
--- a/test/recipes/25-test_pkcs7.t
+++ b/test/recipes/25-test_pkcs7.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/25-test_pkcs8.t b/test/recipes/25-test_pkcs8.t
index 2db574bb695752628c81c12eb7b08f7c99bc88c8..93cb7629bf9c234b5693b10c2c1a4dc62cfb5a23 100644
--- a/test/recipes/25-test_pkcs8.t
+++ b/test/recipes/25-test_pkcs8.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
index c65c21d317b25730ad3bbe8a22cad629d6a15288..32dc4ded8c89961525b916bada32f2db7f8d47c9 100644
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
@@ -15,7 +15,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_req");
 
-plan tests => 102;
+plan tests => 104;
 
 require_ok(srctop_file('test', 'recipes', 'tconversion.pl'));
 
@@ -590,3 +590,14 @@ $cert = "self-signed_CA_with_keyUsages.pem";
 generate_cert($cert, "-in", srctop_file(@certs, "ext-check.csr"),
     "-copy_extensions", "copy");
 has_keyUsage($cert, 1);
+
+# Generate cert using req with '-modulus'
+ok(run(app(["openssl", "req", "-x509", "-new", "-days", "365",
+            "-key", srctop_file("test", "testrsa.pem"),
+            "-config", srctop_file('test', 'test.cnf'),
+            "-out", "testreq-cert.pem",
+            "-modulus"])), "cert req creation - with -modulus");
+
+# Verify cert
+ok(run(app(["openssl", "x509", "-in", "testreq-cert.pem",
+            "-noout", "-text"])), "cert verification");
diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
index 7d3d758ac710ce85506426604572cd2c0eade7cd..c69dcb2239319c5dfac5f539faac3a54b0303d49 100644
--- a/test/recipes/25-test_verify.t
+++ b/test/recipes/25-test_verify.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index df49ce2750ca94d14991003b0d32dc5c7382f520..408ac40c7c3e5b3a9132809767481c4181094014 100644
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/30-test_defltfips.t b/test/recipes/30-test_defltfips.t
index 103f28da764a003271fe16538e371e0212680d6a..c8f145405b2b4e899b7fbecd3f87d7aab79e1b42 100644
--- a/test/recipes/30-test_defltfips.t
+++ b/test/recipes/30-test_defltfips.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index 3ab3ea6d4ad2440bf4c26130060271d92fb0124c..eddca5c58ea390649b53d70c2082eaca66134b9a 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/30-test_evp_data/evpciph_aes_common.txt b/test/recipes/30-test_evp_data/evpciph_aes_common.txt
index 3355bc90f014ae95df774873a10b92cb31cf96fd..484147b26a961de8bc9b07e929e8f90448d15735 100644
--- a/test/recipes/30-test_evp_data/evpciph_aes_common.txt
+++ b/test/recipes/30-test_evp_data/evpciph_aes_common.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evpciph_aes_siv.txt b/test/recipes/30-test_evp_data/evpciph_aes_siv.txt
index e434f13f4154b54de81543d6c49d9b406d7ec589..ab7f2b6f6aa28aab3aed6dc60f4eb099f40b22fc 100644
--- a/test/recipes/30-test_evp_data/evpciph_aes_siv.txt
+++ b/test/recipes/30-test_evp_data/evpciph_aes_siv.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2018-2023 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
diff --git a/test/recipes/30-test_evp_data/evpciph_chacha.txt b/test/recipes/30-test_evp_data/evpciph_chacha.txt
index f283b240f3a0942f1ee9448a03c82101410ba164..52a39c03f8f2ffbf2073a7df6749405dcd538cd8 100644
--- a/test/recipes/30-test_evp_data/evpciph_chacha.txt
+++ b/test/recipes/30-test_evp_data/evpciph_chacha.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt b/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt
index 04cef6f7e81b5fbcba8cce629f0709fa98112c0a..d05a1b1ac50f61800375eb79730111985bef1b2b 100644
--- a/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_kbkdf_counter.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
diff --git a/test/recipes/30-test_evp_data/evpkdf_ss.txt b/test/recipes/30-test_evp_data/evpkdf_ss.txt
index c2b405a6481eb248cfcad31453573a615e6964ca..80dcbcb07147836761f6275515d817ddf7910390 100644
--- a/test/recipes/30-test_evp_data/evpkdf_ss.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_ss.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evpkdf_tls12_prf.txt b/test/recipes/30-test_evp_data/evpkdf_tls12_prf.txt
index fe62453dbb999b883f4058c2b1957e140e1e149e..44040ff66b48134415ba2d28808ea9213cf4f05f 100644
--- a/test/recipes/30-test_evp_data/evpkdf_tls12_prf.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_tls12_prf.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evpkdf_x963.txt b/test/recipes/30-test_evp_data/evpkdf_x963.txt
index 7d078debfb102c45b2a068820dc3c6f2dfe31742..ad175acc11466df8544a872aa7de47f3199e5c89 100644
--- a/test/recipes/30-test_evp_data/evpkdf_x963.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_x963.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evpmac_common.txt b/test/recipes/30-test_evp_data/evpmac_common.txt
index 7bcce7d9204b2dba25b4649e803620611762426f..e47023aae6cc37ca511d77c8ecbcace6356ec1ed 100644
--- a/test/recipes/30-test_evp_data/evpmac_common.txt
+++ b/test/recipes/30-test_evp_data/evpmac_common.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evpmd_blake.txt b/test/recipes/30-test_evp_data/evpmd_blake.txt
index 0aaee9e07a5d824d0f4fcfa772ec18f9f23b814d..02b3df9e9c6d14bdc35af39c5979d752aafe1d79 100644
--- a/test/recipes/30-test_evp_data/evpmd_blake.txt
+++ b/test/recipes/30-test_evp_data/evpmd_blake.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evpmd_sha.txt b/test/recipes/30-test_evp_data/evpmd_sha.txt
index 149137b7122d146d9dadbca401f81244ca8a9c40..b3b95ed76b56162ffd6ed5ee3f5ded8016cb0def 100644
--- a/test/recipes/30-test_evp_data/evpmd_sha.txt
+++ b/test/recipes/30-test_evp_data/evpmd_sha.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evppkey_dsa.txt b/test/recipes/30-test_evp_data/evppkey_dsa.txt
index 8c19153ca17eb4bbd65ca34ffa483961285c48d6..debd62bca84cbcc8b3920ec129e935e1cdb6ddf8 100644
--- a/test/recipes/30-test_evp_data/evppkey_dsa.txt
+++ b/test/recipes/30-test_evp_data/evppkey_dsa.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evppkey_ecx.txt b/test/recipes/30-test_evp_data/evppkey_ecx.txt
index 56930372305fa3c0f9dcef0cda011359eefb2ac6..2d6c6854239bedd094a212fd78be07af02db3253 100644
--- a/test/recipes/30-test_evp_data/evppkey_ecx.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ecx.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evppkey_mismatch.txt b/test/recipes/30-test_evp_data/evppkey_mismatch.txt
index 10d8db3427fe185bb713f2ad1a6a4c066b3cb1f7..0859814860e3473d05f7af8502f57fcd47c0cef3 100644
--- a/test/recipes/30-test_evp_data/evppkey_mismatch.txt
+++ b/test/recipes/30-test_evp_data/evppkey_mismatch.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evppkey_mismatch_ecx.txt b/test/recipes/30-test_evp_data/evppkey_mismatch_ecx.txt
index ebbd4d4b39d1e7ca86193891535703d474ef6b17..bf8b21ca0645d91da3a9c9943a91192e16984eef 100644
--- a/test/recipes/30-test_evp_data/evppkey_mismatch_ecx.txt
+++ b/test/recipes/30-test_evp_data/evppkey_mismatch_ecx.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evppkey_rsa.txt b/test/recipes/30-test_evp_data/evppkey_rsa.txt
index d127ef7b5d3804b94e98907ccab7d99bc03e35a6..78d14d31be10f1e558282c629274c649acdb0734 100644
--- a/test/recipes/30-test_evp_data/evppkey_rsa.txt
+++ b/test/recipes/30-test_evp_data/evppkey_rsa.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evppkey_rsa_common.txt b/test/recipes/30-test_evp_data/evppkey_rsa_common.txt
index 351b257323963e1a2c382945c8f150eb2292060c..76ddc1ec60a1d45266d688f5ba3c74cec467eb90 100644
--- a/test/recipes/30-test_evp_data/evppkey_rsa_common.txt
+++ b/test/recipes/30-test_evp_data/evppkey_rsa_common.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2023 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
diff --git a/test/recipes/30-test_evp_data/evprand.txt b/test/recipes/30-test_evp_data/evprand.txt
index 090a9fa9fb5df17dafb7f03463c539a4fda48db0..0e2ee82c587a08ed6f96f86904787dcbccb2603b 100644
--- a/test/recipes/30-test_evp_data/evprand.txt
+++ b/test/recipes/30-test_evp_data/evprand.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
diff --git a/test/recipes/65-test_cmp_protect.t b/test/recipes/65-test_cmp_protect.t
index 631603df7cf8ede94e50405f267e1a9c8faa6ef8..92c91d8b88acab8b49e034b6745dbb83ded0b0f2 100644
--- a/test/recipes/65-test_cmp_protect.t
+++ b/test/recipes/65-test_cmp_protect.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright Nokia 2007-2019
 # Copyright Siemens AG 2015-2019
 #
@@ -30,8 +30,10 @@ plan skip_all => "This test is not supported in a shared library build on Window
 plan tests => 2 + ($no_fips ? 0 : 1); #fips test
 
 my @basic_cmd = ("cmp_protect_test",
-                 data_file("server.pem"),
-                 data_file("IR_protected.der"),
+                 data_file("prot_RSA.pem"),
+                 data_file("IR_protected.der"), # signed using prot_RSA.pem
+                 data_file("prot_Ed.pem"), # test/certs/root-ed25519.privkey.pem
+                 data_file("GENM_protected_Ed.der"), # signed using prot_Ed.pem
                  data_file("IR_unprotected.der"),
                  data_file("IP_PBM.der"),
                  data_file("server.crt"),
diff --git a/test/recipes/65-test_cmp_protect_data/GENM_protected_Ed.der b/test/recipes/65-test_cmp_protect_data/GENM_protected_Ed.der
new file mode 100644
index 0000000000000000000000000000000000000000..3efa755b7ede35964ccd53ccc2bb3b43f7039eb7
Binary files /dev/null and b/test/recipes/65-test_cmp_protect_data/GENM_protected_Ed.der differ
diff --git a/test/recipes/65-test_cmp_protect_data/IR_protected.der b/test/recipes/65-test_cmp_protect_data/IR_protected.der
index ce0a7a46dcf2c12e038df94b72be63af77a2e3e4..2912c6b8106ad5b57587b76fd3e10c26d0669481 100644
Binary files a/test/recipes/65-test_cmp_protect_data/IR_protected.der and b/test/recipes/65-test_cmp_protect_data/IR_protected.der differ
diff --git a/test/recipes/65-test_cmp_protect_data/prot_Ed.pem b/test/recipes/65-test_cmp_protect_data/prot_Ed.pem
new file mode 100644
index 0000000000000000000000000000000000000000..e447080ae285928f6d49718a50f81f0af98cd4da
--- /dev/null
+++ b/test/recipes/65-test_cmp_protect_data/prot_Ed.pem
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
+-----END PRIVATE KEY-----
diff --git a/test/recipes/65-test_cmp_protect_data/prot_RSA.pem b/test/recipes/65-test_cmp_protect_data/prot_RSA.pem
new file mode 100644
index 0000000000000000000000000000000000000000..23242667984556b7a9478bc2a94ff2f3bf072bde
--- /dev/null
+++ b/test/recipes/65-test_cmp_protect_data/prot_RSA.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA4ckRrH0UWmIJFj99kBqvCipGjJRAaPkdvWjdDQLglTpI3eZA
+JHnq0ypW/PZccrWjo7mxuvAStEYWF+5Jx6ZFmAsC1K0NNebSAZQoLWYZqiOzkfVV
+pLicMnItNFElfCohBzPCYmF5UlC5yp9PSUEfNwPJqDIRMtw+IlVUV3AJw9TJ3uuW
+q/vWW9r96/gBKKddmj/q2gGT8RC6LxEaolTbhfPbHaA1DFpv1WQFb3oAV3Wq14SO
+Zf9bH1olBVsmBMsUshFEw5MXVrNCv2moM4HtITMyjvZe7eIwHzSzf6dvQjERG6Gv
+Z/i5KOhaqgJCnRKdHHzijz9cLec5p9NSOuC1OwIDAQABAoIBAGiYVO+rIfqc38jG
+sMxJED2NSBFnvE7k2LoeEgktBA0daxQgziYXtIkOXC3jkwAw1RXLuGH5RTDuJt3/
+LX6nsCW3NCCB6lTGERNaJyKg4dLHpzA+juY3/2P/MKHD1bGncpV7jNk2fpV7gBY1
+pu0wld1Oi+S3DPCaxs3w6Zl39Y4Z7oSNf6DRO5lGN3Asc8TSVjIOWpAl8LIg+P2B
+ZvFeHRANVXaV9YmF2uEi7iMgH4vGrK2svsmM9VThVO4ArGcTRTvGYn7aw3/H4Pt+
+lYuhERdpkKBT0tCgIpO5IJXMl4/5RSDTtcBwiJcReN5IHUAItBIPSHcMflNSKG/I
+aQf4u0ECgYEA8+PAyzn096Y2UrKzE75yuadCveLjsUWx2NN5ZMohQru99F4k7Pab
+/Te4qOe5zlxHAPK3LRwvbwUWo5mLfs45wFrSgZoRlYcCuL+JaX0y2oXMMF9E+UkY
+tljMt/HpLo1SfSjN2Sae4LVhC7rWJ43LtyRepptzBPGqd26eLPGAMr8CgYEA7P8u
+RGkMOrMzEKAb0A9smrzq2xW88T1VejqEt6R8mUcNt8PFHMgjuzVU4zDysrlb7G/0
+VSkQWnJxBh1yNGc1Av7YgwicIgApr4ty0hZhLcnKX2VrNw+L/sSe/cnwVAc6RtPK
+RR6xQubuLlrCGcbYXmyn5Jv+nlY0S3uCyDFHqIUCgYAwtpLxhJf7RwWeqva9wNJl
+ZpUcHE9iPwtwxXx/tyfBjoI4Zv11HyS1BQYrJm2kXCYKeHBB4FlREXEeKDMGluZO
+F1XocP+GIDtY71jg6xLXNtY76yt5pzH6ae4p53WtyKhrO1UyRFaDh3bkwuK3b8j6
+wZbuLCpjGGn2BPAvBeWXPQKBgEewKN6op/pZmmi9Bay5/bAQ1TnQKYcPdnuyl9K0
+/ruespeTsFw0bhqC11qhw8gsKZIri0z3TusNEwM2hQU08uQlEnkQcaoXQoTHOcQy
+4NJo575Tf0r4ePBnqXA7VWcViJtEFTszPYtvLzz2VyBU9b4aP+73AN4EVW0/vx+v
+SG3BAoGBAMzESFA2TXwUFmozK5zowIszc995Xqpi7mXKk77WESOpoS1dQ1wF1dSg
+XOwxzFoYovLxcc1K9lqOrod8BV+qGuEfc/PIJ2aiXjvEDeZYX2eWaANNmj4OSLoJ
+MNYj9tZxbq56slD7snf7AgUBnwKz0Pj6H6UsbE3gdJqZWCDyw/bB
+-----END RSA PRIVATE KEY-----
diff --git a/test/recipes/70-test_key_share.t b/test/recipes/70-test_key_share.t
index 2c2527ca5c45d0bafb43b74275f1d5186e171bbe..ef21146e0c796dd29c3202f322d8f60fa1f18d40 100644
--- a/test/recipes/70-test_key_share.t
+++ b/test/recipes/70-test_key_share.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/70-test_quic_multistream.t b/test/recipes/70-test_quic_multistream.t
index e7bdf03d74c9e02d43bb67b1e18e45259f87cbb2..b4e6e4147330fb03f91907184ce3b6b2e4d799a5 100644
--- a/test/recipes/70-test_quic_multistream.t
+++ b/test/recipes/70-test_quic_multistream.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/70-test_quic_tserver.t b/test/recipes/70-test_quic_tserver.t
index 4ff2d208b657679d86c4ebc9d0c366e9b8fc5d16..ea432e529a3ba05e0f150b2b4d3c4e54ecefd1bb 100644
--- a/test/recipes/70-test_quic_tserver.t
+++ b/test/recipes/70-test_quic_tserver.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/70-test_tls13cookie.t b/test/recipes/70-test_tls13cookie.t
index ead0f37cf891abc47f044a1dc984ab89217e1913..4be31c52e7f9c313bd8b31c713baebfc959243da 100644
--- a/test/recipes/70-test_tls13cookie.t
+++ b/test/recipes/70-test_tls13cookie.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/70-test_tls13hrr.t b/test/recipes/70-test_tls13hrr.t
index ece9f033ded03f8225a1a8eb0dc1d395698c8c8f..3feabef060ce70668209eb79a108d982d4bac3a5 100644
--- a/test/recipes/70-test_tls13hrr.t
+++ b/test/recipes/70-test_tls13hrr.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/70-test_tls13kexmodes.t b/test/recipes/70-test_tls13kexmodes.t
index ea61a01f82c79194f5e59d08c246ea7259a8e143..c4711e442b6c15caf12603105cf359c7461093e5 100644
--- a/test/recipes/70-test_tls13kexmodes.t
+++ b/test/recipes/70-test_tls13kexmodes.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/70-test_tls13messages.t b/test/recipes/70-test_tls13messages.t
index 4fa56d59ba12c0d83bf7e4f294723e2e4f43a594..f579cd3c9fbabdcd9000b03c1ae2ef7a0f136750 100644
--- a/test/recipes/70-test_tls13messages.t
+++ b/test/recipes/70-test_tls13messages.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/70-test_tls13psk.t b/test/recipes/70-test_tls13psk.t
index d352bc18bf8e985123884e5096e97ceea52b73bd..5607dd604ca85582248d274b743aae5abfc592d7 100644
--- a/test/recipes/70-test_tls13psk.t
+++ b/test/recipes/70-test_tls13psk.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/75-test_quic_cc.t b/test/recipes/75-test_quic_cc.t
index 97f4151779ba1fd0d160d7d354037fe3e4e86730..5a310f325947df1e78c9dc6d7f3bd1862b0ce7a3 100644
--- a/test/recipes/75-test_quic_cc.t
+++ b/test/recipes/75-test_quic_cc.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/75-test_quicapi.t b/test/recipes/75-test_quicapi.t
index 5f248a18f62a50275a37334de66b7179ebdba8f3..bd411f221c8d68d882f6336745f23e9519d9bc6e 100644
--- a/test/recipes/75-test_quicapi.t
+++ b/test/recipes/75-test_quicapi.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/79-test_http.t b/test/recipes/79-test_http.t
index ecf6eb23a213dc1b9b109f664215a260b3c31039..236120071790c2c73b80466db0cf4d1bfd993ef4 100644
--- a/test/recipes/79-test_http.t
+++ b/test/recipes/79-test_http.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 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
diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index 6a7a74b7e7dc675ab0baa4d534e539704b7ac7e4..916f952a0c3e15abd7d2f6f41aaa5dad1c6c544e 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index 1b0ec8a659a695ecbf947f4dc21e5b7271d7e9b0..62ce1bd169063e227170a30a199e7731f4f7eafa 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright Nokia 2007-2019
 # Copyright Siemens AG 2015-2019
 #
@@ -299,19 +299,22 @@ sub start_server {
     }
     print "$server_name server PID=$pid\n";
 
-    if ($server_port == 0) {
-        # Find out the actual server port and possibly different PID
+    if ($server_host eq '*' || $server_port == 0) {
+        # Find out the actual server host and port and possibly different PID
         $pid = 0;
         while (<$server_fh>) {
             print "$server_name server output: $_";
             next if m/using section/;
             s/\R$//;                # Better chomp
-            ($server_port, $pid) = ($1, $2) if /^ACCEPT\s.*:(\d+) PID=(\d+)$/;
+            ($server_host, $server_port, $pid) = ($1, $2, $3)
+                if /^ACCEPT\s(.*?):(\d+) PID=(\d+)$/;
             last; # Do not loop further to prevent hangs on server misbehavior
         }
+        $server_host = "[::1]" if $server_host eq "[::]";
+        $server_host = "127.0.0.1" if $server_host eq "0.0.0.0";
     }
     unless ($server_port > 0) {
-        stop_server($server_name, $pid);
+        stop_server($server_name, $pid) if $pid;
         print "Cannot get expected output from the $server_name server";
         return 0;
     }
diff --git a/test/recipes/80-test_cmp_http_data/test_connection.csv b/test/recipes/80-test_cmp_http_data/test_connection.csv
index 3c0a598d11cecaf39dd31ea7fa6dfb30cd66ca6a..202eb223c496a7349376206c0c34df40535af22c 100644
--- a/test/recipes/80-test_cmp_http_data/test_connection.csv
+++ b/test/recipes/80-test_cmp_http_data/test_connection.csv
@@ -3,7 +3,6 @@ expected,description, -section,val, -server,val, -proxy,val, -no_proxy,val, -tls
 ,,,,,,,,,,,,,,,,,,,
 1,default config, -section,,,,,,,,BLANK,,,,BLANK,,BLANK,,BLANK,
 1,server domain name, -section,, -server,localhost:_SERVER_PORT,,,,,,,,,,,,,,
-1,server IPv6 address, -section,, -server,[::1]:_SERVER_PORT,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,
 0,wrong server, -section,, -server,xn--rksmrgs-5wao1o.example.com:_SERVER_PORT,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK,
 0,wrong server port, -section,, -server,_SERVER_HOST:99,,,,,BLANK,,,, -msg_timeout,1,BLANK,,BLANK,
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 25b0238f8550c9be15efd8d0e8b5ee68799ff396..21c683c4046a7fc75585fc3c6684bff10f8fbe68 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
@@ -50,7 +50,7 @@ my ($no_des, $no_dh, $no_dsa, $no_ec, $no_ec2m, $no_rc2, $no_zlib)
 
 $no_rc2 = 1 if disabled("legacy");
 
-plan tests => 20;
+plan tests => 21;
 
 ok(run(test(["pkcs7_test"])), "test pkcs7");
 
@@ -1140,3 +1140,13 @@ with({ exit_checker => sub { return shift == 6; } },
                    ])),
             "Check failure during BIO setup with -stream is handled correctly");
     });
+
+# Test case for return value mis-check reported in #21986
+with({ exit_checker => sub { return shift == 3; } },
+    sub {
+        ok(run(app(['openssl', 'cms', '-sign',
+                    '-in', srctop_file("test", "smcont.txt"),
+                    '-signer', srctop_file("test/smime-certs", "smdsa1.pem"),
+                    '-md', 'SHAKE256'])),
+           "issue#21986");
+    });
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 1a3a3c1567772992185ea0e4f3dc3089bd3ee914..195b85ea8cdd588a57d23d6f6cd54e54df554143 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recipes/90-test_quicfaults.t b/test/recipes/90-test_quicfaults.t
index addac8fc0ab7916fb5dea61eca9da54c02ae7cd9..7fa039a37060445523b07dd016520dc5aa07a407 100644
--- a/test/recipes/90-test_quicfaults.t
+++ b/test/recipes/90-test_quicfaults.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/90-test_store.t b/test/recipes/90-test_store.t
index c0bf1d1bb0aefe8f3bb31408060356a9f002cc65..7c5624e5a225ae7b3b591e47772c8aff8050c7a8 100644
--- a/test/recipes/90-test_store.t
+++ b/test/recipes/90-test_store.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/recipes/90-test_trace_api.t b/test/recipes/90-test_trace_api.t
index 8d7ee4adb9af8b330bad751250d9d8fbb18ea471..bc4f34858be79ecee3b493cd6a930575dbd34dba 100644
--- a/test/recipes/90-test_trace_api.t
+++ b/test/recipes/90-test_trace_api.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2023 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
diff --git a/test/recipes/91-test_pkey_check.t b/test/recipes/91-test_pkey_check.t
index c290b0ba729681ad61db54753e413c075e044d7f..dc7cc64533af26ef6f544e48d4ff39ef3f5c0da8 100644
--- a/test/recipes/91-test_pkey_check.t
+++ b/test/recipes/91-test_pkey_check.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2023 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
diff --git a/test/recipes/99-test_fuzz_decoder.t b/test/recipes/99-test_fuzz_decoder.t
index 17758e03d0fc749e61763ebc1240e8c7e0117e9f..99a9b6db119b851a28b15d0a48efa3b8a6a2a138 100644
--- a/test/recipes/99-test_fuzz_decoder.t
+++ b/test/recipes/99-test_fuzz_decoder.t
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/recipes/99-test_fuzz_pem.t b/test/recipes/99-test_fuzz_pem.t
index a0ca846afd02f0cabeebd42d12d5cc282487c6a1..28b5c24ac860d78384df3633896c92d9f78f1c7a 100644
--- a/test/recipes/99-test_fuzz_pem.t
+++ b/test/recipes/99-test_fuzz_pem.t
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/recipes/99-test_fuzz_punycode.t b/test/recipes/99-test_fuzz_punycode.t
index daba65768335b75ee2caa5639f51bc0bc9cc7ab2..b12ae3154a8038742322e42479b4b9cac6e24c66 100644
--- a/test/recipes/99-test_fuzz_punycode.t
+++ b/test/recipes/99-test_fuzz_punycode.t
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/recipes/99-test_fuzz_v3name.t b/test/recipes/99-test_fuzz_v3name.t
index 2c586501be1e5d1e75ee7502ae96c69d65f8afab..e6d88c7946f476c5b35f54786d3d19d7f17e1b2e 100644
--- a/test/recipes/99-test_fuzz_v3name.t
+++ b/test/recipes/99-test_fuzz_v3name.t
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/recipes/99-test_fuzz_x509.t b/test/recipes/99-test_fuzz_x509.t
index 7ca3ee8ae7ca00df0a5d843c9e96793579589cb5..b0b86365d1019382811059ffe42ace1e9e7eb1bc 100644
--- a/test/recipes/99-test_fuzz_x509.t
+++ b/test/recipes/99-test_fuzz_x509.t
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/recipes/tconversion.pl b/test/recipes/tconversion.pl
index 222ef1ac13d9ab5ff33034b2e890aafce072de6b..6f10758f29accfd9e3e309d9e0d46328655bfa88 100644
--- a/test/recipes/tconversion.pl
+++ b/test/recipes/tconversion.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2023 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
diff --git a/test/recordlentest.c b/test/recordlentest.c
index d46b75f686d25fe1d795e79b7cf8434d73dc91f4..c7fb27408f46dbb151c0f203a140a27f949d3365 100644
--- a/test/recordlentest.c
+++ b/test/recordlentest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/test/rsa_mp_test.c b/test/rsa_mp_test.c
index 81b42a2fdf70d16faffff39de32c3b246063a7e3..cc9e282b140901226729ae19f39c768a62af903a 100644
--- a/test/rsa_mp_test.c
+++ b/test/rsa_mp_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2017 BaishanCloud. All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
diff --git a/test/rsa_sp800_56b_test.c b/test/rsa_sp800_56b_test.c
index 10443683b9c2ef08a84539ed867461a1506fd148..7660019f4739f1d11f0d2d35162eed91a29713a9 100644
--- a/test/rsa_sp800_56b_test.c
+++ b/test/rsa_sp800_56b_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/test/rsa_test.c b/test/rsa_test.c
index 82c3097085e78d058cc7ffb9ffcafd51ecf68003..fe2087465f63a915b5a49195684cf3244b4d6e3e 100644
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 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
diff --git a/test/rsa_x931_test.c b/test/rsa_x931_test.c
index 5f3396a3a03fcfdb1bd6d5c0ef1bf9b0e582491a..4310f7beab450d4dccbbc5e26c4e776962bc993b 100644
--- a/test/rsa_x931_test.c
+++ b/test/rsa_x931_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/sanitytest.c b/test/sanitytest.c
index 9628fdb4bf8142ac6dc447ec23e48ed25fa2e2f6..dd19bfbc71da0ebc6262b1f5d487aead4aad0d79 100644
--- a/test/sanitytest.c
+++ b/test/sanitytest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2023 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
diff --git a/test/smime-certs/mksmime-certs.sh b/test/smime-certs/mksmime-certs.sh
index 160fcbfb4fb9ca218ab9d050161048bac57df865..ab7e22a136e2867891c0ee8b6291bc9d89362dce 100644
--- a/test/smime-certs/mksmime-certs.sh
+++ b/test/smime-certs/mksmime-certs.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2013-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2013-2023 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
diff --git a/test/ssl-tests/28-seclevel.cnf.in b/test/ssl-tests/28-seclevel.cnf.in
index 3fc301eb140f8039e2de459ed3428dd5cf30885c..9204f215e530ebfcdf4ed3a7ec7f03228a3f290c 100644
--- a/test/ssl-tests/28-seclevel.cnf.in
+++ b/test/ssl-tests/28-seclevel.cnf.in
@@ -1,5 +1,5 @@
 # -*- mode: perl; -*-
-# Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/ssl-tests/30-extended-master-secret.cnf.in b/test/ssl-tests/30-extended-master-secret.cnf.in
index 40f4df3308462006d60ab42786a971c0be353b48..9401026e20afa19855229c282d1bd88ac0c95944 100644
--- a/test/ssl-tests/30-extended-master-secret.cnf.in
+++ b/test/ssl-tests/30-extended-master-secret.cnf.in
@@ -1,5 +1,5 @@
 # -*- mode: perl; -*-
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/test/ssl_ctx_test.c b/test/ssl_ctx_test.c
index ea7aadc2f69fe606cc69aa7ddaee5d94af918375..16da838dea106bd87bf4b15d10a1dffc19110392 100644
--- a/test/ssl_ctx_test.c
+++ b/test/ssl_ctx_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c
index 8218ab1a908776efe2150d5d81fe9f3bb5113658..21834b1a36313c8f793d3797ca093f16dd11920f 100644
--- a/test/ssl_old_test.c
+++ b/test/ssl_old_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
diff --git a/test/ssl_test.c b/test/ssl_test.c
index 56b765ad8e7ff6c8138871e302ed37003d3aa6c3..ea608518f92ed6455ade35185aff8f8c340be330 100644
--- a/test/ssl_test.c
+++ b/test/ssl_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/sslapitest.c b/test/sslapitest.c
index b50929eddbe79e9d4c1986d9e2e5a5943bd3af0f..756675c1dce6aa4ce7314ddafd9cef20985220db 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
@@ -9054,7 +9054,7 @@ static int test_session_timeout(int test)
      * Test session ordering and timeout
      * Can't explicitly test performance of the new code,
      * but can test to see if the ordering of the sessions
-     * are correct, and they they are removed as expected
+     * are correct, and they are removed as expected
      */
     SSL_SESSION *early = NULL;
     SSL_SESSION *middle = NULL;
@@ -9549,7 +9549,7 @@ static int test_pluggable_group(int idx)
  */
 static int create_cert_key(int idx, char *certfilename, char *privkeyfilename)
 {
-    EVP_PKEY_CTX * evpctx = EVP_PKEY_CTX_new_from_name(libctx,
+    EVP_PKEY_CTX *evpctx = EVP_PKEY_CTX_new_from_name(libctx,
                              (idx == 0) ? "xorhmacsig" : "xorhmacsha2sig", NULL);
     EVP_PKEY *pkey = NULL;
     X509 *x509 = X509_new();
diff --git a/test/sslbuffertest.c b/test/sslbuffertest.c
index beace8ffd6495e7f8e4be985fe08eccec6227d44..94229d54d62aa7a6f05bdd9687235b8179490582 100644
--- a/test/sslbuffertest.c
+++ b/test/sslbuffertest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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.
diff --git a/test/testutil.h b/test/testutil.h
index 033c6f587d8002ba10a728024abf729ee0a1eb9a..a247f55ed6b83f010784cd321dd7a3f815bb7860 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2023 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
diff --git a/test/testutil/basic_output.c b/test/testutil/basic_output.c
index ebd646ce144579b6a4586cbef1016bd6eac33ab3..5297b350e7c35e26e3af97b48af488daff02c11f 100644
--- a/test/testutil/basic_output.c
+++ b/test/testutil/basic_output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/test/testutil/fake_random.c b/test/testutil/fake_random.c
index ebf3a9d74b079d911f21a86bacceced3274a009c..b211f48625c2db8db03855355cfe77a84d3e0b34 100644
--- a/test/testutil/fake_random.c
+++ b/test/testutil/fake_random.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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.
diff --git a/test/testutil/main.c b/test/testutil/main.c
index 2945bb52b8e58817ac10319b6edcdf43c6689996..32e32d8328723ba1e0fb7cb4b15defa47035c9f4 100644
--- a/test/testutil/main.c
+++ b/test/testutil/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/testutil/provider.c b/test/testutil/provider.c
index 30c757c5c1d3f33cc93204ce25b5dfb25f79cd81..79ae13b42a1f0f07a6f3382cdb3dca7785b191b1 100644
--- a/test/testutil/provider.c
+++ b/test/testutil/provider.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2023 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
diff --git a/test/threadstest.c b/test/threadstest.c
index a4bab43cc7bfe66428e84325de158d713d2b1dd3..317b637a07e3da2605a45c19ef6fc134436253fe 100644
--- a/test/threadstest.c
+++ b/test/threadstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/tls-provider.c b/test/tls-provider.c
index 39dde831f48560bba28f0499277dad249feaed57..5f1479435f78abff6fd1221c33e45e8b1c8f22c7 100644
--- a/test/tls-provider.c
+++ b/test/tls-provider.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2023 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
@@ -2152,7 +2152,7 @@ struct keytype_desc_st {
 /*
  * Start blatant code steal. Alternative: Open up d2i_X509_PUBKEY_INTERNAL
  * as per https://github.com/openssl/openssl/issues/16697 (TBD)
- * Code from from openssl/crypto/x509/x_pubkey.c as
+ * Code from openssl/crypto/x509/x_pubkey.c as
  * ossl_d2i_X509_PUBKEY_INTERNAL is presently not public
  */
 struct X509_pubkey_st {
diff --git a/test/tls13ccstest.c b/test/tls13ccstest.c
index fe44d90fbc4dceb777ecccad294e26735f9bc048..1dde451c950a320e344e86e59f33f7f9532375ca 100644
--- a/test/tls13ccstest.c
+++ b/test/tls13ccstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index cecbb4296be5771d6a24ebd441f6ce9b409c3a6b..f1e6490f9f900b810bd19642d3e7e5cd2c191f48 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index f51dd9e9db88b92ab95e9152d9be12e702a07209..352c1898adfb1765d54bcea117aa67391cbd3ccc 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/trace_api_test.c b/test/trace_api_test.c
index 15b5805e64cae241207e4a91fa72821bce3da899..e12750f06a70b8f5133077247ad280360feea7f1 100644
--- a/test/trace_api_test.c
+++ b/test/trace_api_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2023 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
diff --git a/test/upcallstest.c b/test/upcallstest.c
index 096d0b188d527d9ce39e568222aac8b7ca8b4c9c..d2c89b5202eec962b1c31d1775f7d332c3be05f6 100644
--- a/test/upcallstest.c
+++ b/test/upcallstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/test/user_property_test.c b/test/user_property_test.c
index a7e7abb05104fd8628e7293f1efd9c6b6ad8ff79..73ae149ad08d15b39baaf6566b18d699825a6d31 100644
--- a/test/user_property_test.c
+++ b/test/user_property_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2023 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
diff --git a/test/v3nametest.c b/test/v3nametest.c
index 0341995dde823f0b6fa7cc4f438dc560a4fcfa54..3609eba04552ae7b372b5f822f6a46cf81ea05d5 100644
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-2023 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
diff --git a/test/wpackettest.c b/test/wpackettest.c
index dd88a7e15b31ddab9bb53b15f0a93f6ac8a1c548..aaa374af188bea0c3cfd0c88a1073eefab120330 100644
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2023 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
diff --git a/test/x509_check_cert_pkey_test.c b/test/x509_check_cert_pkey_test.c
index 83f4cb563c8615994b2875d562f68375de191409..52c4ea40e081b131d9b2fdcfa158c5a52a86201a 100644
--- a/test/x509_check_cert_pkey_test.c
+++ b/test/x509_check_cert_pkey_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2023 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
diff --git a/util/check-format.pl b/util/check-format.pl
index afae3d4a76c37ad3732a7a105353aa3888d5ff1b..e1a91bcc58150d04c68d432323658386f910e078 100755
--- a/util/check-format.pl
+++ b/util/check-format.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl
 #
-# Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright Siemens AG 2019-2022
 #
 # Licensed under the Apache License 2.0 (the "License").
diff --git a/util/find-doc-nits b/util/find-doc-nits
index 877838f00e697334461a927978a9242b584d038c..7d1cdb59b1dbd6e1845200237ffe5d6bed48fb51 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2002-2023 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
diff --git a/util/mk-fipsmodule-cnf.pl b/util/mk-fipsmodule-cnf.pl
index a1867140640c223ad3c488c77ec849747e998c66..3eb397adad5e4171613431333ff2a39fa884bcd9 100644
--- a/util/mk-fipsmodule-cnf.pl
+++ b/util/mk-fipsmodule-cnf.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2023 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
diff --git a/util/mkerr.pl b/util/mkerr.pl
index cf9dc3771e32320df86ddc5775fae08fd0c8af90..6f22bbd5827e9e2bfa979a29eeb92ac3a2270499 100755
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2023 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
diff --git a/util/perl/OpenSSL/Ordinals.pm b/util/perl/OpenSSL/Ordinals.pm
index 4f770ad1ad9f61debf4eb03ef3f54d44d1cfb6e7..da5a31bd21abefc9af770ecba48b70888d9f19cd 100644
--- a/util/perl/OpenSSL/Ordinals.pm
+++ b/util/perl/OpenSSL/Ordinals.pm
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2018-2023 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
diff --git a/util/perl/OpenSSL/Util.pm b/util/perl/OpenSSL/Util.pm
index e75b1a43b8eeb3c2759f512b5b055608624815dd..970fc009b3bc368b485f228908e28cb0e7c3a3ea 100644
--- a/util/perl/OpenSSL/Util.pm
+++ b/util/perl/OpenSSL/Util.pm
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2018-2023 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
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index 6b2cd9b9fb438f99113ad1eda29ea2efac43ebaa..791b19847ad85d4733c6a10bd296077ca5bc2c5d 100755
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1998-2023 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
diff --git a/util/perl/TLSProxy/Message.pm b/util/perl/TLSProxy/Message.pm
index 21e04a5cbc35bf1fe36c9514d6525994ae5b8a7e..ce221875697f1f257aa52d4ecc476cee005c5277 100644
--- a/util/perl/TLSProxy/Message.pm
+++ b/util/perl/TLSProxy/Message.pm
@@ -1,4 +1,4 @@
-# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 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
diff --git a/util/quicserver.c b/util/quicserver.c
index c25128eaf6c3d12a3e1a6dc51dd4951b0becb09f..fd9f9399bd6e2219d03694863061b9f79953e1e7 100644
--- a/util/quicserver.c
+++ b/util/quicserver.c
@@ -113,10 +113,12 @@ static BIO *create_dgram_bio(int family, const char *hostname, const char *port)
     if (sock == -1)
         return NULL;
 
-    /* Create a BIO to wrap the socket*/
+    /* Create a BIO to wrap the socket */
     bio = BIO_new(BIO_s_datagram());
-    if (bio == NULL)
+    if (bio == NULL) {
         BIO_closesocket(sock);
+        return NULL;
+    }
 
     /*
      * Associate the newly created BIO with the underlying socket. By
@@ -217,7 +219,12 @@ int main(int argc, char *argv[])
     bio = NULL;
 
     if (trace)
+#ifndef OPENSSL_NO_SSL_TRACE
         ossl_quic_tserver_set_msg_callback(qtserv, SSL_trace, bio_err);
+#else
+        BIO_printf(bio_err,
+                   "Warning: -trace specified but no SSL tracing support present\n");
+#endif
 
     /* Wait for handshake to complete */
     ossl_quic_tserver_tick(qtserv);