winscard.h / CFLAGS_PCSC cleanups
Merge OpenSSL configure changes with SCIDI Build process changes for future CT-API support git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@225 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
aet
parent
e605e6fa8b
commit
24c6f4176e
|
|
@ -388,13 +388,15 @@ int main(void)
|
|||
fi
|
||||
done
|
||||
|
||||
# if test -z "$found_crypto" ; then
|
||||
# AC_MSG_ERROR([Could not find working OpenSSL library, please install or check config.log])
|
||||
# fi
|
||||
if test -n "$found_crypto" ; then
|
||||
if test -z "$ssldir" ; then
|
||||
ssldir="(system)"
|
||||
fi
|
||||
ac_cv_openssldir=$ssldir
|
||||
SSL_MSG="yes"
|
||||
AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
|
||||
fi
|
||||
])
|
||||
|
||||
|
|
@ -425,6 +427,9 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
|
|||
fi
|
||||
fi
|
||||
LIBS="$saved_LIBS"
|
||||
if test "x$SSL_MSG" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_SSL, test "x$SSL_MSG" = "xyes")
|
||||
|
||||
dnl Check for PAM libs
|
||||
|
|
@ -492,7 +497,6 @@ CFLAGS_OPENSC="-I\${top_srcdir}/src/libopensc"
|
|||
AC_SUBST(LIBOPENSC)
|
||||
LIBOPENSC="\${top_srcdir}/src/libopensc/libopensc.la"
|
||||
|
||||
|
||||
# Pass information about installed OpenSC requirements, so that
|
||||
# a proper opensc-config file will be build.
|
||||
OPENSC_LIBS="-L${libdir} -lopensc"
|
||||
|
|
@ -500,7 +504,6 @@ OPENSC_CFLAGS=""
|
|||
AC_SUBST(OPENSC_LIBS)
|
||||
AC_SUBST(OPENSC_CFLAGS)
|
||||
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
aclocal/Makefile
|
||||
|
|
|
|||
|
|
@ -2,7 +2,13 @@
|
|||
|
||||
EXTRA_DIST = opensc-config.in
|
||||
|
||||
INCLUDES = @CFLAGS_PCSC@
|
||||
if HAVE_PCSCLITE
|
||||
PCSC_SRC = reader-pcsc.c
|
||||
PCSC_FLAGS = @CFLAGS_PCSC@
|
||||
PCSC_LIB = @LIBPCSC@
|
||||
endif
|
||||
|
||||
INCLUDES = $(PCSC_FLAGS)
|
||||
|
||||
bin_SCRIPTS = opensc-config
|
||||
|
||||
|
|
@ -10,15 +16,15 @@ lib_LTLIBRARIES = libopensc.la
|
|||
libopensc_la_SOURCES = asn1.c base64.c sec.c log.c sc.c card.c iso7816.c \
|
||||
dir.c pkcs15.c pkcs15-cert.c pkcs15-pin.c \
|
||||
pkcs15-prkey.c pkcs15-sec.c pkcs15-cache.c \
|
||||
reader-pcsc.c \
|
||||
$(PCSC_SRC) \
|
||||
card-setec.c card-flex.c card-gpk.c \
|
||||
card-tcos.c card-emv.c card-default.c
|
||||
libopensc_la_LDFLAGS = -version-info 0:6:0
|
||||
|
||||
if HAVE_SSL
|
||||
libopensc_la_LIBADD = @LIBPCSC@ @LIBCRYPTO@
|
||||
libopensc_la_LIBADD = $(PCSC_LIB) @LIBCRYPTO@
|
||||
else
|
||||
libopensc_la_LIBADD = @LIBPCSC@
|
||||
libopensc_la_LIBADD = $(PCSC_LIB)
|
||||
endif
|
||||
|
||||
include_HEADERS = opensc.h opensc-pkcs15.h opensc-emv.h \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Process this file with automake to create Makefile.in
|
||||
|
||||
INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
|
||||
INCLUDES = @CFLAGS_OPENSC@
|
||||
LDFLAGS = @LDFLAGS@ @LIBCRYPTO@ @LIBOPENSC@
|
||||
|
||||
EXTRA_DIST = openssh-3.0.2p1-patch.diff
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
libdir = ${prefix}/lib/security
|
||||
|
||||
INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
|
||||
INCLUDES = @CFLAGS_OPENSC@
|
||||
LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ @LIBCRYPTO@ @LIBOPENSC@
|
||||
|
||||
SRC = pam_pkcs15.c
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ SUBDIRS = . rsaref
|
|||
|
||||
libdir = ${prefix}/lib/pkcs11
|
||||
|
||||
INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
|
||||
INCLUDES = @CFLAGS_OPENSC@
|
||||
|
||||
LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@
|
||||
|
||||
|
|
|
|||
|
|
@ -21,18 +21,13 @@
|
|||
#ifndef __opensc_pkcs11_h__
|
||||
#define __opensc_pkcs11_h__
|
||||
|
||||
#include <winscard.h>
|
||||
|
||||
#include <opensc.h>
|
||||
#include <opensc-pkcs15.h>
|
||||
|
||||
#include "rsaref/pkcs11.h"
|
||||
|
||||
|
||||
#define SC_PKCS11_MAX_VIRTUAL_SLOTS 4
|
||||
#define SC_PKCS11_MAX_READERS 2
|
||||
|
||||
|
||||
struct sc_pkcs11_session;
|
||||
struct sc_pkcs11_slot;
|
||||
struct sc_pkcs11_card;
|
||||
|
|
@ -78,7 +73,6 @@ struct sc_pkcs11_object {
|
|||
};
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* PKCS#11 Smartcard Framework abstraction
|
||||
*/
|
||||
|
|
@ -109,7 +103,6 @@ struct sc_pkcs11_framework_ops {
|
|||
};
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* PKCS#11 Slot (used to access card with specific framework data)
|
||||
*/
|
||||
|
|
@ -171,8 +164,6 @@ struct sc_pkcs11_session {
|
|||
struct sc_pkcs11_operation *operation;
|
||||
};
|
||||
|
||||
|
||||
|
||||
/* Module variables */
|
||||
extern struct sc_context *context;
|
||||
extern struct sc_pkcs11_pool session_pool;
|
||||
|
|
@ -182,7 +173,6 @@ extern struct sc_pkcs11_card card_table[SC_PKCS11_MAX_READERS];
|
|||
/* Framework definitions */
|
||||
extern struct sc_pkcs11_framework_ops framework_pkcs15;
|
||||
|
||||
|
||||
void strcpy_bp(u8 *dst, const char *src, int dstsize);
|
||||
CK_RV sc_to_cryptoki_error(int rc, int reader);
|
||||
void dump_template(const char *info, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount);
|
||||
|
|
@ -209,4 +199,3 @@ CK_RV session_check_operation(struct sc_pkcs11_session *, int);
|
|||
CK_RV session_stop_operation(struct sc_pkcs11_session *);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Process this file with automake to create Makefile.in
|
||||
|
||||
INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
|
||||
INCLUDES = @CFLAGS_OPENSC@
|
||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
||||
|
||||
noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Process this file with automake to create Makefile.in
|
||||
|
||||
INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
|
||||
INCLUDES = @CFLAGS_OPENSC@
|
||||
LDFLAGS = @LDFLAGS@ @LIBOPENSC@
|
||||
|
||||
if HAVE_SSL
|
||||
|
|
|
|||
Loading…
Reference in New Issue