python-pskc branch master updated. 0.5-41-g2651e80

[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  2651e80366f0a02bd4913b665033e071f1f7a292 (commit)
      from  44b13539993a2de5183a1dcf49b5efd6c471b727 (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=2651e80366f0a02bd4913b665033e071f1f7a292

commit 2651e80366f0a02bd4913b665033e071f1f7a292
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Dec 29 17:54:25 2017 +0100

    Not all XML serialisers write namespaces in same order
    
    This ignores the namespace declarations in the generated XML files
    because not all implementations on all environments write these in the
    same order.

diff --git a/tests/test_write.doctest b/tests/test_write.doctest
index e22bf8b..91bbe8c 100644
--- a/tests/test_write.doctest
+++ b/tests/test_write.doctest
@@ -214,9 +214,9 @@ Read an encrypted PSKC file and write it out as-is. This 
does not require
 providing the encryption key.
 
 >>> pskc = PSKC('tests/rfc6030/figure6.pskcxml')
->>> pskc.write(sys.stdout)  #doctest: +REPORT_UDIFF
+>>> pskc.write(sys.stdout)  #doctest: +ELLIPSIS +REPORT_UDIFF
 <?xml version="1.0" encoding="UTF-8"?>
-<pskc:KeyContainer xmlns:ds="http://www.w3.org/2000/09/xmldsig#"; 
xmlns:pskc="urn:ietf:params:xml:ns:keyprov:pskc" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"; Version="1.0">
+<pskc:KeyContainer ... Version="1.0">
  <pskc:EncryptionKey>
   <ds:KeyName>Pre-shared-key</ds:KeyName>
  </pskc:EncryptionKey>
@@ -274,7 +274,7 @@ Set up an encrypted PSKC file and generate a pre-shared key 
for it.
 >>> with open(f.name, 'r') as r:
 ...     x = sys.stdout.write(r.read())  #doctest: +ELLIPSIS +REPORT_UDIFF
 <?xml version="1.0" encoding="UTF-8"?>
-<pskc:KeyContainer xmlns:ds="http://www.w3.org/2000/09/xmldsig#"; 
xmlns:pskc="urn:ietf:params:xml:ns:keyprov:pskc" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"; Version="1.0">
+<pskc:KeyContainer ... Version="1.0">
  <pskc:EncryptionKey>
   <ds:KeyName>Pre-shared KEY</ds:KeyName>
  </pskc:EncryptionKey>
@@ -343,7 +343,7 @@ Use PBKDF2 to derive a key instead of using a pre-shared 
key.
 >>> with open(f.name, 'r') as r:
 ...     x = sys.stdout.write(r.read())  #doctest: +ELLIPSIS +REPORT_UDIFF
 <?xml version="1.0" encoding="UTF-8"?>
-<pskc:KeyContainer xmlns:pskc="urn:ietf:params:xml:ns:keyprov:pskc" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"; 
xmlns:xenc11="http://www.w3.org/2009/xmlenc11#"; Version="1.0">
+<pskc:KeyContainer ... Version="1.0">
  <pskc:EncryptionKey>
   <xenc11:DerivedKey>
    <xenc11:KeyDerivationMethod 
Algorithm="http://www.rsasecurity.com/rsalabs/pkcs/schemas/pkcs-5v2-0#pbkdf2";>
@@ -488,7 +488,7 @@ result in an empty KeyDerivation element.
 >>> pskc.encryption.derivation.algorithm = 'unknown'
 >>> pskc.write(sys.stdout)  #doctest: +ELLIPSIS +REPORT_UDIFF
 <?xml version="1.0" encoding="UTF-8"?>
-<pskc:KeyContainer xmlns:pskc="urn:ietf:params:xml:ns:keyprov:pskc" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"; 
xmlns:xenc11="http://www.w3.org/2009/xmlenc11#"; Version="1.0">
+<pskc:KeyContainer ... Version="1.0">
  <pskc:EncryptionKey>
   <xenc11:DerivedKey>
    <xenc11:KeyDerivationMethod Algorithm="unknown"/>
@@ -511,7 +511,7 @@ We can make the PKKDF2 salt have to be transmitted 
out-of-bounds:
 >>> pskc.encryption.derivation.pbkdf2_salt = None
 >>> pskc.write(sys.stdout)  #doctest: +ELLIPSIS +REPORT_UDIFF
 <?xml version="1.0" encoding="UTF-8"?>
-<pskc:KeyContainer xmlns:pskc="urn:ietf:params:xml:ns:keyprov:pskc" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"; 
xmlns:xenc11="http://www.w3.org/2009/xmlenc11#"; Version="1.0">
+<pskc:KeyContainer ... Version="1.0">
  <pskc:EncryptionKey>
   <xenc11:DerivedKey>
    <xenc11:KeyDerivationMethod 
Algorithm="http://www.rsasecurity.com/rsalabs/pkcs/schemas/pkcs-5v2-0#pbkdf2";>

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

Summary of changes:
 tests/test_write.doctest | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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/