Skip to content

Add macOS (arm64) support via Homebrew + Apple frameworks #40

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

Open
ps-spb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add macOS (arm64) support via Homebrew + Apple frameworks #40

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
48 changes: 41 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
# Try to locate the AWS SDK if not specified with AWS_SDK_PATH
MACHINE := $(shell gcc -dumpmachine)
# macOS-specific dependency detection
ifeq ($(shell uname), Darwin)
# OpenSSL via Homebrew
OPENSSL_PREFIX := $(shell brew --prefix openssl@3 2>/dev/null)
ifneq ($(OPENSSL_PREFIX),)
OPENSSL_INC := -I$(OPENSSL_PREFIX)/include
OPENSSL_LIB := -L$(OPENSSL_PREFIX)/lib
Copy link
Owner

@JackOfMostTrades JackOfMostTrades May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this append to LIBS rather than being a separate var? (Seems like it might just simplify the commands below)

else
$(warning OpenSSL not found via Homebrew. Try: brew install openssl@3)
endif

# json-c via Homebrew
JSONC_PREFIX := $(shell brew --prefix json-c 2>/dev/null)
ifneq ($(JSONC_PREFIX),)
JSON_C_INC := -I$(JSONC_PREFIX)/include -I$(JSONC_PREFIX)/include/json-c
JSON_C_LIB := -L$(JSONC_PREFIX)/lib
Copy link
Owner

@JackOfMostTrades JackOfMostTrades May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment about this going into LIBS?

else
$(warning json-c not found via Homebrew. Try: brew install json-c)
endif
OSX_FRAMEWORKS := \
-framework CoreFoundation \
-framework Security \
-framework SystemConfiguration \
-framework CoreServices
endif

ifeq ($(AWS_SDK_PATH),)
ifneq ($(wildcard /usr/include/aws),)
AWS_SDK_PATH := /usr
Expand Down Expand Up @@ -140,7 +166,15 @@ else
endif
ifeq ($(AWS_SDK_C_STATIC),y)
$(info Using C SDK static libraries)
STATIC_LIBS += -Wl,--start-group
ifneq ($(shell uname), Darwin)
GROUP_START := -Wl,--start-group
GROUP_END := -Wl,--end-group
else
GROUP_START :=
GROUP_END :=
endif

STATIC_LIBS += $(GROUP_START)
STATIC_LIBS += $(AWS_SDK_LIB_PATH)/libaws-checksums.a
STATIC_LIBS += $(AWS_SDK_LIB_PATH)/libaws-c-common.a
STATIC_LIBS += $(AWS_SDK_LIB_PATH)/libaws-c-event-stream.a
Expand All @@ -153,7 +187,7 @@ ifeq ($(AWS_SDK_C_STATIC),y)
STATIC_LIBS += $(AWS_SDK_LIB_PATH)/libaws-c-s3.a
STATIC_LIBS += $(AWS_SDK_LIB_PATH)/libaws-c-sdkutils.a
STATIC_LIBS += $(AWS_SDK_LIB_PATH)/libs2n.a
STATIC_LIBS += -Wl,--end-group
STATIC_LIBS += $(GROUP_END)
else ifeq ($(AWS_SDK_C_STATIC),n)
$(info Using C SDK dynamic libraries)
LIBS += $(AWS_SDK_LIB_PATH)/libaws-checksums.so
Expand All @@ -176,16 +210,16 @@ test: aws_kms_pkcs11_test certificates_test
AWS_KMS_PKCS11_DEBUG=1 ./aws_kms_pkcs11_test

certificates_test: certificates.cpp certificates_test.cpp
g++ -g -fPIC -Wall -I$(AWS_SDK_PATH)/include $(PKCS11_INC) $(JSON_C_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 \
debug.cpp util.cpp certificates.cpp certificates_test.cpp -o certificates_test $(STATIC_LIBS) $(LIBS) -lcrypto -ljson-c -lcurl -lz
g++ -g -fPIC -Wall -I$(AWS_SDK_PATH)/include $(OSX_FRAMEWORKS) $(OPENSSL_INC) $(JSON_C_INC) $(PKCS11_INC) $(JSON_C_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 \
Copy link
Owner

@JackOfMostTrades JackOfMostTrades May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like JSON_C_INC is on here twice now.

debug.cpp util.cpp certificates.cpp certificates_test.cpp -o certificates_test $(STATIC_LIBS) $(LIBS) $(OPENSSL_LIB) $(JSON_C_LIB) -lcrypto -ljson-c -lcurl -lz

aws_kms_pkcs11_test: aws_kms_pkcs11_test.c aws_kms_pkcs11.so
g++ -g -fPIC -Wall -I$(AWS_SDK_PATH)/include $(PKCS11_INC) $(JSON_C_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 \
g++ -g -fPIC -Wall -I$(AWS_SDK_PATH)/include $(OSX_FRAMEWORKS) $(OPENSSL_INC) $(JSON_C_INC) $(PKCS11_INC) $(JSON_C_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 \
Copy link
Owner

@JackOfMostTrades JackOfMostTrades May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSON_C_INC repeated

aws_kms_pkcs11_test.c -o aws_kms_pkcs11_test -ldl

aws_kms_pkcs11.so: aws_kms_pkcs11.cpp unsupported.cpp aws_kms_slot.cpp debug.cpp util.cpp attributes.cpp certificates.cpp
g++ -shared -fPIC -Wall -I$(AWS_SDK_PATH)/include $(PKCS11_INC) $(JSON_C_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 $(SRC) \
-o aws_kms_pkcs11.so $(STATIC_LIBS) $(LIBS) -lcrypto -ljson-c -lcurl -lz
g++ -shared -fPIC -Wall -I$(AWS_SDK_PATH)/include $(OSX_FRAMEWORKS) $(OPENSSL_INC) $(JSON_C_INC) $(PKCS11_INC) $(JSON_C_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 $(SRC) \
Copy link
Owner

@JackOfMostTrades JackOfMostTrades May 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSON_C_INC repeated

-o aws_kms_pkcs11.so $(STATIC_LIBS) $(LIBS) $(OPENSSL_LIB) $(JSON_C_LIB) -lcrypto -ljson-c -lcurl -lz

install: aws_kms_pkcs11.so
mkdir -p $(DESTDIR)$(PKCS11_MOD_PATH)
Expand Down
2 changes: 1 addition & 1 deletion certificates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ X509* parseCertificateFromARN(const string &ca_arn, const string &arn, const std
req.SetCertificateAuthorityArn(ca_arn);
auto res = acmpca.GetCertificate(req);
if (!res.IsSuccess()) {
debug("Failed to retreive certificate %s from CA %s\n", arn, ca_arn);
debug("Failed to retreive certificate %s from CA %s\n", arn.c_str(), ca_arn.c_str());
return NULL;
}
auto pem = res.GetResult().GetCertificate();
Expand Down