| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
This option can be used to skip a number of rows in the CSV file before
the key data is read. If the number of rows to skip is 0, the column
interpretation should be provided using the --columns option.
|
|
|
|
|
| |
This option can be used to set key properties for all keys in the PSKC
file.
|
|
|
|
|
|
| |
This option can be used to override the list of columns as found in the
first line of the CSV file or provide a mapping for values found in the
first line to PSKC properties.
|
|
|
|
|
|
| |
This script reads a CSV file and writes out a PSKC file with the key
information from the CSV file. The CSV file is expected to have one row
for each key and key property values in columns.
|
|
|
|
|
| |
This also installs pskc2csv and pskc2pskc console script entry points as
part of the package installation.
|
| |
|
| |
|
|
|
|
|
|
| |
This script reads a PSKC file in any supported format and writes out a
RFC 6030 compliant version of the file, optionally with the encryption
removed or (re-)encrypting the file with a new key.
|
|
|
|
|
|
|
|
| |
In some cases a PSKC file can be written with a MAC algorithm but
without a MAC key. This is possible when the MAC key is not supplied
(allowed in older PSKC versions) and a fallback to the encryption key is
done. If we have not yet decrypted the file the MAC key is not yet
available and so can't be included in the written file.
|
|
|
|
|
|
|
| |
This ensures that the encryption IV, which should be per encrypted value
is written out per encrypted value instead of globally. This is mostly
useful for when reading an old format PSKC file and writing out a RFC
6030 compliant one.
|
|
|
|
|
| |
This adds a function to decrypt all values and remove the encryption of
an encrypted PSKC file.
|
|
|
|
|
|
|
| |
This ensures that the tests also work without a TTY and work regardless
of the PYTHONWARNINGS and TZ environment variables
Fixes cd33833
|
|
|
|
|
|
| |
This ignores the namespace declarations in the generated XML files
because not all implementations on all environments write these in the
same order.
|
|
|
|
|
|
| |
This property can be use to see whether the PSKC file needs an
additional pre-shared key or passphrase to decrypt any stored
information.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds support for creating and verifying embedded XML signatures in
PSKC files. This uses the third-party signxml library for actual signing
and verification.
The signxml library has a dependency on lxml and defusedxml (and a few
others) but all parts of python-pskc still work correctly with our
without lxml and/or defusedxml and signxml is only required when working
with embedded signatures.
This modifies the tox configuration to skip the signature checks if
singxml is not installed and to only require 100% code coverage if the
signature tests are done.
|
| |
|
|
|
|
|
| |
This makes the old name (pin_max_failed_attemtps) available as a
deprecated property.
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds basic support for parsing the PSKC files as specified in
draft-hoyer-keyprov-portable-symmetric-key-container-00 and
draft-hoyer-keyprov-portable-symmetric-key-container-01.
It should be able to extract secrets, counters, etc. but not all
properties from the PSKC file are supported.
It is speculated that this format resembles the "Verisign PSKC format"
that some applications produce.
|
|
|
|
|
|
|
| |
This adds tests for parsing the files that are shipped as part of the
multiOTP test suite.
https://www.multiotp.net/
|
|
|
|
|
|
|
|
|
|
|
| |
This changes the way encrypted values are stored internally before being
decrypted. For example, the internal _secret property can now be a
decrypted plain value or an EncryptedValue instance instead of always
being a DataType, simplifying some things (e.g. all XML
encoding/decoding is now done in the corresponding module).
This should not change the public API but does have consequences for
those who use custom serialisers or parsers.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
The cryptography library is better supported.
This uses the functions from cryptography for AES and Triple DES
encryption, replaces the (un)padding functions that were previously
implemented in python-pskc with cryptography and uses PBKDF2
implementation from hashlib.
|
|
|
|
|
|
| |
This uses os.urandom() as a source for random data and replaces other
utility functions. This also removes one import for getting the lengths
of Tripple DES keys.
|
|
|
|
|
|
| |
This avoids a using xml.dom.minidom to indent the XML tree and keep the
attributes ordered alphabetically. This also allows for customisations
to the XML formatting.
|
|
|
|
|
| |
Some Python versions don't have the algorithms_available property but do
have the algorithms property in hashlib.
|
|
|
|
|
|
|
| |
The PBKDF2 salt was saved in the wrong way (b'base64encodeddata' instead
of base64encodeddata) when using Python 3. This fixes that problem and
tests that saving and loading of a file that uses PBKDF2 key derivation
works.
|
|
|
|
|
| |
This makes minor changes to the pskc2csv script to make it more easily
testable.
|
|
|
|
|
| |
This provides a read-only userid property on Key objects that uses the
key_userid or device_userid value, whichever one is defined.
|
|
|
|
|
|
|
|
| |
This switches to using the hashlib.new() function to be able to use all
hashes that are available in Python (specifically RIPEMD160).
This also adds a number of tests for HMACs using test vectors from
RFC 2202, RFC 4231 and RFC 2857.
|
| |
|
|
|
|
| |
Have one doctest file per vendor to make tests a little more manageable.
|
|
|
|
| |
This adds tests from draft-josefsson-keyprov-pskc-yubikey-00.
|
|
|
|
|
|
| |
This adds support for parsing ActivIdentity files that conform to a very
old version of an Internet Draft. The implementation and test were based
on a file provided by Jaap Ruijgrok.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This updates the tests to use the original examples from
draft-hoyer-keyprov-pskc-algorithm-profiles-01 instead of modifying them
to fit the RFC 6030 schema (but does include some minor changes to make
them valid XML).
This adds a few additions to the parser to handle legacy challenge and
resposne encoding and a few key policy properties.
This also includes a fix for 0b757ec in the handling of the
<ChallengeFormat> element under a <Usage> element.
|
|
|
|
| |
Note that asymmetric encryption and digital signature checking has not
yet been implemented so the tests are pretty minimal.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds support for parsing most examples from
draft-ietf-keyprov-pskc-02. That file uses a few other names for
elements and attributes of the PSKC file and a few other minor
differences.
The XML parsing has been changed to allow specifying multiple matches
and the find*() functions now return the first found match.
While all examples from draft-ietf-keyprov-pskc-02 are tested support
for verifying digital signatures and asymmetric keys have not yet been
implemented.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
RFC 6030 implies that the MAC should be performed over the ciphertext
but some earlier drafts implied that the MAC should be performed on the
plaintext. This change accpets the MAC if either the plaintext or
ciphertext match.
Note that this change allows for a padding oracle attack when CBC
encryption modes are used because decryption (and unpadding) needs to be
done before MAC checking. However, this module is not expected to be
available to users to process arbitrary PSKC files repeatedly.
This removes the tests for a missing MAC key (and replaces it for tests
of missing EncryptionMethod) because falling back to using the
encryption key (implemented in a444f78) in combination with this change
means that decryption is performed before MAC checking and is no longer
possible to trigger a missing MAC key error.
|
| |
|
|
|
|
|
| |
This ensures that the files that are read in the test suite are properly
closed to avoid leaking open file descriptors.
|
|
|
|
|
|
|
|
| |
This allows having multiple keys per device while also maintaining the
previous API.
Note that having multiple keys per device is not allowed by the RFC 6030
schema but is allowed by some older internet drafts.
|
| |
|
|
|
|
| |
This enables branch coverage testing and adds tests to improve coverage.
|
|
|
|
| |
This also ensures that the PRF URL is normalised.
|
|
|
|
|
|
| |
This uses the encryption key also as MAC key if no MAC key has been
specified in the PSKC file. Earlier versions of the PSKC draft specified
this behaviour.
|
|
|
|
|
|
| |
In older versions of the PSKC standard it was allowed to have a global
initialization vector for CBC based encryption algorithms. It is
probably not a good idea to re-use an IV in general.
|
| |
|
| |
|
|
|
|
|
| |
This factors out the PBKDF2 key derivation to a separate function and
introduces a function to configure KeyDerivation instances with PBKDF2.
|