---
.gitignore | 4 ----
usr/lib/pkcs11/aep_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/api/Makefile.am | 14 +++++++-------
usr/lib/pkcs11/bcom_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/cca_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/cr_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/ica_s390_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/ica_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/leeds_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/soft_stdll/Makefile.am | 8 ++++----
usr/lib/pkcs11/tpm_stdll/Makefile.am | 8 ++++----
11 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3d66b5d..104c711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,10 +22,6 @@
/man/man8/pkcsslotd.8
/misc/pkcsslotd
/missing
-/usr/lib/pkcs11/api/opencryptoki
-/usr/lib/pkcs11/cca_stdll/opencryptoki
-/usr/lib/pkcs11/soft_stdll/opencryptoki
-/usr/lib/pkcs11/tpm_stdll/opencryptoki
/usr/sbin/pkcs11_startup/pkcs11_startup
/usr/sbin/pkcs_slot/pkcs_slot
/usr/sbin/pkcsconf/pkcsconf
diff --git a/usr/lib/pkcs11/aep_stdll/Makefile.am
b/usr/lib/pkcs11/aep_stdll/Makefile.am
index 812c484..2d5f6c8 100644
--- a/usr/lib/pkcs11/aep_stdll/Makefile.am
+++ b/usr/lib/pkcs11/aep_stdll/Makefile.am
@@ -1,15 +1,15 @@
-nobase_lib_LTLIBRARIES = opencryptoki/stdll/libpkcs11_aep.la
+stdll_LTLIBRARIES = libpkcs11_aep.la
-opencryptoki_stdll_libpkcs11_aep_la_LDFLAGS = $(LCRYPTO) \
+libpkcs11_aep_la_LDFLAGS = $(LCRYPTO) \
$(AEP_LIB_DIRS) -nostartfiles -shared -Wl,-soname,PKCS11_AEP.so.1 -lc \
-lpthread -lcrypto -laep
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV \
+libpkcs11_aep_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=1 -DLITE=0 -DNOCDMF -DNOMD2 \
-DNODSA -DAEP_GENERIC -DNORIPE -DSTDLL_NAME=\"aeptok\"
-opencryptoki_stdll_libpkcs11_aep_la_SOURCES = ../common/asn1.c \
+libpkcs11_aep_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c
\
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
diff --git a/usr/lib/pkcs11/api/Makefile.am b/usr/lib/pkcs11/api/Makefile.am
index 76828d6..cb40fc0 100644
--- a/usr/lib/pkcs11/api/Makefile.am
+++ b/usr/lib/pkcs11/api/Makefile.am
@@ -1,18 +1,18 @@
-nobase_lib_LTLIBRARIES = opencryptoki/libopencryptoki.la
+pkglib_LTLIBRARIES = libopencryptoki.la
SO_CURRENT=0
SO_REVISION=0
SO_AGE=0
-opencryptoki_libopencryptoki_la_LDFLAGS = -shared -Wl,-Bsymbolic -lc -ldl \
- -lpthread -version-info \
- $(SO_CURRENT):$(SO_REVISION):$(SO_AGE)
+libopencryptoki_la_LDFLAGS = -shared -Wl,-Bsymbolic -lc -ldl \
+ -lpthread -version-info \
+ $(SO_CURRENT):$(SO_REVISION):$(SO_AGE)
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_libopencryptoki_la_CFLAGS = -DSPINXPL -DAPI -DDEV -D_THREAD_SAFE \
- -fPIC -I../. -I../../../include/pkcs11
+libopencryptoki_la_CFLAGS = -DSPINXPL -DAPI -DDEV -D_THREAD_SAFE \
+ -I../. -I../../../include/pkcs11
-opencryptoki_libopencryptoki_la_SOURCES = api_interface.c shrd_mem.c apiutil.c
+libopencryptoki_la_SOURCES = api_interface.c shrd_mem.c apiutil.c
install-data-hook:
$(MKDIR_P) $(DESTDIR)$(libdir)/opencryptoki/stdll
diff --git a/usr/lib/pkcs11/bcom_stdll/Makefile.am
b/usr/lib/pkcs11/bcom_stdll/Makefile.am
index de285bd..58b8db5 100644
--- a/usr/lib/pkcs11/bcom_stdll/Makefile.am
+++ b/usr/lib/pkcs11/bcom_stdll/Makefile.am
@@ -1,17 +1,17 @@
-nobase_lib_LTLIBRARIES = opencryptoki/stdll/libpkcs11_bc.la
+stdll_LTLIBRARIES = libpkcs11_bc.la
-opencryptoki_stdll_libpkcs11_bc_la_LDFLAGS = $(LCRYPTO) $(BC_LIB_DIRS) \
+libpkcs11_bc_la_LDFLAGS = $(LCRYPTO) $(BC_LIB_DIRS) \
-nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,PKCS11_BC.so.1 -lc \
-lpthread -lubsec -ldl
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_bc_la_CFLAGS = -DSPINXPL -DDEV \
+libpkcs11_bc_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA -DNOAES \
-DNODH -DNORIPE -DSTDLL_NAME=\"bcomtok\"
-opencryptoki_stdll_libpkcs11_bc_la_SOURCES = ../common/asn1.c \
+libpkcs11_bc_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
diff --git a/usr/lib/pkcs11/cca_stdll/Makefile.am
b/usr/lib/pkcs11/cca_stdll/Makefile.am
index 9c210b8..1a935e8 100644
--- a/usr/lib/pkcs11/cca_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cca_stdll/Makefile.am
@@ -4,18 +4,18 @@
#
# The PKCS#11 STDLL library
#
-nobase_lib_LTLIBRARIES=opencryptoki/stdll/libpkcs11_cca.la
+stdll_LTLIBRARIES=libpkcs11_cca.la
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_cca_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF
\
+libpkcs11_cca_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \
-DNODSA -DNODH -DNOECB \
-I. -I../../../include -I../../../include/pkcs11 -I../common \
-DSTDLL_NAME=\"ccatok\"
-opencryptoki_stdll_libpkcs11_cca_la_LDFLAGS = -shared -Wl,-Bsymbolic \
+libpkcs11_cca_la_LDFLAGS = -shared -Wl,-Bsymbolic \
-lcrypto -lpthread -nostartfiles -Wl,-soname,$@
-opencryptoki_stdll_libpkcs11_cca_la_SOURCES = asn1.c \
+libpkcs11_cca_la_SOURCES = asn1.c \
../common/dig_mgr.c \
../common/hwf_obj.c \
../common/log.c \
diff --git a/usr/lib/pkcs11/cr_stdll/Makefile.am
b/usr/lib/pkcs11/cr_stdll/Makefile.am
index 6e4ef63..019baf1 100644
--- a/usr/lib/pkcs11/cr_stdll/Makefile.am
+++ b/usr/lib/pkcs11/cr_stdll/Makefile.am
@@ -1,16 +1,16 @@
-nobase_lib_LTLIBRARIES = opencryptoki/stdll/libpkcs11_cr.la
+stdll_LTLIBRARIES = libpkcs11_cr.la
-opencryptoki_stdll_libpkcs11_cr_la_LDFLAGS = $(LCRYPTO) $(CR_LIB_DIRS) \
+libpkcs11_cr_la_LDFLAGS = $(LCRYPTO) $(CR_LIB_DIRS) \
-nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,PKCS11_BC.so.1 -lc \
-lpthread -lsocketarmor -ldl -lcrypto
VARIANT = -DSHALLOW=0 -DSWTOK=1 -DLITE=0
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_cr_la_CFLAGS = -DSPINXPL -DDEV \
+libpkcs11_cr_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC $(VARIANT) -DNOCDMF -DNOMD2 -DNODSA
-opencryptoki_stdll_libpkcs11_cr_la_SOURCES = ../common/asn1.c \
+libpkcs11_cr_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
diff --git a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
index 61a4e7b..6f4bfe5 100644
--- a/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
@@ -1,15 +1,15 @@
-nobase_lib_LTLIBRARIES = opencryptoki/stdll/libpkcs11_ica.la
+stdll_LTLIBRARIES = libpkcs11_ica.la
-opencryptoki_stdll_libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
+libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
$(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic -Wl,-soname,$@ \
-Wl,-Bsymbolic -lc -lpthread -lica -ldl -lcrypto
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
+libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNODH \
-DNOCDMF -DNOMD2 -DNODSA -DSTDLL_NAME=\"icatok\"
-opencryptoki_stdll_libpkcs11_ica_la_SOURCES = ../common/asn1.c \
+libpkcs11_ica_la_SOURCES = ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
diff --git a/usr/lib/pkcs11/ica_stdll/Makefile.am
b/usr/lib/pkcs11/ica_stdll/Makefile.am
index 2d0e0bb..17ad10d 100644
--- a/usr/lib/pkcs11/ica_stdll/Makefile.am
+++ b/usr/lib/pkcs11/ica_stdll/Makefile.am
@@ -1,11 +1,11 @@
-nobase_lib_LTLIBRARIES = opencryptoki/stdll/libpkcs11_ica.la
+stdll_LTLIBRARIES = libpkcs11_ica.la
-opencryptoki_stdll_libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
+libpkcs11_ica_la_LDFLAGS = $(LCRYPTO) \
$(ICA_LIB_DIRS) -nostartfiles -shared -Wl,-Bsymbolic \
-Wl,-soname,PKCS11_ICA.so.1 -lc -lpthread -ldl -lica
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
+libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV \
-D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 -DLITE=1 -DNOCDMF -DNOMD2 \
-DNODSA -DNOAES -DNODH -DNORIPE -DSTDLL_NAME=\"icatok\"
@@ -13,7 +13,7 @@ opencryptoki_stdll_libpkcs11_ica_la_CFLAGS = -DSPINXPL -DDEV
\
AM_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE -fPIC -DSHALLOW=0 -DSWTOK=0 \
-DLITE=1 -DNOCDMF -DNOMD2 -DNODSA -DNOAES -DNODH -DNORIPE
-opencryptoki_stdll_libpkcs11_ica_la_SOURCES= ../common/asn1.c \
+libpkcs11_ica_la_SOURCES= ../common/asn1.c \
../common/cert.c ../common/hwf_obj.c ../common/dp_obj.c \
../common/data_obj.c ../common/decr_mgr.c ../common/dig_mgr.c \
../common/encr_mgr.c ../common/globals.c ../common/loadsave.c \
diff --git a/usr/lib/pkcs11/leeds_stdll/Makefile.am
b/usr/lib/pkcs11/leeds_stdll/Makefile.am
index c40e3a8..f28417e 100644
--- a/usr/lib/pkcs11/leeds_stdll/Makefile.am
+++ b/usr/lib/pkcs11/leeds_stdll/Makefile.am
@@ -1,12 +1,12 @@
-nobase_lib_LTLIBRARIES=opencryptoki/stdll/libpkcs11_4758.la
+stdll_LTLIBRARIES=libpkcs11_4758.la
-opencryptoki_stdll_libpkcs11_4758_la_LDFLAGS = $(SCC_LIBS) -nostartfiles
-shared \
+libpkcs11_4758_la_LDFLAGS = $(SCC_LIBS) -nostartfiles -shared \
-Wl,-Bsymbolic -Wl,-soname,[email protected] -lpthread -lscc -ldl
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE
-DLEEDS_BUILD
+libpkcs11_4758_la_CFLAGS = -DDEV -D_THREAD_SAFE -DLEEDS_BUILD
-opencryptoki_stdll_libpkcs11_4758_la_SOURCES = host_api.c util.c
+libpkcs11_4758_la_SOURCES = host_api.c util.c
INCLUDES = $(SCC_INC_DIRS) -I/usr/include -I. -I../../../include/pkcs11/stdll \
-I../../../include/pkcs11
diff --git a/usr/lib/pkcs11/soft_stdll/Makefile.am
b/usr/lib/pkcs11/soft_stdll/Makefile.am
index 7d3ed3d..f508873 100644
--- a/usr/lib/pkcs11/soft_stdll/Makefile.am
+++ b/usr/lib/pkcs11/soft_stdll/Makefile.am
@@ -1,10 +1,10 @@
-nobase_lib_LTLIBRARIES = opencryptoki/stdll/libpkcs11_sw.la
+stdll_LTLIBRARIES = libpkcs11_sw.la
-opencryptoki_stdll_libpkcs11_sw_la_LDFLAGS = -shared -Wl,-Bsymbolic \
+libpkcs11_sw_la_LDFLAGS = -shared -Wl,-Bsymbolic \
-lc -lpthread -lcrypto
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE \
+libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV -D_THREAD_SAFE \
-DSHALLOW=0 -DSWTOK=1 -DLITE=0 \
-DNOCDMF -DNOMD2 -DNODSA -DNORIPE
\
-fPIC \
@@ -13,7 +13,7 @@ opencryptoki_stdll_libpkcs11_sw_la_CFLAGS = -DSPINXPL -DDEV
-D_THREAD_SAFE \
-I../../../include/pkcs11 \
-I../common -DSTDLL_NAME=\"swtok\"
-opencryptoki_stdll_libpkcs11_sw_la_SOURCES = ../common/asn1.c \
+libpkcs11_sw_la_SOURCES = ../common/asn1.c \
../common/cert.c \
../common/hwf_obj.c \
../common/dp_obj.c \
diff --git a/usr/lib/pkcs11/tpm_stdll/Makefile.am
b/usr/lib/pkcs11/tpm_stdll/Makefile.am
index 02b231d..ad7c134 100644
--- a/usr/lib/pkcs11/tpm_stdll/Makefile.am
+++ b/usr/lib/pkcs11/tpm_stdll/Makefile.am
@@ -1,6 +1,6 @@
# Makefile.am for common functions for openCryptoki
# Michael A. Halcrow <[email protected]>
-nobase_lib_LTLIBRARIES=opencryptoki/stdll/libpkcs11_tpm.la
+stdll_LTLIBRARIES=libpkcs11_tpm.la
AUTOMAKE_OPTIONS = gnu
@@ -9,17 +9,17 @@ AUTOMAKE_OPTIONS = gnu
# TODO: -DLINUX and -DSPINXPL should be controlled via configure.in
# Not all versions of automake observe libname_CFLAGS
-opencryptoki_stdll_libpkcs11_tpm_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF
\
+libpkcs11_tpm_la_CFLAGS = -DLINUX -DSPINXPL -DNOCDMF \
-DNODSA -DNODH \
-I. -I../../../include \
-I../../../include/pkcs11 \
-I../common -DMMAP \
-DSTDLL_NAME=\"tpmtok\"
-opencryptoki_stdll_libpkcs11_tpm_la_LDFLAGS = -shared -Wl,-Bsymbolic \
+libpkcs11_tpm_la_LDFLAGS = -shared -Wl,-Bsymbolic \
-lcrypto -ltspi -lpthread
-opencryptoki_stdll_libpkcs11_tpm_la_SOURCES = ../common/asn1.c \
+libpkcs11_tpm_la_SOURCES = ../common/asn1.c \
dig_mgr.c \
../common/hwf_obj.c \
../common/log.c \
--
1.7.4.rc3
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
