diff --git a/COPYING b/COPYING index 88798ab..caeca07 120000 --- a/COPYING +++ b/COPYING @@ -1 +1 @@ -/usr/share/automake-1.15/COPYING \ No newline at end of file +/usr/share/automake-1.14/COPYING \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 41658c4..27f0413 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * [r391] ChangeLog, resolve-debbuilddeps.sh: diff --git a/INSTALL b/INSTALL index ddcdb76..f812f5a 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.15/INSTALL \ No newline at end of file +/usr/share/automake-1.14/INSTALL \ No newline at end of file diff --git a/configure.ac b/configure.ac index 6f3e1da..95fa22c 100644 --- a/configure.ac +++ b/configure.ac @@ -22,17 +22,18 @@ AC_ARG_ENABLE(pkcs11-download, [AS_HELP_STRING([--enable-pkcs11-download], [download pkcs11 header])], [have_pedantic="$enableval" + AC_MSG_NOTICE([downloading pkcs11 library headers]) if test "$enableval" = "yes"; then test -d usr/include || mkdir -p 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 wget --unlink $f 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 done 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 AM_CPPFLAGS+=" -I$(pwd)" cd - diff --git a/src/suisseid.hxx b/src/suisseid.hxx index 6fdc721..9fba246 100644 --- a/src/suisseid.hxx +++ b/src/suisseid.hxx @@ -151,12 +151,10 @@ namespace suisseid { Certificate(const std::string& v, const std::string& l, const std::string& s, - const std::string& si, const cryptoki::Attribute& i): std::string(v), _label(l), _subject(s), - _si(si), _id(i) { } const std::string& label() { @@ -168,13 +166,9 @@ namespace suisseid { const cryptoki::Attribute& id() { return _id; } - const std::string& subjectInfo() { - return _si; - } private: std::string _label; std::string _subject; - std::string _si; cryptoki::Attribute _id; }; @@ -283,7 +277,6 @@ namespace suisseid { res.push_back(Certificate(cert->attribute(CKA_VALUE).value, cert->attribute(CKA_LABEL).value, cert->attribute(CKA_SUBJECT).value, - cert->attribute(CKA_SUBJECT_INFO).value, cert->attribute(CKA_ID))); return res; }