Version 2.0.2 (released 2013-01-08)

* oathtool: Base32 decoding of keys are now more liberal in what accepts.
  It can now accept keys on the "gr6d 5br7 25s6 vnck v4vl hlao re"
  format, i.e., base32 data delimited using SPC and without padding.
  The old proper base32 format is still supported.
* liboath: oath_base32_decode now ignores SPC and adds pad characters.
* liboath: If password in usersfile is + then ignore supplied password.
  This enables the pam_oath module to be used with external password
  verification.  Based on patch from Ilkka Virta <itvirta@iki.fi>.
* tests: Fixed expiry date of some certificates used in the test suite.
  The last release would only complete 'make check' during a 30 day window.
* API and ABI is backwards compatible with the previous version.

Version 2.0.1 (released 2012-10-24)

* libpskc, pskctool: Support sign and verify of PSKC data using XML DigSig.
* libpskc: XML Schema validation modified.
  The entire PSKC schema is now supported (before the XML Digital
  Signatures and Encryption parts were removed).  The code now assumes
  that the schema is available in the local XML catalog.  Thanks to Liam
  Quin for hints about XML catalogs.
* pskctool: the --check (-c) parameter was renamed to --info (-i).
* API and ABI is backwards compatible with the previous version.

Version 2.0.0 (released 2012-10-10)

* libpskc, pskctool: New components.
  The OATH Toolkit now supports the Portable Symmetric Key Container
  (PSKC) data format specified in RFC 6030 for dealing with key
  provisioning.  There is a new low-level library libpskc for managing
  PSKC data for application developers and a new command line tool
  pskctool for interacting with PSKC data for users.  The PSKC
  functionality depends on Libxml2 <http://xmlsoft.org/>.  It can be
  disabled unconditionally using the ./configure-parameter
  --disable-pskc.
* liboath: Add manpages for library API.
* API and ABI is backwards compatible with the previous version.

4 files changed, 142 insertions, 16 deletions

diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index 222f5d2bf1a..1ff5a7ecee0 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/11/18 02:25:38 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/03/16 20:52:38 pettai Exp $
 #
 
-DISTNAME=	oath-toolkit-1.12.6
+DISTNAME=	oath-toolkit-2.0.2
 CATEGORIES=	security
 MASTER_SITES=	http://download.savannah.gnu.org/releases/oath-toolkit/
 
@@ -16,5 +16,7 @@ USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE+=	liboath/liboath.pc.in
 
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../security/xmlsec1/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/oath-toolkit/PLIST b/security/oath-toolkit/PLIST
index 29a9e316330..807ad20b01b 100644
--- a/security/oath-toolkit/PLIST
+++ b/security/oath-toolkit/PLIST
@@ -1,23 +1,147 @@
-@comment $NetBSD: PLIST,v 1.2 2012/11/10 18:07:44 pettai Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/03/16 20:52:38 pettai Exp $
 bin/oathtool
+bin/pskctool
 include/liboath/oath.h
+include/pskc/container.h
+include/pskc/enums.h
+include/pskc/errors.h
+include/pskc/exports.h
+include/pskc/global.h
+include/pskc/keypackage.h
+include/pskc/pskc.h
+include/pskc/version.h
 lib/liboath.la
+lib/libpskc.la
 lib/pkgconfig/liboath.pc
+lib/pkgconfig/libpskc.pc
 lib/security/pam_oath.la
 man/man1/oathtool.1
+man/man1/pskctool.1
+man/man3/oath_authenticate_usersfile.3
+man/man3/oath_base32_decode.3
+man/man3/oath_base32_encode.3
+man/man3/oath_bin2hex.3
+man/man3/oath_check_version.3
+man/man3/oath_done.3
+man/man3/oath_hex2bin.3
+man/man3/oath_hotp_generate.3
+man/man3/oath_hotp_validate.3
+man/man3/oath_hotp_validate_callback.3
+man/man3/oath_init.3
+man/man3/oath_strerror.3
+man/man3/oath_strerror_name.3
+man/man3/oath_totp_generate.3
+man/man3/oath_totp_validate.3
+man/man3/oath_totp_validate2.3
+man/man3/oath_totp_validate2_callback.3
+man/man3/oath_totp_validate_callback.3
+man/man3/pskc_build_xml.3
+man/man3/pskc_check_version.3
+man/man3/pskc_done.3
+man/man3/pskc_free.3
+man/man3/pskc_get_cryptomodule_id.3
+man/man3/pskc_get_device_devicebinding.3
+man/man3/pskc_get_device_expirydate.3
+man/man3/pskc_get_device_issueno.3
+man/man3/pskc_get_device_manufacturer.3
+man/man3/pskc_get_device_model.3
+man/man3/pskc_get_device_serialno.3
+man/man3/pskc_get_device_startdate.3
+man/man3/pskc_get_device_userid.3
+man/man3/pskc_get_id.3
+man/man3/pskc_get_key_algorithm.3
+man/man3/pskc_get_key_algparm_chall_checkdigits.3
+man/man3/pskc_get_key_algparm_chall_encoding.3
+man/man3/pskc_get_key_algparm_chall_max.3
+man/man3/pskc_get_key_algparm_chall_min.3
+man/man3/pskc_get_key_algparm_resp_checkdigits.3
+man/man3/pskc_get_key_algparm_resp_encoding.3
+man/man3/pskc_get_key_algparm_resp_length.3
+man/man3/pskc_get_key_algparm_suite.3
+man/man3/pskc_get_key_data_b64secret.3
+man/man3/pskc_get_key_data_counter.3
+man/man3/pskc_get_key_data_secret.3
+man/man3/pskc_get_key_data_time.3
+man/man3/pskc_get_key_data_timedrift.3
+man/man3/pskc_get_key_data_timeinterval.3
+man/man3/pskc_get_key_friendlyname.3
+man/man3/pskc_get_key_id.3
+man/man3/pskc_get_key_issuer.3
+man/man3/pskc_get_key_policy_expirydate.3
+man/man3/pskc_get_key_policy_keyusages.3
+man/man3/pskc_get_key_policy_numberoftransactions.3
+man/man3/pskc_get_key_policy_pinencoding.3
+man/man3/pskc_get_key_policy_pinkeyid.3
+man/man3/pskc_get_key_policy_pinmaxfailedattempts.3
+man/man3/pskc_get_key_policy_pinmaxlength.3
+man/man3/pskc_get_key_policy_pinminlength.3
+man/man3/pskc_get_key_policy_pinusagemode.3
+man/man3/pskc_get_key_policy_startdate.3
+man/man3/pskc_get_key_profileid.3
+man/man3/pskc_get_key_reference.3
+man/man3/pskc_get_key_userid.3
+man/man3/pskc_get_keypackage.3
+man/man3/pskc_get_signed_p.3
+man/man3/pskc_get_version.3
+man/man3/pskc_global_done.3
+man/man3/pskc_global_init.3
+man/man3/pskc_global_log.3
+man/man3/pskc_init.3
+man/man3/pskc_keyusage2str.3
+man/man3/pskc_output.3
+man/man3/pskc_parse_from_memory.3
+man/man3/pskc_pinusagemode2str.3
+man/man3/pskc_sign_x509.3
+man/man3/pskc_str2keyusage.3
+man/man3/pskc_str2pinusagemode.3
+man/man3/pskc_str2valueformat.3
+man/man3/pskc_strerror.3
+man/man3/pskc_strerror_name.3
+man/man3/pskc_validate.3
+man/man3/pskc_valueformat2str.3
+man/man3/pskc_verify_x509crt.3
 share/gtk-doc/html/liboath/api-index-1-10-0.html
 share/gtk-doc/html/liboath/api-index-1-12-0.html
 share/gtk-doc/html/liboath/api-index-1-4-0.html
 share/gtk-doc/html/liboath/api-index-1-6-0.html
 share/gtk-doc/html/liboath/api-index-1-8-0.html
 share/gtk-doc/html/liboath/api-index-full.html
-share/gtk-doc/html/liboath/ch01.html
 share/gtk-doc/html/liboath/home.png
 share/gtk-doc/html/liboath/index.html
 share/gtk-doc/html/liboath/index.sgml
+share/gtk-doc/html/liboath/intro.html
 share/gtk-doc/html/liboath/left.png
 share/gtk-doc/html/liboath/liboath-oath.html
 share/gtk-doc/html/liboath/liboath.devhelp2
 share/gtk-doc/html/liboath/right.png
 share/gtk-doc/html/liboath/style.css
 share/gtk-doc/html/liboath/up.png
+share/gtk-doc/html/libpskc/api-index-full.html
+share/gtk-doc/html/libpskc/ch02s02.html
+share/gtk-doc/html/libpskc/ch02s03.html
+share/gtk-doc/html/libpskc/ch02s04.html
+share/gtk-doc/html/libpskc/home.png
+share/gtk-doc/html/libpskc/index.html
+share/gtk-doc/html/libpskc/index.sgml
+share/gtk-doc/html/libpskc/left.png
+share/gtk-doc/html/libpskc/libpskc-container.html
+share/gtk-doc/html/libpskc/libpskc-enums.html
+share/gtk-doc/html/libpskc/libpskc-errors.html
+share/gtk-doc/html/libpskc/libpskc-global.html
+share/gtk-doc/html/libpskc/libpskc-keypackage.html
+share/gtk-doc/html/libpskc/libpskc-pskc.html
+share/gtk-doc/html/libpskc/libpskc-version.html
+share/gtk-doc/html/libpskc/libpskc.devhelp2
+share/gtk-doc/html/libpskc/pskc-reference.html
+share/gtk-doc/html/libpskc/pskc-tutorial-libpskc-sign.html
+share/gtk-doc/html/libpskc/pskc-tutorial-libpskc-verify.html
+share/gtk-doc/html/libpskc/pskc-tutorial-pskctool.html
+share/gtk-doc/html/libpskc/pskc-tutorial-quickstart.html
+share/gtk-doc/html/libpskc/pskc-tutorial.html
+share/gtk-doc/html/libpskc/right.png
+share/gtk-doc/html/libpskc/style.css
+share/gtk-doc/html/libpskc/up.png
+share/xml/pskc/catalog-pskc.xml
+share/xml/pskc/pskc-schema.xsd
+share/xml/pskc/xenc-schema.xsd
+share/xml/pskc/xmldsig-core-schema.xsd
diff --git a/security/oath-toolkit/distinfo b/security/oath-toolkit/distinfo
index ed6cee09398..0de9def7756 100644
--- a/security/oath-toolkit/distinfo
+++ b/security/oath-toolkit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2012/11/10 18:07:44 pettai Exp $
+$NetBSD: distinfo,v 1.8 2013/03/16 20:52:38 pettai Exp $
 
-SHA1 (oath-toolkit-1.12.6.tar.gz) = e1d116d7a60aca902b880cd99d542f7896f21e39
-RMD160 (oath-toolkit-1.12.6.tar.gz) = dd6613531f770042b113230f7d42c49a302f6e89
-Size (oath-toolkit-1.12.6.tar.gz) = 2275393 bytes
-SHA1 (patch-liboath_gl_fflush.c) = 5a1ff1a9ae740e55816fbd5d33f01145e52368a4
+SHA1 (oath-toolkit-2.0.2.tar.gz) = 3672924a9d9c3373ec62a6b79e9aa1e846c4d178
+RMD160 (oath-toolkit-2.0.2.tar.gz) = 751beac5e9b34c0905cfbb4bd58ee7c6b379fd65
+Size (oath-toolkit-2.0.2.tar.gz) = 3946021 bytes
+SHA1 (patch-liboath_gl_fflush.c) = d957eed6c3e653ee53bbcf0b95b0c032f092b07d
 SHA1 (patch-liboath_gl_fseeko.c) = bd67a1af8c01a2dbf849f8612cbb18470cb3b248
diff --git a/security/oath-toolkit/patches/patch-liboath_gl_fflush.c b/security/oath-toolkit/patches/patch-liboath_gl_fflush.c
index 6009ac48aaf..4c3ad6e7689 100644
--- a/security/oath-toolkit/patches/patch-liboath_gl_fflush.c
+++ b/security/oath-toolkit/patches/patch-liboath_gl_fflush.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-liboath_gl_fflush.c,v 1.2 2012/11/10 18:07:44 pettai Exp $
+$NetBSD: patch-liboath_gl_fflush.c,v 1.3 2013/03/16 20:52:38 pettai Exp $
 
---- liboath/gl/fflush.c.orig	2012-08-07 07:13:22.000000000 +0000
+--- liboath/gl/fflush.c.orig	2013-01-03 22:33:04.000000000 +0000
 +++ liboath/gl/fflush.c
-@@ -94,7 +94,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
+@@ -96,7 +96,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
                     off_t pos _GL_UNUSED_PARAMETER)
  {
- #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
--# if defined __CYGWIN__
-+# if defined(__CYGWIN__) || defined(__NetBSD__)
+ #  if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+-#   if defined __CYGWIN__
++#   if defined(__CYGWIN__) || defined(__NetBSD__)
    /* fp_->_offset is typed as an integer.  */
    fp_->_offset = pos;
- # else
+ #   else