giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added manual page opensc.conf(5) 

splits the HTML documentation into files.html and tools.html
This commit is contained in:
Frank Morgner 2018-05-31 19:06:17 +02:00
parent 16275c2683
commit 47ee3a3978
14 changed files with 4598 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -49,7 +49,6 @@ tags
*.gz
*.bz2
*.[0-9]
*.html
*.gif
*.css
*.out
@ -77,6 +76,11 @@ doc/tools/pkcs15-tool
doc/tools/sc-hsm-tool
doc/tools/westcos-tool
doc/tools/dnie-tool
doc/tools/egk-tool
doc/tools/npa-tool
doc/tools/opensc-asn1
doc/tools/opensc-notify
doc/files/opensc.conf.5.xml
etc/opensc.conf.win
etc/opensc.conf

1
configure.ac
View File

@ -1057,6 +1057,7 @@ AC_CONFIG_FILES([
Makefile
doc/Makefile
doc/tools/Makefile
doc/files/Makefile
etc/Makefile
src/Makefile
src/common/Makefile

2
doc/Makefile.am
View File

@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
SUBDIRS = tools
SUBDIRS = tools files
dist_noinst_SCRIPTS = html.xsl man.xsl
dist_noinst_DATA = api.css

32
doc/files/Makefile.am Normal file
View File

@ -0,0 +1,32 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
dist_noinst_DATA = pkcs15-profile.5.xml opensc.conf.5.xml.in
if ENABLE_DOC
html_DATA = files.html
endif
if ENABLE_MAN
man5_MANS = pkcs15-profile.5 opensc.conf.5
endif
opensc.conf.5: $(srcdir)/opensc.conf.5.xml.in
sed \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@docdir[@]|$(docdir)|g' \
-e 's|@libdir[@]|$(libdir)|g' \
-e 's|@DYN_LIB_EXT[@]|$(DYN_LIB_EXT)|g' \
-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
-e 's|@PROFILE_DIR_DEFAULT[@]|$(PROFILE_DIR_DEFAULT)|g' \
-e 's|@DEFAULT_SM_MODULE[@]|$(DEFAULT_SM_MODULE)|g' \
< $< > opensc.conf.5.xml
$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl opensc.conf.5.xml
files.html: $(srcdir)/files.xml $(wildcard $(srcdir)/*.5.xml) opensc.conf.5.xml
$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $<
%.5: $(srcdir)/%.5.xml
sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \
| $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $<
clean-local:
-rm -rf $(html_DATA) $(man5_MANS) opensc.conf.5.xml

1105
doc/files/files.html Normal file
View File

File diff suppressed because it is too large Load Diff

10
doc/files/files.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<book xmlns:xi="http://www.w3.org/2001/XInclude">
<title>OpenSC Manual Pages: Section 5</title>
<xi:include href="opensc.conf.5.xml"/>
<xi:include href="pkcs15-profile.5.xml"/>
</book>

1647
doc/files/opensc.conf.5.xml.in Normal file
View File

File diff suppressed because it is too large Load Diff

0
doc/tools/pkcs15-profile.5.xml → doc/files/pkcs15-profile.5.xml
View File

9
doc/tools/Makefile.am
View File

@ -12,22 +12,17 @@ endif
if ENABLE_MAN
man1_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.1.xml))
man5_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.5.xml))
endif
completion_DATA = $(patsubst $(srcdir)/%.1.xml, %, $(wildcard $(srcdir)/*.1.xml))
tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdir)/*.5.xml)
tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml)
$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $<
%.1: $(srcdir)/%.1.xml
sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \
| $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $<
%.5: $(srcdir)/%.5.xml
sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' < $< \
| $(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $<
%: $(srcdir)/%.1.xml
@echo $< $@
@cat $(srcdir)/completion-template \
@ -48,4 +43,4 @@ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdi
> $@
clean-local:
-rm -rf $(html_DATA) $(man1_MANS) $(man5_MANS) $(completion_DATA)
-rm -rf $(html_DATA) $(man1_MANS) $(completion_DATA)

1096
doc/tools/files.html Normal file
View File

File diff suppressed because it is too large Load Diff

1195
doc/tools/tools.html
View File

File diff suppressed because it is too large Load Diff

57
doc/tools/tools.xml
View File

@ -1,40 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<book xmlns:xi="http://www.w3.org/2001/XInclude">
<title>OpenSC Manuals</title>
<reference>
<referenceinfo>
<title>OpenSC tools</title>
</referenceinfo>
<xi:include href="cardos-tool.1.xml"/>
<xi:include href="cryptoflex-tool.1.xml"/>
<xi:include href="dnie-tool.1.xml"/>
<xi:include href="egk-tool.1.xml"/>
<xi:include href="eidenv.1.xml"/>
<xi:include href="gids-tool.1.xml"/>
<xi:include href="iasecc-tool.1.xml"/>
<xi:include href="netkey-tool.1.xml"/>
<xi:include href="npa-tool.1.xml"/>
<xi:include href="openpgp-tool.1.xml"/>
<xi:include href="opensc-asn1.1.xml"/>
<xi:include href="opensc-explorer.1.xml"/>
<xi:include href="opensc-notify.1.xml"/>
<xi:include href="opensc-tool.1.xml"/>
<xi:include href="piv-tool.1.xml"/>
<xi:include href="pkcs11-tool.1.xml"/>
<xi:include href="pkcs15-crypt.1.xml"/>
<xi:include href="pkcs15-init.1.xml"/>
<xi:include href="pkcs15-tool.1.xml"/>
<xi:include href="sc-hsm-tool.1.xml"/>
<xi:include href="westcos-tool.1.xml"/>
</reference>
<title>OpenSC Manual Pages: Section 1</title>
<reference>
<referenceinfo>
<title>OpenSC file formats</title>
</referenceinfo>
<xi:include href="pkcs15-profile.5.xml"/>
</reference>
<xi:include href="cardos-tool.1.xml"/>
<xi:include href="cryptoflex-tool.1.xml"/>
<xi:include href="dnie-tool.1.xml"/>
<xi:include href="egk-tool.1.xml"/>
<xi:include href="eidenv.1.xml"/>
<xi:include href="gids-tool.1.xml"/>
<xi:include href="iasecc-tool.1.xml"/>
<xi:include href="netkey-tool.1.xml"/>
<xi:include href="npa-tool.1.xml"/>
<xi:include href="openpgp-tool.1.xml"/>
<xi:include href="opensc-asn1.1.xml"/>
<xi:include href="opensc-explorer.1.xml"/>
<xi:include href="opensc-notify.1.xml"/>
<xi:include href="opensc-tool.1.xml"/>
<xi:include href="piv-tool.1.xml"/>
<xi:include href="pkcs11-tool.1.xml"/>
<xi:include href="pkcs15-crypt.1.xml"/>
<xi:include href="pkcs15-init.1.xml"/>
<xi:include href="pkcs15-tool.1.xml"/>
<xi:include href="sc-hsm-tool.1.xml"/>
<xi:include href="westcos-tool.1.xml"/>
</book>

11
etc/opensc.conf.in
View File

@ -284,8 +284,8 @@ app default {
#
# md_read_only: Mark card as read/only card in Minidriver/BaseCSP interface (Default: false)
# md_supports_X509_enrollment: Indicate X509 enrollment support at Minidriver/BaseCSP interface (Default: false)
# md_guid_as_id: Use the GUID generated for the key as id in the PKCS#15 structure (Default: false - auto generated)
# md_guid_as_label: Use the GUID generated for the key as label in the PKCS#15 structure (Default: false - no label set)
# md_guid_as_id: Use the GUID generated for the key as id in the PKCS#15 structure (Default: false, i.e. auto generated)
# md_guid_as_label: Use the GUID generated for the key as label in the PKCS#15 structure (Default: false, i.e. no label set)
# md_supports_container_key_gen: Card allows generating key pairs on the card (Default: false)
# md_supports_container_key_import: Card allows importing private keys (Default: false)
#
@ -890,11 +890,10 @@ app default {
# Whether to use the cache files in the user's
# home directory.
#
# At the moment you have to 'teach' the card
# to the system by running command: pkcs15-tool -L
# Note: If caching is done by a system process, caching may be placed
# inaccessible from the user account. Use a global caching directory if
# you wish to share the cached information.
#
# WARNING: Caching shouldn't be used in setuid root
# applications.
# Default: false
# use_file_caching = true;
#

1
src/pkcs11/openssl.c
View File

@ -28,6 +28,7 @@
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/opensslv.h>
#include <openssl/x509.h>
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
#include <openssl/conf.h>
#include <openssl/opensslconf.h> /* for OPENSSL_NO_* */