mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* configure.ac: Removed OpenSC detection and options.
* acinclude.m4: Ditto. * scdaemon.texi: Removed OpenSC specific options. * app-p15.c: New. Basic support for pkcs15 cards without OpenSC. There are quite a couple of things missing but at least I can use my old TCOS cards from the Aegypten-1 development for signing. * app.c (select_application): Detect pkcs15 applications. * Makefile.am (scdaemon_SOURCES): Removed card.c, card-common.h and card-p15.c because they are now obsolete. Added app-p15.c. Removed all OpenSC stuff. * command.c (do_reset, open_card, cmd_serialno, cmd_learn) (cmd_readcert, cmd_readkey, cmd_pksign, cmd_pkdecrypt): Removed all special cases for the old card.c based mechanisms. * scdaemon.c, apdu.c: Removed all special cases for OpenSC.
This commit is contained in:
parent
a832ff3de0
commit
a22750dc1e
16 changed files with 2623 additions and 896 deletions
18
configure.ac
18
configure.ac
|
@ -38,9 +38,6 @@ NEED_LIBASSUAN_VERSION=0.6.9
|
|||
|
||||
NEED_KSBA_VERSION=0.9.11
|
||||
|
||||
NEED_OPENSC_VERSION=0.8.0
|
||||
|
||||
|
||||
|
||||
PACKAGE=$PACKAGE_NAME
|
||||
PACKAGE_GT=${PACKAGE_NAME}2
|
||||
|
@ -59,7 +56,6 @@ have_gpg_error=no
|
|||
have_libgcrypt=no
|
||||
have_libassuan=no
|
||||
have_ksba=no
|
||||
have_opensc=no
|
||||
have_pth=no
|
||||
|
||||
GNUPG_BUILD_PROGRAM(gpg, no)
|
||||
|
@ -503,16 +499,6 @@ AC_PATH_PROG(SHRED, shred, /usr/bin/shred)
|
|||
AC_DEFINE_UNQUOTED(SHRED,
|
||||
"${SHRED}", [defines the filename of the shred program])
|
||||
|
||||
#
|
||||
# OpenSC is needed by the SCdaemon - if it is not availbale we can only
|
||||
# build a limited SCdaemon
|
||||
#
|
||||
AM_PATH_OPENSC("$NEED_OPENSC_VERSION",have_opensc=yes,have_opensc=no)
|
||||
if test $have_opensc = yes; then
|
||||
AC_DEFINE(HAVE_OPENSC,1,
|
||||
[defined if the OpenSC library is available])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_OPENSC, test "$have_opensc" = "yes")
|
||||
|
||||
#
|
||||
# Check whether the (highly desirable) GNU Pth library is available
|
||||
|
@ -1052,10 +1038,6 @@ if test "$build_scdaemon" = "yes"; then
|
|||
tmp=", "
|
||||
missing_pth=yes
|
||||
fi
|
||||
if test $have_opensc = no; then
|
||||
build_scdaemon_extra="${build_scdaemon_extra}${tmp}no pkcs#15"
|
||||
tmp=", "
|
||||
fi
|
||||
if test -n "$build_scdaemon_extra"; then
|
||||
build_scdaemon_extra="(${build_scdaemon_extra})"
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue