python-pskc branch master updated. 1.0-12-ge6f2dd4

[Commits of the python-pskc project <python-pskc-commits [at] lists.arthurdejong.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-pskc".

The branch, master has been updated
       via  e6f2dd4695859da116e19e176da0f88a16e29367 (commit)
       via  9026e1cfd65ad81ebba125e49cb01b95ab9ed4da (commit)
      from  b3e7fe7b513ced378600b7fa08a96779e54e2b4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://arthurdejong.org/git/python-pskc/commit/?id=e6f2dd4695859da116e19e176da0f88a16e29367

commit e6f2dd4695859da116e19e176da0f88a16e29367
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sun Mar 11 11:37:01 2018 +0100

    Increase default PBKDF2 iterations to 100000

diff --git a/pskc/encryption.py b/pskc/encryption.py
index 7c23c5e..1ffc3ac 100644
--- a/pskc/encryption.py
+++ b/pskc/encryption.py
@@ -258,7 +258,7 @@ class KeyDerivation(object):
         if iterations:
             self.pbkdf2_iterations = iterations
         elif self.pbkdf2_iterations is None:
-            self.pbkdf2_iterations = 12 * 1000
+            self.pbkdf2_iterations = 100000
         if key_length:  # pragma: no branch (always specified)
             self.pbkdf2_key_length = key_length
         if prf:
diff --git a/tests/test_encryption.doctest b/tests/test_encryption.doctest
index 0a5dcdb..761c5f7 100644
--- a/tests/test_encryption.doctest
+++ b/tests/test_encryption.doctest
@@ -271,7 +271,7 @@ reasonable defaults.
 >>> pskc.encryption.derivation.algorithm
 'http://www.rsasecurity.com/rsalabs/pkcs/schemas/pkcs-5v2-0#pbkdf2'
 >>> pskc.encryption.derivation.pbkdf2_iterations
-12000
+100000
 >>> len(pskc.encryption.derivation.pbkdf2_salt)
 16
 >>> pskc.encryption.derivation.pbkdf2_key_length
diff --git a/tests/test_pskc2pskc.doctest b/tests/test_pskc2pskc.doctest
index 43eddd9..f404469 100644
--- a/tests/test_pskc2pskc.doctest
+++ b/tests/test_pskc2pskc.doctest
@@ -296,7 +296,7 @@ We can also decrypt a file and configure a new passphrase.
      <Salt>
       <Specified>...</Specified>
      </Salt>
-     <IterationCount>12000</IterationCount>
+     <IterationCount>...</IterationCount>
      <KeyLength>16</KeyLength>
     </xenc11:PBKDF2-params>
    </xenc11:KeyDerivationMethod>
diff --git a/tests/test_write.doctest b/tests/test_write.doctest
index 4d980d6..779fc4c 100644
--- a/tests/test_write.doctest
+++ b/tests/test_write.doctest
@@ -440,7 +440,7 @@ Use PBKDF2 to derive a key instead of using a pre-shared 
key.
      <Salt>
       <Specified>...</Specified>
      </Salt>
-     <IterationCount>12000</IterationCount>
+     <IterationCount>...</IterationCount>
      <KeyLength>16</KeyLength>
     </xenc11:PBKDF2-params>
    </xenc11:KeyDerivationMethod>
@@ -605,7 +605,7 @@ We can make the PKKDF2 salt have to be transmitted 
out-of-bounds:
   <xenc11:DerivedKey>
    <xenc11:KeyDerivationMethod 
Algorithm="http://www.rsasecurity.com/rsalabs/pkcs/schemas/pkcs-5v2-0#pbkdf2";>
     <xenc11:PBKDF2-params>
-     <IterationCount>12000</IterationCount>
+     <IterationCount>...</IterationCount>
      <KeyLength>16</KeyLength>
     </xenc11:PBKDF2-params>
    </xenc11:KeyDerivationMethod>

https://arthurdejong.org/git/python-pskc/commit/?id=9026e1cfd65ad81ebba125e49cb01b95ab9ed4da

commit 9026e1cfd65ad81ebba125e49cb01b95ab9ed4da
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Wed Feb 21 19:40:57 2018 +0100

    Support building a universal wheel

diff --git a/setup.cfg b/setup.cfg
index a0725b3..d1d7b30 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,13 @@
+[metadata]
+license_file=COPYING
+
 [sdist]
 owner=root
 group=root
 
+[bdist_wheel]
+universal = 1
+
 [nosetests]
 with-doctest=true
 doctest-extension=doctest

-----------------------------------------------------------------------

Summary of changes:
 pskc/encryption.py            | 2 +-
 setup.cfg                     | 6 ++++++
 tests/test_encryption.doctest | 2 +-
 tests/test_pskc2pskc.doctest  | 2 +-
 tests/test_write.doctest      | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
python-pskc
-- 
To unsubscribe send an email to
python-pskc-commits-unsubscribe@lists.arthurdejong.org or see
https://lists.arthurdejong.org/python-pskc-commits/