From f7e2fe139c911d1ca914c0ea63246c1cf18d247e Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Fri, 19 May 2023 13:14:10 -0400
Subject: [PATCH 1/2] cargo: fix minimum version of openssl crate

We now use API only available in openssl 0.10.46 and above.

Fixes: e4757c9750 ("microsoft/crypto/mod: replace deprecated function `parse` with `parse2`")
---
 Cargo.toml            | 2 +-
 docs/release-notes.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4442ebac..8a91c394 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ mailparse = ">= 0.13, < 0.15"
 maplit = "1.0"
 nix = ">= 0.19, < 0.27"
 openssh-keys = ">= 0.5, < 0.7"
-openssl = "0.10"
+openssl = "0.10.46"
 pnet_base = ">= 0.26, < 0.34"
 pnet_datalink = ">= 0.26, < 0.34"
 reqwest = { version = ">= 0.10, < 0.12", features = [ "blocking" ] }
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 2c4903b1..82c9f3f5 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -16,6 +16,7 @@ Packaging changes:
 
 - Require `clap` ≥ 4
 - Require `mockito` ≥ 1
+- Require `openssl` ≥ 0.10.46
 
 
 ## Afterburn 5.4.1 (2023-02-06)

From 0e159bef44cd05d3765b6a84e659a81e4639d8f0 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Fri, 19 May 2023 13:32:17 -0400
Subject: [PATCH 2/2] docs/release-notes: note Azure SSH regression fix with
 new openssl

On versions of the openssl crate new enough to have parse2(), the legacy
parse() function is a wrapper that panics when parsing the Azure SSH key
certificate:

    thread 'main' panicked at 'called `Option::unwrap()` on a `None` value', [...]/openssl-0.10.52/src/pkcs12.rs:42:31

We've switched to parse2() in the current codebase, but older versions
built with newer openssl will fail.  Note the fix.

See https://github.com/coreos/fedora-coreos-tracker/issues/1492.
---
 docs/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 82c9f3f5..eebb2eb4 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -11,6 +11,7 @@ Major changes:
 
 Minor changes:
 
+- Fix SSH key fetching on Azure with `openssl` crate ≥ 0.10.46
 
 Packaging changes: