This patch creates a new libopensc containing those three libraries.
The export list contains all symbols exported by those three.
common/libcompat.la is also linked into libopensc, but not exported.
The tools thus link common/libcompat.la themself.
Is this the way we want to go? Shall I appy it?
Regards, Andreas
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/Makefile.am opensc/src/libopensc/Makefile.am
--- opensc.orig/src/libopensc/Makefile.am 2010-02-01 08:03:26.000000000 +0100
+++ opensc/src/libopensc/Makefile.am 2010-02-01 07:43:28.000000000 +0100
@@ -1,12 +1,10 @@
include $(top_srcdir)/win32/ltrc.inc
-MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
-CLEANFILES = versioninfo.rc
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = Makefile.mak
bin_SCRIPTS = opensc-config
-lib_LTLIBRARIES = libopensc.la
+noinst_LTLIBRARIES = libopensc.la
openscinclude_HEADERS = \
opensc.h pkcs15.h \
cardctl.h asn1.h log.h ui.h \
@@ -46,33 +44,4 @@ libopensc_la_SOURCES = \
pkcs15-tcos.c pkcs15-esteid.c pkcs15-postecert.c pkcs15-gemsafeGPK.c \
pkcs15-actalis.c pkcs15-atrust-acos.c pkcs15-tccardos.c pkcs15-piv.c \
pkcs15-esinit.c p15emu-westcos.c pkcs15-pteid.c \
- compression.c p15card-helper.c \
- \
- libopensc.exports
-if WIN32
-libopensc_la_SOURCES += versioninfo.rc
-else
-dist_noinst_DATA = versioninfo.rc
-endif
-libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \
- $(OPTIONAL_ZLIB_LIBS) $(OPTIONAL_ICONV_LIBS) $(LTLIB_LIBS) \
- $(top_builddir)/src/scconf/libscconf.la \
- $(top_builddir)/src/common/libcompat.la
-if WIN32
-libopensc_la_LIBADD += -lws2_32
-endif
-libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
- -export-symbols "$(srcdir)/libopensc.exports" \
- -no-undefined
-
-versioninfo.rc:
- sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \
- "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
-
-if WIN32
-# def file required for MS users to build library
-mylibdir=$(libdir)
-mylib_DATA=.libs/@win_libpre...@opensc-@opensc_lt_old...@.dll.def
-.libs/@win_libpre...@opensc-@opensc_lt_old...@.dll.def: libopensc.la
-endif
+ compression.c p15card-helper.c
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/libopensc.exports opensc/src/libopensc/libopensc.exports
--- opensc.orig/src/libopensc/libopensc.exports 2010-02-01 08:03:26.000000000 +0100
+++ opensc/src/libopensc/libopensc.exports 1970-01-01 01:00:00.000000000 +0100
@@ -1,214 +0,0 @@
-_sc_asn1_decode
-_sc_asn1_encode
-_sc_debug
-sc_append_file_id
-sc_append_path
-sc_append_path_id
-sc_append_record
-sc_asn1_clear_algorithm_id
-sc_asn1_decode
-sc_asn1_decode_algorithm_id
-sc_asn1_decode_bit_string
-sc_asn1_decode_bit_string_ni
-sc_asn1_decode_choice
-sc_asn1_decode_integer
-sc_asn1_decode_object_id
-sc_asn1_encode
-sc_asn1_encode_algorithm_id
-sc_asn1_find_tag
-sc_asn1_print_tags
-sc_asn1_put_tag
-sc_asn1_skip_tag
-sc_asn1_verify_tag
-sc_base64_decode
-sc_base64_encode
-sc_bin_to_hex
-sc_build_pin
-sc_cancel
-sc_card_ctl
-sc_card_valid
-sc_change_reference_data
-sc_check_sw
-sc_compare_oid
-sc_compare_path
-sc_compare_path_prefix
-sc_compute_signature
-sc_concatenate_path
-sc_connect_card
-sc_context_create
-sc_copy_asn1_entry
-sc_create_file
-sc_ctx_detect_readers
-sc_ctx_get_reader
-sc_ctx_get_reader_by_id
-sc_ctx_get_reader_by_name
-sc_ctx_get_reader_count
-sc_decipher
-sc_delete_file
-sc_delete_record
-sc_der_clear
-sc_der_copy
-sc_detect_card_presence
-sc_disconnect_card
-sc_do_log
-sc_do_log_va
-sc_enum_apps
-sc_establish_context
-sc_file_add_acl_entry
-sc_file_clear_acl_entries
-sc_file_dup
-sc_file_free
-sc_file_get_acl_entry
-sc_file_new
-sc_file_set_prop_attr
-sc_file_set_sec_attr
-sc_file_set_type_attr
-sc_file_valid
-sc_find_app_by_aid
-sc_find_pkcs15_app
-sc_format_apdu
-sc_format_asn1_entry
-sc_format_oid
-sc_format_path
-sc_free_apps
-sc_get_cache_dir
-sc_get_challenge
-sc_get_conf_block
-sc_get_data
-sc_get_mf_path
-sc_get_version
-sc_hex_dump
-sc_dump_hex
-sc_hex_to_bin
-sc_list_files
-sc_lock
-sc_logout
-sc_make_cache_dir
-sc_mem_clear
-sc_path_print
-sc_path_set
-sc_pin_cmd
-sc_pkcs15_add_df
-sc_pkcs15_add_object
-sc_pkcs15_add_unusedspace
-sc_pkcs15_bind
-sc_pkcs15_bind_synthetic
-sc_pkcs15_cache_file
-sc_pkcs15_card_clear
-sc_pkcs15_card_free
-sc_pkcs15_card_new
-sc_pkcs15_change_pin
-sc_pkcs15_compare_id
-sc_pkcs15_compute_signature
-sc_pkcs15_decipher
-sc_pkcs15_decode_aodf_entry
-sc_pkcs15_decode_cdf_entry
-sc_pkcs15_decode_dodf_entry
-sc_pkcs15_decode_enveloped_data
-sc_pkcs15_decode_prkdf_entry
-sc_pkcs15_decode_prkey
-sc_pkcs15_decode_pubkey
-sc_pkcs15_decode_pubkey_dsa
-sc_pkcs15_decode_pubkey_rsa
-sc_pkcs15_decode_pubkey_gostr3410
-sc_pkcs15_decode_pukdf_entry
-sc_pkcs15_encode_aodf_entry
-sc_pkcs15_encode_cdf_entry
-sc_pkcs15_encode_df
-sc_pkcs15_encode_dodf_entry
-sc_pkcs15_encode_enveloped_data
-sc_pkcs15_encode_odf
-sc_pkcs15_encode_prkdf_entry
-sc_pkcs15_encode_prkey
-sc_pkcs15_encode_pubkey
-sc_pkcs15_encode_pubkey_dsa
-sc_pkcs15_encode_pubkey_rsa
-sc_pkcs15_encode_pubkey_gostr3410
-sc_pkcs15_encode_pukdf_entry
-sc_pkcs15_encode_tokeninfo
-sc_pkcs15_encode_unusedspace
-sc_pkcs15_erase_prkey
-sc_pkcs15_erase_pubkey
-sc_pkcs15_find_cert_by_id
-sc_pkcs15_find_data_object_by_app_oid
-sc_pkcs15_find_data_object_by_id
-sc_pkcs15_find_data_object_by_name
-sc_pkcs15_find_object_by_id
-sc_pkcs15_find_pin_by_auth_id
-sc_pkcs15_find_pin_by_reference
-sc_pkcs15_find_prkey_by_id
-sc_pkcs15_find_prkey_by_id_usage
-sc_pkcs15_find_prkey_by_reference
-sc_pkcs15_find_pubkey_by_id
-sc_pkcs15_find_so_pin
-sc_pkcs15_format_id
-sc_pkcs15_free_cert_info
-sc_pkcs15_free_certificate
-sc_pkcs15_free_data_info
-sc_pkcs15_free_data_object
-sc_pkcs15_free_object
-sc_pkcs15_free_pin_info
-sc_pkcs15_free_prkey
-sc_pkcs15_free_prkey_info
-sc_pkcs15_free_pubkey
-sc_pkcs15_free_pubkey_info
-sc_pkcs15_get_objects
-sc_pkcs15_get_objects_cond
-sc_pkcs15_hex_string_to_id
-sc_pkcs15_is_emulation_only
-sc_pkcs15_make_absolute_path
-sc_pkcs15_parse_df
-sc_pkcs15_parse_tokeninfo
-sc_pkcs15_parse_unusedspace
-sc_pkcs15_pincache_clear
-sc_pkcs15_print_id
-sc_pkcs15_read_cached_file
-sc_pkcs15_read_certificate
-sc_pkcs15_read_data_object
-sc_pkcs15_read_file
-sc_pkcs15_read_prkey
-sc_pkcs15_read_pubkey
-sc_pkcs15_pubkey_from_prvkey
-sc_pkcs15_pubkey_from_cert
-sc_pkcs15_remove_df
-sc_pkcs15_remove_object
-sc_pkcs15_remove_unusedspace
-sc_pkcs15_search_objects
-sc_pkcs15_unbind
-sc_pkcs15_unblock_pin
-sc_pkcs15_unwrap_data
-sc_pkcs15_verify_pin
-sc_pkcs15_wrap_data
-sc_pkcs15emu_add_data_object
-sc_pkcs15emu_add_pin_obj
-sc_pkcs15emu_add_rsa_prkey
-sc_pkcs15emu_add_rsa_pubkey
-sc_pkcs15emu_add_x509_cert
-sc_pkcs15emu_object_add
-sc_print_path
-sc_put_data
-sc_read_binary
-sc_read_record
-sc_release_context
-sc_reset
-sc_reset_retry_counter
-sc_restore_security_env
-sc_select_file
-sc_set_card_driver
-sc_set_security_env
-sc_strerror
-sc_transmit_apdu
-sc_ui_display_debug
-sc_ui_display_error
-sc_ui_get_pin
-sc_ui_get_pin_pair
-sc_ui_set_language
-sc_unlock
-sc_update_binary
-sc_update_dir
-sc_update_record
-sc_verify
-sc_wait_for_event
-sc_write_binary
-sc_write_record
-sc_get_iso7816_driver
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs11/Makefile.am opensc/src/pkcs11/Makefile.am
--- opensc.orig/src/pkcs11/Makefile.am 2010-02-01 08:03:22.000000000 +0100
+++ opensc/src/pkcs11/Makefile.am 2010-02-01 07:18:40.000000000 +0100
@@ -19,10 +19,7 @@ OPENSC_PKCS11_SRC = pkcs11-global.c pkcs
framework-pkcs15init.c debug.c opensc-pkcs11.exports \
pkcs11-display.c pkcs11-display.h
OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) \
- $(top_builddir)/src/pkcs15init/libpkcs15init.la \
- $(top_builddir)/src/libopensc/libopensc.la \
- $(top_builddir)/src/scconf/libscconf.la \
- $(top_builddir)/src/common/libcompat.la
+ $(top_builddir)/src/pkcs15init/libopensc.la
libpkcs11_la_SOURCES = libpkcs11.c
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/Makefile.am opensc/src/pkcs15init/Makefile.am
--- opensc.orig/src/pkcs15init/Makefile.am 2010-02-01 08:03:23.000000000 +0100
+++ opensc/src/pkcs15init/Makefile.am 2010-02-01 07:42:57.000000000 +0100
@@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = \
CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak
-lib_LTLIBRARIES = libpkcs15init.la
+lib_LTLIBRARIES = libopensc.la
openscinclude_HEADERS = pkcs15-init.h
noinst_HEADERS = profile.h keycache.h
dist_pkgdata_DATA = \
@@ -32,7 +32,7 @@ AM_CPPFLAGS = -DSC_PKCS15_PROFILE_DIRECT
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS)
INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
-libpkcs15init_la_SOURCES = \
+libopensc_la_SOURCES = \
pkcs15-lib.c profile.c keycache.c \
pkcs15-westcos.c \
pkcs15-gpk.c pkcs15-miocos.c pkcs15-cflex.c \
@@ -40,19 +40,23 @@ libpkcs15init_la_SOURCES = \
pkcs15-oberthur.c pkcs15-setcos.c pkcs15-incrypto34.c \
pkcs15-muscle.c pkcs15-asepcos.c pkcs15-rutoken.c \
pkcs15-entersafe.c pkcs15-rtecp.c pkcs15-myeid.c \
- pkcs15init.exports
+ libopensc.exports
if WIN32
-libpkcs15init_la_SOURCES += versioninfo.rc
+libopensc_la_SOURCES += versioninfo.rc
else
dist_noinst_DATA = versioninfo.rc
endif
-libpkcs15init_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
+libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \
+ $(OPTIONAL_ZLIB_LIBS) $(OPTIONAL_ICONV_LIBS) $(LTLIB_LIBS) \
$(top_builddir)/src/libopensc/libopensc.la \
$(top_builddir)/src/scconf/libscconf.la \
$(top_builddir)/src/common/libcompat.la
-libpkcs15init_la_LDFLAGS = $(AM_LDFLAGS) \
+if WIN32
+libopensc_la_LIBADD += -lws2_32
+endif
+libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
-version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
- -export-symbols "$(srcdir)/pkcs15init.exports" \
+ -export-symbols "$(srcdir)/libopensc.exports" \
-no-undefined
versioninfo.rc:
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/libopensc.exports opensc/src/pkcs15init/libopensc.exports
--- opensc.orig/src/pkcs15init/libopensc.exports 1970-01-01 01:00:00.000000000 +0100
+++ opensc/src/pkcs15init/libopensc.exports 2010-02-01 07:47:52.000000000 +0100
@@ -0,0 +1,301 @@
+scconf_block_add
+scconf_block_copy
+scconf_block_destroy
+scconf_find_block
+scconf_find_blocks
+scconf_find_list
+scconf_free
+scconf_get_bool
+scconf_get_int
+scconf_get_str
+scconf_item_add
+scconf_item_copy
+scconf_item_destroy
+scconf_list_add
+scconf_list_array_length
+scconf_list_copy
+scconf_list_destroy
+scconf_list_strdup
+scconf_list_strings_length
+scconf_list_toarray
+scconf_new
+scconf_parse
+scconf_parse_entries
+scconf_parse_string
+scconf_put_bool
+scconf_put_int
+scconf_put_str
+scconf_write
+scconf_write_entries
+_sc_asn1_decode
+_sc_asn1_encode
+_sc_debug
+sc_append_file_id
+sc_append_path
+sc_append_path_id
+sc_append_record
+sc_asn1_clear_algorithm_id
+sc_asn1_decode
+sc_asn1_decode_algorithm_id
+sc_asn1_decode_bit_string
+sc_asn1_decode_bit_string_ni
+sc_asn1_decode_choice
+sc_asn1_decode_integer
+sc_asn1_decode_object_id
+sc_asn1_encode
+sc_asn1_encode_algorithm_id
+sc_asn1_find_tag
+sc_asn1_print_tags
+sc_asn1_put_tag
+sc_asn1_skip_tag
+sc_asn1_verify_tag
+sc_base64_decode
+sc_base64_encode
+sc_bin_to_hex
+sc_build_pin
+sc_cancel
+sc_card_ctl
+sc_card_valid
+sc_change_reference_data
+sc_check_sw
+sc_compare_oid
+sc_compare_path
+sc_compare_path_prefix
+sc_compute_signature
+sc_concatenate_path
+sc_connect_card
+sc_context_create
+sc_copy_asn1_entry
+sc_create_file
+sc_ctx_detect_readers
+sc_ctx_get_reader
+sc_ctx_get_reader_by_id
+sc_ctx_get_reader_by_name
+sc_ctx_get_reader_count
+sc_decipher
+sc_delete_file
+sc_delete_record
+sc_der_clear
+sc_der_copy
+sc_detect_card_presence
+sc_disconnect_card
+sc_do_log
+sc_do_log_va
+sc_enum_apps
+sc_establish_context
+sc_file_add_acl_entry
+sc_file_clear_acl_entries
+sc_file_dup
+sc_file_free
+sc_file_get_acl_entry
+sc_file_new
+sc_file_set_prop_attr
+sc_file_set_sec_attr
+sc_file_set_type_attr
+sc_file_valid
+sc_find_app_by_aid
+sc_find_pkcs15_app
+sc_format_apdu
+sc_format_asn1_entry
+sc_format_oid
+sc_format_path
+sc_free_apps
+sc_get_cache_dir
+sc_get_challenge
+sc_get_conf_block
+sc_get_data
+sc_get_mf_path
+sc_get_version
+sc_hex_dump
+sc_dump_hex
+sc_hex_to_bin
+sc_list_files
+sc_lock
+sc_logout
+sc_make_cache_dir
+sc_mem_clear
+sc_path_print
+sc_path_set
+sc_pin_cmd
+sc_pkcs15_add_df
+sc_pkcs15_add_object
+sc_pkcs15_add_unusedspace
+sc_pkcs15_bind
+sc_pkcs15_bind_synthetic
+sc_pkcs15_cache_file
+sc_pkcs15_card_clear
+sc_pkcs15_card_free
+sc_pkcs15_card_new
+sc_pkcs15_change_pin
+sc_pkcs15_compare_id
+sc_pkcs15_compute_signature
+sc_pkcs15_decipher
+sc_pkcs15_decode_aodf_entry
+sc_pkcs15_decode_cdf_entry
+sc_pkcs15_decode_dodf_entry
+sc_pkcs15_decode_enveloped_data
+sc_pkcs15_decode_prkdf_entry
+sc_pkcs15_decode_prkey
+sc_pkcs15_decode_pubkey
+sc_pkcs15_decode_pubkey_dsa
+sc_pkcs15_decode_pubkey_rsa
+sc_pkcs15_decode_pubkey_gostr3410
+sc_pkcs15_decode_pukdf_entry
+sc_pkcs15_encode_aodf_entry
+sc_pkcs15_encode_cdf_entry
+sc_pkcs15_encode_df
+sc_pkcs15_encode_dodf_entry
+sc_pkcs15_encode_enveloped_data
+sc_pkcs15_encode_odf
+sc_pkcs15_encode_prkdf_entry
+sc_pkcs15_encode_prkey
+sc_pkcs15_encode_pubkey
+sc_pkcs15_encode_pubkey_dsa
+sc_pkcs15_encode_pubkey_rsa
+sc_pkcs15_encode_pubkey_gostr3410
+sc_pkcs15_encode_pukdf_entry
+sc_pkcs15_encode_tokeninfo
+sc_pkcs15_encode_unusedspace
+sc_pkcs15_erase_prkey
+sc_pkcs15_erase_pubkey
+sc_pkcs15_find_cert_by_id
+sc_pkcs15_find_data_object_by_app_oid
+sc_pkcs15_find_data_object_by_id
+sc_pkcs15_find_data_object_by_name
+sc_pkcs15_find_object_by_id
+sc_pkcs15_find_pin_by_auth_id
+sc_pkcs15_find_pin_by_reference
+sc_pkcs15_find_prkey_by_id
+sc_pkcs15_find_prkey_by_id_usage
+sc_pkcs15_find_prkey_by_reference
+sc_pkcs15_find_pubkey_by_id
+sc_pkcs15_find_so_pin
+sc_pkcs15_format_id
+sc_pkcs15_free_cert_info
+sc_pkcs15_free_certificate
+sc_pkcs15_free_data_info
+sc_pkcs15_free_data_object
+sc_pkcs15_free_object
+sc_pkcs15_free_pin_info
+sc_pkcs15_free_prkey
+sc_pkcs15_free_prkey_info
+sc_pkcs15_free_pubkey
+sc_pkcs15_free_pubkey_info
+sc_pkcs15_get_objects
+sc_pkcs15_get_objects_cond
+sc_pkcs15_hex_string_to_id
+sc_pkcs15_is_emulation_only
+sc_pkcs15_make_absolute_path
+sc_pkcs15_parse_df
+sc_pkcs15_parse_tokeninfo
+sc_pkcs15_parse_unusedspace
+sc_pkcs15_pincache_clear
+sc_pkcs15_print_id
+sc_pkcs15_read_cached_file
+sc_pkcs15_read_certificate
+sc_pkcs15_read_data_object
+sc_pkcs15_read_file
+sc_pkcs15_read_prkey
+sc_pkcs15_read_pubkey
+sc_pkcs15_pubkey_from_prvkey
+sc_pkcs15_pubkey_from_cert
+sc_pkcs15_remove_df
+sc_pkcs15_remove_object
+sc_pkcs15_remove_unusedspace
+sc_pkcs15_search_objects
+sc_pkcs15_unbind
+sc_pkcs15_unblock_pin
+sc_pkcs15_unwrap_data
+sc_pkcs15_verify_pin
+sc_pkcs15_wrap_data
+sc_pkcs15emu_add_data_object
+sc_pkcs15emu_add_pin_obj
+sc_pkcs15emu_add_rsa_prkey
+sc_pkcs15emu_add_rsa_pubkey
+sc_pkcs15emu_add_x509_cert
+sc_pkcs15emu_object_add
+sc_print_path
+sc_put_data
+sc_read_binary
+sc_read_record
+sc_release_context
+sc_reset
+sc_reset_retry_counter
+sc_restore_security_env
+sc_select_file
+sc_set_card_driver
+sc_set_security_env
+sc_strerror
+sc_transmit_apdu
+sc_ui_display_debug
+sc_ui_display_error
+sc_ui_get_pin
+sc_ui_get_pin_pair
+sc_ui_set_language
+sc_unlock
+sc_update_binary
+sc_update_dir
+sc_update_record
+sc_verify
+sc_wait_for_event
+sc_write_binary
+sc_write_record
+sc_get_iso7816_driver
+sc_keycache_find_named_pin
+sc_keycache_forget_key
+sc_keycache_get_key
+sc_keycache_get_pin
+sc_keycache_get_pin_name
+sc_keycache_put_key
+sc_keycache_put_pin
+sc_keycache_set_pin_name
+sc_pkcs15init_add_app
+sc_pkcs15init_authenticate
+sc_pkcs15init_bind
+sc_pkcs15init_change_attrib
+sc_pkcs15init_create_file
+sc_pkcs15init_delete_by_path
+sc_pkcs15init_delete_object
+sc_pkcs15init_erase_card
+sc_pkcs15init_erase_card_recursively
+sc_pkcs15init_finalize_card
+sc_pkcs15init_fixup_acls
+sc_pkcs15init_fixup_file
+sc_pkcs15init_generate_key
+sc_pkcs15init_get_asepcos_ops
+sc_pkcs15init_get_cardos_ops
+sc_pkcs15init_get_cryptoflex_ops
+sc_pkcs15init_get_cyberflex_ops
+sc_pkcs15init_get_gpk_ops
+sc_pkcs15init_get_incrypto34_ops
+sc_pkcs15init_get_jcop_ops
+sc_pkcs15init_get_label
+sc_pkcs15init_get_manufacturer
+sc_pkcs15init_get_miocos_ops
+sc_pkcs15init_get_muscle_ops
+sc_pkcs15init_get_oberthur_ops
+sc_pkcs15init_get_pin_info
+sc_pkcs15init_get_rutoken_ops
+sc_pkcs15init_get_rtecp_ops
+sc_pkcs15init_get_serial
+sc_pkcs15init_get_setcos_ops
+sc_pkcs15init_get_starcos_ops
+sc_pkcs15init_requires_restrictive_usage
+sc_pkcs15init_rmdir
+sc_pkcs15init_set_callbacks
+sc_pkcs15init_set_lifecycle
+sc_pkcs15init_set_p15card
+sc_pkcs15init_set_pin_data
+sc_pkcs15init_set_secret
+sc_pkcs15init_set_serial
+sc_pkcs15init_store_certificate
+sc_pkcs15init_store_data_object
+sc_pkcs15init_store_pin
+sc_pkcs15init_store_private_key
+sc_pkcs15init_store_public_key
+sc_pkcs15init_store_split_key
+sc_pkcs15init_unbind
+sc_pkcs15init_update_any_df
+sc_pkcs15init_update_certificate
+sc_pkcs15init_update_file
+sc_pkcs15init_verify_key
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15init.exports opensc/src/pkcs15init/pkcs15init.exports
--- opensc.orig/src/pkcs15init/pkcs15init.exports 2009-12-13 10:14:27.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15init.exports 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-sc_keycache_find_named_pin
-sc_keycache_forget_key
-sc_keycache_get_key
-sc_keycache_get_pin
-sc_keycache_get_pin_name
-sc_keycache_put_key
-sc_keycache_put_pin
-sc_keycache_set_pin_name
-sc_pkcs15init_add_app
-sc_pkcs15init_authenticate
-sc_pkcs15init_bind
-sc_pkcs15init_change_attrib
-sc_pkcs15init_create_file
-sc_pkcs15init_delete_by_path
-sc_pkcs15init_delete_object
-sc_pkcs15init_erase_card
-sc_pkcs15init_erase_card_recursively
-sc_pkcs15init_finalize_card
-sc_pkcs15init_fixup_acls
-sc_pkcs15init_fixup_file
-sc_pkcs15init_generate_key
-sc_pkcs15init_get_asepcos_ops
-sc_pkcs15init_get_cardos_ops
-sc_pkcs15init_get_cryptoflex_ops
-sc_pkcs15init_get_cyberflex_ops
-sc_pkcs15init_get_gpk_ops
-sc_pkcs15init_get_incrypto34_ops
-sc_pkcs15init_get_jcop_ops
-sc_pkcs15init_get_label
-sc_pkcs15init_get_manufacturer
-sc_pkcs15init_get_miocos_ops
-sc_pkcs15init_get_muscle_ops
-sc_pkcs15init_get_oberthur_ops
-sc_pkcs15init_get_pin_info
-sc_pkcs15init_get_rutoken_ops
-sc_pkcs15init_get_rtecp_ops
-sc_pkcs15init_get_serial
-sc_pkcs15init_get_setcos_ops
-sc_pkcs15init_get_starcos_ops
-sc_pkcs15init_requires_restrictive_usage
-sc_pkcs15init_rmdir
-sc_pkcs15init_set_callbacks
-sc_pkcs15init_set_lifecycle
-sc_pkcs15init_set_p15card
-sc_pkcs15init_set_pin_data
-sc_pkcs15init_set_secret
-sc_pkcs15init_set_serial
-sc_pkcs15init_store_certificate
-sc_pkcs15init_store_data_object
-sc_pkcs15init_store_pin
-sc_pkcs15init_store_private_key
-sc_pkcs15init_store_public_key
-sc_pkcs15init_store_split_key
-sc_pkcs15init_unbind
-sc_pkcs15init_update_any_df
-sc_pkcs15init_update_certificate
-sc_pkcs15init_update_file
-sc_pkcs15init_verify_key
diff -udrNPp --exclude=.svn opensc.orig/src/scconf/Makefile.am opensc/src/scconf/Makefile.am
--- opensc.orig/src/scconf/Makefile.am 2009-12-13 10:14:27.000000000 +0100
+++ opensc/src/scconf/Makefile.am 2010-02-01 07:44:15.000000000 +0100
@@ -1,35 +1,18 @@
include $(top_srcdir)/win32/ltrc.inc
-MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
DISTCLEANFILES = lex-parse.c
-CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak
dist_noinst_DATA = README.scconf lex-parse.l
openscinclude_HEADERS = scconf.h
noinst_HEADERS = internal.h
noinst_PROGRAMS = test-conf
-lib_LTLIBRARIES = libscconf.la
+noinst_LTLIBRARIES = libscconf.la
INCLUDES = -I$(top_srcdir)/src/common
-libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c \
- scconf.exports
-if WIN32
-libscconf_la_SOURCES += versioninfo.rc
-else
-dist_noinst_DATA += versioninfo.rc
-endif
-libscconf_la_LIBADD = $(top_builddir)/src/common/libcompat.la
-libscconf_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \
- -export-symbols "$(srcdir)/scconf.exports" \
- -no-undefined
+libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c
test_conf_SOURCES = test-conf.c
-test_conf_LDADD = libscconf.la
-
-versioninfo.rc:
- sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \
- "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
+test_conf_LDADD = libscconf.la $(top_builddir)/src/common/libcompat.la
diff -udrNPp --exclude=.svn opensc.orig/src/scconf/scconf.exports opensc/src/scconf/scconf.exports
--- opensc.orig/src/scconf/scconf.exports 2009-12-13 10:14:27.000000000 +0100
+++ opensc/src/scconf/scconf.exports 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-scconf_block_add
-scconf_block_copy
-scconf_block_destroy
-scconf_find_block
-scconf_find_blocks
-scconf_find_list
-scconf_free
-scconf_get_bool
-scconf_get_int
-scconf_get_str
-scconf_item_add
-scconf_item_copy
-scconf_item_destroy
-scconf_list_add
-scconf_list_array_length
-scconf_list_copy
-scconf_list_destroy
-scconf_list_strdup
-scconf_list_strings_length
-scconf_list_toarray
-scconf_new
-scconf_parse
-scconf_parse_entries
-scconf_parse_string
-scconf_put_bool
-scconf_put_int
-scconf_put_str
-scconf_write
-scconf_write_entries
diff -udrNPp --exclude=.svn opensc.orig/src/tests/Makefile.am opensc/src/tests/Makefile.am
--- opensc.orig/src/tests/Makefile.am 2009-12-13 10:14:26.000000000 +0100
+++ opensc/src/tests/Makefile.am 2010-02-01 07:46:20.000000000 +0100
@@ -9,8 +9,7 @@ SUBDIRS = regression
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
-LIBS = $(top_builddir)/src/libopensc/libopensc.la \
- $(top_builddir)/src/common/libcompat.la
+LIBS = $(top_builddir)/src/pkcs15init/libopensc.la
COMMON_SRC = sc-test.c
COMMON_INC = sc-test.h
diff -udrNPp --exclude=.svn opensc.orig/src/tools/Makefile.am opensc/src/tools/Makefile.am
--- opensc.orig/src/tools/Makefile.am 2010-02-01 08:03:21.000000000 +0100
+++ opensc/src/tools/Makefile.am 2010-02-01 07:59:09.000000000 +0100
@@ -18,8 +18,8 @@ endif
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
-LIBS = $(top_builddir)/src/libopensc/libopensc.la \
- $(top_builddir)/src/common/libcompat.la
+LIBS = $(top_builddir)/src/common/libcompat.la \
+ $(top_builddir)/src/pkcs15init/libopensc.la
opensc_tool_SOURCES = opensc-tool.c util.c
piv_tool_SOURCES = piv-tool.c util.c
@@ -36,8 +36,7 @@ pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_
cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c
cryptoflex_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
pkcs15_init_SOURCES = pkcs15-init.c util.c
-pkcs15_init_LDADD = $(OPTIONAL_OPENSSL_LIBS) \
- $(top_builddir)/src/pkcs15init/libpkcs15init.la
+pkcs15_init_LDADD = $(OPTIONAL_OPENSSL_LIBS)
cardos_tool_SOURCES = cardos-tool.c util.c
cardos_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
eidenv_SOURCES = eidenv.c util.c
_______________________________________________
opensc-devel mailing list
opensc-devel@lists.opensc-project.org
http://www.opensc-project.org/mailman/listinfo/opensc-devel
