Skip to content

Commit a5d58ad

Browse files
sedcli-kmip: removed openssl submodule
It is impractical to keep openssl submodule added to sedcli project for multiple reasons. For example openssl dependency is also required by libkmip submodule. There is no good way to point libkmip to use openssl submodule instead of searching for it in OS installation path. This patch removes openssl submodule from sedcli and instead relies on OS installed version of it. Signed-off-by: Andrzej Jakowski <[email protected]>
1 parent 22341dd commit a5d58ad

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "src/openssl"]
2-
path = src/openssl
3-
url = https://github.com/openssl/openssl.git
41
[submodule "src/libkmip"]
52
path = src/libkmip
63
url = https://github.com/OpenKMIP/libkmip.git

src/configure

+7-11
Original file line numberDiff line numberDiff line change
@@ -126,27 +126,23 @@ if [ "${kmip_enabled}" == "yes" ]; then
126126
popd > /dev/null
127127

128128
cat > $TMP_SRC <<EOF
129-
#include <openssl/hmac.h>
129+
#include <stdio.h>
130+
#include <openssl/opensslv.h>
130131
131132
int main(int argc, char **argv)
132133
{
133-
HMAC_CTX *ctx;
134-
135-
ctx = HMAC_CTX_new();
136-
HMAC_CTX_reset(ctx);
137-
HMAC_CTX_free(ctx);
134+
printf("%s\n", OPENSSL_VERSION_TEXT);
138135
139136
return 0;
140137
}
141138
EOF
142139

143-
if [ "${ret_code}" -eq "0" ]; then
144-
print_status "KMIP support" "yes"
140+
if [ "${ret_code}" -eq "0" ] && test_compile "openssl" "" "-lcrypto -lssl"; then
141+
openssl_ver="`${TMP_BIN}`"
142+
print_status "KMIP support" "yes (detected ${openssl_ver})"
145143
app_config_mk "CONFIG_KMIP=y"
146144
app_config_mk "INCLUDES+=libkmip"
147-
app_config_mk "LDFLAGS_KMIP+=-Llibkmip -lkmip"
148-
app_config_mk "INCLUDES+=openssl"
149-
app_config_mk "LDFLAGS_KMIP+=-Lopenssl -lcrypto -lssl"
145+
app_config_mk "LDFLAGS_KMIP+=-Llibkmip -lkmip -lcrypto -lssl"
150146
else
151147
print_status "KMIP support" "no"
152148
fi

src/openssl

-1
This file was deleted.

0 commit comments

Comments
 (0)