forked from openembedded/openembedded-core
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
curl: fix OpenSSL host verification + hostname in certificate CN brok…
…en in 7.82.0 Backport upstream fix for: curl/curl#8559 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
- Loading branch information
Showing
2 changed files
with
36 additions
and
1 deletion.
There are no files selected for viewing
33 changes: 33 additions & 0 deletions
33
meta/recipes-support/curl/curl/openssl-fix-CN-check-error-code.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001 | ||
From: Daniel Stenberg <daniel@haxx.se> | ||
Date: Tue, 8 Mar 2022 13:38:13 +0100 | ||
Subject: [PATCH] openssl: fix CN check error code | ||
|
||
Due to a missing 'else' this returns error too easily. | ||
|
||
Regressed in: d15692ebb | ||
|
||
Reported-by: Kristoffer Gleditsch | ||
Fixes #8559 | ||
Closes #8560 | ||
--- | ||
lib/vtls/openssl.c | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c | ||
index 0b79fc50a..4618beeb3 100644 | ||
--- a/lib/vtls/openssl.c | ||
+++ b/lib/vtls/openssl.c | ||
@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, | ||
memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen); | ||
peer_CN[peerlen] = '\0'; | ||
} | ||
- result = CURLE_OUT_OF_MEMORY; | ||
+ else | ||
+ result = CURLE_OUT_OF_MEMORY; | ||
} | ||
} | ||
else /* not a UTF8 name */ | ||
-- | ||
2.24.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters