Skip to content

Commit 1bfd4c4

Browse files
metsmametsma
committed
OpenSSL
Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 647421d commit 1bfd4c4

File tree

13 files changed

+45
-49
lines changed

13 files changed

+45
-49
lines changed

‎configure.ac‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,8 +1056,6 @@ if test "${enable_readline}" = "yes"; then
10561056
fi
10571057
if test "${enable_openssl}" = "yes"; then
10581058
OPENSC_FEATURES="${OPENSC_FEATURES} openssl"
1059-
OPTIONAL_OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
1060-
OPTIONAL_OPENSSL_LIBS="${OPENSSL_LIBS}"
10611059
fi
10621060
if test "${enable_openct}" = "yes"; then
10631061
OPENSC_FEATURES="${OPENSC_FEATURES} openct"
@@ -1130,8 +1128,6 @@ AC_SUBST([OPTIONAL_ZLIB_CFLAGS])
11301128
AC_SUBST([OPTIONAL_ZLIB_LIBS])
11311129
AC_SUBST([OPTIONAL_READLINE_CFLAGS])
11321130
AC_SUBST([OPTIONAL_READLINE_LIBS])
1133-
AC_SUBST([OPTIONAL_OPENSSL_CFLAGS])
1134-
AC_SUBST([OPTIONAL_OPENSSL_LIBS])
11351131
AC_SUBST([OPTIONAL_OPENCT_CFLAGS])
11361132
AC_SUBST([OPTIONAL_OPENCT_LIBS])
11371133
AC_SUBST([OPTIONAL_PCSC_CFLAGS])

‎src/libopensc/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -D'OPENSC_CONF_PATH="$(sysconfdir)/opensc.conf"' \
2020
-D'DEFAULT_SM_MODULE_PATH="$(DEFAULT_SM_MODULE_PATH)"' \
2121
-D'DEFAULT_SM_MODULE="$(DEFAULT_SM_MODULE)"' \
2222
-I$(top_srcdir)/src
23-
AM_CFLAGS = $(OPENPACE_CFLAGS) $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
23+
AM_CFLAGS = $(OPENPACE_CFLAGS) $(OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
2424
$(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_ZLIB_CFLAGS)
2525
AM_OBJCFLAGS = $(AM_CFLAGS)
2626

@@ -76,7 +76,7 @@ libopensc_static_la_SOURCES = $(libopensc_la_SOURCES_BASE)
7676
if WIN32
7777
libopensc_la_SOURCES += $(top_builddir)/win32/versioninfo.rc
7878
endif
79-
libopensc_la_LIBADD = $(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) \
79+
libopensc_la_LIBADD = $(OPENPACE_LIBS) $(OPENSSL_LIBS) \
8080
$(OPTIONAL_OPENCT_LIBS) $(OPTIONAL_ZLIB_LIBS) \
8181
$(top_builddir)/src/pkcs15init/libpkcs15init.la \
8282
$(top_builddir)/src/scconf/libscconf.la \

‎src/minidriver/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ else
1212
dist_noinst_DATA = opensc-minidriver.inf
1313
endif
1414

15-
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPENPACE_CFLAGS)
15+
AM_CFLAGS = $(OPENSSL_CFLAGS) $(OPENPACE_CFLAGS)
1616
AM_CPPFLAGS = -I$(top_srcdir)/src
1717

1818
opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c opensc-minidriver.exports versioninfo-minidriver.rc
1919
opensc_minidriver@LIBRARY_BITNESS@_la_LIBADD = \
2020
$(top_builddir)/src/libopensc/libopensc_static.la \
21-
$(OPTIONAL_OPENSSL_LIBS) \
21+
$(OPENSSL_LIBS) \
2222
-lbcrypt -lcrypt32 -lrpcrt4 -lwinmm
2323
opensc_minidriver@LIBRARY_BITNESS@_la_LDFLAGS = $(AM_LDFLAGS) \
2424
-export-symbols "$(srcdir)/opensc-minidriver.exports" \

‎src/pkcs11/Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ OPENSC_PKCS11_SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot
1717
framework-pkcs15init.c debug.c pkcs11.exports \
1818
pkcs11-display.c pkcs11-display.h
1919
OPENSC_PKCS11_CFLAGS = \
20-
$(OPENPACE_CFLAGS) $(OPTIONAL_OPENSSL_CFLAGS) $(OPENSC_PKCS11_PTHREAD_CFLAGS)
20+
$(OPENPACE_CFLAGS) $(OPENSSL_CFLAGS) $(OPENSC_PKCS11_PTHREAD_CFLAGS)
2121
OPENSC_PKCS11_LIBS = \
2222
$(top_builddir)/src/libopensc/libopensc.la \
2323
$(top_builddir)/src/common/libscdl.la \
2424
$(top_builddir)/src/common/libcompat.la \
25-
$(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS)
25+
$(OPENPACE_LIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS)
2626
if WIN32
2727
OPENSC_PKCS11_LIBS += -lshlwapi
2828
endif
@@ -49,12 +49,12 @@ libopensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
4949
libopensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS)
5050

5151
pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11.exports
52-
pkcs11_spy_la_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPENSC_PKCS11_PTHREAD_CFLAGS)
52+
pkcs11_spy_la_CFLAGS = $(OPENSSL_CFLAGS) $(OPENSC_PKCS11_PTHREAD_CFLAGS)
5353
pkcs11_spy_la_LIBADD = \
5454
$(top_builddir)/src/common/libpkcs11.la \
5555
$(top_builddir)/src/common/libscdl.la \
5656
$(top_builddir)/src/common/libcompat.la \
57-
$(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS)
57+
$(OPENSSL_LIBS) $(PTHREAD_LIBS)
5858
pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
5959
-export-symbols "$(srcdir)/pkcs11.exports" \
6060
-module -shared -avoid-version -no-undefined

‎src/pkcs15init/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dist_pkgdata_DATA = \
3030

3131
AM_CPPFLAGS = -D'SC_PKCS15_PROFILE_DIRECTORY="$(pkgdatadir)"' \
3232
-I$(top_srcdir)/src
33-
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS)
33+
AM_CFLAGS = $(OPENSSL_CFLAGS)
3434

3535
libpkcs15init_la_SOURCES = \
3636
pkcs15-lib.c profile.c \

‎src/sm/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES += libsm.la
1515
endif
1616
noinst_HEADERS += sm-common.h
1717

18-
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
18+
AM_CFLAGS = $(OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
1919
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/include
2020

2121
libsm_la_SOURCES = sm-common.c sm-common.h

‎src/smm/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
44

55
EXTRA_DIST = Makefile.mak
66

7-
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
7+
AM_CFLAGS = $(OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
88
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
99
LIBS = $(top_builddir)/src/sm/libsm.la \
1010
$(top_builddir)/src/libopensc/libopensc.la \
@@ -20,7 +20,7 @@ libsmm_local_la_SOURCES = smm-local.c sm-module.h \
2020
sm-global-platform.c sm-cwa14890.c \
2121
sm-card-authentic.c sm-card-iasecc.c \
2222
smm-local.exports
23-
libsmm_local_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS)
23+
libsmm_local_la_LIBADD = $(OPENSSL_LIBS)
2424
libsmm_local_la_LDFLAGS = -module -shared -no-undefined -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
2525

2626
# noinst_HEADERS = sm.h

‎src/tests/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SUBDIRS = regression p11test fuzzing unittests
77
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
88

99
AM_CPPFLAGS = -I$(top_srcdir)/src
10-
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS)
10+
AM_CFLAGS = $(OPENSSL_CFLAGS)
1111
LIBS = \
1212
$(top_builddir)/src/libopensc/libopensc.la \
1313
$(top_builddir)/src/common/libscdl.la \

‎src/tests/fuzzing/Makefile.am‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AM_CPPFLAGS = -I$(top_srcdir)/src -D'SC_PKCS15_PROFILE_DIRECTORY="$(pkgdatadir)"' \
22
-D'DEFAULT_PKCS11_PROVIDER="$(DEFAULT_PKCS11_PROVIDER)"'
3-
AM_CFLAGS = -g -O0 $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) $(PTHREAD_CFLAGS)
3+
AM_CFLAGS = -g -O0 $(OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) $(PTHREAD_CFLAGS)
44
LIBS = $(FUZZING_LIBS)\
55
$(top_builddir)/src/libopensc/libopensc.la \
66
$(top_builddir)/src/common/libscdl.la \
@@ -36,23 +36,23 @@ fuzz_pkcs15_decode_SOURCES = fuzz_pkcs15_decode.c fuzzer_reader.c $(ADDITIONAL_S
3636
fuzz_pkcs15_reader_SOURCES = fuzz_pkcs15_reader.c fuzzer_reader.c $(ADDITIONAL_SRC)
3737
fuzz_scconf_parse_string_SOURCES = fuzz_scconf_parse_string.c $(ADDITIONAL_SRC)
3838
fuzz_pkcs15init_SOURCES = fuzz_pkcs15init.c fuzzer_reader.c $(ADDITIONAL_SRC)
39-
fuzz_pkcs15init_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(OPENPACE_LIBS)
39+
fuzz_pkcs15init_LDADD = $(OPENSSL_LIBS) $(OPENPACE_LIBS)
4040
fuzz_pkcs15init_LDFLAGS = -static
4141
fuzz_pkcs15_encode_SOURCES = fuzz_pkcs15_encode.c fuzzer_reader.c $(ADDITIONAL_SRC)
4242
fuzz_card_SOURCES = fuzz_card.c fuzzer_reader.c $(ADDITIONAL_SRC)
4343
fuzz_piv_tool_SOURCES = fuzz_piv_tool.c fuzzer_reader.c fuzzer_tool.c $(ADDITIONAL_SRC) \
4444
../../tools/util.c
45-
fuzz_piv_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
45+
fuzz_piv_tool_LDADD = $(OPENSSL_LIBS)
4646
fuzz_pkcs15_tool_SOURCES = fuzz_pkcs15_tool.c fuzzer_reader.c fuzzer_tool.c $(ADDITIONAL_SRC) \
4747
../../tools/util.c ../../pkcs11/pkcs11-display.c
48-
fuzz_pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
48+
fuzz_pkcs15_tool_LDADD = $(OPENSSL_LIBS)
4949
fuzz_pkcs15_crypt_SOURCES = fuzz_pkcs15_crypt.c fuzzer_reader.c fuzzer_tool.c $(ADDITIONAL_SRC) \
5050
../../tools/util.c
51-
fuzz_pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS)
51+
fuzz_pkcs15_crypt_LDADD = $(OPENSSL_LIBS)
5252
fuzz_pkcs11_SOURCES = fuzz_pkcs11.c fuzzer_reader.c fuzzer_tool.c $(ADDITIONAL_SRC)
53-
fuzz_pkcs11_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
53+
fuzz_pkcs11_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
5454
fuzz_pkcs11_LDADD = \
5555
$(top_builddir)/src/common/libpkcs11.la \
56-
$(OPTIONAL_OPENSSL_LIBS) \
56+
$(OPENSSL_LIBS) \
5757
$(top_builddir)/src/pkcs11/libopensc-pkcs11.la
5858
fuzz_pkcs11_uri_SOURCES = fuzz_pkcs11_uri.c ../../tools/pkcs11_uri.c $(ADDITIONAL_SRC)

‎src/tests/p11test/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ p11test_SOURCES = p11test.c p11test_loader.c \
3434
p11test_case_wrap.c \
3535
p11test_case_secret.c \
3636
p11test_helpers.c
37-
p11test_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(CMOCKA_CFLAGS)
38-
p11test_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(CMOCKA_LIBS) $(LDL_LIBS)
37+
p11test_CFLAGS = $(OPENSSL_CFLAGS) $(CMOCKA_CFLAGS)
38+
p11test_LDADD = $(OPENSSL_LIBS) $(CMOCKA_LIBS) $(LDL_LIBS)
3939

4040
if WIN32
4141
p11test_SOURCES += $(top_builddir)/win32/versioninfo.rc

0 commit comments

Comments
 (0)