libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fixed recently introduced bug

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-04-07 14:15:24 +00:00
parent c86e96f568
commit bb52e6438e
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING
View File

@@ -1 +1 @@
/usr/share/automake-1.15/COPYING /usr/share/automake-1.14/COPYING

11
ChangeLog
View File

@@ -1,3 +1,14 @@
2017-02-08 18:48
* [r393] configure.ac:
fixed remaining deb dependencies
2017-02-06 22:52
* [r392] COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4,
bootstrap.sh, configure.ac, debian/control.in:
fixed debian dependencies
2017-02-06 10:14 2017-02-06 10:14
* [r391] ChangeLog, resolve-debbuilddeps.sh: * [r391] ChangeLog, resolve-debbuilddeps.sh:

2
INSTALL
View File

@@ -1 +1 @@
/usr/share/automake-1.15/INSTALL /usr/share/automake-1.14/INSTALL

5
configure.ac
View File

@@ -22,17 +22,18 @@ AC_ARG_ENABLE(pkcs11-download,
[AS_HELP_STRING([--enable-pkcs11-download], [AS_HELP_STRING([--enable-pkcs11-download],
[download pkcs11 header])], [download pkcs11 header])],
[have_pedantic="$enableval" [have_pedantic="$enableval"
AC_MSG_NOTICE([downloading pkcs11 library headers])
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
test -d usr/include || mkdir -p usr/include test -d usr/include || mkdir -p usr/include
cd usr/include cd usr/include
for f in $(wget -qO- ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/ 2>&1 | html2 | sed -n 's,.*/a/@href=\(.*\.h\)$,\1,gp'); do for f in $(wget -qO- ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/ 2>&1 | html2 | sed -n 's,.*/a/@href=\(.*\.h\)$,\1,gp'); do
wget --unlink $f wget --unlink $f
if ! test -f "${f##*/}"; then if ! test -f "${f##*/}"; then
AC_MSG_ERROR([download failed of PKCS11 header file: $f]) AC_MSG_ERROR([download failed of pkcs11 header file: $f])
fi fi
done done
if ! test -f cryptoki.h; then if ! test -f cryptoki.h; then
AC_MSG_ERROR([download failed of PKCS11 - have you installed xml2?]) AC_MSG_ERROR([download failed of pkcs11 headers - have you installed xml2?])
fi fi
AM_CPPFLAGS+=" -I$(pwd)" AM_CPPFLAGS+=" -I$(pwd)"
cd - cd -

7
src/suisseid.hxx
View File

@@ -151,12 +151,10 @@ namespace suisseid {
Certificate(const std::string& v, Certificate(const std::string& v,
const std::string& l, const std::string& l,
const std::string& s, const std::string& s,
const std::string& si,
const cryptoki::Attribute& i): const cryptoki::Attribute& i):
std::string(v), std::string(v),
_label(l), _label(l),
_subject(s), _subject(s),
_si(si),
_id(i) { _id(i) {
} }
const std::string& label() { const std::string& label() {
@@ -168,13 +166,9 @@ namespace suisseid {
const cryptoki::Attribute& id() { const cryptoki::Attribute& id() {
return _id; return _id;
} }
const std::string& subjectInfo() {
return _si;
}
private: private:
std::string _label; std::string _label;
std::string _subject; std::string _subject;
std::string _si;
cryptoki::Attribute _id; cryptoki::Attribute _id;
}; };
@@ -283,7 +277,6 @@ namespace suisseid {
res.push_back(Certificate(cert->attribute(CKA_VALUE).value, res.push_back(Certificate(cert->attribute(CKA_VALUE).value,
cert->attribute(CKA_LABEL).value, cert->attribute(CKA_LABEL).value,
cert->attribute(CKA_SUBJECT).value, cert->attribute(CKA_SUBJECT).value,
cert->attribute(CKA_SUBJECT_INFO).value,
cert->attribute(CKA_ID))); cert->attribute(CKA_ID)));
return res; return res;
} }