diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-01-12 21:18:21 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-01-13 00:18:21 -0500 |
| commit | dbcbffa06c9930a687010ca816596ca3f5cc78e9 (patch) | |
| tree | 27f88222ed222e45784f4c1e6ea0b8d6b9f9d07b /src/cryptography/hazmat/primitives/serialization | |
| parent | 9b198104db8b53178212b5849919b6a61ca794ab (diff) | |
| download | cryptography-dbcbffa06c9930a687010ca816596ca3f5cc78e9.tar.gz cryptography-dbcbffa06c9930a687010ca816596ca3f5cc78e9.tar.bz2 cryptography-dbcbffa06c9930a687010ca816596ca3f5cc78e9.zip | |
support x448 public/private serialization both raw and pkcs8 (#4653)
* support x448 public/private serialization both raw and pkcs8
* add tests for all other asym key types to prevent Raw
* more tests
* better tests
* fix a test
* funny story, I'm actually illiterate.
* pep8
* require PrivateFormat.Raw or PublicFormat.Raw with Encoding.Raw
* missing docs
* parametrize
* docs fixes
* remove dupe line
* assert something
Diffstat (limited to 'src/cryptography/hazmat/primitives/serialization')
| -rw-r--r-- | src/cryptography/hazmat/primitives/serialization/base.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/primitives/serialization/base.py b/src/cryptography/hazmat/primitives/serialization/base.py index 5dd0c639..1670fd18 100644 --- a/src/cryptography/hazmat/primitives/serialization/base.py +++ b/src/cryptography/hazmat/primitives/serialization/base.py @@ -40,17 +40,20 @@ class Encoding(Enum): PEM = "PEM" DER = "DER" OpenSSH = "OpenSSH" + Raw = "Raw" class PrivateFormat(Enum): PKCS8 = "PKCS8" TraditionalOpenSSL = "TraditionalOpenSSL" + Raw = "Raw" class PublicFormat(Enum): SubjectPublicKeyInfo = "X.509 subjectPublicKeyInfo with PKCS#1" PKCS1 = "Raw PKCS#1" OpenSSH = "OpenSSH" + Raw = "Raw" class ParameterFormat(Enum): |