Skip to content
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

Add MacOS specific compilation options #31

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

Add MacOS specific compilation options #31

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea/
*.iml
*.so
*.dylib
aws_kms_pkcs11_test
77 changes: 59 additions & 18 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Detect OS
UNAME_S := $(shell uname -s)

# Try to locate the AWS SDK if not specified with AWS_SDK_PATH
MACHINE := $(shell gcc -dumpmachine)
ifeq ($(AWS_SDK_PATH),)
Expand Down Expand Up @@ -28,9 +31,9 @@ endif
# dynamic libs, or both.
#
# Let's try to intuit this unless specified, with a bias towards static libs
# if available, as they SDK versions tend to have ABI compatilbility issues
# if available, as they SDK versions tend to have ABI compatibility issues
#
# Use these variables to override the mechanisms for those two sets:
# Use these variables to override the mechanisms for those two sets:
#
# AWS_SDK_STATIC = y : Force use of static libraries for both C and C++
# AWS_SDK_STATIC = n : Force use of dynamic libraries for both C and C++
Expand All @@ -57,17 +60,17 @@ ifndef AWS_SDK_C_STATIC
else ifneq ($(wildcard ${AWS_SDK_LIB_PATH}/libaws-c-common.so),)
AWS_SDK_C_STATIC := n
else
$(error Cannot find either static or dynamic SDK C libraries)
$(error Cannot find either static or dynamic SDK C libraries)
endif
endif

ifndef AWS_SDK_CPP_STATIC
ifneq ($(wildcard ${AWS_SDK_LIB_PATH}/libaws-cpp-sdk-kms.a),)
AWS_SDK_CPP_STATIC := y
AWS_SDK_CPP_STATIC := y
else ifneq ($(wildcard ${AWS_SDK_LIB_PATH}/libaws-cpp-sdk-core.so),)
AWS_SDK_CPP_STATIC := n
AWS_SDK_CPP_STATIC := n
else
$(error Cannot find either static or dynamic SDK C++ libraries)
$(error Cannot find either static or dynamic SDK C++ libraries)
endif
endif

Expand Down Expand Up @@ -111,6 +114,29 @@ ifeq ($(JSON_C_INC),)
endif
endif

# Try to locate the json-c libraries if location not specified with JSON_C_LIB
ifeq ($(JSON_C_LIB),)
JSON_C_LIB := $(shell pkg-config --libs json-c 2>/dev/null)
ifeq ($(JSON_C_LIB),)
$(error json-c libraries not found, specify JSON_C_LIB)
endif
endif

# Try to locate OpenSSL if not specified with OPENSSL_INC and OPENSSL_LIB
ifeq ($(OPENSSL_INC),)
OPENSSL_INC := $(shell pkg-config --cflags openssl 2>/dev/null)
ifeq ($(OPENSSL_INC),)
Copy link
Owner

Choose a reason for hiding this comment

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

pkg-config --cflags openssl will actually be empty on an Ubuntu system (this is why CI is failing) because header files are in the standard include path. If the make will fail if pkg-config has non-zero exit code then you can probably skip this check? A stack overflow post leads me to think ifneq ($(.SHELLSTATUS),0) might be the right alternative here.

$(error OpenSSL not found, please specify OPENSSL_INC)
endif
endif

ifeq ($(OPENSSL_LIB),)
OPENSSL_LIB := $(shell pkg-config --libs openssl 2>/dev/null)
ifeq ($(OPENSSL_LIB),)
$(error OpenSSL libraries not found, please specify OPENSSL_LIB)
endif
endif

ifdef AWS_SDK_USE_SYSTEM_PROXY
ifeq ($(AWS_SDK_USE_SYSTEM_PROXY),y)
PROXY_CFLAGS := -DAWS_SDK_USE_SYSTEM_PROXY=1
Expand All @@ -124,6 +150,7 @@ endif
# Build library link list
STATIC_LIBS :=
LIBS :=

ifeq ($(AWS_SDK_CPP_STATIC),y)
$(info Using C++ SDK static libraries)
STATIC_LIBS += $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-kms.a
Expand All @@ -136,11 +163,14 @@ else ifeq ($(AWS_SDK_CPP_STATIC),n)
LIBS += $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-kms.so
LIBS += $(AWS_SDK_LIB_PATH)/libaws-cpp-sdk-acm-pca.so
else
$(error Unrecognized value for AWS_SDK_CPP_STATIC, use y or n)
$(error Unrecognized value for AWS_SDK_CPP_STATIC, use y or n)
endif

ifeq ($(AWS_SDK_C_STATIC),y)
$(info Using C SDK static libraries)
STATIC_LIBS += -Wl,--start-group
ifeq ($(UNAME_S),Linux)
STATIC_LIBS += -Wl,--start-group
endif
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,39 +183,50 @@ 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
ifeq ($(UNAME_S),Linux)
STATIC_LIBS += -Wl,--end-group
endif
else ifeq ($(AWS_SDK_C_STATIC),n)
$(info Using C SDK dynamic libraries)
LIBS += $(AWS_SDK_LIB_PATH)/libaws-checksums.so
LIBS += $(AWS_SDK_LIB_PATH)/libaws-c-common.so
LIBS += $(AWS_SDK_LIB_PATH)/libaws-c-event-stream.so
else
$(error Unrecognized value for AWS_SDK_C_STATIC, use y or n)
$(error Unrecognized value for AWS_SDK_C_STATIC, use y or n)
endif

# Source files
SRC = attributes.cpp aws_kms_pkcs11.cpp certificates.cpp unsupported.cpp debug.cpp aws_kms_slot.cpp

all: aws_kms_pkcs11.so
# Additional frameworks for macOS
ifeq ($(UNAME_S),Darwin)
MACOSX_FRAMEWORKS := -framework CoreFoundation -framework Security
endif

all: aws_kms_pkcs11.so aws_kms_pkcs11.dylib
Copy link
Owner

Choose a reason for hiding this comment

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

I'm not sure if it makes sense to target the dylib on Linux systems (and vice-versa)? Can/should all: be defined based on UNAME_S?


clean:
rm -f aws_kms_pkcs11.so aws_kms_pkcs11_test aws_kms_client_test
rm -f aws_kms_pkcs11.so aws_kms_pkcs11.dylib aws_kms_pkcs11_test aws_kms_client_test

test: aws_kms_pkcs11_test certificates_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 certificates.cpp certificates_test.cpp -o certificates_test $(STATIC_LIBS) $(LIBS) -lcrypto -ljson-c -lcurl
g++ -g -fPIC -Wall -I$(AWS_SDK_PATH)/include $(PKCS11_INC) $(JSON_C_INC) $(OPENSSL_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 \
debug.cpp certificates.cpp certificates_test.cpp -o certificates_test $(STATIC_LIBS) $(LIBS) $(OPENSSL_LIB) $(JSON_C_LIB) -lcurl $(MACOSX_FRAMEWORKS) -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 \
aws_kms_pkcs11_test.c -o aws_kms_pkcs11_test -ldl
g++ -g -fPIC -Wall -I$(AWS_SDK_PATH)/include $(PKCS11_INC) $(JSON_C_INC) $(OPENSSL_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 \
aws_kms_pkcs11_test.c -o aws_kms_pkcs11_test -ldl $(OPENSSL_LIB) $(JSON_C_LIB) $(MACOSX_FRAMEWORKS) -lz

aws_kms_pkcs11.so: aws_kms_pkcs11.cpp unsupported.cpp aws_kms_slot.cpp debug.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
g++ -shared -fPIC -Wall -I$(AWS_SDK_PATH)/include $(PKCS11_INC) $(JSON_C_INC) $(OPENSSL_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 $(SRC) \
-o aws_kms_pkcs11.so $(STATIC_LIBS) $(LIBS) $(OPENSSL_LIB) $(JSON_C_LIB) -lcurl $(MACOSX_FRAMEWORKS) -lz

aws_kms_pkcs11.dylib: aws_kms_pkcs11.cpp unsupported.cpp aws_kms_slot.cpp debug.cpp attributes.cpp certificates.cpp
g++ -dynamiclib -fPIC -Wall -I$(AWS_SDK_PATH)/include $(PKCS11_INC) $(JSON_C_INC) $(OPENSSL_INC) $(PROXY_CFLAGS) -fno-exceptions -std=c++17 $(SRC) \
-o aws_kms_pkcs11.dylib $(STATIC_LIBS) $(LIBS) $(OPENSSL_LIB) $(JSON_C_LIB) -lcurl $(MACOSX_FRAMEWORKS) -lz

install: aws_kms_pkcs11.so
cp aws_kms_pkcs11.so $(PKCS11_MOD_PATH)/
Expand Down
10 changes: 5 additions & 5 deletions certificates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,22 @@ X509* parseCertificateFromARN(const string &ca_arn, const string &arn, const std
#endif

if (!region.empty())
awsConfig.region = region;
awsConfig.region = region;
Aws::ACMPCA::ACMPCAClient acmpca(awsConfig);
Aws::ACMPCA::Model::GetCertificateRequest req;

req.SetCertificateArn(arn);
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);
return NULL;
debug("Failed to retrieve certificate %s from CA %s\n", arn.c_str(), ca_arn.c_str());
return NULL;
}
auto pem = res.GetResult().GetCertificate();
auto bio = BIO_new_mem_buf((char *)pem.c_str(), -1);
if (!bio) {
debug("Failed to allocate BIO for cert\n");
return NULL;
debug("Failed to allocate BIO for cert\n");
return NULL;
}
auto cert = PEM_read_bio_X509(bio, NULL, 0, NULL);
BIO_free(bio);
Expand Down