Merge ~ravi-sharma/ubuntu/+source/openssl:fix-lp2133492 into ubuntu/+source/openssl:debian/sid

[Ravi Kant Sharma]

[Ravi Kant Sharma (ravi-sharma)]

PPA: https://launchpad.net/~ravi-sharma/+archive/ubuntu/fix-lp2133492/+packages

 Results:
  - openssl: resolute/openssl/3.5.4-1ubuntu1 [amd64]
    + ✅ openssl on resolute for amd64 @ 08.01.26 22:42:29
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-ravi-sharma-fix-lp2133492/resolute/amd64/o/openssl/20260108_224229_951d5@/log.gz
  - openssl: resolute/openssl/3.5.4-1ubuntu1 [arm64]
    + ✅ openssl on resolute for arm64 @ 08.01.26 22:42:50
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-ravi-sharma-fix-lp2133492/resolute/arm64/o/openssl/20260108_224250_4f333@/log.gz
  - openssl: resolute/openssl/3.5.4-1ubuntu1 [armhf]
    + ✅ openssl on resolute for armhf @ 08.01.26 22:43:36
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-ravi-sharma-fix-lp2133492/resolute/armhf/o/openssl/20260108_224336_f43df@/log.gz
  - openssl: resolute/openssl/3.5.4-1ubuntu1 [i386]
    + ❌ openssl on resolute for i386 @ 08.01.26 22:43:53
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-ravi-sharma-fix-lp2133492/resolute/i386/o/openssl/20260108_224353_a04f9@/log.gz
      • Status: FAIL
      • 97s FAIL 🟥
    + ✅ openssl on resolute for i386 @ 08.01.26 23:14:49
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-ravi-sharma-fix-lp2133492/resolute/i386/o/openssl/20260108_231449_d3cde@/log.gz
  - openssl: resolute/openssl/3.5.4-1ubuntu1 [ppc64el]
    + ✅ openssl on resolute for ppc64el @ 08.01.26 22:42:15
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-ravi-sharma-fix-lp2133492/resolute/ppc64el/o/openssl/20260108_224215_fee0b@/log.gz
  - openssl: resolute/openssl/3.5.4-1ubuntu1 [s390x]
    + ✅ openssl on resolute for s390x @ 08.01.26 22:44:12
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-ravi-sharma-fix-lp2133492/resolute/s390x/o/openssl/20260108_224412_cecdb@/log.gz
* Running: (none)
* Waiting: (none)

[Ravi Kant Sharma (ravi-sharma)]

The debian/sid branch has the trixie `stable` version instead of `unstable`. The diff does not make much sense, please look at the branch for review.

[Ravi Kant Sharma (ravi-sharma)]

The upload contains merge (LP: #2133492) and a bug fix (LP: #2137464).

[Ravi Kant Sharma (ravi-sharma)]

Please ignore rich history for this merge. I have saved split commits in a branch. I will recreate it on the next debian/sid git ubuntu import.

[Ravi Kant Sharma (ravi-sharma)]

> The debian/sid branch has the trixie `stable` version instead of `unstable`.
> The diff does not make much sense, please look at the branch for review.

I added a commit on top of local debian/sid to make it 3.5.4-1 and rest of the process was a standar git-ubuntu merge.

Unmerged commits

a8a8f56... by Ravi Kant Sharma on 2026-01-08

Changelog for 3.5.4-1ubuntu1

4dae229... by Ravi Kant Sharma on 2026-01-08

update-maintainer

fc2fe5b... by Ravi Kant Sharma on 2026-01-08

reconstruct-changelog

60f5e91... by Ravi Kant Sharma on 2026-01-08

merge-changelogs

4238261... by Ravi Kant Sharma on 2026-01-08

match last filename for output in ecp_nistp521-ppc64.pl

66d8f8e... by Ravi Kant Sharma on 2025-09-01

fips patches (debian/patches/fips)

deee078... by Ravi Kant Sharma on 2025-09-01

Don't enable or package anything FIPS (LP #2087955)

6d3a9d4... by Ravi Kant Sharma on 2025-09-01

Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins

125f47b... by Ravi Kant Sharma on 2025-09-01

Disable LTO with which the codebase is generally incompatible (LP #2058017)

4b0be6f... by Ravi Kant Sharma on 2025-09-01

Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl

diff --git a/debian/changelog b/debian/changelog
index fe943c4..54742bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,113 @@
-openssl (3.5.4-1~deb13u1) trixie; urgency=medium
+openssl (3.5.4-1ubuntu1) resolute; urgency=medium
+
+  * Match last filename for output in ecp_nistp521-ppc64.pl (LP: #2137464)
+    - d/p/regex_match_ecp_nistp521-ppc64.patch
+  * Drop patches, merged upstream
+    - d/p/CVE-2025-9230.patch
+    - d/p/CVE-2025-9231-1.patch
+    - d/p/CVE-2025-9231-2.patch
+    - d/p/CVE-2025-9232.patch 
+  * Merge with Debian unstable (LP: #2133492). Remaining changes:
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl
+    - Disable LTO with which the codebase is generally incompatible (LP #2058017)
+    - Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins
+    - Don't enable or package anything FIPS (LP #2087955)
+    - Match last filename for output in ecp_nistp521-ppc64.pl (LP #2137464)
+    - fips patches (debian/patches/fips):
+      - crypto: Add kernel FIPS mode detection
+      - crypto: Automatically use the FIPS provider...
+      - apps/speed: Omit unavailable algorithms in FIPS mode
+      - apps: pass -propquery arg to the libctx DRBG fetches
+      - test: Ensure encoding runs with the correct context...
+      - Add Ubuntu-specific defines to help FIPS certification (LP #2073991)
+        + UBUNTU_OSSL_SELF_TEST_DESC_PCT_DH
+        + UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE
+
+ -- Ravi Kant Sharma <[e-mail]>  Thu, 08 Jan 2026 15:53:39 +0100
+
+openssl (3.5.4-1) unstable; urgency=medium
 
   * Import 3.5.4
-
- -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 01 Nov 2025 12:22:59 +0100
-
-openssl (3.5.1-1+deb13u1) trixie-security; urgency=medium
-
-  * CVE-2025-9230 (Out-of-bounds read & write in RFC 3211 KEK Unwrap)
-  * CVE-2025-9231 (Timing side-channel in SM2 algorithm on 64 bit ARM)
-  * CVE-2025-9232 (Out-of-bounds read in HTTP client no_proxy handling)
-
- -- Sebastian Andrzej Siewior <[e-mail]>  Fri, 26 Sep 2025 21:18:35 +0200
+   - CVE-2025-9230 (Out-of-bounds read & write in RFC 3211 KEK Unwrap)
+   - CVE-2025-9231 (Timing side-channel in SM2 algorithm on 64 bit ARM)
+   - CVE-2025-9232 (Out-of-bounds read in HTTP client no_proxy handling)
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 30 Sep 2025 21:54:39 +0200
+
+openssl (3.5.3-1ubuntu2) questing; urgency=medium
+
+  * SECURITY UPDATE: Out-of-bounds read & write in RFC 3211 KEK Unwrap
+    - debian/patches/CVE-2025-9230.patch: fix incorrect check of unwrapped
+      key size in crypto/cms/cms_pwri.c.
+    - CVE-2025-9230
+  * SECURITY UPDATE: Timing side-channel in SM2 algorithm on 64 bit ARM
+    - debian/patches/CVE-2025-9231-1.patch: use constant time modular
+      inversion in crypto/ec/ecp_sm2p256.c.
+    - debian/patches/CVE-2025-9231-2.patch: remove unused code in
+      crypto/ec/ecp_sm2p256.c.
+    - CVE-2025-9231
+  * SECURITY UPDATE: Out-of-bounds read in HTTP client no_proxy handling
+    - debian/patches/CVE-2025-9232.patch: add missing terminating NUL byte
+      in crypto/http/http_lib.c.
+    - CVE-2025-9232
+
+ -- Hlib Korzhynskyy <[e-mail]>  Tue, 30 Sep 2025 16:17:50 -0230
+
+openssl (3.5.3-1ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP: #2125443). Remaining changes:
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl
+    - Disable LTO with which the codebase is generally incompatible (LP #2058017)
+    - Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins
+    - Don't enable or package anything FIPS (LP #2087955)
+    - fips patches (debian/patches/fips):
+      - crypto: Add kernel FIPS mode detection
+      - crypto: Automatically use the FIPS provider...
+      - apps/speed: Omit unavailable algorithms in FIPS mode
+      - apps: pass -propquery arg to the libctx DRBG fetches
+      - test: Ensure encoding runs with the correct context...
+      - Add Ubuntu-specific defines to help FIPS certification (LP #2073991)
+        + UBUNTU_OSSL_SELF_TEST_DESC_PCT_DH
+        + UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE
+
+ -- Ravi Kant Sharma <[e-mail]>  Mon, 22 Sep 2025 22:35:44 +0200
+
+openssl (3.5.3-1) unstable; urgency=medium
+
+  * Import 3.5.3
+  * Drop pic & Bsymbolic patches. This shouldn't be needed anymore.
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Wed, 17 Sep 2025 21:39:04 +0200
+
+openssl (3.5.2-1ubuntu1) questing; urgency=medium
+
+   * Merge with Debian unstable (LP: #2121799). Remaining changes:
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl
+    - Disable LTO with which the codebase is generally incompatible (LP #2058017)
+    - Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins
+    - Don't enable or package anything FIPS (LP #2087955)
+    - fips patches (debian/patches/fips):
+      - crypto: Add kernel FIPS mode detection
+      - crypto: Automatically use the FIPS provider...
+      - apps/speed: Omit unavailable algorithms in FIPS mode
+      - apps: pass -propquery arg to the libctx DRBG fetches
+      - test: Ensure encoding runs with the correct context...
+      - Add Ubuntu-specific defines to help FIPS certification (LP #2073991)
+        + UBUNTU_OSSL_SELF_TEST_DESC_PCT_DH
+        + UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE
+  * Patches refresh
+    - d/p/fips/two-defines-for-fips-in-libssl-dev-headers.patch
+
+ -- Ravi Kant Sharma <[e-mail]>  Mon, 01 Sep 2025 15:47:30 +0200
+
+openssl (3.5.2-1) unstable; urgency=medium
+
+  * Import 3.5.2
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 10 Aug 2025 11:30:37 +0200
 
 openssl (3.5.1-1) unstable; urgency=medium
 
@@ -18,6 +115,32 @@ openssl (3.5.1-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 12 Jul 2025 18:49:06 +0200
 
+openssl (3.5.0-2ubuntu1) questing; urgency=medium
+
+   * Merge with Debian unstable (LP: #2112457). Remaining changes:
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl
+    - Disable LTO with which the codebase is generally incompatible (LP #2058017)
+    - Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins
+    - Don't enable or package anything FIPS (LP #2087955)
+    - fips patches (debian/patches/fips):
+      - crypto: Add kernel FIPS mode detection
+      - crypto: Automatically use the FIPS provider...
+      - apps/speed: Omit unavailable algorithms in FIPS mode
+      - apps: pass -propquery arg to the libctx DRBG fetches
+      - test: Ensure encoding runs with the correct context...
+      - Add Ubuntu-specific defines to help FIPS certification (LP #2073991)
+        + UBUNTU_OSSL_SELF_TEST_DESC_PCT_DH
+        + UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE
+  * Patches refresh
+    - d/p/fips/crypto-Automatically-use-the-FIPS-provider-when-the-kerne.patch
+    - d/p/fips/two-defines-for-fips-in-libssl-dev-headers.patch
+  * Dropped patch, merged upstream (LP #2096810)
+    - s390x-Add-hardware-acceleration-for-full-AES-XTS.patch
+  * Drop all post-3.4.1 upstream patches
+
+ -- Ravi Kant Sharma <[e-mail]>  Wed, 04 Jun 2025 12:46:00 +0200
+
 openssl (3.5.0-2) unstable; urgency=medium
 
   * Fix P-384 curve on lower-than-P9 PPC64 targets Closes: #1106516).
@@ -46,6 +169,43 @@ openssl (3.5.0~~alpha1-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Wed, 12 Mar 2025 22:08:55 +0100
 
+openssl (3.4.1-1ubuntu3) plucky; urgency=medium
+
+  * Cherry-pick additional 3.4 fixes up to April 2:
+    - post-3.4.1/*: refresh and add new upstream patches from git
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 03 Apr 2025 10:48:37 +0200
+
+openssl (3.4.1-1ubuntu2) plucky; urgency=medium
+
+  * Pull patches between 3.4.1 and 2025/02/17:
+    - post-3.4.1/*: add upstream patches from git
+    - SPARC-assembly-Don-t-file-aes-cbc-on-T4-with-small-sizes.patch:
+      remove as it's included in the upstream patches
+
+ -- Adrien Nader <[e-mail]>  Tue, 18 Mar 2025 10:07:41 +0100
+
+openssl (3.4.1-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl
+    - Disable LTO with which the codebase is generally incompatible (LP: #2058017)
+    - Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins
+    - Don't enable or package anything FIPS (LP: #2087955)
+    - patch: crypto: Add kernel FIPS mode detection
+    - patch: crypto: Automatically use the FIPS provider...
+    - patch: apps/speed: Omit unavailable algorithms in FIPS mode
+    - patch: apps: pass -propquery arg to the libctx DRBG fetches
+    - patch: test: Ensure encoding runs with the correct context...
+    - patch: Add Ubuntu-specific defines to help FIPS certification (LP: #2073991)
+      + UBUNTU_OSSL_SELF_TEST_DESC_PCT_DH
+      + UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE
+  * Remove now-unneeded work-around for m2crypto as discussed in #1091133
+  * patch: add CPACF instruction usage for AES-XTS (LP: #2096810)
+
+ -- Adrien Nader <[e-mail]>  Wed, 12 Feb 2025 10:21:22 +0100
+
 openssl (3.4.1-1) unstable; urgency=medium
 
   * Import 3.4.1
@@ -64,6 +224,39 @@ openssl (3.4.0-2) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Mon, 06 Jan 2025 19:01:42 +0100
 
+openssl (3.4.0-1ubuntu2) plucky; urgency=medium
+
+  * d/p/fips/crypto-Automatically-use-the-FIPS-provider-when-the-kerne.patch:
+    Extend the patch to print the error encounted when a fallback
+    provider fails loading, e.g. due to FIPS auto-loading (LP: #2066990)
+  * d/p/Revert-When-defining-ossl_ssize_t-ssize_t-remember-t.patch:
+    Work-around SWIG using different feature flag defines than GCC and
+    parsing sys/select.h differently. (LP: #2091883)
+
+ -- Adrien Nader <[e-mail]>  Thu, 19 Dec 2024 16:12:42 +0100
+
+openssl (3.4.0-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2044795). Remaining changes:
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl
+    - Disable LTO with which the codebase is generally incompatible (LP: #2058017)
+    - Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins
+    - patch: crypto: Add kernel FIPS mode detection
+    - patch: crypto: Automatically use the FIPS provider...
+    - patch: apps/speed: Omit unavailable algorithms in FIPS mode
+    - patch: apps: pass -propquery arg to the libctx DRBG fetches
+    - patch: test: Ensure encoding runs with the correct context...
+    - patch: Add Ubuntu-specific defines to help FIPS certification (LP: #2073991)
+      + UBUNTU_OSSL_SELF_TEST_DESC_PCT_DH
+      + UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE
+    Dropped, merged upstream:
+    - debian/patches/CVE-2024-6119.patch: avoid type errors in EAI-related
+      name check logic in crypto/x509/v3_utl.c, test/*.
+  * Don't enable or package anything FIPS (LP: #2087955)
+
+ -- Adrien Nader <[e-mail]>  Fri, 29 Nov 2024 11:19:56 +0100
+
 openssl (3.4.0-1) experimental; urgency=medium
 
   * Import 3.4.0
@@ -131,6 +324,37 @@ openssl (3.3.1-5) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 04 Aug 2024 23:22:06 +0200
 
+openssl (3.3.1-2ubuntu2) oracular; urgency=medium
+
+  * SECURITY UPDATE: Possible denial of service in X.509 name checks
+    - debian/patches/CVE-2024-6119.patch: avoid type errors in EAI-related
+      name check logic in crypto/x509/v3_utl.c, test/*.
+    - CVE-2024-6119
+  * Add Ubuntu-specific defines to help FIPS certification (LP: #2073991)
+    - UBUNTU_OSSL_SELF_TEST_DESC_PCT_DH
+    - UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE
+
+ -- Adrien Nader <[e-mail]>  Wed, 11 Sep 2024 16:09:42 +0200
+
+openssl (3.3.1-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2044795). Remaining changes:
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Symlink copyright/changelog.Debian.gz in libssl3* to libssl-dev/openssl
+    - Disable LTO with which the codebase is generally incompatible (LP #2058017)
+    - Default config reads crypto-config and /etc/ssl/openssl.cnf.d dropins
+    - patch: crypto: Add kernel FIPS mode detection
+    - patch: crypto: Automatically use the FIPS provider...
+    - patch: apps/speed: Omit unavailable algorithms in FIPS mode
+    - patch: apps: pass -propquery arg to the libctx DRBG fetches
+    - patch: test: Ensure encoding runs with the correct context...
+    - SECURITY UPDATE: crash or memory disclosure via SSL_select_next_proto
+      - debian/patches/CVE-2024-5535*.patch: validate provided client list in
+        ssl/ssl_lib.c.
+      - CVE-2024-5535
+
+ -- Simon Chopin <[e-mail]>  Mon, 12 Aug 2024 13:49:56 +0200
+
 openssl (3.3.1-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -163,6 +387,76 @@ openssl (3.3.0~beta1-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Fri, 05 Apr 2024 23:09:03 +0200
 
+openssl (3.2.2-1ubuntu3) oracular; urgency=medium
+
+  * Added extra commits to previous upload to fix FTBFS in quic tests
+    - debian/patches/CVE-2024-5535-2.patch: more correctly handle a
+      selected_len of 0 when processing NPN in ssl/statem/extensions_clnt.c.
+    - debian/patches/CVE-2024-5535-3.patch: use correctly formatted ALPN
+      data in tserver in ssl/quic/quic_tserver.c.
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 02 Aug 2024 07:41:40 -0400
+
+openssl (3.2.2-1ubuntu2) oracular; urgency=medium
+
+  * SECURITY UPDATE: crash or memory disclosure via SSL_select_next_proto
+    - debian/patches/CVE-2024-5535.patch: validate provided client list in
+      ssl/ssl_lib.c.
+    - CVE-2024-5535
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 31 Jul 2024 13:16:18 -0400
+
+openssl (3.2.2-1ubuntu1) oracular; urgency=medium
+
+  * Merge 3.2.2-1 from Debian unstable
+    - Remaining changes:
+      + Symlink changelog.Debian.gz and copyright.gz from libssl-dev and
+        openssl to the ones in libssl3t64
+      + Use perl:native in the autopkgtest for installability on i386.
+      + Disable LTO with which the codebase is generally incompatible
+        (LP: #2058017)
+      + Add fips-mode detection and adjust defaults when running in fips mode
+  * The changelog.gz symlink was broken (LP: #1297025)
+  * The copyright symlink was broken (LP: #2067672)
+  * Default configuration includes two paths:
+    - /var/lib/crypto-config/profiles/current/openssl.conf.d
+    - /etc/ssl/openssl.conf.d
+    First one is to read configuration through the crypto-config framework.
+    Second one is for customization by sysadmin.
+
+ -- Adrien Nader <[e-mail]>  Mon, 01 Jul 2024 17:04:32 +0200
+
+openssl (3.2.1-3ubuntu1) oracular; urgency=medium
+
+  * Merge 3.2.1-3 from Debian unstable (LP: #2067384)
+    - Remaining changes:
+      + Symlink changelog{,.Debian}.gz and copyright.gz from libssl-dev to
+        openssl
+      + Use perl:native in the autopkgtest for installability on i386.
+      + Disable LTO with which the codebase is generally incompatible
+        (LP: #2058017)
+      + Add fips-mode detection and adjust defaults when running in fips mode
+    - Dropped changes:
+      + d/libssl3.postinst: Revert Debian deletion
+        - Skip services restart & reboot notification if needrestart is in-use.
+        - Bump version check to 1.1.1 (bug opened as LP: #1999139)
+        - Use a different priority for libssl1.1/restart-services depending
+          on whether a desktop, or server dist-upgrade is being performed.
+        - Import libraries/restart-without-asking template as used by above.
+      + Add support for building with noudeb build profile which has been
+        integrated
+      + Patches that forbade TLS < 1.2 @SECLEVEL=2 which is now upstream
+        behaviour:
+        - skip_tls1.1_seclevel3_tests.patch
+        - tests-use-seclevel-1.patch
+        - tls1.2-min-seclevel2.patch
+      + Revert the provider removal from the default configuration as there's
+        no point in carrying the delta (will see if Debian drops the patch)
+      + d/p/intel/*: was a backport from upstream changes
+      + d/p/CVE-*: was a backport from upstream changes
+
+ -- Adrien Nader <[e-mail]>  Tue, 28 May 2024 14:30:44 +0200
+
 openssl (3.2.1-3) unstable; urgency=medium
 
   * Upload to unstable.
@@ -266,6 +560,262 @@ openssl (3.1.0-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 06 May 2023 12:11:09 +0200
 
+openssl (3.0.13-0ubuntu4) oracular; urgency=medium
+
+  * SECURITY UPDATE: Implicit rejection for RSA PKCS#1 (LP: #2054090)
+    - debian/patches/openssl-pkcs1-implicit-rejection.patch:
+      Return deterministic random output instead of an error in case
+      there is a padding error in crypto/cms/cms_env.c,
+      crypto/evp/ctrl_params_translate.c, crypto/pkcs7/pk7_doit.c,
+      crypto/rsa/rsa_ossl.c, crypto/rsa/rsa_pk1.c,
+      crypto/rsa/rsa_pmeth.c, doc/man1/openssl-pkeyutl.pod.in,
+      doc/man1/openssl-rsautl.pod.in, doc/man3/EVP_PKEY_CTX_ctrl.pod,
+      doc/man3/EVP_PKEY_decrypt.pod,
+      doc/man3/RSA_padding_add_PKCS1_type_1.pod,
+      doc/man3/RSA_public_encrypt.pod, doc/man7/provider-asym_cipher.pod,
+      include/crypto/rsa.h, include/openssl/core_names.h,
+      include/openssl/rsa.h,
+      providers/implementations/asymciphers/rsa_enc.c and
+      test/recipes/30-test_evp_data/evppkey_rsa_common.txt.
+
+ -- David Fernandez Gonzalez <[e-mail]>  Wed, 15 May 2024 09:54:00 +0200
+
+openssl (3.0.13-0ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 06:42:03 +0000
+
+openssl (3.0.13-0ubuntu2) noble; urgency=medium
+
+  [ Tobias Heider ]
+  * Add fips-mode detection and adjust defaults when running in fips mode
+    (LP: #2056593):
+    - d/p/fips/crypto-Add-kernel-FIPS-mode-detection.patch:
+      Detect if kernel fips mode is enabled
+    - d/p/fips/crypto-Automatically-use-the-FIPS-provider-when-the-kerne.patch:
+      Load FIPS provider if running in FIPS mode
+    - d/p/fips/apps-speed-Omit-unavailable-algorithms-in-FIPS-mode.patch:
+      Limit openssl-speed to FIPS compliant algorithms when running in FIPS mode
+    - d/p/fips/apps-pass-propquery-arg-to-the-libctx-DRBG-fetches.patch
+      Make sure DRBG respects query properties
+    - d/p/fips/test-Ensure-encoding-runs-with-the-correct-context-during.patch:
+      Make sure encoding runs with correct library context and provider
+
+  [ Adrien Nader ]
+  * Re-enable intel/0002-AES-GCM-enabled-with-AVX512-vAES-and-vPCLMULQDQ.patch
+    (LP: #2030784)
+    Thanks Bun K Tan and Dan Zimmerman
+  * Disable LTO with which the codebase is generally incompatible (LP: #2058017)
+
+ -- Adrien Nader <[e-mail]>  Fri, 15 Mar 2024 09:46:33 +0100
+
+openssl (3.0.13-0ubuntu1) noble; urgency=medium
+
+  * Import 3.0.13
+    - Drop security patches :
+      + CVE-2023-5363-1.patch
+      + CVE-2023-5363-2.patch
+      + CVE-2023-5678.patch
+      + CVE-2023-6129.patch
+      + CVE-2023-6237.patch
+      + CVE-2024-0727.patch
+    - Skip intel/0002-AES-GCM-enabled-with-AVX512-vAES-and-vPCLMULQDQ.patch
+      as it causes testsuite failures.
+
+ -- Adrien Nader <[e-mail]>  Fri, 08 Mar 2024 10:47:35 +0100
+
+openssl (3.0.10-1ubuntu5) noble; urgency=medium
+
+  * Rename libraries for 64-bit time_t transition.  Closes: #1064264
+
+ -- Steve Langasek <[e-mail]>  Sun, 03 Mar 2024 20:47:45 -0800
+
+openssl (3.0.10-1ubuntu4) noble; urgency=medium
+
+  * SECURITY UPDATE: Excessive time spent in DH check / generation with
+    large Q parameter value
+    - debian/patches/CVE-2023-5678.patch: make DH_check_pub_key() and
+      DH_generate_key() safer yet in crypto/dh/dh_check.c,
+      crypto/dh/dh_err.c, crypto/dh/dh_key.c, crypto/err/openssl.txt,
+      include/crypto/dherr.h, include/openssl/dh.h,
+      include/openssl/dherr.h.
+    - CVE-2023-5678
+  * SECURITY UPDATE: POLY1305 MAC implementation corrupts vector registers
+    on PowerPC
+    - debian/patches/CVE-2023-6129.patch: fix vector register clobbering in
+      crypto/poly1305/asm/poly1305-ppc.pl.
+    - CVE-2023-6129
+  * SECURITY UPDATE: Excessive time spent checking invalid RSA public keys
+    - debian/patches/CVE-2023-6237.patch: limit the execution time of RSA
+      public key check in crypto/rsa/rsa_sp800_56b_check.c,
+      test/recipes/91-test_pkey_check.t,
+      test/recipes/91-test_pkey_check_data/rsapub_17k.pem.
+    - CVE-2023-6237
+  * SECURITY UPDATE: PKCS12 Decoding crashes
+    - debian/patches/CVE-2024-0727.patch: add NULL checks where ContentInfo
+      data can be NULL in crypto/pkcs12/p12_add.c,
+      crypto/pkcs12/p12_mutl.c, crypto/pkcs12/p12_npas.c,
+      crypto/pkcs7/pk7_mime.c.
+    - CVE-2024-0727
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 31 Jan 2024 13:03:16 -0500
+
+openssl (3.0.10-1ubuntu3) noble; urgency=medium
+
+  * Drop most of d/libssl3.postinst, keeping only the reboot notification on
+    servers. The dropped code was actually unreachable since around Ubuntu
+    18.04, except for debconf which was loaded but not used.
+  * Remove template for debconf
+
+ -- Adrien Nader <[e-mail]>  Mon, 18 Sep 2023 16:06:16 +0200
+
+openssl (3.0.10-1ubuntu2.1) mantic-security; urgency=medium
+
+  * SECURITY UPDATE: Incorrect cipher key and IV length processing
+    - debian/patches/CVE-2023-5363-1.patch: process key length and iv
+      length early if present in crypto/evp/evp_enc.c.
+    - debian/patches/CVE-2023-5363-2.patch: add unit test in
+      test/evp_extra_test.c.
+    - CVE-2023-5363
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 13 Oct 2023 07:51:05 -0400
+
+openssl (3.0.10-1ubuntu2) mantic; urgency=medium
+
+  * d/p/intel/*: cherry-pick AVX512 patches for recent Intel CPUs (LP: #2030784)
+
+ -- Simon Chopin <[e-mail]>  Tue, 08 Aug 2023 17:51:58 +0200
+
+openssl (3.0.10-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Remaining changes:
+      + Symlink changelog{,.Debian}.gz and copyright.gz from libssl-dev to
+        openssl
+      + d/libssl3.postinst: Revert Debian deletion
+        - Skip services restart & reboot notification if needrestart is in-use.
+        - Bump version check to 1.1.1 (bug opened as LP: #1999139)
+        - Use a different priority for libssl1.1/restart-services depending
+          on whether a desktop, or server dist-upgrade is being performed.
+        - Import libraries/restart-without-asking template as used by above.
+      + Add support for building with noudeb build profile.
+      + Use perl:native in the autopkgtest for installability on i386.
+
+ -- Gianfranco Costamagna <[e-mail]>  Wed, 02 Aug 2023 08:59:28 +0200
+
+openssl (3.0.10-1) unstable; urgency=medium
+
+  * Import 3.0.10
+   - CVE-2023-2975 (AES-SIV implementation ignores empty associated data
+     entries) (Closes: #1041818).
+   - CVE-2023-3446 (Excessive time spent checking DH keys and parameters).
+     (Closes: #1041817).
+   - CVE-2023-3817 (Excessive time spent checking DH q parameter value).
+   - Drop bc and m4 from B-D.
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 01 Aug 2023 22:00:05 +0200
+
+openssl (3.0.9-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Remaining changes:
+      + Symlink changelog{,.Debian}.gz and copyright.gz from libssl-dev to
+        openssl
+      + d/libssl3.postinst: Revert Debian deletion
+        - Skip services restart & reboot notification if needrestart is in-use.
+        - Bump version check to 1.1.1 (bug opened as LP: #1999139)
+        - Use a different priority for libssl1.1/restart-services depending
+          on whether a desktop, or server dist-upgrade is being performed.
+        - Import libraries/restart-without-asking template as used by above.
+      + Add support for building with noudeb build profile.
+      + Use perl:native in the autopkgtest for installability on i386.
+
+ -- Gianfranco Costamagna <[e-mail]>  Mon, 12 Jun 2023 11:19:44 +0200
+
+openssl (3.0.9-1) unstable; urgency=medium
+
+  * Import 3.0.9
+   - CVE-2023-0464 (Excessive Resource Usage Verifying X.509 Policy
+     Constraints) (Closes: #1034720).
+   - CVE-2023-0465 (Invalid certificate policies in leaf certificates are
+     silently ignored).
+   - CVE-2023-0466 (Certificate policy check not enabled).
+   - Alternative fix for CVE-2022-4304 (Timing Oracle in RSA Decryption).
+   - CVE-2023-2650 (Possible DoS translating ASN.1 object identifiers).
+   - CVE-2023-1255 (Input buffer over-read in AES-XTS implementation on 64 bit ARM).
+   - Add new symbol.
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 30 May 2023 18:12:36 +0200
+
+openssl (3.0.8-1ubuntu3) mantic; urgency=medium
+
+  * SECURITY UPDATE: DoS in AES-XTS cipher decryption
+    - debian/patches/CVE-2023-1255.patch: avoid buffer overrread in
+      crypto/aes/asm/aesv8-armx.pl.
+    - CVE-2023-1255
+  * SECURITY UPDATE: Possible DoS translating ASN.1 object identifiers
+    - debian/patches/CVE-2023-2650.patch: restrict the size of OBJECT
+      IDENTIFIERs that OBJ_obj2txt will translate in
+      crypto/objects/obj_dat.c.
+    - CVE-2023-2650
+  * Replace CVE-2022-4304 fix with improved version
+    - debian/patches/revert-CVE-2022-4304.patch: remove previous fix.
+    - debian/patches/CVE-2022-4304.patch: use alternative fix in
+      crypto/bn/bn_asm.c, crypto/bn/bn_blind.c, crypto/bn/bn_lib.c,
+      crypto/bn/bn_local.h, crypto/rsa/rsa_ossl.c.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 24 May 2023 13:04:49 -0400
+
+openssl (3.0.8-1ubuntu2) mantic; urgency=medium
+
+  * Manual reupload from lunar-security to mantic-proposed pocket, due to
+    LP failing to copy it
+
+ -- Gianfranco Costamagna <[e-mail]>  Wed, 03 May 2023 10:49:04 +0200
+
+openssl (3.0.8-1ubuntu1.1) lunar-security; urgency=medium
+
+  * SECURITY UPDATE: excessive resource use when verifying policy constraints
+    - debian/patches/CVE-2023-0464-1.patch: limit the number of nodes created
+      in a policy tree (the default limit is set to 1000 nodes).
+    - debian/patches/CVE-2023-0464-2.patch: add test cases for the policy
+      resource overuse.
+    - debian/patches/CVE-2023-0464-3.patch: disable the policy tree
+      exponential growth test conditionally.
+    - CVE-2023-0464
+  * SECURITY UPDATE: invalid certificate policies ignored in leaf certificates
+    - debian/patches/CVE-2023-0465-1.patch: ensure that EXFLAG_INVALID_POLICY
+      is checked even in leaf certs.
+    - debian/patches/CVE-2023-0465-2.patch: generate some certificates with
+      the certificatePolicies extension.
+    - debian/patches/CVE-2023-0465-3.patch: add a certificate policies test.
+    - CVE-2023-0466
+  * SECURITY UPDATE: certificate policy check in X509_VERIFY_PARAM_add0_policy
+    not enabled as documented
+    - debian/patches/CVE-2023-0466.patch: fix documentation of
+      X509_VERIFY_PARAM_add0_policy().
+    - CVE-2023-0466
+
+ -- Camila Camargo de Matos <[e-mail]>  Mon, 24 Apr 2023 07:52:33 -0300
+
+openssl (3.0.8-1ubuntu1) lunar; urgency=medium
+
+  * Merge 3.0.8 from Debian testing (LP: #2006954)
+    - Remaining changes:
+      + Symlink changelog{,.Debian}.gz and copyright.gz from libssl-dev to
+        openssl
+      + d/libssl3.postinst: Revert Debian deletion
+        - Skip services restart & reboot notification if needrestart is in-use.
+        - Bump version check to 1.1.1 (bug opened as LP: #1999139)
+        - Use a different priority for libssl1.1/restart-services depending
+          on whether a desktop, or server dist-upgrade is being performed.
+        - Import libraries/restart-without-asking template as used by above.
+      + Add support for building with noudeb build profile.
+      + Use perl:native in the autopkgtest for installability on i386.
+
+ -- Adrien Nader <[e-mail]>  Mon, 20 Feb 2023 16:10:19 +0100
+
 openssl (3.0.8-1) unstable; urgency=medium
 
   * Import 3.0.8
@@ -300,6 +850,40 @@ openssl (3.0.7-2) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Thu, 19 Jan 2023 21:31:42 +0100
 
+openssl (3.0.7-1ubuntu1) lunar; urgency=medium
+
+  * Merge 3.0.7 from Debian unstable (LP: #1998942)
+    - Drop patches merged upstream:
+      + CVE-2022-3358.patch
+      + CVE-2022-3602-1.patch
+      + CVE-2022-3602-2.patch
+    - Shrink patch since upstream fixed some tests in the patch above:
+      + tests-use-seclevel-1.patch
+    - Drop patch since -DOPENSSL_TLS_SECURITY_LEVEL=2 is now hard-coded:
+      + Set-systemwide-default-settings-for-libssl-users.patch
+    - Drop Debian patch not needed anymore:
+      + TEST-Provide-a-default-openssl.cnf-for-tests.patch
+    - Mention Debian as defaulting to SECLEVEL=2 in addition to Ubuntu:
+      + tls1.2-min-seclevel2.patch
+    - Remaining changes:
+      + Symlink changelog{,.Debian}.gz and copyright.gz from libssl-dev to
+        openssl
+      + d/libssl3.postinst: Revert Debian deletion
+        - Skip services restart & reboot notification if needrestart is in-use.
+        - Bump version check to 1.1.1 (bug opened as LP: #1999139)
+        - Use a different priority for libssl1.1/restart-services depending
+          on whether a desktop, or server dist-upgrade is being performed.
+        - Import libraries/restart-without-asking template as used by above.
+      + Add support for building with noudeb build profile.
+      + Use perl:native in the autopkgtest for installability on i386.
+  * Correct comment as to which TLS version is disabled with our seclevel:
+    - skip_tls1.1_seclevel3_tests.patch
+
+  [Sebastian Andrzej Siewior]
+  * CVE-2022-3996 (X.509 Policy Constraints Double Locking).
+
+ -- Adrien Nader <[e-mail]>  Tue, 06 Dec 2022 15:11:40 +0100
+
 openssl (3.0.7-1) unstable; urgency=medium
 
   * Import 3.0.7
@@ -326,6 +910,53 @@ openssl (3.0.5-3) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 18 Sep 2022 21:48:05 +0200
 
+openssl (3.0.5-2ubuntu2) kinetic-security; urgency=medium
+
+  * SECURITY UPDATE: X.509 Email Address Buffer Overflow
+    - debian/patches/CVE-2022-3602-1.patch: fix off by one in punycode
+      decoder in crypto/punycode.c, test/build.info, test/punycode_test.c,
+      test/recipes/04-test_punycode.t.
+    - debian/patches/CVE-2022-3602-2.patch: ensure the result is zero
+      terminated in crypto/punycode.c.
+    - CVE-2022-3602
+  * SECURITY UPDATE: legacy custom cipher issue
+    - debian/patches/CVE-2022-3358.patch: fix usage of custom EVP_CIPHER
+      objects in crypto/evp/digest.c, crypto/evp/evp_enc.c.
+    - CVE-2022-3358
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 27 Oct 2022 13:05:01 -0400
+
+openssl (3.0.5-2ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable (LP: #1987047). Remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - d/libssl3.postinst: Revert Debian deletion
+      + Skip services restart & reboot notification if needrestart is in-use.
+      + Bump version check to to 1.1.1.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Import libraries/restart-without-asking template as used by above.
+    - Add support for building with noudeb build profile.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+      level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+      below 1.2 and update documentation. Previous default of 1, can be set
+      by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+      using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+    - Use perl:native in the autopkgtest for installability on i386.
+    - d/p/skip_tls1.1_seclevel3_tests.patch: new Ubuntu-specific patch for the
+      testsuite
+    - d/p/Set-systemwide-default-settings-for-libssl-users: partially apply it
+      on Ubuntu to make it easier for user to change security level
+  * Dropped changes, merged upstream:
+    - d/p/fix-avx512-overflow.patch: Cherry-picked from upstream to fix a 3.0.4
+      regression on AVX-512 capable CPUs.
+  * Revert the provider removal from the default configuration, following
+    discussions on LP: #1979639
+
+ -- Simon Chopin <[e-mail]>  Fri, 19 Aug 2022 10:05:04 +0200
+
 openssl (3.0.5-2) unstable; urgency=medium
 
   * Update to commit ce3951fc30c7b ("VC++ 2008 or earlier x86 compilers…")
@@ -350,6 +981,39 @@ openssl (3.0.4-2) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Fri, 24 Jun 2022 19:27:02 +0200
 
+openssl (3.0.4-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable (LP: #1979639). Remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - d/libssl3.postinst: Revert Debian deletion
+      + Skip services restart & reboot notification if needrestart is in-use.
+      + Bump version check to to 1.1.1.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Import libraries/restart-without-asking template as used by above.
+    - Add support for building with noudeb build profile.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+      level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+      below 1.2 and update documentation. Previous default of 1, can be set
+      by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+      using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+    - Use perl:native in the autopkgtest for installability on i386.
+    - d/p/skip_tls1.1_seclevel3_tests.patch: new Ubuntu-specific patch for the
+      testsuite
+    - d/p/Set-systemwide-default-settings-for-libssl-users: partially apply it
+      on Ubuntu to make it easier for user to change security level
+  * Dropped changes, merged upstream:
+    - Add some more string comparison fixes
+    - d/p/lp1947588.patch: Cherry-picked as our patches make it very easy to
+      trigger the underlying bug
+    - d/p/lp1978093/*: renew some expiring test certificates
+  * d/p/fix-avx512-overflow.patch: Cherry-picked from upstream to fix a 3.0.4
+    regression on AVX-512 capable CPUs.
+
+ -- Simon Chopin <[e-mail]>  Thu, 23 Jun 2022 12:43:23 +0200
+
 openssl (3.0.4-1) unstable; urgency=medium
 
   * Import 3.0.4
@@ -377,6 +1041,49 @@ openssl (3.0.3-6) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 04 Jun 2022 15:25:53 +0200
 
+openssl (3.0.3-5ubuntu3) kinetic; urgency=medium
+
+  * d/p/lp1978093/*: renew some expiring test certificates (LP: #1978093)
+
+ -- Simon Chopin <[e-mail]>  Thu, 09 Jun 2022 13:20:55 +0200
+
+openssl (3.0.3-5ubuntu2) kinetic; urgency=medium
+
+  * d/p/Set-systemwide-default-settings-for-libssl-users: don't comment out
+    the CipherString string to avoid an empty section.
+
+ -- Simon Chopin <[e-mail]>  Tue, 31 May 2022 13:02:15 +0200
+
+openssl (3.0.3-5ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1974035):
+    Remaining change:
+    - Replace duplicate files in the doc directory with symlinks.
+    - d/libssl3.postinst: Revert Debian deletion
+      + Skip services restart & reboot notification if needrestart is in-use.
+      + Bump version check to to 1.1.1.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Import libraries/restart-without-asking template as used by above.
+    - Add support for building with noudeb build profile.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+      level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+      below 1.2 and update documentation. Previous default of 1, can be set
+      by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+      using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+    - Use perl:native in the autopkgtest for installability on i386.
+    - d/p/skip_tls1.1_seclevel3_tests.patch: new Ubuntu-specific patch for the
+      testsuite
+  * Add some more string comparison fixes (LP: #1974037)
+  * d/p/Set-systemwide-default-settings-for-libssl-users: partially apply it on
+    Ubuntu to make it easier for user to change security level (LP: #1972056)
+  * d/p/lp1947588.patch: Cherry-picked as our patches make it very easy to
+    trigger the underlying bug (LP: #1947588)
+
+ -- Simon Chopin <[e-mail]>  Tue, 31 May 2022 09:49:54 +0200
+
 openssl (3.0.3-5) unstable; urgency=medium
 
   * Don't generate endbr32 opcodes on i386. Thanks to Wolfgang Walter
@@ -426,6 +1133,14 @@ openssl (3.0.3-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Fri, 06 May 2022 22:21:52 +0200
 
+openssl (3.0.3-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release (LP: #1968997):
+    - d/p/CVE-2022-*: dropped, present upstream
+    - d/p/c_rehash-compat.patch: refreshed
+
+ -- Simon Chopin <[e-mail]>  Thu, 05 May 2022 10:56:04 +0200
+
 openssl (3.0.2-1) experimental; urgency=medium
 
   * Import 3.0.2
@@ -434,6 +1149,40 @@ openssl (3.0.2-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 15 Mar 2022 20:54:57 +0100
 
+openssl (3.0.2-0ubuntu2) kinetic; urgency=medium
+
+  * SECURITY UPDATE: c_rehash script allows command injection
+    - debian/patches/CVE-2022-1292.patch: do not use shell to invoke
+      openssl in tools/c_rehash.in.
+    - CVE-2022-1292
+  * SECURITY UPDATE: OCSP_basic_verify may incorrectly verify the response
+    signing certificate
+    - debian/patches/CVE-2022-1343-1.patch: fix OCSP_basic_verify signer
+      certificate validation in crypto/ocsp/ocsp_vfy.c.
+    - debian/patches/CVE-2022-1343-2.patch: test ocsp with invalid
+      responses in test/recipes/80-test_ocsp.t.
+    - CVE-2022-1343
+  * SECURITY UPDATE: incorrect MAC key used in the RC4-MD5 ciphersuite
+    - debian/patches/CVE-2022-1434.patch: fix the RC4-MD5 cipher in
+      providers/implementations/ciphers/cipher_rc4_hmac_md5.c,
+      test/recipes/30-test_evp_data/evpciph_aes_stitched.txt,
+      test/recipes/30-test_evp_data/evpciph_rc4_stitched.txt.
+    - CVE-2022-1434
+  * SECURITY UPDATE: resource leakage when decoding certificates and keys
+    - debian/patches/CVE-2022-1473.patch: fix bug in OPENSSL_LH_flush in
+      crypto/lhash/lhash.c.
+    - CVE-2022-1473
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 03 May 2022 12:01:34 -0400
+
+openssl (3.0.2-0ubuntu1) jammy; urgency=medium
+
+  * New upstream bugfix release (LP: #1965141)
+  * d/p/skip_tls1.1_seclevel3_tests.patch: new Ubuntu-specific patch for the
+    testsuite
+
+ -- Simon Chopin <[e-mail]>  Wed, 16 Mar 2022 09:35:51 +0100
+
 openssl (3.0.1-1) experimental; urgency=medium
 
   * Import 3.0.1
@@ -445,6 +1194,60 @@ openssl (3.0.1-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Mon, 27 Dec 2021 11:44:50 +0100
 
+openssl (3.0.1-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release (LP: #1955026).
+    + Dropped patches, merged upstream:
+      - d/p/double-engine-load*
+      - d/p/Add-null-digest-implementation-to-the-default-provid.patch
+      - d/p/Don-t-create-an-ECX-key-with-short-keys.patch
+    + Refreshed patches:
+      - d/p/c_rehash-compat.patch
+
+ -- Simon Chopin <[e-mail]>  Thu, 16 Dec 2021 09:10:48 +0100
+
+openssl (3.0.0-1ubuntu2) jammy; urgency=medium
+
+  * Cherry-pick upstream fixes to prevent double engine loading (LP: #1951943)
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 07 Dec 2021 17:15:51 +0100
+
+openssl (3.0.0-1ubuntu1) jammy; urgency=medium
+
+  * Manual merge of version 3.0.0-1 from Debian experimental, remaining
+    changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers, unless needrestart is available.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Skip services restart & reboot notification if needrestart is in-use.
+      + Bump version check to to 1.1.1.
+      + Import libraries/restart-without-asking template as used by above.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Reword the NEWS entry, as applicable on Ubuntu.
+    - Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+      level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+      below 1.2 and update documentation. Previous default of 1, can be set
+      by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+      using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+    - Add support for building with noudeb build profile.
+  * d/p/Don-t-create-an-ECX-key-with-short-keys.patch:
+    Backported from upstream to fix a regression with short keys (LP: #1946213)
+  * d/p/Add-null-digest-implementation-to-the-default-provid.patch:
+    Backported from upstream to fix a compatibility issue with 1.1.1l
+  * Manually call dh_installdirs to fix build failure
+  * Drop some Ubuntu patches merged upstream
+    + The s390x series (00xx) has been applied upstream
+    + The lp-1927161 Intel CET series has been applied upstream
+    + CVE-2021-3449 has been fixed upstream
+    + CVE-2021-3450 doesn't apply to 3.0 branch
+  * Refresh and adapt the remaining patches
+
+ -- Simon Chopin <[e-mail]>  Mon, 20 Sep 2021 18:09:50 +0200
+
 openssl (3.0.0-1) experimental; urgency=medium
 
   * Import 3.0.0.
@@ -519,6 +1322,152 @@ openssl (3.0.0~~alpha1-1) experimental; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 25 Apr 2020 23:08:44 +0200
 
+openssl (1.1.1j-1ubuntu4) impish; urgency=medium
+
+  * Split d/p/pr12272.patch into multiple patchfiles to fix dpkg-source
+    error when attempting to build a source package, due to pr12272.patch
+    patching files multiple times within the same patch. (LP: #1927161)
+    - d/p/lp-1927161-1-x86-Add-endbranch-to-indirect-branch-targets-fo.patch
+    - d/p/lp-1927161-2-Use-swapcontext-for-Intel-CET.patch
+    - d/p/lp-1927161-3-x86-Always-generate-note-gnu-property-section-f.patch
+    - d/p/lp-1927161-4-x86_64-Always-generate-note-gnu-property-sectio.patch
+    - d/p/lp-1927161-5-x86_64-Add-endbranch-at-function-entries-for-In.patch 
+
+ -- Matthew Ruffell <[e-mail]>  Wed, 05 May 2021 11:49:27 +1200
+
+openssl (1.1.1j-1ubuntu3) hirsute; urgency=medium
+
+  * SECURITY UPDATE: NULL pointer deref in signature_algorithms processing
+    - debian/patches/CVE-2021-3449-1.patch: fix NULL pointer dereference in
+      ssl/statem/extensions.c.
+    - debian/patches/CVE-2021-3449-2.patch: teach TLSProxy how to encrypt
+      <= TLSv1.2 ETM records in util/perl/TLSProxy/Message.pm.
+    - debian/patches/CVE-2021-3449-3.patch: add a test to
+      test/recipes/70-test_renegotiation.t.
+    - debian/patches/CVE-2021-3449-4.patch: ensure buffer/length pairs are
+      always in sync in ssl/s3_lib.c, ssl/ssl_lib.c,
+      ssl/statem/extensions.c, ssl/statem/extensions_clnt.c,
+      ssl/statem/statem_clnt.c, ssl/statem/statem_srvr.c.
+    - CVE-2021-3449
+  * SECURITY UPDATE: CA cert check bypass with X509_V_FLAG_X509_STRICT
+    - debian/patches/CVE-2021-3450-1.patch: do not override error return
+      value by check_curve in crypto/x509/x509_vfy.c,
+      test/verify_extra_test.c.
+    - debian/patches/CVE-2021-3450-2.patch: fix return code check in
+      crypto/x509/x509_vfy.c.
+    - CVE-2021-3450
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 25 Mar 2021 11:44:30 -0400
+
+openssl (1.1.1j-1ubuntu2) hirsute; urgency=medium
+
+  * No-change upload to pick up lto.
+
+ -- Matthias Klose <[e-mail]>  Tue, 23 Mar 2021 15:24:20 +0100
+
+openssl (1.1.1j-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers, unless needrestart is available.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Skip services restart & reboot notification if needrestart is in-use.
+      + Bump version check to to 1.1.1.
+      + Import libraries/restart-without-asking template as used by above.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Reword the NEWS entry, as applicable on Ubuntu.
+    - Cherrypick s390x SIMD acceleration patches for poly1305 and chacha20
+      and ECC from master.
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+      level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+      below 1.2 and update documentation. Previous default of 1, can be set
+      by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+      using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+    - Import https://github.com/openssl/openssl/pull/12272.patch to enable
+      CET.
+  * Add support for building with noudeb build profile.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 23 Feb 2021 22:01:12 +0000
+
+openssl (1.1.1j-1) unstable; urgency=medium
+
+  * New upstream version.
+   - CVE-2021-23841 (NULL pointer deref in X509_issuer_and_serial_hash()).
+   - CVE-2021-23840 (Possible overflow of the output length argument in
+     EVP_CipherUpdate(), EVP_EncryptUpdate() and EVP_DecryptUpdate()).
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 16 Feb 2021 20:50:01 +0100
+
+openssl (1.1.1i-3ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Feb 2021 10:35:47 +0100
+
+openssl (1.1.1i-3ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers, unless needrestart is available.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Skip services restart & reboot notification if needrestart is in-use.
+      + Bump version check to to 1.1.1.
+      + Import libraries/restart-without-asking template as used by above.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Reword the NEWS entry, as applicable on Ubuntu.
+    - Cherrypick s390x SIMD acceleration patches for poly1305 and chacha20
+      and ECC from master.
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+      level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+      below 1.2 and update documentation. Previous default of 1, can be set
+      by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+      using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+    - Import https://github.com/openssl/openssl/pull/12272.patch to enable
+      CET.
+
+  * Drop many patches included upstream.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 08 Feb 2021 11:08:21 +0000
+
+openssl (1.1.1i-3) unstable; urgency=medium
+
+  * Cherry-pick a patch from upstream to address #13931.
+  * Enable LFS. Thanks to Dan Nicholson for debugging (Closes: #923479).
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 30 Jan 2021 14:06:46 +0100
+
+openssl (1.1.1i-2) unstable; urgency=medium
+
+  * Apply two patches from upstream to address x509 related regressions.
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 17 Jan 2021 20:08:26 +0100
+
+openssl (1.1.1i-1) unstable; urgency=medium
+
+  * New upstream version.
+    - CVE-2020-1971 (EDIPARTYNAME NULL pointer de-reference).
+    - Restore rejection of expired trusted (root) certificate
+      (Closes: #976465).
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 08 Dec 2020 20:32:32 +0100
+
+openssl (1.1.1h-1) unstable; urgency=medium
+
+  * New upstream version
+  * Disable CAPI engine, it is designed for Windows.
+
+ -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 11 Oct 2020 00:00:47 +0200
+
 openssl (1.1.1g-1) unstable; urgency=medium
 
   * New upstream version
@@ -526,6 +1475,87 @@ openssl (1.1.1g-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 21 Apr 2020 21:45:21 +0200
 
+openssl (1.1.1f-1ubuntu5) hirsute; urgency=medium
+
+  * SECURITY UPDATE: EDIPARTYNAME NULL pointer de-ref
+    - debian/patches/CVE-2020-1971-1.patch: use explicit tagging for
+      DirectoryString in crypto/x509v3/v3_genn.c.
+    - debian/patches/CVE-2020-1971-2.patch: correctly compare EdiPartyName
+      in crypto/x509v3/v3_genn.c.
+    - debian/patches/CVE-2020-1971-3.patch: check that multi-strings/CHOICE
+      types don't use implicit tagging in crypto/asn1/asn1_err.c,
+      crypto/asn1/tasn_dec.c, crypto/err/openssl.txt,
+      include/openssl/asn1err.h.
+    - debian/patches/CVE-2020-1971-4.patch: complain if we are attempting
+      to encode with an invalid ASN.1 template in crypto/asn1/asn1_err.c,
+      crypto/asn1/tasn_enc.c, crypto/err/openssl.txt,
+      include/openssl/asn1err.h.
+    - debian/patches/CVE-2020-1971-5.patch: add a test for GENERAL_NAME_cmp
+      in test/v3nametest.c.
+    - debian/patches/CVE-2020-1971-6.patch: add a test for
+      encoding/decoding using an invalid ASN.1 Template in
+      test/asn1_decode_test.c, test/asn1_encode_test.c.
+    - CVE-2020-1971
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 08 Dec 2020 12:33:52 -0500
+
+openssl (1.1.1f-1ubuntu4) groovy; urgency=medium
+
+  * Cherrypick upstream fix for non-interactive detection on Linux. LP:
+    #1879826
+  * Cherrypick AES CTR-DRGB: performance improvement LP: #1799928
+  * Skip services restart & reboot notification if needrestart is in-use
+    LP: #1895708
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 15 Sep 2020 18:04:36 +0100
+
+openssl (1.1.1f-1ubuntu3) groovy; urgency=medium
+
+  * Import https://github.com/openssl/openssl/pull/12272.patch to enable
+    CET.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 25 Jun 2020 14:18:43 +0100
+
+openssl (1.1.1f-1ubuntu2) focal; urgency=medium
+
+  * SECURITY UPDATE: Segmentation fault in SSL_check_chain
+    - debian/patches/CVE-2020-1967-1.patch: add test for CVE-2020-1967 in
+      test/recipes/70-test_sslsigalgs.t.
+    - debian/patches/CVE-2020-1967-2.patch: fix NULL dereference in
+      SSL_check_chain() for TLS 1.3 in ssl/t1_lib.c.
+    - debian/patches/CVE-2020-1967-3.patch: fix test in
+      test/recipes/70-test_sslsigalgs.t.
+    - debian/patches/CVE-2020-1967-4.patch: fix test in
+      test/recipes/70-test_sslsigalgs.t.
+    - CVE-2020-1967
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 20 Apr 2020 07:53:50 -0400
+
+openssl (1.1.1f-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Bump version check to to 1.1.1.
+      + Import libraries/restart-without-asking template as used by above.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Reword the NEWS entry, as applicable on Ubuntu.
+    - Cherrypick s390x SIMD acceleration patches for poly1305 and chacha20
+      and ECC from master.
+    - Use perl:native in the autopkgtest for installability on i386.
+    - Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+      level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+      below 1.2 and update documentation. Previous default of 1, can be set
+      by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+      using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 03 Apr 2020 18:31:00 +0100
+
 openssl (1.1.1f-1) unstable; urgency=medium
 
   * New upstream version
@@ -546,6 +1576,50 @@ openssl (1.1.1e-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Wed, 18 Mar 2020 20:59:39 +0100
 
+openssl (1.1.1d-2ubuntu6) focal; urgency=medium
+
+  * Revert version number change to 1.1.1e-dev.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 06 Mar 2020 04:08:51 +0000
+
+openssl (1.1.1d-2ubuntu4) focal; urgency=medium
+
+  * Apply 1_1_1-stable branch patches
+  * Apply s390x ECC assembly pack improvements
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 26 Feb 2020 21:54:47 +0000
+
+openssl (1.1.1d-2ubuntu3) focal; urgency=medium
+
+  * Use perl:native in the autopkgtest for installability on i386.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 16 Jan 2020 14:15:26 +0000
+
+openssl (1.1.1d-2ubuntu2) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+      + Bump version check to to 1.1.1.
+      + Import libraries/restart-without-asking template as used by above.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Reword the NEWS entry, as applicable on Ubuntu.
+    - Cherrypick s390x SIMD acceleration patches for poly1305 and chacha20
+      from master.
+
+  * Set OPENSSL_TLS_SECURITY_LEVEL=2 as compiled-in minimum security
+    level. Change meaning of SECURITY_LEVEL=2 to prohibit TLS versions
+    below 1.2 and update documentation. Previous default of 1, can be set
+    by calling SSL_CTX_set_security_level(), SSL_set_security_level() or
+    using ':@SECLEVEL=1' CipherString value in openssl.cfg.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 08 Jan 2020 17:17:41 +0000
+
 openssl (1.1.1d-2) unstable; urgency=medium
 
   * Reenable AES-CBC-HMAC-SHA ciphers (Closes: #941987).
@@ -564,6 +1638,47 @@ openssl (1.1.1d-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 14 Sep 2019 00:38:12 +0200
 
+openssl (1.1.1c-1ubuntu4) eoan; urgency=medium
+
+  * Cherrypick s390x SIMD acceleration patches for poly1305 and chacha20
+    from master. LP: #1736705 LP: #1736704
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 20 Aug 2019 12:46:33 +0100
+
+openssl (1.1.1c-1ubuntu3) eoan; urgency=medium
+
+  * Import libraries/restart-without-asking as used in postinst, to
+    prevent failure to configure the package without debconf database. LP:
+    #1832919
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 20 Jun 2019 17:59:55 +0100
+
+openssl (1.1.1c-1ubuntu2) eoan; urgency=medium
+
+  * Bump major version of OpenSSL in postinst to trigger services restart
+    upon upgrade. Many services listed there must be restarted when
+    upgrading 1.1.0 to 1.1.1. LP: #1832522
+  * Fix path to Xorg for reboot notifications on desktop. LP: #1832421
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 13 Jun 2019 15:29:07 +0100
+
+openssl (1.1.1c-1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Drop the NEWS entry, not applicable on Ubuntu.
+  * Cherrypick upstream patch to fix ca -spkac output to be text again
+    LP: #1828215
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 10 Jun 2019 18:11:35 +0100
+
 openssl (1.1.1c-1) unstable; urgency=medium
 
   * New upstream version
@@ -572,6 +1687,21 @@ openssl (1.1.1c-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Thu, 30 May 2019 17:27:48 +0200
 
+openssl (1.1.1b-2ubuntu1) devel; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Drop the NEWS entry, not applicable on Ubuntu.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 17 Apr 2019 17:26:42 +0100
+
 openssl (1.1.1b-2) unstable; urgency=medium
 
   * Fix BUF_MEM regression (Closes: #923516)
@@ -580,6 +1710,33 @@ openssl (1.1.1b-2) unstable; urgency=medium
 
  -- Kurt Roeckx <[e-mail]>  Tue, 16 Apr 2019 21:31:11 +0200
 
+openssl (1.1.1b-1ubuntu2) disco; urgency=medium
+
+  * debian/rules: Ship openssl.cnf in libssl1.1-udeb, as required to use
+    OpenSSL by other udebs, e.g. wget-udeb. LP: #1822898
+
+  * Drop debian/patches/UBUNTU-lower-tls-security-level-for-compat.patch
+    to revert TLS_SECURITY_LEVEL back to 1. LP: #1822984
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 03 Apr 2019 11:50:23 +0100
+
+openssl (1.1.1b-1ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Further decrease security level from 1 to 0, for compatibility with
+      openssl 1.0.2.
+    - Drop the NEWS entry, not applicable on Ubuntu.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 27 Feb 2019 18:13:17 -0500
+
 openssl (1.1.1b-1) unstable; urgency=medium
 
   [ Sebastian Andrzej Siewior ]
@@ -591,6 +1748,28 @@ openssl (1.1.1b-1) unstable; urgency=medium
 
  -- Kurt Roeckx <[e-mail]>  Tue, 26 Feb 2019 19:52:12 +0100
 
+openssl (1.1.1a-1ubuntu2) disco; urgency=medium
+
+  * Drop the NEWS entry, not applicable on Ubuntu.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 28 Nov 2018 14:24:28 +0000
+
+openssl (1.1.1a-1ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Further decrease security level from 1 to 0, for compatibility with
+      openssl 1.0.2.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 28 Nov 2018 14:06:04 +0000
+
 openssl (1.1.1a-1) unstable; urgency=medium
 
   * Add Breaks on python-boto (See: #909545)
@@ -614,6 +1793,28 @@ openssl (1.1.1-2) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 28 Oct 2018 23:52:24 +0100
 
+openssl (1.1.1-1ubuntu2) cosmic; urgency=medium
+
+  * Fixup typpos in the autopkgtest binary name.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 25 Sep 2018 15:41:07 +0100
+
+openssl (1.1.1-1ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Replace duplicate files in the doc directory with symlinks.
+    - debian/libssl1.1.postinst:
+      + Display a system restart required notification on libssl1.1
+        upgrade on servers.
+      + Use a different priority for libssl1.1/restart-services depending
+        on whether a desktop, or server dist-upgrade is being performed.
+    - Revert "Enable system default config to enforce TLS1.2 as a
+      minimum" & "Increase default security level from 1 to 2".
+    - Further decrease security level from 1 to 0, for compatibility with
+      openssl 1.0.2.
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 17 Sep 2018 13:24:38 +0100
+
 openssl (1.1.1-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 5d0a1d4..848aa19 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: openssl
 Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.22.5), libzstd-dev, zlib1g-dev
 Section: utils
 Priority: optional
-Maintainer: Debian OpenSSL Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OpenSSL Team <[e-mail]>
 Uploaders: Christoph Martin <[e-mail]>, Kurt Roeckx <[e-mail]>, Sebastian Andrzej Siewior <[e-mail]>
 Standards-Version: 4.7.2
 Vcs-Browser: https://salsa.debian.org/debian/openssl
@@ -46,29 +47,13 @@ Description: Secure Sockets Layer toolkit - cryptographic utility
  the cryptography community, or something similar.
  For details see OSSL_PROVIDER-legacy man page.
 
-Package: openssl-provider-fips
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Secure Sockets Layer toolkit - cryptographic utility
- This package is part of the OpenSSL project's implementation of the SSL
- and TLS cryptographic protocols for secure communication over the
- Internet.
- .
- This package contains the FIPS provider. The OpenSSL FIPS provider is a
- special provider that conforms to the Federal Information Processing Standards
- (FIPS) specified in FIPS 140-2. This 'module' contains an approved set of
- cryptographic algorithms that is validated by an accredited testing
- laboratory.
- For details see OSSL_PROVIDER-fips and fips_module man page.
-
 Package: libssl3t64
 Provides: ${t64:Provides}
 Replaces: libssl3
 Section: libs
 Architecture: any
 Multi-Arch: same
-Breaks: libssl3 (<< ${source:Version}), openssh-client (<< 1:9.4p1), openssh-server (<< 1:9.4p1), python3-m2crypto (<< 0.38.0-4), freeradius (<< 3.2.7+dfsg-1+deb13u1)
+Breaks: libssl3 (<< ${source:Version}), openssh-client (<< 1:9.4p1), openssh-server (<< 1:9.4p1), python3-m2crypto (<< 0.38.0-4)
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, openssl-provider-legacy
 Description: Secure Sockets Layer toolkit - shared libraries
diff --git a/debian/gbp.conf b/debian/gbp.conf
index fa8005e..ac60d92 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 dist = DEP14
 upstream-branch = upstream/openssl-3.5
-debian-branch = debian/trixie
+debian-branch = debian/unstable
 debian-tag = debian/openssl-%(version)s
 id-length = 12
 abbrev = 12
diff --git a/debian/patches/default-configuration-read-dropins-and-crypto-config.patch b/debian/patches/default-configuration-read-dropins-and-crypto-config.patch
new file mode 100644
index 0000000..def5ee9
--- /dev/null
+++ b/debian/patches/default-configuration-read-dropins-and-crypto-config.patch
@@ -0,0 +1,30 @@
+From 3776c4a41e268d7733e3476743d8104e48477c52 Mon Sep 17 00:00:00 2001
+From: Adrien Nader <[e-mail]>
+Date: Mon, 1 Jul 2024 16:49:06 +0200
+Subject: [PATCH] configuration: read crypto-config and /etc/ssl/openssl.conf.d
+ dropins
+Forwarded: not-needed
+Last-Update: 2024/07/01
+
+Append two .include directives to the default configuration in order to
+integrate with the crypto-config framework and to allow easier
+configuration by sysadmins.
+
+---
+ apps/openssl.cnf | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/apps/openssl.cnf b/apps/openssl.cnf
+index 2833b6f30..175fc5897 100644
+--- a/apps/openssl.cnf
++++ b/apps/openssl.cnf
+@@ -388,3 +388,6 @@ oldcert = $insta::certout # insta.cert.pem
+ # Certificate revocation
+ cmd = rr
+ oldcert = $insta::certout # insta.cert.pem
++
++.include /var/lib/crypto-config/profiles/current/openssl.conf.d
++.include /etc/ssl/openssl.conf.d
+-- 
+2.40.1
+
diff --git a/debian/patches/fips/apps-pass-propquery-arg-to-the-libctx-DRBG-fetches.patch b/debian/patches/fips/apps-pass-propquery-arg-to-the-libctx-DRBG-fetches.patch
new file mode 100644
index 0000000..fce1415
--- /dev/null
+++ b/debian/patches/fips/apps-pass-propquery-arg-to-the-libctx-DRBG-fetches.patch
@@ -0,0 +1,38 @@
+From: Chris Coulson <[e-mail]>
+Date: Thu, 13 Oct 2022 00:02:26 +0100
+Subject: apps: pass -propquery arg to the libctx DRBG fetches
+
+Forwarded: no
+Applied-Upstream: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/2056593
+
+The -propquery argument might be used to define a preference for which provider
+an algorithm is fetched from. Set the query properties for the library context
+DRBG fetches as well so that they are fetched with the same properties.
+---
+ apps/lib/app_libctx.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/apps/lib/app_libctx.c b/apps/lib/app_libctx.c
+index 4b9ec40e8527..d1c9909165b4 100644
+--- a/apps/lib/app_libctx.c
++++ b/apps/lib/app_libctx.c
+@@ -6,6 +6,7 @@
+  * in the file LICENSE in the source distribution or at
+  * https://www.openssl.org/source/license.html
+  */
++#include <openssl/rand.h>
+ #include "app_libctx.h"
+ #include "apps.h"
+ 
+@@ -15,6 +16,10 @@ static const char *app_propq = NULL;
+ int app_set_propq(const char *arg)
+ {
+     app_propq = arg;
++    if (!RAND_set_DRBG_type(app_libctx, NULL, arg, NULL, NULL))
++        return 0;
++    if (!RAND_set_seed_source_type(app_libctx, NULL, arg))
++        return 0;
+     return 1;
+ }
+ 
diff --git a/debian/patches/fips/apps-speed-Omit-unavailable-algorithms-in-FIPS-mode.patch b/debian/patches/fips/apps-speed-Omit-unavailable-algorithms-in-FIPS-mode.patch
new file mode 100644
index 0000000..b2cca08
--- /dev/null
+++ b/debian/patches/fips/apps-speed-Omit-unavailable-algorithms-in-FIPS-mode.patch
@@ -0,0 +1,130 @@
+From: Chris Coulson <[e-mail]>
+Date: Thu, 21 Apr 2022 13:11:18 +0100
+Subject: apps/speed: Omit unavailable algorithms in FIPS mode
+
+Forwarded: no
+Applied-Upstream: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/2056593
+---
+ apps/speed.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 66 insertions(+)
+
+diff --git a/apps/speed.c b/apps/speed.c
+index 57aeb67bf..97a593912 100644
+--- a/apps/speed.c
++++ b/apps/speed.c
+@@ -1851,6 +1851,9 @@ int speed_main(int argc, char **argv)
+     OPENSSL_assert(strcmp(sm2_choices[SM2_NUM - 1].name, "curveSM2") == 0);
+ #endif
+ 
++    if (EVP_default_properties_is_fips_enabled(app_get0_libctx()))
++        evp_mac_mdname = "sha1";
++
+     prog = opt_init(argc, argv, speed_options);
+     while ((o = opt_next()) != OPT_EOF) {
+         switch (o) {
+@@ -2123,6 +2126,8 @@ int speed_main(int argc, char **argv)
+         if (strcmp(algo, "des") == 0) {
+             doit[D_CBC_DES] = doit[D_EDE3_DES] = 1;
+             algo_found = 1;
++            if (EVP_default_properties_is_fips_enabled(app_get0_libctx()))
++                doit[D_CBC_DES] = 0;
+         }
+         if (strcmp(algo, "sha") == 0) {
+             doit[D_SHA1] = doit[D_SHA256] = doit[D_SHA512] = 1;
+@@ -2136,6 +2141,8 @@ int speed_main(int argc, char **argv)
+             if (algo[sizeof("rsa") - 1] == '\0') {
+                 memset(rsa_doit, 1, sizeof(rsa_doit));
+                 algo_found = 1;
++                if (EVP_default_properties_is_fips_enabled(app_get0_libctx()))
++                    rsa_doit[R_RSA_512] = rsa_doit[R_RSA_1024] = 0;
+             }
+             if (opt_found(algo, rsa_choices, &i)) {
+                 rsa_doit[i] = 1;
+@@ -2158,6 +2165,10 @@ int speed_main(int argc, char **argv)
+             if (algo[sizeof("dsa") - 1] == '\0') {
+                 memset(dsa_doit, 1, sizeof(dsa_doit));
+                 algo_found = 1;
++                /* R_DSA_512 and R_DSA_1024 should be disabled in FIPS mode,
++                 * but actually, none of the DSA benchmarks work because the
++                 * compiled-in keys fail the necessary checks. Just return an
++                 * error if the DSA benchmarks are invoked explicitly. */
+             }
+             if (opt_found(algo, dsa_choices, &i)) {
+                 dsa_doit[i] = 2;
+@@ -2176,6 +2187,18 @@ int speed_main(int argc, char **argv)
+             if (algo[sizeof("ecdsa") - 1] == '\0') {
+                 memset(ecdsa_doit, 1, sizeof(ecdsa_doit));
+                 algo_found = 1;
++                if (EVP_default_properties_is_fips_enabled(app_get0_libctx())) {
++                    ecdsa_doit[R_EC_P160] = ecdsa_doit[R_EC_P192] = 0;
++#ifndef OPENSSL_NO_EC2M
++                    ecdsa_doit[R_EC_K163] = ecdsa_doit[R_EC_B163] = 0;
++#endif
++                    ecdsa_doit[R_EC_BRP256R1] =
++                        ecdsa_doit[R_EC_BRP256T1] =
++                        ecdsa_doit[R_EC_BRP384R1] =
++                        ecdsa_doit[R_EC_BRP384T1] =
++                        ecdsa_doit[R_EC_BRP512R1] =
++                        ecdsa_doit[R_EC_BRP512T1] = 0;
++                }
+             }
+             if (opt_found(algo, ecdsa_choices, &i)) {
+                 ecdsa_doit[i] = 2;
+@@ -2186,6 +2209,18 @@ int speed_main(int argc, char **argv)
+             if (algo[sizeof("ecdh") - 1] == '\0') {
+                 memset(ecdh_doit, 1, sizeof(ecdh_doit));
+                 algo_found = 1;
++                if (EVP_default_properties_is_fips_enabled(app_get0_libctx())) {
++                    ecdh_doit[R_EC_P160] = ecdh_doit[R_EC_P192] = 0;
++#ifndef OPENSSL_NO_EC2M
++                    ecdh_doit[R_EC_K163] = ecdh_doit[R_EC_B163] = 0;
++#endif
++                    ecdh_doit[R_EC_BRP256R1] =
++                        ecdh_doit[R_EC_BRP256T1] =
++                        ecdh_doit[R_EC_BRP384R1] =
++                        ecdh_doit[R_EC_BRP384T1] =
++                        ecdh_doit[R_EC_BRP512R1] =
++                        ecdh_doit[R_EC_BRP512T1] = 0;
++                }
+             }
+             if (opt_found(algo, ecdh_choices, &i)) {
+                 ecdh_doit[i] = 2;
+@@ -2394,6 +2429,37 @@ int speed_main(int argc, char **argv)
+         do_kems = 1;
+         memset(sigs_doit, 1, sizeof(sigs_doit));
+         do_sigs = 1;
++        if (EVP_default_properties_is_fips_enabled(app_get0_libctx())) {
++            rsa_doit[R_RSA_512] = rsa_doit[R_RSA_1024] = 0;
++
++            memset(dsa_doit, 0, sizeof(dsa_doit));
++
++            ecdsa_doit[R_EC_P160] = ecdsa_doit[R_EC_P192] = 0;
++#ifndef OPENSSL_NO_EC2M
++            ecdsa_doit[R_EC_K163] = ecdsa_doit[R_EC_B163] = 0;
++#endif
++            ecdsa_doit[R_EC_BRP256R1] =
++                ecdsa_doit[R_EC_BRP256T1] =
++                ecdsa_doit[R_EC_BRP384R1] =
++                ecdsa_doit[R_EC_BRP384T1] =
++                ecdsa_doit[R_EC_BRP512R1] =
++                ecdsa_doit[R_EC_BRP512T1] = 0;
++
++            ecdh_doit[R_EC_P160] = ecdh_doit[R_EC_P192] = 0;
++#ifndef OPENSSL_NO_EC2M
++            ecdh_doit[R_EC_K163] = ecdh_doit[R_EC_B163] = 0;
++#endif
++            ecdh_doit[R_EC_BRP256R1] =
++                ecdh_doit[R_EC_BRP256T1] =
++                ecdh_doit[R_EC_BRP384R1] =
++                ecdh_doit[R_EC_BRP384T1] =
++                ecdh_doit[R_EC_BRP512R1] =
++                ecdh_doit[R_EC_BRP512T1] = 0;
++
++#ifndef OPENSSL_NO_SM2
++            memset(sm2_doit, 0, sizeof(sm2_doit));
++#endif
++        }
+     }
+     for (i = 0; i < ALGOR_NUM; i++)
+         if (doit[i])
diff --git a/debian/patches/fips/crypto-Add-kernel-FIPS-mode-detection.patch b/debian/patches/fips/crypto-Add-kernel-FIPS-mode-detection.patch
new file mode 100644
index 0000000..bb2cd65
--- /dev/null
+++ b/debian/patches/fips/crypto-Add-kernel-FIPS-mode-detection.patch
@@ -0,0 +1,158 @@
+From: Chris Coulson <[e-mail]>
+Date: Thu, 14 Apr 2022 14:57:44 +0100
+Subject: crypto: Add kernel FIPS mode detection
+
+Forwarded: no
+Applied-Upstream: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/2056593
+
+This adds a new internal API to determine whether the kernel has been booted
+in FIPS mode. This can be overridden with the OPENSSL_FORCE_FIPS_MODE
+environment variable. OPENSSL_FIPS_MODE_SWITCH_PATH can be used to specify an
+alternative path for the fips_enabled file and is used in tests.
+The FIPS_MODULE switch can be used to enable build of the the FIPS provider
+module specific parts which are not needed in the OpenSSL library itself.
+---
+ crypto/build.info  |  2 +-
+ crypto/context.c   | 20 ++++++++++++++++++++
+ crypto/fips_mode.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ crypto/fips_mode.h | 17 +++++++++++++++++
+ 4 files changed, 84 insertions(+), 1 deletion(-)
+ create mode 100644 crypto/fips_mode.c
+ create mode 100644 crypto/fips_mode.h
+
+diff --git a/crypto/build.info b/crypto/build.info
+index 2d5b22fcf..60d7f0467 100644
+--- a/crypto/build.info
++++ b/crypto/build.info
+@@ -107,7 +107,7 @@ SOURCE[../libcrypto]=$UTIL_COMMON \
+         comp_methods.c cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c \
+         o_dir.c o_fopen.c getenv.c o_init.c init.c trace.c provider.c \
+         provider_child.c punycode.c passphrase.c sleep.c deterministic_nonce.c \
+-        quic_vlint.c time.c defaults.c ssl_err.c
++        quic_vlint.c time.c defaults.c ssl_err.c fips_mode.c
+ SOURCE[../providers/libfips.a]=$UTIL_COMMON
+ 
+ SOURCE[../libcrypto]=$UPLINKSRC
+diff --git a/crypto/context.c b/crypto/context.c
+index 33d52a964..508bec91e 100644
+--- a/crypto/context.c
++++ b/crypto/context.c
+@@ -18,6 +18,11 @@
+ #include "crypto/decoder.h"
+ #include "crypto/context.h"
+ 
++#ifndef FIPS_MODULE
++# include "crypto/evp.h"
++# include "fips_mode.h"
++#endif
++
+ struct ossl_lib_ctx_st {
+     CRYPTO_RWLOCK *lock;
+     OSSL_EX_DATA_GLOBAL global;
+@@ -79,15 +84,30 @@ int ossl_lib_ctx_is_child(OSSL_LIB_CTX *ctx)
+     return ctx->ischild;
+ }
+ 
++#if !defined(FIPS_MODULE)
++static CRYPTO_ONCE init_fips = CRYPTO_ONCE_STATIC_INIT;
++
++DEFINE_RUN_ONCE_STATIC(do_init_fips)
++{
++    ossl_init_fips();
++    return 1;
++}
++#endif
++
+ static void context_deinit_objs(OSSL_LIB_CTX *ctx);
+ 
+ static int context_init(OSSL_LIB_CTX *ctx)
+ {
+     int exdata_done = 0;
+ 
+     if (!CRYPTO_THREAD_init_local(&ctx->rcu_local_key, NULL))
+         return 0;
+ 
++#if !defined(FIPS_MODULE)
++    if (!RUN_ONCE(&init_fips, do_init_fips))
++        return 0;
++#endif
++
+     ctx->lock = CRYPTO_THREAD_lock_new();
+     if (ctx->lock == NULL)
+         goto err;
+diff --git a/crypto/fips_mode.c b/crypto/fips_mode.c
+new file mode 100644
+index 000000000000..0131075ed764
+--- /dev/null
++++ b/crypto/fips_mode.c
+@@ -0,0 +1,46 @@
++#define _GNU_SOURCE
++#include <errno.h>
++#include <fcntl.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include "fips_mode.h"
++
++#define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled"
++
++static int fips_mode;
++
++int ossl_fips_mode(void)
++{
++    return fips_mode;
++}
++
++void ossl_init_fips(void)
++{
++    const char *switch_path = FIPS_MODE_SWITCH_FILE;
++    char *v;
++    char c;
++    int fd;
++
++    if ((v = secure_getenv("OPENSSL_FORCE_FIPS_MODE")) != NULL) {
++        fips_mode = strcmp(v, "0") == 0 ? 0 : 1;
++        return;
++    }
++
++    if ((v = secure_getenv("OPENSSL_FIPS_MODE_SWITCH_PATH")) != NULL) {
++        switch_path = v;
++    }
++
++    fd = open(switch_path, O_RDONLY);
++    if (fd < 0) {
++        fips_mode = 0;
++        return;
++    }
++
++    while (read(fd, &c, sizeof(c)) < 0 && errno == EINTR);
++    close(fd);
++
++    fips_mode = c == '1' ? 1 : 0;
++}
+diff --git a/crypto/fips_mode.h b/crypto/fips_mode.h
+new file mode 100644
+index 000000000000..5f0607ba9d70
+--- /dev/null
++++ b/crypto/fips_mode.h
+@@ -0,0 +1,17 @@
++/*
++ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
++ *
++ * Licensed under 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
++ */
++
++#ifndef OSSL_FIPS_MODE_H
++# define OSSL_FIPS_MODE_H
++# pragma once
++
++int ossl_fips_mode(void);
++void ossl_init_fips(void);
++
++#endif
diff --git a/debian/patches/fips/crypto-Automatically-use-the-FIPS-provider-when-the-kerne.patch b/debian/patches/fips/crypto-Automatically-use-the-FIPS-provider-when-the-kerne.patch
new file mode 100644
index 0000000..648e77c
--- /dev/null
+++ b/debian/patches/fips/crypto-Automatically-use-the-FIPS-provider-when-the-kerne.patch
@@ -0,0 +1,472 @@
+From bad1e625197d002a3588723f81b92b3349baef17 Mon Sep 17 00:00:00 2001
+From: Chris Coulson <[e-mail]>
+Date: Fri, 21 Jun 2024 13:58:24 +0200
+Subject: [PATCH] crypto: Automatically use the FIPS provider when the kernel
+ is booted in FIPS mode
+
+Forwarded: no
+Applied-Upstream: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/2056593
+
+This automatically configures all library contexts to use the FIPS provider when
+the kernel is booted in FIPS mode by:
+- Setting "fips=yes" as the default property for algorithm fetches
+- Loading and activating the FIPS provider as the fallback provider.
+
+If applications load providers via a configuration either because the default
+configuration is modified or they override the default configuration, this
+disables loading of the fallback providers. In this case, the configuration
+must load the FIPS provider when FIPS mode is enabled, else algorithm fetches
+will fail
+
+Applications can choose to use non-FIPS approved algorithms by specifying the
+"-fips" or "fips=no" property for algorithm fetches and loading the default
+provider.
+---
+ crypto/context.c                              |   5 +
+ crypto/provider_core.c                        |   4 +-
+ crypto/provider_local.h                       |   2 +-
+ crypto/provider_predefined.c                  |  25 ++++-
+ doc/man3/EVP_set_default_properties.pod       |   3 +-
+ doc/man5/config.pod                           |   8 +-
+ doc/man7/OSSL_PROVIDER-default.pod            |   7 +-
+ doc/man7/fips_module.pod                      |  15 +++
+ .../ossl-guide-libraries-introduction.pod     |  28 ++++-
+ test/build.info                               |   6 +-
+ test/fips_auto_enable_test.c                  | 106 ++++++++++++++++++
+ test/recipes/04-test_auto_fips_mode.t         |  50 +++++++++
+ test/recipes/04-test_auto_fips_mode/off       |   1 +
+ test/recipes/04-test_auto_fips_mode/on        |   1 +
+ test/run_tests.pl                             |   1 +
+ 15 files changed, 246 insertions(+), 16 deletions(-)
+ create mode 100644 test/fips_auto_enable_test.c
+ create mode 100644 test/recipes/04-test_auto_fips_mode.t
+ create mode 100644 test/recipes/04-test_auto_fips_mode/off
+ create mode 100644 test/recipes/04-test_auto_fips_mode/on
+
+--- a/crypto/context.c
++++ b/crypto/context.c
+@@ -237,6 +237,11 @@
+     ctx->comp_methods = ossl_load_builtin_compressions();
+ #endif
+ 
++#if !defined(FIPS_MODULE)
++    if (ossl_fips_mode() == 1 && !evp_default_properties_enable_fips_int(ctx, 1, 0))
++        goto err;
++#endif
++
+     return 1;
+ 
+  err:
+--- a/crypto/provider_core.c
++++ b/crypto/provider_core.c
+@@ -534,7 +534,7 @@
+         int chosen = 0;
+ 
+         /* Check if this is a predefined builtin provider */
+-        for (p = ossl_predefined_providers; p->name != NULL; p++) {
++        for (p = ossl_predefined_providers(); p->name != NULL; p++) {
+             if (strcmp(p->name, name) != 0)
+                 continue;
+             /* These compile-time templates always have NULL parameters */
+@@ -1456,7 +1456,7 @@
+         return 1;
+     }
+ 
+-    for (p = ossl_predefined_providers; p->name != NULL; p++) {
++    for (p = ossl_predefined_providers(); p->name != NULL; p++) {
+         OSSL_PROVIDER *prov = NULL;
+         OSSL_PROVIDER_INFO *info = store->provinfo;
+         STACK_OF(INFOPAIR) *params = NULL;
+@@ -1508,6 +1508,10 @@
+     }
+  err:
+     CRYPTO_THREAD_unlock(store->lock);
++    if (!ret)
++        fprintf(stderr, "While loading \"%s\" provider: %s\n",
++            (p != NULL ? p->name : "<unknown>"),
++            ERR_error_string(ERR_peek_last_error(), NULL));
+     return ret;
+ }
+ 
+--- a/crypto/provider_local.h
++++ b/crypto/provider_local.h
+@@ -23,7 +23,7 @@
+     unsigned int is_fallback:1;
+ } OSSL_PROVIDER_INFO;
+ 
+-extern const OSSL_PROVIDER_INFO ossl_predefined_providers[];
++const OSSL_PROVIDER_INFO *ossl_predefined_providers(void);
+ 
+ void ossl_provider_info_clear(OSSL_PROVIDER_INFO *info);
+ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
+--- a/crypto/provider_predefined.c
++++ b/crypto/provider_predefined.c
+@@ -9,6 +9,9 @@
+ 
+ #include <openssl/core.h>
+ #include "provider_local.h"
++#if !defined(FIPS_MODULE)
++# include "fips_mode.h"
++#endif
+ 
+ OSSL_provider_init_fn ossl_default_provider_init;
+ OSSL_provider_init_fn ossl_base_provider_init;
+@@ -17,7 +20,7 @@
+ #ifdef STATIC_LEGACY
+ OSSL_provider_init_fn ossl_legacy_provider_init;
+ #endif
+-const OSSL_PROVIDER_INFO ossl_predefined_providers[] = {
++const OSSL_PROVIDER_INFO providers[] = {
+ #ifdef FIPS_MODULE
+     { "fips", NULL, ossl_fips_intern_provider_init, NULL, 1 },
+ #else
+@@ -30,3 +33,23 @@
+ #endif
+     { NULL, NULL, NULL, NULL, 0 }
+ };
++
++#if !defined(FIPS_MODULE)
++const OSSL_PROVIDER_INFO fips_providers[] = {
++    { "fips", NULL, NULL, NULL, 1 },
++    { "base", NULL, ossl_base_provider_init, NULL, 1 },
++    { "default", NULL, ossl_default_provider_init, NULL, 0 },
++    { "null", NULL, ossl_null_provider_init, NULL, 0 },
++    { NULL, NULL, NULL, NULL, 0 }
++};
++#endif
++
++const OSSL_PROVIDER_INFO *ossl_predefined_providers(void)
++{
++#if !defined(FIPS_MODULE)
++    if (ossl_fips_mode() == 1)
++        return fips_providers;
++#endif
++
++    return providers;
++}
+--- a/doc/man3/EVP_set_default_properties.pod
++++ b/doc/man3/EVP_set_default_properties.pod
+@@ -39,7 +39,8 @@
+ existing query strings that have been set via EVP_set_default_properties().
+ 
+ EVP_default_properties_is_fips_enabled() indicates if 'fips=yes' is a default
+-property for the given I<libctx>.
++property for the given I<libctx>. This is the default for every I<libctx> on
++systems that are operaring in FIPS-approved mode.
+ 
+ =head1 NOTES
+ 
+--- a/doc/man5/config.pod
++++ b/doc/man5/config.pod
+@@ -286,11 +286,13 @@
+ 
+ =head3 Default provider and its activation
+ 
+-If no providers are activated explicitly, the default one is activated implicitly.
+-See L<OSSL_PROVIDER-default(7)> for more details.
++If no providers are activated explicitly, either the default provider or
++FIPS provider are activated implicitly depending on the environment.
++See L<crypto(7)>, L<OSSL_PROVIDER-default(7)> and L<OSSL_PROVIDER-FIPS(7)> for
++more details.
+ 
+ If you add a section explicitly activating any other provider(s),
+-you most probably need to explicitly activate the default provider,
++you most probably need to explicitly activate the default or FIPS provider,
+ otherwise it becomes unavailable in openssl. It may make the system remotely unavailable.
+ 
+ =head2 EVP Configuration
+--- a/doc/man7/OSSL_PROVIDER-default.pod
++++ b/doc/man7/OSSL_PROVIDER-default.pod
+@@ -9,9 +9,10 @@
+ The OpenSSL default provider supplies the majority of OpenSSL's diverse
+ algorithm implementations. If an application doesn't specify anything else
+ explicitly (e.g. in the application or via config), then this is the
+-provider that will be used as fallback: It is loaded automatically the
+-first time that an algorithm is fetched from a provider or a function
+-acting on providers is called and no other provider has been loaded yet.
++provider that will be used as fallback on systems that are not operating in
++FIPS-approved mode: It is loaded automatically the first time that an algorithm
++is fetched from a provider or a function acting on providers is called and no
++other provider has been loaded yet.
+ 
+ If an attempt to load a provider has already been made (whether successful
+ or not) then the default provider won't be loaded automatically. Therefore
+--- a/doc/man7/fips_module.pod
++++ b/doc/man7/fips_module.pod
+@@ -45,6 +45,21 @@
+ avoid using all deprecated functions. See L<ossl-guide-migration(7)> for a list of
+ deprecated functions.
+ 
++=head2 Applications running on systems operating in FIPS-approved mode
++
++When running on systems that are operating in FIPS-approved mode and no
++providers are loaded explicitly via the application or config, the FIPS module
++is loaded implicitly as a fallback provider whenever an algorithm is fetched
++for the first time. The "default" provider is not loaded implicitly in this
++case, and must be loaded explicitly if it is required by an application.
++
++Every L<OSSL_LIB_CTX(3)> is created with "fips=yes" as a default property in
++this mode so that algorithm fetches will only fetch algorithms that define
++this property and are FIPS-approved. To use algorithms that are not FIPS
++approved, either specify "-fips" or "fips=no" as a property query string with
++fetching functions, or use the L<EVP_default_properties_enable_fips(3)> function
++to remove the default property for a specific B<OSSL_LIB_CTX>.
++
+ =head2 Making all applications use the FIPS module by default
+ 
+ One simple approach is to cause all applications that are using OpenSSL to only
+--- a/doc/man7/ossl-guide-libraries-introduction.pod
++++ b/doc/man7/ossl-guide-libraries-introduction.pod
+@@ -48,7 +48,21 @@
+ providers in the form of loadable modules.
+ 
+ If you don't load a provider explicitly (either in program code or via config)
+-then the OpenSSL built-in "default" provider will be automatically loaded.
++then one of the following OpenSSL provdiers will be loaded automatically:
++
++=over 4
++
++=item *
++
++The built-in "default" provider when running on a system that is not operating
++in FIPS-approved mode.
++
++=item *
++
++The "fips" provider when running on a system that is operating in FIPS-approved
++mode.
++
++=back
+ 
+ See L</OPENSSL PROVIDERS> below for a description of the providers that OpenSSL
+ itself supplies.
+@@ -188,9 +202,10 @@
+ search criterion for these implementations.  The default provider includes all
+ of the functionality in the base provider below.
+ 
+-If you don't load any providers at all then the "default" provider will be
+-automatically loaded. If you explicitly load any provider then the "default"
+-provider would also need to be explicitly loaded if it is required.
++If you don't load any providers at all and the system is not running in
++FIPS-approved mode, then the "default" provider will be automatically loaded.
++If you explicitly load any provider then the "default" provider would also need
++to be explicitly loaded if it is required.
+ 
+ See L<OSSL_PROVIDER-default(7)>.
+ 
+@@ -224,6 +239,11 @@
+ Typically the L</Base provider> will also need to be loaded because the FIPS
+ provider does not support the encoding or decoding of keys.
+ 
++If you don't load any providers at all and the system is running in
++FIPS-approved mode, then the FIPS provider will be automatically loaded.
++If you explicitly load any provider then the FIPS provider would also need
++to be explicitly loaded if it is required.
++
+ See L<OSSL_PROVIDER-FIPS(7)> and L<fips_module(7)>.
+ 
+ =head2 Legacy provider
+--- a/test/build.info
++++ b/test/build.info
+@@ -69,7 +69,8 @@
+           ca_internals_test bio_tfo_test membio_test bio_dgram_test list_test \
+           fips_version_test x509_test hpke_test pairwise_fail_test \
+           nodefltctxtest evp_xof_test x509_load_cert_file_test bio_meth_test \
+-          x509_acert_test x509_req_test strtoultest bio_pw_callback_test
++          x509_acert_test x509_req_test strtoultest bio_pw_callback_test \
++          fips_auto_enable_test
+ 
+   IF[{- !$disabled{'rpk'} -}]
+     PROGRAMS{noinst}=rpktest
+@@ -808,6 +809,10 @@
+   INCLUDE[ca_internals_test]=.. ../include ../apps/include
+   DEPEND[ca_internals_test]=libtestutil.a ../libssl
+ 
++  SOURCE[fips_auto_enable_test]=fips_auto_enable_test.c
++  INCLUDE[fips_auto_enable_test]=../include  ../apps/include
++  DEPEND[fips_auto_enable_test]=../libcrypto libtestutil.a
++
+   # Internal test programs.  These are essentially a collection of internal
+   # test routines.  Some of them need to reach internal symbols that aren't
+   # available through the shared library (at least on Linux, Solaris, Windows
+--- /dev/null
++++ b/test/fips_auto_enable_test.c
+@@ -0,0 +1,106 @@
++/*
++ * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
++ *
++ * Licensed under the Apache License 2.0 (the "License").  You may not use
++ * this file except in compliance with the License.  You can obtain a copy
++ * in the file LICENSE in the source distribution or at
++ * https://www.openssl.org/source/license.html
++ */
++
++#include <openssl/evp.h>
++#include <openssl/provider.h>
++#include "testutil.h"
++
++static int badfips;
++static int context;
++static int fips;
++
++static int test_fips_auto(void)
++{
++    OSSL_LIB_CTX *libctx = NULL;
++    EVP_MD *sha256 = NULL;
++    int is_fips_enabled, fips_loaded, default_loaded;
++    const char *prov_name, *expected_prov_name = fips ? "fips" : "default";
++    int testresult = 0;
++
++    if (context) {
++        if (!TEST_ptr(libctx = OSSL_LIB_CTX_new()))
++            goto err;
++    }
++
++    is_fips_enabled = EVP_default_properties_is_fips_enabled(libctx);
++
++    if (!TEST_int_eq(is_fips_enabled, fips))
++        goto err;
++
++    sha256 = EVP_MD_fetch(libctx, "SHA-256", NULL);
++    if (!fips || !badfips) {
++        if (!TEST_ptr(sha256))
++            goto err;
++
++        prov_name = OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(sha256));
++        if (!TEST_str_eq(prov_name, expected_prov_name))
++            goto err;
++    } else if (!TEST_ptr_null(sha256))
++        goto err;
++
++    fips_loaded = OSSL_PROVIDER_available(libctx, "fips");
++    default_loaded = OSSL_PROVIDER_available(libctx, "default");
++
++    if (!TEST_int_eq(fips_loaded, fips && !badfips) ||
++        !TEST_int_eq(default_loaded, !fips && !badfips))
++        goto err;
++
++    testresult = 1;
++ err:
++    EVP_MD_free(sha256);
++    OSSL_LIB_CTX_free(libctx);
++    return testresult;
++}
++
++typedef enum OPTION_choice {
++    OPT_ERR = -1,
++    OPT_EOF = 0,
++    OPT_FIPS,
++    OPT_BAD_FIPS,
++    OPT_CONTEXT,
++    OPT_TEST_ENUM
++} OPTION_CHOICE;
++
++const OPTIONS *test_get_options(void)
++{
++    static const OPTIONS options[] = {
++        OPT_TEST_OPTIONS_DEFAULT_USAGE,
++        { "fips", OPT_FIPS, '-', "Test library context in FIPS mode" },
++        { "badfips", OPT_BAD_FIPS, '-', "Expect FIPS mode not to work correctly" },
++        { "context", OPT_CONTEXT, '-', "Explicitly use a non-default library context" },
++        { NULL }
++    };
++    return options;
++}
++
++int setup_tests(void)
++{
++    OPTION_CHOICE o;
++
++    while ((o = opt_next()) != OPT_EOF) {
++        switch (o) {
++        case OPT_FIPS:
++            fips = 1;
++            break;
++        case OPT_BAD_FIPS:
++            badfips = 1;
++            break;
++        case OPT_CONTEXT:
++            context = 1;
++            break;
++        case OPT_TEST_CASES:
++            break;
++        default:
++            return 0;
++        }
++    }
++
++    ADD_TEST(test_fips_auto);
++    return 1;
++}
+--- /dev/null
++++ b/test/recipes/04-test_auto_fips_mode.t
+@@ -0,0 +1,50 @@
++#! /usr/bin/env perl
++# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
++#
++# Licensed under the Apache License 2.0 (the "License").  You may not use
++# this file except in compliance with the License.  You can obtain a copy
++# in the file LICENSE in the source distribution or at
++# https://www.openssl.org/source/license.html
++
++use strict;
++use warnings;
++
++use File::Spec::Functions qw/curdir/;
++use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
++use OpenSSL::Test::Utils;
++use Cwd qw(abs_path);
++
++BEGIN {
++    setup("test_auto_fips_mode");
++}
++
++my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
++
++plan tests => ($no_fips ? 5 : 7);
++
++$ENV{OPENSSL_FIPS_MODE_SWITCH_PATH} = abs_path(srctop_dir("test", "recipes",
++        "04-test_auto_fips_mode", "notexist"));
++ok(run(test(["fips_auto_enable_test"])), "running fips_auto_enable_test");
++ok(run(test(["fips_auto_enable_test", "-context"])),
++    "running fips_auto_enable_test -context");
++
++$ENV{OPENSSL_FIPS_MODE_SWITCH_PATH} = abs_path(srctop_file("test", "recipes",
++        "04-test_auto_fips_mode", "off"));
++ok(run(test(["fips_auto_enable_test"])),
++    "running fips_auto_enable_test with FIPS mode off");
++ok(run(test(["fips_auto_enable_test", "-context"])),
++    "running fips_auto_enable_test -context with FIPS mode off");
++
++$ENV{OPENSSL_FIPS_MODE_SWITCH_PATH} = abs_path(srctop_file("test", "recipes",
++        "04-test_auto_fips_mode", "on"));
++
++unless($no_fips) {
++    ok(run(test(["fips_auto_enable_test", "-fips"])),
++        "running fips_auto_enable_test -fips");
++    ok(run(test(["fips_auto_enable_test", "-context", "-fips"])),
++        "running fips_auto_enable_test -context -fips");
++}
++
++$ENV{OPENSSL_MODULES} = curdir();
++ok(run(test(["fips_auto_enable_test", "-fips", "-badfips"])),
++    "running fips_auto_enable_test -fips -badfips");
+--- /dev/null
++++ b/test/recipes/04-test_auto_fips_mode/off
+@@ -0,0 +1 @@
++0
+--- /dev/null
++++ b/test/recipes/04-test_auto_fips_mode/on
+@@ -0,0 +1 @@
++1
+--- a/test/run_tests.pl
++++ b/test/run_tests.pl
+@@ -37,6 +37,7 @@
+ $ENV{OPENSSL_CONF_INCLUDE} = rel2abs(catdir($bldtop, "test"));
+ $ENV{OPENSSL_MODULES} = rel2abs(catdir($bldtop, "providers"));
+ $ENV{OPENSSL_ENGINES} = rel2abs(catdir($bldtop, "engines"));
++$ENV{OPENSSL_FIPS_MODE_SWITCH_PATH} = "/nonexistant";
+ $ENV{CTLOG_FILE} = rel2abs(catfile($srctop, "test", "ct", "log_list.cnf"));
+ 
+ # On platforms that support this, this will ensure malloc returns data that is
diff --git a/debian/patches/fips/test-Ensure-encoding-runs-with-the-correct-context-during.patch b/debian/patches/fips/test-Ensure-encoding-runs-with-the-correct-context-during.patch
new file mode 100644
index 0000000..ed4294f
--- /dev/null
+++ b/debian/patches/fips/test-Ensure-encoding-runs-with-the-correct-context-during.patch
@@ -0,0 +1,57 @@
+From: Chris Coulson <[e-mail]>
+Date: Thu, 30 Mar 2023 16:10:16 +0100
+Subject: test: Ensure encoding runs with the correct context during
+ test_encoder_decoder
+
+Forwarded: no
+Applied-Upstream: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/2056593
+
+This test uses 2 library contexts - one context for creating initial test keys,
+and then another context (or the default context) for running tests. There is an
+issue that during the encoding tests, the OSSL_ENCODER_CTX is created from the
+created EVP_PKEYs, which are associated with the library context used to create
+the keys. This means that encoding tests run with the wrong library context,
+which always uses the default provider.
+---
+ test/endecode_test.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/test/endecode_test.c b/test/endecode_test.c
+index e28fd41b7..e7b25937a 100644
+--- a/test/endecode_test.c
++++ b/test/endecode_test.c
+@@ -109,11 +109,12 @@ static EVP_PKEY *make_template(const char *type, OSSL_PARAM *genparams)
+ static EVP_PKEY *make_key(const char *type, EVP_PKEY *template,
+                           OSSL_PARAM *genparams)
+ {
+-    EVP_PKEY *pkey = NULL;
++    EVP_PKEY *tmp_pkey = NULL, *pkey = NULL;
+     EVP_PKEY_CTX *ctx =
+         template != NULL
+         ? EVP_PKEY_CTX_new_from_pkey(keyctx, template, testpropq)
+         : EVP_PKEY_CTX_new_from_name(keyctx, type, testpropq);
++    OSSL_PARAM *params = NULL;
+ 
+     /*
+      * No real need to check the errors other than for the cascade
+@@ -123,8 +124,18 @@ static EVP_PKEY *make_key(const char *type, EVP_PKEY *template,
+            && EVP_PKEY_keygen_init(ctx) > 0
+            && (genparams == NULL
+                || EVP_PKEY_CTX_set_params(ctx, genparams) > 0)
+-           && EVP_PKEY_keygen(ctx, &pkey) > 0);
++           && EVP_PKEY_keygen(ctx, &tmp_pkey) > 0);
++    EVP_PKEY_CTX_free(ctx);
++
++    (void)(tmp_pkey != NULL
++           && ((ctx = EVP_PKEY_CTX_new_from_name(testctx, type, testpropq)) != NULL)
++           && EVP_PKEY_todata(pkey, EVP_PKEY_KEYPAIR, &params) > 0
++           && EVP_PKEY_fromdata_init(ctx) > 0
++           && EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, params) > 0);
++    OSSL_PARAM_free(params);
+     EVP_PKEY_CTX_free(ctx);
++    EVP_PKEY_free(tmp_pkey);
++
+     return pkey;
+ }
+ #endif
diff --git a/debian/patches/fips/two-defines-for-fips-in-libssl-dev-headers.patch b/debian/patches/fips/two-defines-for-fips-in-libssl-dev-headers.patch
new file mode 100644
index 0000000..369a354
--- /dev/null
+++ b/debian/patches/fips/two-defines-for-fips-in-libssl-dev-headers.patch
@@ -0,0 +1,72 @@
+From: Adrien Nader <[e-mail]>
+Date: Wed, 11 Sept 2023 15:27:16 +0200
+Subject: Add two defines for FIPS in libssl-dev headers
+
+During FIPS certification for Noble, it was found that a few defines were
+missing and had to be manually inserted. This should be the last change
+needed to make libssl directly available for FIPS setups as all the remaining delta is in providers.
+
+The two defines are extracted from two patches:
+- crypto/dh: perform a PCT during key generation
+- providers: Add a FIPS status indicator
+
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/2073991
+
+---
+
+--- a/doc/man7/OSSL_PROVIDER-FIPS.pod
++++ b/doc/man7/OSSL_PROVIDER-FIPS.pod
+@@ -281,6 +281,36 @@
+ 
+ =back
+ 
++=head1 STATUS INDICATOR
++
++FIPS 140-3 requires that services provide an indicator when the service uses an
++approved cryptographic algorithm in an approved manner. In most cases, the
++status can be determine implicitly by observing the return code from an
++approved security service call, but the FIPS provider module may permit the
++use of approved cryptographic algorithms in a non-approved manner in some cases.
++For this, the Ubuntu FIPS provider module provides an explicit status indicator
++which is implemented as a gettable provider module parameter, and can be
++accessed using L<OSSL_PROVIDER_get_params(3)> on the B<OSSL_PROVIDER> associated
++with the FIPS provider module.
++
++See L<OSSL_PARAM(3)> for information about passing parameters.
++
++The following B<OSSL_PARAM> key is used for accessing the status indicator:
++
++=over 4
++
++=item "ubuntu.fips-unapproved-usage" (B<UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE>) <integer>
++
++Gets 1 if the L<OSSL_LIB_CTX(3)> associated with the B<OSSL_PROVIDER> has been
++used to execute a security service call that used an approved cryptographic
++algorithm in a non-approved manner inside the FIPS provider module. Querying
++this parameter resets it to 0. Note that this only applies to services inside
++of the FIPS provider module boundary - it cannot indicate whether the
++L<OSSL_LIB_CTX> has been used to execute security service calls in other
++provider modules.
++
++=back
++
+ =head1 SELF TESTING
+ 
+ A requirement of FIPS modules is to run cryptographic algorithm self tests.
+--- a/include/openssl/fips_names.h
++++ b/include/openssl/fips_names.h
+@@ -43,6 +43,13 @@
+ # define OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK
+ # define OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST
+ 
++/*
++ * The module status indicator for the FIPS provider. This is queried from
++ * the provider.
++ * Type: OSSL_PARAM_INTEGER
++ */
++# define UBUNTU_OSSL_PROV_FIPS_PARAM_UNAPPROVED_USAGE "ubuntu.fips-unapproved-usage"
++
+ # ifdef __cplusplus
+ }
+ # endif
diff --git a/debian/patches/no-symbolic.patch b/debian/patches/no-symbolic.patch
deleted file mode 100644
index 85ed6e6..0000000
--- a/debian/patches/no-symbolic.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian OpenSSL Team <[e-mail]>
-Date: Sun, 5 Nov 2017 15:09:09 +0100
-Subject: no-symbolic
-
----
- Configurations/shared-info.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
-index caf6f901261f..be6a5d7b0b90 100644
---- a/Configurations/shared-info.pl
-+++ b/Configurations/shared-info.pl
-@@ -25,7 +25,7 @@ sub detect_gnu_cc {
- my %shared_info;
- %shared_info = (
-     'gnu-shared' => {
--        shared_ldflag         => '-shared -Wl,-Bsymbolic',
-+        shared_ldflag         => '-shared',
-         shared_sonameflag     => '-Wl,-soname=',
-     },
-     'linux-shared' => sub {
diff --git a/debian/patches/pic.patch b/debian/patches/pic.patch
deleted file mode 100644
index 986d2d7..0000000
--- a/debian/patches/pic.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From: Debian OpenSSL Team <[e-mail]>
-Date: Sun, 5 Nov 2017 15:09:09 +0100
-Subject: pic
-
----
- crypto/des/asm/desboth.pl | 17 ++++++++++++++---
- crypto/perlasm/cbc.pl     | 24 ++++++++++++++++++++----
- crypto/perlasm/x86gas.pl  | 16 ++++++++++++++++
- crypto/x86cpuid.pl        | 10 +++++-----
- 4 files changed, 55 insertions(+), 12 deletions(-)
-
-diff --git a/crypto/des/asm/desboth.pl b/crypto/des/asm/desboth.pl
-index afffd20d84cd..b50e85ce24f8 100644
---- a/crypto/des/asm/desboth.pl
-+++ b/crypto/des/asm/desboth.pl
-@@ -23,6 +23,11 @@ sub DES_encrypt3
- 
- 	&push("edi");
- 
-+	&call   (&label("pic_point0"));
-+	&set_label("pic_point0");
-+	&blindpop("ebp");
-+	&add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+
- 	&comment("");
- 	&comment("Load the data words");
- 	&mov($L,&DWP(0,"ebx","",0));
-@@ -54,15 +59,21 @@ sub DES_encrypt3
- 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
- 	&mov(&swtmp(1),	"eax");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 	&mov(&swtmp(2),	(DWC(($enc)?"0":"1")));
- 	&mov(&swtmp(1),	"edi");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 	&mov(&swtmp(2),	(DWC(($enc)?"1":"0")));
- 	&mov(&swtmp(1),	"esi");
- 	&mov(&swtmp(0),	"ebx");
--	&call("DES_encrypt2");
-+	&exch("ebx", "ebp");
-+	&call("DES_encrypt2\@PLT");
-+	&exch("ebx", "ebp");
- 
- 	&stack_pop(3);
- 	&mov($L,&DWP(0,"ebx","",0));
-diff --git a/crypto/perlasm/cbc.pl b/crypto/perlasm/cbc.pl
-index ef09e0fd297a..fe6ff45d1804 100644
---- a/crypto/perlasm/cbc.pl
-+++ b/crypto/perlasm/cbc.pl
-@@ -129,7 +129,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($enc_func);
-+	&call	(&label("pic_point0"));
-+	&set_label("pic_point0");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+	&call("$enc_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
-@@ -199,7 +203,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put in array for call
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($enc_func);
-+	&call	(&label("pic_point1"));
-+	&set_label("pic_point1");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
-+	&call("$enc_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));
-@@ -232,7 +240,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($dec_func);
-+	&call	(&label("pic_point2"));
-+	&set_label("pic_point2");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
-+	&call("$dec_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
-@@ -275,7 +287,11 @@ sub cbc
- 	&mov(&DWP($data_off,"esp","",0),	"eax");	# put back
- 	&mov(&DWP($data_off+4,"esp","",0),	"ebx");	#
- 
--	&call($dec_func);
-+	&call	(&label("pic_point3"));
-+	&set_label("pic_point3");
-+	&blindpop("ebx");
-+	&add	("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
-+	&call("$dec_func\@PLT");
- 
- 	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
- 	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
-diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl
-index f3c01ea89b4b..2fba3d831c74 100644
---- a/crypto/perlasm/x86gas.pl
-+++ b/crypto/perlasm/x86gas.pl
-@@ -172,6 +172,7 @@ sub ::file_end
- 	if ($::macosx)	{ push (@out,"$tmp,2\n"); }
- 	elsif ($::elf)	{ push (@out,"$tmp,4\n"); }
- 	else		{ push (@out,"$tmp\n"); }
-+	if ($::elf)     { push (@out,".hidden\tOPENSSL_ia32cap_P\n"); }
-     }
-     push(@out,$initseg) if ($initseg);
-     if ($::elf) {
-@@ -250,8 +251,23 @@ ___
-     elsif ($::elf)
-     {	$initseg.=<<___;
- .section	.init
-+___
-+        if ($::pic)
-+	{   $initseg.=<<___;
-+	pushl	%ebx
-+	call	.pic_point0
-+.pic_point0:
-+	popl	%ebx
-+	addl	\$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
-+	call	$f\@PLT
-+	popl	%ebx
-+___
-+	}
-+	else
-+	{   $initseg.=<<___;
- 	call	$f
- ___
-+	}
-     }
-     elsif ($::coff)
-     {   $initseg.=<<___;	# applies to both Cygwin and Mingw
-diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
-index 35e2c5b0a540..282058ce87f3 100644
---- a/crypto/x86cpuid.pl
-+++ b/crypto/x86cpuid.pl
-@@ -16,6 +16,8 @@ $output = pop and open STDOUT,">$output";
- 
- for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- 
-+push(@out, ".hidden OPENSSL_ia32cap_P\n");
-+
- &function_begin("OPENSSL_ia32_cpuid");
- 	&xor	("edx","edx");
- 	&pushf	();
-@@ -185,9 +187,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- &set_label("nocpuid");
- &function_end("OPENSSL_ia32_cpuid");
- 
--&external_label("OPENSSL_ia32cap_P");
--
--&function_begin_B("OPENSSL_rdtsc","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_rdtsc");
- 	&xor	("eax","eax");
- 	&xor	("edx","edx");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
-@@ -201,7 +201,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
- # but it's safe to call it on any [supported] 32-bit platform...
- # Just check for [non-]zero return value...
--&function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_instrument_halt");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
- 	&bt	(&DWP(0,"ecx"),4);
- 	&jnc	(&label("nohalt"));	# no TSC
-@@ -268,7 +268,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
- 	&ret	();
- &function_end_B("OPENSSL_far_spin");
- 
--&function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_wipe_cpu");
- 	&xor	("eax","eax");
- 	&xor	("edx","edx");
- 	&picmeup("ecx","OPENSSL_ia32cap_P");
diff --git a/debian/patches/regex_match_ecp_nistp521-ppc64.patch b/debian/patches/regex_match_ecp_nistp521-ppc64.patch
new file mode 100644
index 0000000..74085ab
--- /dev/null
+++ b/debian/patches/regex_match_ecp_nistp521-ppc64.patch
@@ -0,0 +1,30 @@
+Description: match last filename for output in ecp_nistp521-ppc64.pl
+
+ ecp_nistp521-ppc64.pl matches the incorrect param for output instead of
+ crypto/ec/ecp_nistp521-ppc64.s This leads to ecp_nistp521-ppc64.pl writing
+ output to STDOUT instead of the file crypto/ec/ecp_nistp521-ppc64.s. The
+ missing .s file leads Missing .s file leads to gcc erroring out and build
+ failure.  Makefile generates command with crypto/ec/ecp_nistp521-ppc64.s as
+ the last param. This page matches the last filename instead of first.
+
+Author: Ravi Kant Sharma <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/2137464
+
+---
+Forwarded: https://github.com/openssl/openssl/pull/29417
+Last-Update: 2025-12-17
+
+--- openssl-3.0.13.orig/crypto/ec/asm/ecp_nistp521-ppc64.pl
++++ openssl-3.0.13/crypto/ec/asm/ecp_nistp521-ppc64.pl
+@@ -19,7 +19,10 @@ use warnings;
+ 
+ my $flavour = shift;
+ my $output = "";
+-while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {}
++my $arg;
++while ($arg = shift) {
++    $output = $arg if $arg =~ /\w[\w\-]*\.\w+$/;
++}
+ if (!$output) {
+ 	$output = "-";
+ }
diff --git a/debian/patches/series b/debian/patches/series
index cbf74e5..39ae18e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,18 @@
 debian-targets.patch
 man-section.patch
-no-symbolic.patch
-pic.patch
 c_rehash-compat.patch
 Configure-allow-to-enable-ktls-if-target-does-not-start-w.patch
 conf-Serialize-allocation-free-of-ssl_names.patch
+
+# Ubuntu patches
+
+default-configuration-read-dropins-and-crypto-config.patch
+regex_match_ecp_nistp521-ppc64.patch
+
+# Ubuntu FIPS patches
+fips/crypto-Add-kernel-FIPS-mode-detection.patch
+fips/crypto-Automatically-use-the-FIPS-provider-when-the-kerne.patch
+fips/apps-speed-Omit-unavailable-algorithms-in-FIPS-mode.patch
+fips/apps-pass-propquery-arg-to-the-libctx-DRBG-fetches.patch
+fips/test-Ensure-encoding-runs-with-the-correct-context-during.patch
+fips/two-defines-for-fips-in-libssl-dev-headers.patch
diff --git a/debian/rules b/debian/rules
index 5a80970..958db53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,12 @@
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all future=+lfs
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all future=+lfs optimize=-lto
 
 SHELL=/bin/bash
 
 package=openssl
+library_package=libssl3t64
 
 # For generating the manpages
 export VERSION=$(DEB_VERSION_UPSTREAM)
@@ -30,7 +31,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
 CONFARGS  = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms no-capieng no-rdrand \
-	    enable-tfo enable-zstd enable-zlib enable-fips
+	    enable-tfo enable-zstd enable-zlib no-fips
 #OPT_alpha = ev4 ev5
 ARCHOPTS  = OPT_$(DEB_HOST_ARCH)
 OPTS      = $($(ARCHOPTS))
@@ -146,6 +147,19 @@ override_dh_fixperms:
 	fi
 	dh_fixperms -a -X etc/ssl/private
 
+override_dh_compress:
+	dh_compress
+	# symlink doc files
+	# We used to also add symlinks to changelog.gz but pkgstripfiles from
+	# pkgbinarymangler will remove the real changelog.gz file and break all the
+	# symlinks. Ignore changelog, it will end up as wanted.
+	# NB: pkgstripfiles is not done in PPAs
+	for p in openssl libssl-dev; do \
+	  for f in changelog.Debian.gz copyright; do \
+	    ln -sf ../$(library_package)/$$f debian/$$p/usr/share/doc/$$p/$$f; \
+	  done; \
+	done
+
 override_dh_perl:
 	dh_perl -d
 
@@ -153,5 +167,5 @@ override_dh_makeshlibs:
 	dh_makeshlibs -a -V --add-udeb="libcrypto3-udeb" -Xengines -Xossl-modules -- -c4
 
 override_dh_shlibdeps:
-	sed -i '/^udeb: libssl/s/libcrypto3-udeb/libssl3-udeb/' debian/libssl3t64/DEBIAN/shlibs
-	dh_shlibdeps -a -L libssl3t64
+	sed -i '/^udeb: libssl/s/libcrypto3-udeb/libssl3-udeb/' debian/$(library_package)/DEBIAN/shlibs
+	dh_shlibdeps -a -L $(library_package)
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..927d446
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,23 @@
+# This is a template from
+# https://salsa.debian.org/salsa-ci-team/pipeline/-/raw/master/recipes/salsa-ci.yml
+#
+# If this pipeline is not running at after committing and pushing this file,
+# ensure that https://salsa.debian.org/%{project_path}/-/settings/ci_cd has in
+# field "CI/CD configuration file" filename "debian/salsa-ci.yml".
+#
+# Feel free disable and enable tests to find a good balance between extensive
+# coverage and having a consistently green pipeline where failures are rare
+# enough that they are always investigated and addressed. For documeenation
+# please read https://salsa.debian.org/salsa-ci-team/pipeline
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+# Disable jobs that are failing at the time of adopting Salsa CI. The purpose of
+# a CI system is to detect regressions, so it must be green initially, so change
+# to red is clear. Fixing build flags and reprotest is of course needed, but
+# that is an independent effort from enabling Salsa CI to protect from futher
+# regressions.
+variables:
+  SALSA_CI_DISABLE_BLHC: 1
+  SALSA_CI_DISABLE_REPROTEST: 1
diff --git a/debian/tests/control b/debian/tests/control
index ac7f2cb..874a65e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-25-test-verify
-Depends: openssl, perl
+Depends: openssl, perl:native
 Restrictions: rw-build-tree, allow-stderr