[Python-modules-commits] [python-pskc] 04/06: Add file missing from upstream tarball

Arthur de Jong adejong at moszumanska.debian.org
Sat Jan 21 21:31:48 UTC 2017


This is an automated email from the git hooks/post-receive script.

adejong pushed a commit to branch master
in repository python-pskc.

commit 1d131ba69989a899f36f7eeed708ee8e8bc57b7f
Merge: 0f12874 6e6cb55
Author: Arthur de Jong <adejong at debian.org>
Date:   Sat Jan 21 22:13:22 2017 +0100

    Add file missing from upstream tarball

 debian/.git-dpm                                    |  4 +-
 debian/changelog                                   |  3 +-
 ...01-Add-file-missing-from-upstream-tarball.patch | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/actividentity/test.pskc                      | 34 +++++++++++++++
 5 files changed, 89 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7c5f81e,0000000..c278421
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 3a94d05401f13478ba73266699efeef462793be3
- 3a94d05401f13478ba73266699efeef462793be3
++6e6cb55a7e2d62c6f182cad6e9083d7854ae218c
++6e6cb55a7e2d62c6f182cad6e9083d7854ae218c
 +3a94d05401f13478ba73266699efeef462793be3
 +3a94d05401f13478ba73266699efeef462793be3
 +python-pskc_0.5.orig.tar.gz
 +9d58ba8b96b1352cee87428dfc6efa08a19e4dd6
 +83663
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index f788a8b,0000000..a7ce4f5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,83 -1,0 +1,84 @@@
 +python-pskc (0.5-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release:
 +    - numerous compatibility improvements for reading PSKC files that do not
 +      follow the RFC 6030 schema exactly: specifically accept a number of old
 +      Internet Draft specifications that preceded RFC 6030 and support an
 +      ActivIdentity file format
 +    - split device information from key information (keep old API available)
 +      to allow multiple keys per device (this is not allowed by RFC 6030 but
 +      was allowed in older Internet Drafts)
 +    - accept MAC to be over plaintext in addition to ciphertext
 +    - fall back to using encryption key as MAC key
 +    - documentation improvements
++  * Add file missing from upstream tarball
 +
-  -- Arthur de Jong <adejong at debian.org>  Sat, 21 Jan 2017 19:38:39 +0100
++ -- Arthur de Jong <adejong at debian.org>  Sat, 21 Jan 2017 22:08:59 +0100
 +
 +python-pskc (0.4-2) unstable; urgency=medium
 +
 +  * Add Breaks/Replaces to allow upgrades from older versions
 +    (closes: #820025)
 +
 + -- Arthur de Jong <adejong at debian.org>  Tue, 05 Apr 2016 22:13:26 +0200
 +
 +python-pskc (0.4-1) unstable; urgency=medium
 +
 +  * New upstream release:
 +    - add support for writing encrypted PSKC files (with either a pre-shared
 +      key or PBKDF2 password-based encryption)
 +    - extend may_use() policy checking function to check for unknown policy
 +      elements and key expiry
 +    - add a number of tests for existing vendor PSKC files and have full line
 +      coverage with tests
 +    - be more lenient in handling a number of XML files (e.g. automatically
 +      sanitise encryption algorithm URIs, ignore XML namespaces and support
 +      more spellings of some properties)
 +    - support reading password or key files in pskc2csv
 +    - support Python 3 in the pskc2csv script (thanks Mathias Laurin)
 +    - refactoring and clean-ups to be more easily extendible (thanks Mathias
 +      Laurin)
 +  * Use https in Vcs-Git field (thanks lintian)
 +  * Update package description
 +  * Add a python-pskc-doc package
 +  * Upgrade to standards-version 3.9.7 (no changes needed)
 +
 + -- Arthur de Jong <adejong at debian.org>  Mon, 28 Mar 2016 22:04:23 +0200
 +
 +python-pskc (0.3-1) unstable; urgency=medium
 +
 +  * New upstream release:
 +    - support writing unencrypted PSKC files
 +    - include a sample pskc2csv script in the source code
 +    - fix an issue with XML namespaces for PBKDF2 parameters
 +    - support Python 3
 +    - update documentation
 +  * Update debian/copyright
 +  * Update debhelper compatibility level to 9
 +  * Bump Standards-Version to 3.9.6, no changes needed
 +  * Switch to pybuild buildsystem
 +  * Also build a python3-pskc package for Python 3
 +  * Provide the pskc2csv.py example script
 +
 + -- Arthur de Jong <adejong at debian.org>  Thu, 08 Oct 2015 12:43:24 +0200
 +
 +python-pskc (0.2-1) unstable; urgency=medium
 +
 +  * New upstream release:
 +    - raise exceptions on parsing, decryption and other problems
 +    - support more encryption algorithms (AES128-CBC, AES192-CBC, AES256-CBC,
 +      TripleDES-CBC, KW-AES128, KW-AES192, KW-AES256 and KW-TripleDES) and be
 +      more lenient in accepting algorithm URIs
 +    - support all HMAC algorithms that Python's hashlib module has hash
 +      functions for (HMAC-MD5, HMAC-SHA1, HMAC-SHA224, HMAC-SHA256,
 +      HMAC-SHA384 and HMAC-SHA512)
 +    - support PRF attribute of PBKDF2 algorithm
 +  * Build and install Sphinx documentation.
 +
 + -- Arthur de Jong <adejong at debian.org>  Fri, 20 Jun 2014 14:50:59 +0200
 +
 +python-pskc (0.1-1) unstable; urgency=medium
 +
 +  * Initial release.
 +
 + -- Arthur de Jong <adejong at debian.org>  Fri, 23 May 2014 16:00:30 +0200
diff --cc debian/patches/0001-Add-file-missing-from-upstream-tarball.patch
index 0000000,0000000..d84a011
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-file-missing-from-upstream-tarball.patch
@@@ -1,0 -1,0 +1,50 @@@
++From 6e6cb55a7e2d62c6f182cad6e9083d7854ae218c Mon Sep 17 00:00:00 2001
++From: Arthur de Jong <adejong at debian.org>
++Date: Sat, 21 Jan 2017 22:09:41 +0100
++Subject: Add file missing from upstream tarball
++
++---
++ tests/actividentity/test.pskc | 34 ++++++++++++++++++++++++++++++++++
++ 1 file changed, 34 insertions(+)
++ create mode 100644 tests/actividentity/test.pskc
++
++diff --git a/tests/actividentity/test.pskc b/tests/actividentity/test.pskc
++new file mode 100644
++index 0000000..63a324e
++--- /dev/null
+++++ b/tests/actividentity/test.pskc
++@@ -0,0 +1,34 @@
+++<?xml version="1.0" encoding="UTF-8"?>
+++
+++<!--
+++  Test file provided by a customer of ActivIdentity. The file has been
+++  modified to include only one token and all secret values have been modified
+++  to not leak any actual data. Note that the MAC uses the same key as was
+++  used for encryption and is over the plaintext.
+++-->
+++
+++<KeyContainer xmlns="urn:ietf:params:xml:ns:keyprov:container:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:ietf:params:xml:ns:keyprov:container:1.0:keyprov-pskc-1.0.xsd" version="1.0">
+++<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+++<IV>Xus0lsc+rJLi0nc/ANE0Xg==</IV>
+++</EncryptionMethod>
+++<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"/>
+++<Device>
+++<DeviceId>
+++<Manufacturer>ActivIdentity</Manufacturer>
+++<SerialNo>0950380269</SerialNo>
+++</DeviceId>
+++<Key KeyAlgorithm="http://www.ietf.org/keyprov/pskc#hotp" KeyId="0950380269">
+++<Issuer>ActivIdentity</Issuer>
+++<Usage OTP="true">
+++<ResponseFormat Format="DECIMAL" Length="8"/>
+++</Usage>
+++<Data Name="SECRET">
+++<Value>1HBJThmzYDCU7YCrML6OZKMsRQriSvZpoqeMfBui9dI=</Value>
+++<ValueDigest>SlinEB9YUzcR04MUZDF5dBLtK1c=</ValueDigest>
+++</Data>
+++<Data Name="COUNTER">
+++<Value>AAAAADHwRgM=</Value>
+++</Data>
+++</Key>
+++</Device>
+++</KeyContainer>
diff --cc debian/patches/series
index 0000000,0000000..bed7fba
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-file-missing-from-upstream-tarball.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pskc.git



More information about the Python-modules-commits mailing list