Skip to content

Add upstream openssl 1.1.1q patch for trivial build error on macOS #96594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ned-deily merged 1 commit into from
Sep 5, 2022
Merged

Add upstream openssl 1.1.1q patch for trivial build error on macOS #96594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add upstream openssl 1.1.1q patch for trivial build error on macOS
  • Loading branch information
@ned-deily
ned-deily committed Sep 5, 2022
commit f9a5f460126401518a31e874c14a2b5d9c288c71
1 change: 1 addition & 0 deletions Mac/BuildScript/build-installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ def library_recipes():
name="OpenSSL 1.1.1q",
url="https://www.openssl.org/source/openssl-1.1.1q.tar.gz",
checksum='d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca',
patches=['openssl1.1.1q-pr-18719.patch'],
buildrecipe=build_universal_openssl,
configure=None,
install=None,
Expand Down
17 changes: 17 additions & 0 deletions Mac/BuildScript/openssl1.1.1q-pr-18719.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
https://github.com/openssl/openssl/commit/60f011f584d80447e86cae1d1bd3ae24bc13235b
This fixes a regression in 1.1.1q:

test/v3ext.c:201:24: error: implicitly declaring library function 'memcmp' with type 'int (const void *, const void *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
if (!TEST_true(memcmp(ip1->data, ip2->data, ip1->length) <= 0))

diff -Naur openssl-1.1.1q/test/v3ext.c openssl-1.1.1q-patched/test/v3ext.c
--- openssl-1.1.1q/test/v3ext.c 2022-07-05 09:08:33.000000000 +0000
+++ openssl-1.1.1q-patched/test/v3ext.c 2022-09-05 16:54:45.740859256 +0000
@@ -8,6 +8,7 @@
*/

#include <stdio.h>
+#include <string.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/pem.h>