we stopped installing opensc header files.
so I thought maybe we no longer need the src/include/
directory with the symlinks (or copies on windows).
but, if we remove the src/include directory, we need
a different mechanism to find these files. for example
not via ${top_builddir}/src/include with opensc/file.h,
but via ${top_srcdir}/src with libopensc/file.h.
if we change that, we could as well change the #include
<...> to #include "..." - as far as I know that doesn't
change anything, pure optic, but usualy files part of
the source are referenced with "...", opposed to system
include files with <...>.
I did these changes already, patch attached. not sure
if such a big change is worth the small cleanup,
so please let me know what you think.
(note: doesn't work on windows right now - need to restore
winconfig.h to win32.)
other issues I noticed that we could change:
* not all files have this: #include "config.h"
* some use <config.h> which seems bogus to me.
* some but not all load internal.h. maybe we no
longer need that, as all include files are internal now?
* I prefer to have a strict order of the include files:
first system include files, then other libraries, then
imported code (scconf, common etc.), then our own include
headers. currently its a wild mix/order.
* automake/conf/libtool add "-I." to the gcc command line.
some files are include without directory name in some places
(if .c and .h files are in the same directory), while using
"dir/file.h" in other places. maybe unify that to avoid
including the wrong file by accident.
what do you think?
Regards, Andreas
diff -udrNPp --exclude=.svn opensc.orig/configure.ac opensc/configure.ac
--- opensc.orig/configure.ac 2010-02-26 10:18:24.000000000 +0100
+++ opensc/configure.ac 2010-03-02 20:48:42.000000000 +0100
@@ -652,13 +652,9 @@ AC_DEFINE_UNQUOTED([OPENSC_VERSION_MINOR
AC_DEFINE_UNQUOTED([OPENSC_VERSION_FIX], [${OPENSC_VERSION_FIX}], [OpenSC version fix component])
AC_DEFINE_UNQUOTED([OPENSC_FEATURES], ["${OPENSC_FEATURES}"], [Enabled OpenSC features])
-openscincludedir="\$(includedir)/opensc"
pkcs11dir="\$(libdir)/pkcs11"
-pkgconfigdir="\$(libdir)/pkgconfig"
-AC_SUBST([openscincludedir])
AC_SUBST([pkcs11dir])
-AC_SUBST([pkgconfigdir])
AC_SUBST([xslstylesheetsdir])
AC_SUBST([OPENSC_VERSION_MAJOR])
AC_SUBST([OPENSC_VERSION_MINOR])
@@ -713,9 +709,6 @@ AC_CONFIG_FILES([
etc/Makefile
src/Makefile
src/common/Makefile
- src/include/Makefile
- src/include/winconfig.h
- src/include/opensc/Makefile
src/libopensc/Makefile
src/libopensc/libopensc.pc
src/pkcs11/Makefile
diff -udrNPp --exclude=.svn opensc.orig/src/Makefile.am opensc/src/Makefile.am
--- opensc.orig/src/Makefile.am 2010-02-26 10:18:24.000000000 +0100
+++ opensc/src/Makefile.am 2010-03-02 20:46:17.000000000 +0100
@@ -2,5 +2,5 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
EXTRA_DIST = Makefile.mak
# Order IS important
-SUBDIRS = common include scconf pkcs15init libopensc pkcs11 \
+SUBDIRS = common scconf pkcs15init libopensc pkcs11 \
tools tests cardmod
diff -udrNPp --exclude=.svn opensc.orig/src/Makefile.mak opensc/src/Makefile.mak
--- opensc.orig/src/Makefile.mak 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/Makefile.mak 2010-03-02 20:46:25.000000000 +0100
@@ -2,7 +2,7 @@ TOPDIR = ..
!INCLUDE $(TOPDIR)\win32\Make.rules.mak
-SUBDIRS = include common scconf pkcs15init libopensc pkcs11 tools tests cardmod
+SUBDIRS = common scconf pkcs15init libopensc pkcs11 tools tests cardmod
all::
diff -udrNPp --exclude=.svn opensc.orig/src/cardmod/Makefile.am opensc/src/cardmod/Makefile.am
--- opensc.orig/src/cardmod/Makefile.am 2010-02-16 10:38:02.000000000 +0100
+++ opensc/src/cardmod/Makefile.am 2010-03-02 20:51:32.000000000 +0100
@@ -12,9 +12,7 @@ else
dist_noinst_DATA = cardmod.inf cardmod-westcos.reg
endif
-INCLUDES = -I$(top_builddir)/src/include \
- -I$(top_srcdir)/src/common \
- -I$(top_srcdir)/src/libopensc
+INCLUDES = -I$(top_srcdir)/src
opensc_card...@library_bitness@_la_SOURCES = cardmod.c cardmod.exports \
$(top_builddir)/win32/versioninfo.rc
diff -udrNPp --exclude=.svn opensc.orig/src/cardmod/cardmod.c opensc/src/cardmod/cardmod.c
--- opensc.orig/src/cardmod/cardmod.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/cardmod/cardmod.c 2010-03-02 21:12:33.000000000 +0100
@@ -34,8 +34,8 @@
#include <windows.h>
#include <cardmod.h>
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
#include <log.h>
diff -udrNPp --exclude=.svn opensc.orig/src/common/Makefile.am opensc/src/common/Makefile.am
--- opensc.orig/src/common/Makefile.am 2010-02-16 10:38:02.000000000 +0100
+++ opensc/src/common/Makefile.am 2010-03-02 20:56:07.000000000 +0100
@@ -14,6 +14,5 @@ libcompat_la_SOURCES = \
compat_strlcpy.h compat_strlcpy.c \
compat_getpass.h compat_getpass.c \
compat_getopt.h compat_getopt.c \
- simclist.c
+ simclist.c simclist.h
-openscinclude_HEADERS = simclist.h
diff -udrNPp --exclude=.svn opensc.orig/src/include/Makefile.am opensc/src/include/Makefile.am
--- opensc.orig/src/include/Makefile.am 2009-12-13 10:14:26.000000000 +0100
+++ opensc/src/include/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-MAINTAINERCLEANFILES = \
- $(srcdir)/Makefile.in $(srcdir)/winconfig.h
-EXTRA_DIST = Makefile.mak
-
-SUBDIRS = opensc
-
-dist_noinst_HEADERS = winconfig.h
diff -udrNPp --exclude=.svn opensc.orig/src/include/Makefile.mak opensc/src/include/Makefile.mak
--- opensc.orig/src/include/Makefile.mak 2005-12-29 13:36:28.000000000 +0100
+++ opensc/src/include/Makefile.mak 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-
-all: config.h
-
-config.h: winconfig.h
- @copy /y winconfig.h config.h
diff -udrNPp --exclude=.svn opensc.orig/src/include/opensc/Makefile.am opensc/src/include/opensc/Makefile.am
--- opensc.orig/src/include/opensc/Makefile.am 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/include/opensc/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-EXTRA_DIST = svnignore
-
-all-local:
- @-rm -f *.h
- @$(LN_S) $(top_srcdir)/src/libopensc/asn1.h asn1.h
- @$(LN_S) $(top_srcdir)/src/libopensc/cardctl.h cardctl.h
- @$(LN_S) $(top_srcdir)/src/libopensc/cards.h cards.h
- @$(LN_S) $(top_srcdir)/src/libopensc/errors.h errors.h
- @$(LN_S) $(top_srcdir)/src/libopensc/log.h log.h
- @$(LN_S) $(top_srcdir)/src/libopensc/opensc.h opensc.h
- @$(LN_S) $(top_srcdir)/src/libopensc/pkcs15.h pkcs15.h
- @$(LN_S) $(top_srcdir)/src/libopensc/types.h types.h
- @$(LN_S) $(top_srcdir)/src/pkcs11/pkcs11.h pkcs11.h
- @$(LN_S) $(top_srcdir)/src/pkcs11/pkcs11-opensc.h pkcs11-opensc.h
- @$(LN_S) $(top_srcdir)/src/pkcs15init/pkcs15-init.h pkcs15-init.h
- @$(LN_S) $(top_srcdir)/src/scconf/scconf.h scconf.h
- @$(LN_S) $(top_srcdir)/src/common/simclist.h simclist.h
-
-distclean-local:
- -rm -f *.h
diff -udrNPp --exclude=.svn opensc.orig/src/include/opensc/svnignore opensc/src/include/opensc/svnignore
--- opensc.orig/src/include/opensc/svnignore 2009-12-13 10:14:26.000000000 +0100
+++ opensc/src/include/opensc/svnignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-*.h
-*.in
-Makefile
diff -udrNPp --exclude=.svn opensc.orig/src/include/winconfig.h.in opensc/src/include/winconfig.h.in
--- opensc.orig/src/include/winconfig.h.in 2009-12-13 10:14:26.000000000 +0100
+++ opensc/src/include/winconfig.h.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,98 +0,0 @@
-#ifndef _OPENSC_WINCONFIG_H
-#define _OPENSC_WINCONFIG_H
-
-#include <stdio.h>
-#include <windows.h>
-#include <winscard.h>
-#include <sys/timeb.h>
-#include <sys/stat.h>
-
-#ifndef strcasecmp
-#define strcasecmp stricmp
-#endif
-
-#ifndef strncasecmp
-#define strncasecmp strnicmp
-#endif
-
-#ifndef snprintf
-#define snprintf _snprintf
-#endif
-
-#ifndef vsnprintf
-#define vsnprintf _vsnprintf
-#endif
-
-#ifndef isatty
-#define isatty _isatty
-#endif
-
-#ifndef strnicmp
-#define strnicmp _strnicmp
-#endif
-
-#ifndef stricmp
-#define stricmp _stricmp
-#endif
-
-#ifndef strdup
-#define strdup _strdup
-#endif
-
-#ifndef fileno
-#define fileno _fileno
-#endif
-
-#ifndef mkdir
-#define mkdir _mkdir
-#endif
-
-#ifndef access
-#define access _access
-#endif
-
-#ifndef unlink
-#define unlink _unlink
-#endif
-
-#ifndef putenv
-#define putenv _putenv
-#endif
-
-#ifndef R_OK
-#define R_OK 4 /* test whether readable. */
-#define W_OK 2 /* test whether writable. */
-#define X_OK 1 /* test whether execubale. */
-#define F_OK 0 /* test whether exist. */
-#endif
-
-#ifndef S_IRUSR
-#define S_IRUSR S_IREAD
-#endif
-
-#ifndef S_IWUSR
-#define S_IWUSR S_IWRITE
-#endif
-
-#define HAVE_IO_H
-#define ENABLE_PCSC
-#define HAVE_WINSCARD_H
-#define DEFAULT_PCSC_PROVIDER "winscard.dll"
-
-#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC\\profiles"
-
-#define PATH_MAX _MAX_PATH
-
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "@PACKAGE_VERSION@"
-#endif
-
-#ifndef PACKAGE_NAME
-#define PACKAGE_NAME "@PACKAGE_NAME@"
-#endif
-
-#ifndef OPENSC_FEATURES
-#define OPENSC_FEATURES "N/A"
-#endif
-
-#endif
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/Makefile.am opensc/src/libopensc/Makefile.am
--- opensc.orig/src/libopensc/Makefile.am 2010-02-26 10:18:24.000000000 +0100
+++ opensc/src/libopensc/Makefile.am 2010-03-02 20:56:36.000000000 +0100
@@ -5,19 +5,17 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
EXTRA_DIST = Makefile.mak
lib_LTLIBRARIES = libopensc.la
-openscinclude_HEADERS = \
+noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h \
+ internal-winscard.h p15card-helper.h \
opensc.h pkcs15.h \
cardctl.h asn1.h log.h \
errors.h types.h compression.h
-noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h \
- internal-winscard.h p15card-helper.h
-pkgconfig_DATA = libopensc.pc
AM_CPPFLAGS = -DOPENSC_CONF_PATH=\"$(sysconfdir)/opensc.conf\"
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
$(OPTIONAL_PCSC_CFLAGS) $(OPTIONAL_ZLIB_CFLAGS) \
$(OPTIONAL_ICONV_CFLAGS) $(LTLIB_CFLAGS)
-INCLUDES = -I$(top_builddir)/src/include -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir)/src
libopensc_la_SOURCES = \
sc.c ctx.c log.c errors.c \
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/asn1.h opensc/src/libopensc/asn1.h
--- opensc.orig/src/libopensc/asn1.h 2009-12-13 08:44:43.000000000 +0100
+++ opensc/src/libopensc/asn1.h 2010-03-02 21:10:22.000000000 +0100
@@ -25,8 +25,8 @@
extern "C" {
#endif
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
struct sc_asn1_entry {
const char *name;
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/card-cardos.c opensc/src/libopensc/card-cardos.c
--- opensc.orig/src/libopensc/card-cardos.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/card-cardos.c 2010-03-02 21:12:51.000000000 +0100
@@ -26,7 +26,7 @@
#include <ctype.h>
#include <string.h>
-#include <opensc/asn1.h>
+#include "libopensc/asn1.h"
static const struct sc_card_operations *iso_ops = NULL;
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/card-muscle.c opensc/src/libopensc/card-muscle.c
--- opensc.orig/src/libopensc/card-muscle.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/card-muscle.c 2010-03-02 21:13:06.000000000 +0100
@@ -22,8 +22,8 @@
#include "cardctl.h"
#include "muscle.h"
#include "muscle-filesystem.h"
-#include <opensc/types.h>
-#include <opensc.h>
+#include "libopensc/types.h"
+#include "libopensc/opensc.h"
#include <stdlib.h>
#include <string.h>
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/card-rutoken.c opensc/src/libopensc/card-rutoken.c
--- opensc.orig/src/libopensc/card-rutoken.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/card-rutoken.c 2010-03-02 21:32:16.000000000 +0100
@@ -38,17 +38,16 @@ typedef __int8 int8_t;
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include "opensc.h"
-#include "pkcs15.h"
-#include "internal.h"
-#include "cardctl.h"
-#include "asn1.h"
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
+#include "libopensc/internal.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/asn1.h"
#ifdef ENABLE_OPENSSL
#include <openssl/evp.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
-#include <opensc/asn1.h>
#include <openssl/x509.h>
#include <openssl/err.h>
#endif
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/card-setcos.c opensc/src/libopensc/card-setcos.c
--- opensc.orig/src/libopensc/card-setcos.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/card-setcos.c 2010-03-02 21:13:20.000000000 +0100
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
-#include <opensc/asn1.h>
+#include "libopensc/asn1.h"
static struct sc_atr_table setcos_atrs[] = {
/* some Nokia branded SC */
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/cardctl.h opensc/src/libopensc/cardctl.h
--- opensc.orig/src/libopensc/cardctl.h 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/cardctl.h 2010-03-02 21:05:48.000000000 +0100
@@ -21,7 +21,7 @@
#ifndef _OPENSC_CARDCTL_H
#define _OPENSC_CARDCTL_H
-#include <opensc/types.h>
+#include "libopensc/types.h"
#ifdef __cplusplus
extern "C" {
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/cards.h opensc/src/libopensc/cards.h
--- opensc.orig/src/libopensc/cards.h 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/cards.h 2010-03-02 21:10:30.000000000 +0100
@@ -21,7 +21,7 @@
#ifndef _OPENSC_CARDS_H
#define _OPENSC_CARDS_H
-#include <opensc/types.h>
+#include "libopensc/types.h"
#ifdef __cplusplus
extern "C" {
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/internal.h opensc/src/libopensc/internal.h
--- opensc.orig/src/libopensc/internal.h 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/internal.h 2010-03-02 21:30:54.000000000 +0100
@@ -30,10 +30,10 @@
extern "C" {
#endif
-#include "opensc.h"
-#include "simclist.h"
-#include "log.h"
-#include "cards.h"
+#include "libopensc/opensc.h"
+#include "common/simclist.h"
+#include "libopensc/log.h"
+#include "libopensc/cards.h"
#include <assert.h>
#ifdef _WIN32
#include <windows.h>
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/log.h opensc/src/libopensc/log.h
--- opensc.orig/src/libopensc/log.h 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/log.h 2010-03-02 21:06:32.000000000 +0100
@@ -27,7 +27,7 @@ extern "C" {
#endif
#include <stdarg.h>
-#include <opensc/opensc.h>
+#include "libopensc/opensc.h"
#define SC_LOG_TYPE_ERROR 0
#define SC_LOG_TYPE_VERBOSE 1
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/muscle-filesystem.c opensc/src/libopensc/muscle-filesystem.c
--- opensc.orig/src/libopensc/muscle-filesystem.c 2009-12-13 08:44:43.000000000 +0100
+++ opensc/src/libopensc/muscle-filesystem.c 2010-03-02 21:13:36.000000000 +0100
@@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "muscle-filesystem.h"
-#include <opensc/errors.h>
+#include "libopensc/muscle-filesystem.h"
+#include "libopensc/errors.h"
#include <memory.h>
#include <stdio.h>
#include <assert.h>
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/muscle-filesystem.h opensc/src/libopensc/muscle-filesystem.h
--- opensc.orig/src/libopensc/muscle-filesystem.h 2009-12-13 10:14:28.000000000 +0100
+++ opensc/src/libopensc/muscle-filesystem.h 2010-03-02 21:10:45.000000000 +0100
@@ -23,7 +23,7 @@
#include <stdlib.h>
-#include <opensc/types.h>
+#include "libopensc/types.h"
typedef struct msc_id {
u8 id[4];
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/muscle.h opensc/src/libopensc/muscle.h
--- opensc.orig/src/libopensc/muscle.h 2009-12-13 10:14:28.000000000 +0100
+++ opensc/src/libopensc/muscle.h 2010-03-02 21:11:15.000000000 +0100
@@ -22,11 +22,11 @@
#include <stddef.h>
-#include <opensc/types.h>
-#include <opensc.h>
-#include <opensc/cardctl.h>
+#include "libopensc/types.h"
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
-#include "muscle-filesystem.h"
+#include "libopensc/muscle-filesystem.h"
#define MSC_MAX_APDU 512 /* Max APDU send/recv, used for stack allocation */
#define MSC_MAX_PIN_LENGTH 8
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/opensc.h opensc/src/libopensc/opensc.h
--- opensc.orig/src/libopensc/opensc.h 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/opensc.h 2010-03-02 21:05:30.000000000 +0100
@@ -36,10 +36,10 @@
extern "C" {
#endif
-#include <opensc/simclist.h>
-#include <opensc/scconf.h>
-#include <opensc/errors.h>
-#include <opensc/types.h>
+#include "common/simclist.h"
+#include "scconf/scconf.h"
+#include "libopensc/errors.h"
+#include "libopensc/types.h"
/* Different APDU cases */
#define SC_APDU_CASE_NONE 0x00
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/p15card-helper.c opensc/src/libopensc/p15card-helper.c
--- opensc.orig/src/libopensc/p15card-helper.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/p15card-helper.c 2010-03-02 21:14:16.000000000 +0100
@@ -22,10 +22,10 @@
#if ENABLE_OPENSSL
#include "p15card-helper.h"
-#include <opensc/opensc.h>
-#include <opensc/types.h>
-#include <opensc/log.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/types.h"
+#include "libopensc/log.h"
+#include "libopensc/pkcs15.h"
#include <string.h>
#include <stdlib.h>
#include <openssl/bio.h>
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/p15card-helper.h opensc/src/libopensc/p15card-helper.h
--- opensc.orig/src/libopensc/p15card-helper.h 2009-12-13 08:44:43.000000000 +0100
+++ opensc/src/libopensc/p15card-helper.h 2010-03-02 21:11:23.000000000 +0100
@@ -21,7 +21,7 @@
#ifndef P15CARD_HELPER_H
#define P15CARD_HELPER_H
-#include <opensc/pkcs15.h>
+#include "libopensc/pkcs15.h"
#define USAGE_NONREP SC_PKCS15_PRKEY_USAGE_NONREPUDIATION | \
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/p15emu-westcos.c opensc/src/libopensc/p15emu-westcos.c
--- opensc.orig/src/libopensc/p15emu-westcos.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/p15emu-westcos.c 2010-03-02 21:34:23.000000000 +0100
@@ -26,7 +26,7 @@
#include "pkcs15.h"
#include "cardctl.h"
-#include "compat_strlcpy.h"
+#include "common/compat_strlcpy.h"
static int sc_pkcs15emu_westcos_init(sc_pkcs15_card_t * p15card)
{
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-actalis.c opensc/src/libopensc/pkcs15-actalis.c
--- opensc.orig/src/libopensc/pkcs15-actalis.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-actalis.c 2010-03-02 21:14:38.000000000 +0100
@@ -26,12 +26,12 @@
#include <config.h>
#endif
-#include <opensc/pkcs15.h>
-#include <opensc/log.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/log.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#ifdef ENABLE_ZLIB
#include <zlib.h>
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-atrust-acos.c opensc/src/libopensc/pkcs15-atrust-acos.c
--- opensc.orig/src/libopensc/pkcs15-atrust-acos.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-atrust-acos.c 2010-03-02 21:14:59.000000000 +0100
@@ -19,12 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <opensc/pkcs15.h>
-#include <opensc/cardctl.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/cardctl.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#define MANU_ID "A-Trust"
#define CARD_LABEL "a.sign Premium a"
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-esteid.c opensc/src/libopensc/pkcs15-esteid.c
--- opensc.orig/src/libopensc/pkcs15-esteid.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-esteid.c 2010-03-02 21:34:12.000000000 +0100
@@ -28,7 +28,7 @@
#include <stdio.h>
#include "esteid.h"
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#ifdef ENABLE_ICONV
#include <iconv.h>
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-gemsafeGPK.c opensc/src/libopensc/pkcs15-gemsafeGPK.c
--- opensc.orig/src/libopensc/pkcs15-gemsafeGPK.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-gemsafeGPK.c 2010-03-02 21:15:24.000000000 +0100
@@ -20,13 +20,13 @@
*/
#include "internal.h"
-#include <opensc/pkcs15.h>
-#include <opensc/log.h>
-#include <opensc/cardctl.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/log.h"
+#include "libopensc/cardctl.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#define MANU_ID "GemSAFE on GPK16000"
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-infocamere.c opensc/src/libopensc/pkcs15-infocamere.c
--- opensc.orig/src/libopensc/pkcs15-infocamere.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-infocamere.c 2010-03-02 21:15:52.000000000 +0100
@@ -25,12 +25,12 @@
#include <config.h>
#endif
-#include <opensc/pkcs15.h>
-#include <opensc/log.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/log.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#ifdef ENABLE_ZLIB
#include <zlib.h>
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-openpgp.c opensc/src/libopensc/pkcs15-openpgp.c
--- opensc.orig/src/libopensc/pkcs15-openpgp.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-openpgp.c 2010-03-02 21:16:26.000000000 +0100
@@ -20,13 +20,13 @@
*/
#include "internal.h"
-#include <opensc/pkcs15.h>
-#include <opensc/log.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/log.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
int sc_pkcs15emu_openpgp_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-postecert.c opensc/src/libopensc/pkcs15-postecert.c
--- opensc.orig/src/libopensc/pkcs15-postecert.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-postecert.c 2010-03-02 21:16:46.000000000 +0100
@@ -21,12 +21,12 @@
*/
#include "internal.h"
-#include <opensc/pkcs15.h>
-#include <opensc/log.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/log.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
int sc_pkcs15emu_postecert_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-pteid.c opensc/src/libopensc/pkcs15-pteid.c
--- opensc.orig/src/libopensc/pkcs15-pteid.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-pteid.c 2010-03-02 21:34:48.000000000 +0100
@@ -41,7 +41,7 @@
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#define IAS_CARD 0
#define GEMSAFE_CARD 1
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-starcert.c opensc/src/libopensc/pkcs15-starcert.c
--- opensc.orig/src/libopensc/pkcs15-starcert.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-starcert.c 2010-03-02 21:17:11.000000000 +0100
@@ -18,12 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <opensc/pkcs15.h>
-#include <opensc/cardctl.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/cardctl.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#define MANU_ID "Giesecke & Devrient GmbH"
#define STARCERT "StarCertV2201"
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-tccardos.c opensc/src/libopensc/pkcs15-tccardos.c
--- opensc.orig/src/libopensc/pkcs15-tccardos.c 2006-05-15 22:57:30.000000000 +0200
+++ opensc/src/libopensc/pkcs15-tccardos.c 2010-03-02 21:17:22.000000000 +0100
@@ -22,8 +22,8 @@
#include <stdlib.h>
#include <string.h>
-#include <opensc/log.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/log.h"
+#include "libopensc/pkcs15.h"
#define MANU_ID "SIEMENS AG"
#define TC_CARDOS_APP_DF "3F001002"
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15-tcos.c opensc/src/libopensc/pkcs15-tcos.c
--- opensc.orig/src/libopensc/pkcs15-tcos.c 2010-02-16 10:38:06.000000000 +0100
+++ opensc/src/libopensc/pkcs15-tcos.c 2010-03-02 21:17:53.000000000 +0100
@@ -18,14 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "internal.h"
-#include <opensc/pkcs15.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/internal.h"
+#include "libopensc/pkcs15.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
int sc_pkcs15emu_tcos_init_ex(
sc_pkcs15_card_t *p15card,
diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/pkcs15.h opensc/src/libopensc/pkcs15.h
--- opensc.orig/src/libopensc/pkcs15.h 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/libopensc/pkcs15.h 2010-03-02 21:04:43.000000000 +0100
@@ -25,7 +25,7 @@
extern "C" {
#endif
-#include <opensc/opensc.h>
+#include "libopensc/opensc.h"
#define SC_PKCS15_CACHE_DIR ".eid"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs11/Makefile.am opensc/src/pkcs11/Makefile.am
--- opensc.orig/src/pkcs11/Makefile.am 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/pkcs11/Makefile.am 2010-03-02 20:57:49.000000000 +0100
@@ -4,14 +4,13 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
EXTRA_DIST = Makefile.mak
dist_noinst_SCRIPTS = opensc_pkcs11_install.js
-openscinclude_HEADERS = pkcs11.h pkcs11-opensc.h
lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la onepin-opensc-pkcs11.la
noinst_LTLIBRARIES = libpkcs11.la
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS) $(PTHREAD_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src/pkcs15init -I$(top_builddir)/src/include -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir)/src
-OPENSC_PKCS11_INC = sc-pkcs11.h
+OPENSC_PKCS11_INC = sc-pkcs11.h pkcs11.h pkcs11-opensc.h
OPENSC_PKCS11_SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
mechanism.c openssl.c secretkey.c framework-pkcs15.c \
framework-pkcs15init.c debug.c opensc-pkcs11.exports \
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs11/framework-pkcs15.c opensc/src/pkcs11/framework-pkcs15.c
--- opensc.orig/src/pkcs11/framework-pkcs15.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs11/framework-pkcs15.c 2010-03-02 21:36:58.000000000 +0100
@@ -22,7 +22,7 @@
#include <string.h>
#include "sc-pkcs11.h"
#ifdef USE_PKCS15_INIT
-#include <opensc/pkcs15-init.h>
+#include "pkcs15init/pkcs15-init.h"
#endif
extern int hack_enabled;
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs11/framework-pkcs15init.c opensc/src/pkcs11/framework-pkcs15init.c
--- opensc.orig/src/pkcs11/framework-pkcs15init.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/pkcs11/framework-pkcs15init.c 2010-03-02 21:37:40.000000000 +0100
@@ -22,7 +22,7 @@
#include <string.h>
#include "sc-pkcs11.h"
#ifdef USE_PKCS15_INIT
-#include "opensc/pkcs15-init.h"
+#include "pkcs15init/pkcs15-init.h"
/*
* Deal with uninitialized cards
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs11/sc-pkcs11.h opensc/src/pkcs11/sc-pkcs11.h
--- opensc.orig/src/pkcs11/sc-pkcs11.h 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/pkcs11/sc-pkcs11.h 2010-03-02 21:11:59.000000000 +0100
@@ -27,13 +27,13 @@
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
+#include "libopensc/log.h"
#define CRYPTOKI_EXPORTS
-#include <pkcs11.h>
-#include <pkcs11-opensc.h>
+#include "pkcs11.h"
+#include "pkcs11-opensc.h"
#include "pkcs11-display.h"
#ifdef __cplusplus
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/Makefile.am opensc/src/pkcs15init/Makefile.am
--- opensc.orig/src/pkcs15init/Makefile.am 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/pkcs15init/Makefile.am 2010-03-02 20:58:06.000000000 +0100
@@ -4,8 +4,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
EXTRA_DIST = Makefile.mak
noinst_LTLIBRARIES = libpkcs15init.la
-openscinclude_HEADERS = pkcs15-init.h
-noinst_HEADERS = profile.h
+noinst_HEADERS = profile.h pkcs15-init.h
dist_pkgdata_DATA = \
cyberflex.profile \
flex.profile \
@@ -28,7 +27,7 @@ dist_pkgdata_DATA = \
AM_CPPFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
+INCLUDES = -I$(top_srcdir)/src
libpkcs15init_la_SOURCES = \
pkcs15-lib.c profile.c \
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-asepcos.c opensc/src/pkcs15init/pkcs15-asepcos.c
--- opensc.orig/src/pkcs15init/pkcs15-asepcos.c 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-asepcos.c 2010-03-02 21:18:18.000000000 +0100
@@ -22,9 +22,9 @@
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-cardos.c opensc/src/pkcs15init/pkcs15-cardos.c
--- opensc.orig/src/pkcs15init/pkcs15-cardos.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-cardos.c 2010-03-02 21:18:40.000000000 +0100
@@ -27,11 +27,11 @@
#include <string.h>
#include <assert.h>
#include <stdarg.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
-#include <opensc/cards.h>
-#include <opensc/asn1.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
+#include "libopensc/cards.h"
+#include "libopensc/asn1.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-cflex.c opensc/src/pkcs15init/pkcs15-cflex.c
--- opensc.orig/src/pkcs15init/pkcs15-cflex.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-cflex.c 2010-03-02 21:19:14.000000000 +0100
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-entersafe.c opensc/src/pkcs15init/pkcs15-entersafe.c
--- opensc.orig/src/pkcs15init/pkcs15-entersafe.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-entersafe.c 2010-03-02 21:19:34.000000000 +0100
@@ -23,9 +23,9 @@
#include <string.h>
#include <assert.h>
#include <stdarg.h>
-#include <opensc/log.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
+#include "libopensc/log.h"
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-gpk.c opensc/src/pkcs15init/pkcs15-gpk.c
--- opensc.orig/src/pkcs15init/pkcs15-gpk.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-gpk.c 2010-03-02 21:20:10.000000000 +0100
@@ -29,10 +29,10 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/cards.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/cards.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-incrypto34.c opensc/src/pkcs15init/pkcs15-incrypto34.c
--- opensc.orig/src/pkcs15init/pkcs15-incrypto34.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-incrypto34.c 2010-03-02 21:20:23.000000000 +0100
@@ -27,9 +27,9 @@
#include <string.h>
#include <assert.h>
#include <stdarg.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-init.h opensc/src/pkcs15init/pkcs15-init.h
--- opensc.orig/src/pkcs15init/pkcs15-init.h 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-init.h 2010-03-02 21:06:53.000000000 +0100
@@ -11,7 +11,7 @@
extern "C" {
#endif
-#include <opensc/pkcs15.h>
+#include "libopensc/pkcs15.h"
#define SC_PKCS15INIT_X509_DIGITAL_SIGNATURE 0x0080UL
#define SC_PKCS15INIT_X509_NON_REPUDIATION 0x0040UL
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-jcop.c opensc/src/pkcs15init/pkcs15-jcop.c
--- opensc.orig/src/pkcs15init/pkcs15-jcop.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-jcop.c 2010-03-02 21:20:35.000000000 +0100
@@ -27,9 +27,9 @@
#include <string.h>
#include <assert.h>
#include <stdarg.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-lib.c opensc/src/pkcs15init/pkcs15-lib.c
--- opensc.orig/src/pkcs15init/pkcs15-lib.c 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-lib.c 2010-03-02 21:03:36.000000000 +0100
@@ -56,12 +56,12 @@
#include <openssl/pkcs12.h>
#endif
#include <ltdl.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/pkcs15.h"
#include "profile.h"
#include "pkcs15-init.h"
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
-#include <compat_strlcpy.h>
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
+#include "common/compat_strlcpy.h"
#define OPENSC_INFO_FILEPATH "3F0050154946"
#define OPENSC_INFO_FILEID 0x4946
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-miocos.c opensc/src/pkcs15init/pkcs15-miocos.c
--- opensc.orig/src/pkcs15init/pkcs15-miocos.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-miocos.c 2010-03-02 21:20:53.000000000 +0100
@@ -23,9 +23,9 @@
#endif
#include <string.h>
#include <sys/types.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-muscle.c opensc/src/pkcs15init/pkcs15-muscle.c
--- opensc.orig/src/pkcs15init/pkcs15-muscle.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-muscle.c 2010-03-02 21:21:10.000000000 +0100
@@ -29,11 +29,11 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include <opensc/pkcs15.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/cards.h>
-#include <opensc/log.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/cards.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-myeid.c opensc/src/pkcs15init/pkcs15-myeid.c
--- opensc.orig/src/pkcs15init/pkcs15-myeid.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-myeid.c 2010-03-02 21:21:26.000000000 +0100
@@ -25,9 +25,9 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-oberthur.c opensc/src/pkcs15init/pkcs15-oberthur.c
--- opensc.orig/src/pkcs15init/pkcs15-oberthur.c 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-oberthur.c 2010-03-02 21:21:47.000000000 +0100
@@ -33,9 +33,9 @@
#include <openssl/sha.h>
#endif
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-rtecp.c opensc/src/pkcs15init/pkcs15-rtecp.c
--- opensc.orig/src/pkcs15init/pkcs15-rtecp.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-rtecp.c 2010-03-02 21:22:04.000000000 +0100
@@ -24,10 +24,10 @@
#include <assert.h>
#include <stddef.h>
#include <stdlib.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
+#include "libopensc/pkcs15.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-rutoken.c opensc/src/pkcs15init/pkcs15-rutoken.c
--- opensc.orig/src/pkcs15init/pkcs15-rutoken.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-rutoken.c 2010-03-02 21:29:07.000000000 +0100
@@ -34,10 +34,10 @@ typedef unsigned __int32 uint32_t;
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
+#include "libopensc/pkcs15.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-setcos.c opensc/src/pkcs15init/pkcs15-setcos.c
--- opensc.orig/src/pkcs15init/pkcs15-setcos.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-setcos.c 2010-03-02 21:22:24.000000000 +0100
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/log.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/log.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-starcos.c opensc/src/pkcs15init/pkcs15-starcos.c
--- opensc.orig/src/pkcs15init/pkcs15-starcos.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-starcos.c 2010-03-02 21:22:37.000000000 +0100
@@ -26,9 +26,9 @@
#include <string.h>
#include <assert.h>
#include <stdarg.h>
-#include <opensc/log.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
+#include "libopensc/log.h"
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15-westcos.c opensc/src/pkcs15init/pkcs15-westcos.c
--- opensc.orig/src/pkcs15init/pkcs15-westcos.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/pkcs15init/pkcs15-westcos.c 2010-03-02 21:08:39.000000000 +0100
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include <stdio.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
#include "pkcs15-init.h"
#include "profile.h"
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/profile.c opensc/src/pkcs15init/profile.c
--- opensc.orig/src/pkcs15init/profile.c 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/pkcs15init/profile.c 2010-03-02 21:07:58.000000000 +0100
@@ -37,12 +37,12 @@
#endif
#include <assert.h>
#include <stdlib.h>
-#include <opensc/scconf.h>
-#include <opensc/log.h>
-#include <opensc/pkcs15.h>
+#include "scconf/scconf.h"
+#include "libopensc/log.h"
+#include "libopensc/pkcs15.h"
#include "pkcs15-init.h"
#include "profile.h"
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#define DEF_PRKEY_RSA_ACCESS 0x1D
#define DEF_PRKEY_DSA_ACCESS 0x12
diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/profile.h opensc/src/pkcs15init/profile.h
--- opensc.orig/src/pkcs15init/profile.h 2010-03-02 20:31:10.000000000 +0100
+++ opensc/src/pkcs15init/profile.h 2010-03-02 21:06:12.000000000 +0100
@@ -11,7 +11,7 @@
extern "C" {
#endif
-#include <opensc/pkcs15.h>
+#include "libopensc/pkcs15.h"
#ifndef SC_PKCS15_PROFILE_SUFFIX
#define SC_PKCS15_PROFILE_SUFFIX "profile"
diff -udrNPp --exclude=.svn opensc.orig/src/scconf/Makefile.am opensc/src/scconf/Makefile.am
--- opensc.orig/src/scconf/Makefile.am 2010-02-16 10:38:02.000000000 +0100
+++ opensc/src/scconf/Makefile.am 2010-03-02 20:58:25.000000000 +0100
@@ -5,12 +5,11 @@ DISTCLEANFILES = lex-parse.c
EXTRA_DIST = Makefile.mak
dist_noinst_DATA = README.scconf lex-parse.l
-openscinclude_HEADERS = scconf.h
-noinst_HEADERS = internal.h
+noinst_HEADERS = internal.h scconf.h
noinst_PROGRAMS = test-conf
noinst_LTLIBRARIES = libscconf.la
-INCLUDES = -I$(top_srcdir)/src/common
+INCLUDES = -I$(top_srcdir)/src
libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c
diff -udrNPp --exclude=.svn opensc.orig/src/scconf/parse.c opensc/src/scconf/parse.c
--- opensc.orig/src/scconf/parse.c 2009-12-13 10:14:27.000000000 +0100
+++ opensc/src/scconf/parse.c 2010-03-02 21:02:17.000000000 +0100
@@ -31,7 +31,7 @@
#include <errno.h>
#include "scconf.h"
#include "internal.h"
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#define STATE_NAME 0x01
#define STATE_VALUE 0x02
diff -udrNPp --exclude=.svn opensc.orig/src/tests/Makefile.am opensc/src/tests/Makefile.am
--- opensc.orig/src/tests/Makefile.am 2010-02-16 10:38:02.000000000 +0100
+++ opensc/src/tests/Makefile.am 2010-03-02 20:53:06.000000000 +0100
@@ -6,7 +6,7 @@ EXTRA_DIST = Makefile.mak
SUBDIRS = regression
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
-INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
+INCLUDES = -I$(top_srcdir)/src
LIBS = $(top_builddir)/src/libopensc/libopensc.la \
$(top_builddir)/src/common/libcompat.la
diff -udrNPp --exclude=.svn opensc.orig/src/tests/base64.c opensc/src/tests/base64.c
--- opensc.orig/src/tests/base64.c 2005-12-29 13:36:28.000000000 +0100
+++ opensc/src/tests/base64.c 2010-03-02 21:22:48.000000000 +0100
@@ -2,8 +2,8 @@
#include <config.h>
#endif
#include <stdio.h>
-#include <opensc/opensc.h>
-#include <opensc/asn1.h>
+#include "libopensc/opensc.h"
+#include "libopensc/asn1.h"
int main(int argc, char *argv[])
{
diff -udrNPp --exclude=.svn opensc.orig/src/tests/lottery.c opensc/src/tests/lottery.c
--- opensc.orig/src/tests/lottery.c 2009-12-13 08:44:41.000000000 +0100
+++ opensc/src/tests/lottery.c 2010-03-02 21:23:05.000000000 +0100
@@ -13,7 +13,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#include <opensc/opensc.h>
+#include "libopensc/opensc.h"
#include "sc-test.h"
int main(int argc, char *argv[])
diff -udrNPp --exclude=.svn opensc.orig/src/tests/p15dump.c opensc/src/tests/p15dump.c
--- opensc.orig/src/tests/p15dump.c 2010-02-16 10:38:02.000000000 +0100
+++ opensc/src/tests/p15dump.c 2010-03-02 21:23:12.000000000 +0100
@@ -9,8 +9,8 @@
#endif
#include <stdio.h>
#include <stdlib.h>
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
#include "sc-test.h"
static struct sc_pkcs15_card *p15card;
diff -udrNPp --exclude=.svn opensc.orig/src/tests/pintest.c opensc/src/tests/pintest.c
--- opensc.orig/src/tests/pintest.c 2010-02-16 10:38:02.000000000 +0100
+++ opensc/src/tests/pintest.c 2010-03-02 21:23:34.000000000 +0100
@@ -13,9 +13,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
-#include <compat_getpass.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
+#include "common/compat_getpass.h"
#include "sc-test.h"
static struct sc_pkcs15_card *p15card;
diff -udrNPp --exclude=.svn opensc.orig/src/tests/print.c opensc/src/tests/print.c
--- opensc.orig/src/tests/print.c 2009-12-13 10:14:26.000000000 +0100
+++ opensc/src/tests/print.c 2010-03-02 21:23:42.000000000 +0100
@@ -10,8 +10,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
#include "sc-test.h"
void sc_test_print_card(const sc_pkcs15_card_t *mycard)
diff -udrNPp --exclude=.svn opensc.orig/src/tests/prngtest.c opensc/src/tests/prngtest.c
--- opensc.orig/src/tests/prngtest.c 2009-12-13 08:44:41.000000000 +0100
+++ opensc/src/tests/prngtest.c 2010-03-02 21:41:15.000000000 +0100
@@ -15,7 +15,7 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#include <opensc/opensc.h>
+#include "libopensc/opensc.h"
#include "sc-test.h"
int main(int argc, char *argv[])
diff -udrNPp --exclude=.svn opensc.orig/src/tests/sc-test.c opensc/src/tests/sc-test.c
--- opensc.orig/src/tests/sc-test.c 2010-02-16 10:38:02.000000000 +0100
+++ opensc/src/tests/sc-test.c 2010-03-02 21:24:08.000000000 +0100
@@ -10,8 +10,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <compat_getopt.h>
-#include <opensc/opensc.h>
+#include "common/compat_getopt.h"
+#include "libopensc/opensc.h"
#include "sc-test.h"
sc_context_t *ctx;
diff -udrNPp --exclude=.svn opensc.orig/src/tests/sc-test.h opensc/src/tests/sc-test.h
--- opensc.orig/src/tests/sc-test.h 2009-12-13 10:14:26.000000000 +0100
+++ opensc/src/tests/sc-test.h 2010-03-02 21:12:05.000000000 +0100
@@ -1,7 +1,7 @@
#ifndef _SC_TEST_H
#define _SC_TEST_H
-#include <opensc/pkcs15.h>
+#include "libopensc/pkcs15.h"
#ifdef __cplusplus
extern "C" {
diff -udrNPp --exclude=.svn opensc.orig/src/tools/Makefile.am opensc/src/tools/Makefile.am
--- opensc.orig/src/tools/Makefile.am 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/Makefile.am 2010-03-02 20:53:18.000000000 +0100
@@ -15,7 +15,7 @@ dist_bin_SCRIPTS += cardos-info.bat
endif
AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
+INCLUDES = -I$(top_srcdir)/src
LIBS = $(top_builddir)/src/common/libcompat.la \
$(top_builddir)/src/libopensc/libopensc.la
diff -udrNPp --exclude=.svn opensc.orig/src/tools/cardos-tool.c opensc/src/tools/cardos-tool.c
--- opensc.orig/src/tools/cardos-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/cardos-tool.c 2010-03-02 21:24:16.000000000 +0100
@@ -39,7 +39,7 @@
#include <openssl/sha.h>
#endif
-#include <opensc/opensc.h>
+#include "libopensc/opensc.h"
#include "util.h"
static const char *app_name = "cardos-tool";
diff -udrNPp --exclude=.svn opensc.orig/src/tools/cryptoflex-tool.c opensc/src/tools/cryptoflex-tool.c
--- opensc.orig/src/tools/cryptoflex-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/cryptoflex-tool.c 2010-03-02 21:39:44.000000000 +0100
@@ -26,8 +26,8 @@
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/err.h>
-#include <opensc/pkcs15.h>
-#include <compat_strlcpy.h>
+#include "libopensc/pkcs15.h"
+#include "common/compat_strlcpy.h"
#include "util.h"
static const char *app_name = "cryptoflex-tool";
diff -udrNPp --exclude=.svn opensc.orig/src/tools/eidenv.c opensc/src/tools/eidenv.c
--- opensc.orig/src/tools/eidenv.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/eidenv.c 2010-03-02 21:39:17.000000000 +0100
@@ -26,10 +26,10 @@
#include <unistd.h>
#endif
#include <stdlib.h>
-#include <compat_getopt.h>
+#include "common/compat_getopt.h"
#include <string.h>
-#include <opensc/opensc.h>
-#include <opensc/asn1.h>
+#include "libopensc/opensc.h"
+#include "libopensc/asn1.h"
#include "util.h"
#include "../libopensc/cards.h"
diff -udrNPp --exclude=.svn opensc.orig/src/tools/netkey-tool.c opensc/src/tools/netkey-tool.c
--- opensc.orig/src/tools/netkey-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/netkey-tool.c 2010-03-02 21:40:54.000000000 +0100
@@ -29,10 +29,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include <compat_getopt.h>
+#include "common/compat_getopt.h"
#include <string.h>
#include <errno.h>
-#include <opensc/opensc.h>
+#include "libopensc/opensc.h"
#include <openssl/x509v3.h>
#include <openssl/pem.h>
diff -udrNPp --exclude=.svn opensc.orig/src/tools/opensc-explorer.c opensc/src/tools/opensc-explorer.c
--- opensc.orig/src/tools/opensc-explorer.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/opensc-explorer.c 2010-03-02 21:25:16.000000000 +0100
@@ -25,13 +25,13 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <opensc/opensc.h>
-#include <opensc/asn1.h>
+#include "libopensc/opensc.h"
+#include "libopensc/asn1.h"
#ifdef ENABLE_READLINE
#include <readline/readline.h>
#include <readline/history.h>
#endif
-#include <opensc/cardctl.h>
+#include "libopensc/cardctl.h"
#include "util.h"
#define DIM(v) (sizeof(v)/sizeof((v)[0]))
diff -udrNPp --exclude=.svn opensc.orig/src/tools/opensc-tool.c opensc/src/tools/opensc-tool.c
--- opensc.orig/src/tools/opensc-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/opensc-tool.c 2010-03-02 21:25:28.000000000 +0100
@@ -30,8 +30,8 @@
#include <errno.h>
#include <ctype.h>
#include <sys/stat.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
#include "util.h"
static const char *app_name = "opensc-tool";
diff -udrNPp --exclude=.svn opensc.orig/src/tools/piv-tool.c opensc/src/tools/piv-tool.c
--- opensc.orig/src/tools/piv-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/piv-tool.c 2010-03-02 21:25:41.000000000 +0100
@@ -31,8 +31,8 @@
#include <errno.h>
#include <ctype.h>
#include <sys/stat.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
#include "util.h"
#include <openssl/rsa.h>
#include <openssl/x509.h>
diff -udrNPp --exclude=.svn opensc.orig/src/tools/pkcs11-tool.c opensc/src/tools/pkcs11-tool.c
--- opensc.orig/src/tools/pkcs11-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/pkcs11-tool.c 2010-03-02 21:38:52.000000000 +0100
@@ -22,9 +22,9 @@
#include <config.h>
#endif
-#include <opensc/pkcs11.h>
-#include <opensc/pkcs11-opensc.h>
-#include <compat_getpass.h>
+#include "pkcs11/pkcs11.h"
+#include "pkcs11/pkcs11-opensc.h"
+#include "common/compat_getpass.h"
#include "util.h"
#ifdef ENABLE_OPENSSL
diff -udrNPp --exclude=.svn opensc.orig/src/tools/pkcs15-crypt.c opensc/src/tools/pkcs15-crypt.c
--- opensc.orig/src/tools/pkcs15-crypt.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/pkcs15-crypt.c 2010-03-02 21:26:22.000000000 +0100
@@ -28,14 +28,14 @@
#endif
#include <errno.h>
#include <string.h>
-#include <opensc/opensc.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/pkcs15.h"
#ifdef ENABLE_OPENSSL
#include <openssl/evp.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#endif
-#include <compat_getpass.h>
+#include "common/compat_getpass.h"
#include "util.h"
static const char *app_name = "pkcs15-crypt";
diff -udrNPp --exclude=.svn opensc.orig/src/tools/pkcs15-init.c opensc/src/tools/pkcs15-init.c
--- opensc.orig/src/tools/pkcs15-init.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/tools/pkcs15-init.c 2010-03-02 21:40:08.000000000 +0100
@@ -58,14 +58,14 @@
#include <openssl/ec.h>
#endif /* OPENSSL_NO_EC */
#endif /* OPENSSL_VERSION_NUMBER >= 0x10000000L */
-#include <opensc/cardctl.h>
-#include <opensc/pkcs15.h>
-#include <opensc/pkcs15-init.h>
-#include <opensc/log.h>
-#include <opensc/cards.h>
-#include <compat_getpass.h>
+#include "libopensc/cardctl.h"
+#include "libopensc/pkcs15.h"
+#include "pkcs15init/pkcs15-init.h"
+#include "libopensc/log.h"
+#include "libopensc/cards.h"
+#include "common/compat_getpass.h"
#include "util.h"
-#include <compat_strlcpy.h>
+#include "common/compat_strlcpy.h"
#undef GET_KEY_ECHO_OFF
diff -udrNPp --exclude=.svn opensc.orig/src/tools/pkcs15-tool.c opensc/src/tools/pkcs15-tool.c
--- opensc.orig/src/tools/pkcs15-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/pkcs15-tool.c 2010-03-02 21:38:23.000000000 +0100
@@ -36,8 +36,9 @@ typedef unsigned __int32 uint32_t;
#include <openssl/crypto.h>
#endif
#include <limits.h>
-#include <opensc/pkcs15.h>
-#include <compat_getpass.h>
+#include "libopensc/pkcs15.h"
+#include "libopensc/asn1.h"
+#include "common/compat_getpass.h"
#include "util.h"
static const char *app_name = "pkcs15-tool";
@@ -1670,7 +1671,6 @@ end:
/*
* Helper function for PEM encoding public key
*/
-#include "opensc/asn1.h"
static const struct sc_asn1_entry c_asn1_pem_key_items[] = {
{ "algorithm", SC_ASN1_ALGORITHM_ID, SC_ASN1_CONS| SC_ASN1_TAG_SEQUENCE, 0, NULL, NULL},
{ "key", SC_ASN1_BIT_STRING_NI, SC_ASN1_TAG_BIT_STRING, 0, NULL, NULL },
diff -udrNPp --exclude=.svn opensc.orig/src/tools/rutoken-tool.c opensc/src/tools/rutoken-tool.c
--- opensc.orig/src/tools/rutoken-tool.c 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/rutoken-tool.c 2010-03-02 21:27:31.000000000 +0100
@@ -31,9 +31,9 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
-#include <opensc/opensc.h>
-#include <opensc/cardctl.h>
-#include <opensc/pkcs15.h>
+#include "libopensc/opensc.h"
+#include "libopensc/cardctl.h"
+#include "libopensc/pkcs15.h"
#include "util.h"
/* win32 needs this in open(2) */
diff -udrNPp --exclude=.svn opensc.orig/src/tools/util.h opensc/src/tools/util.h
--- opensc.orig/src/tools/util.h 2010-02-16 10:38:01.000000000 +0100
+++ opensc/src/tools/util.h 2010-03-02 21:12:16.000000000 +0100
@@ -16,8 +16,8 @@
#include <unistd.h>
#endif
#include <sys/stat.h>
-#include <compat_getopt.h>
-#include <opensc/opensc.h>
+#include "common/compat_getopt.h"
+#include "libopensc/opensc.h"
#ifdef __cplusplus
extern "C" {
diff -udrNPp --exclude=.svn opensc.orig/src/tools/westcos-tool.c opensc/src/tools/westcos-tool.c
--- opensc.orig/src/tools/westcos-tool.c 2010-02-26 10:18:23.000000000 +0100
+++ opensc/src/tools/westcos-tool.c 2010-03-02 21:27:50.000000000 +0100
@@ -27,10 +27,10 @@
#include <stdlib.h>
#include <string.h>
-#include <opensc/opensc.h>
-#include <opensc/errors.h>
-#include <opensc/pkcs15.h>
-#include <opensc/cardctl.h>
+#include "libopensc/opensc.h"
+#include "libopensc/errors.h"
+#include "libopensc/pkcs15.h"
+#include "libopensc/cardctl.h"
#include <openssl/opensslv.h>
#include <openssl/rsa.h>
_______________________________________________
opensc-devel mailing list
opensc-devel@lists.opensc-project.org
http://www.opensc-project.org/mailman/listinfo/opensc-devel
