aboutsummaryrefslogtreecommitdiff
path: root/asn1crypto
diff options
context:
space:
mode:
authorwbond <will@wbond.net>2019-10-12 04:50:57 -0400
committerwbond <will@wbond.net>2019-10-12 04:50:57 -0400
commit4b0557ef181286dfe62b96b39358775ecb06dcd9 (patch)
treefbded4dff7afdb73a3bf86adf1e41d536752e1b8 /asn1crypto
parentfe9339a5cdb44ff634ac18d66d6ab76a5f07be81 (diff)
downloadasn1crypto-4b0557ef181286dfe62b96b39358775ecb06dcd9.tar.gz
Add more (legacy) OIDs to keys.NamedCurve()
Diffstat (limited to 'asn1crypto')
-rw-r--r--asn1crypto/keys.py60
1 files changed, 47 insertions, 13 deletions
diff --git a/asn1crypto/keys.py b/asn1crypto/keys.py
index a78829d..05f1313 100644
--- a/asn1crypto/keys.py
+++ b/asn1crypto/keys.py
@@ -354,21 +354,38 @@ class NamedCurve(ObjectIdentifier):
'1.2.840.10045.3.1.5': 'prime239v2',
'1.2.840.10045.3.1.6': 'prime239v3',
# https://tools.ietf.org/html/rfc5480#page-5
- # http://www.secg.org/sec2-v2.pdf
+ # http://www.secg.org/SEC2-Ver-1.0.pdf
+ '1.2.840.10045.3.1.1': 'secp192r1',
+ '1.2.840.10045.3.1.7': 'secp256r1',
'1.3.132.0.1': 'sect163k1',
+ '1.3.132.0.2': 'sect163r1',
+ '1.3.132.0.3': 'sect239k1',
+ '1.3.132.0.4': 'sect113r1',
+ '1.3.132.0.5': 'sect113r2',
+ '1.3.132.0.6': 'secp112r1',
+ '1.3.132.0.7': 'secp112r2',
+ '1.3.132.0.8': 'secp160r1',
+ '1.3.132.0.9': 'secp160k1',
'1.3.132.0.10': 'secp256k1',
'1.3.132.0.15': 'sect163r2',
- '1.2.840.10045.3.1.1': 'secp192r1',
- '1.3.132.0.33': 'secp224r1',
- '1.3.132.0.26': 'sect233k1',
- '1.2.840.10045.3.1.7': 'secp256r1',
- '1.3.132.0.27': 'sect233r1',
'1.3.132.0.16': 'sect283k1',
'1.3.132.0.17': 'sect283r1',
+ '1.3.132.0.22': 'sect131r1',
+ '1.3.132.0.23': 'sect131r2',
+ '1.3.132.0.24': 'sect193r1',
+ '1.3.132.0.25': 'sect193r2',
+ '1.3.132.0.26': 'sect233k1',
+ '1.3.132.0.27': 'sect233r1',
+ '1.3.132.0.28': 'secp128r1',
+ '1.3.132.0.29': 'secp128r2',
+ '1.3.132.0.30': 'secp160r2',
+ '1.3.132.0.31': 'secp192k1',
+ '1.3.132.0.32': 'secp224k1',
+ '1.3.132.0.33': 'secp224r1',
'1.3.132.0.34': 'secp384r1',
+ '1.3.132.0.35': 'secp521r1',
'1.3.132.0.36': 'sect409k1',
'1.3.132.0.37': 'sect409r1',
- '1.3.132.0.35': 'secp521r1',
'1.3.132.0.38': 'sect571k1',
'1.3.132.0.39': 'sect571r1',
}
@@ -403,20 +420,37 @@ class NamedCurve(ObjectIdentifier):
'1.2.840.10045.3.1.6': 30,
# Order values used to compute these sourced from
# http://www.secg.org/SEC2-Ver-1.0.pdf
+ '1.2.840.10045.3.1.1': 24,
+ '1.2.840.10045.3.1.7': 32,
'1.3.132.0.1': 21,
+ '1.3.132.0.2': 21,
+ '1.3.132.0.3': 26,
+ '1.3.132.0.4': 14,
+ '1.3.132.0.5': 14,
+ '1.3.132.0.6': 14,
+ '1.3.132.0.7': 14,
+ '1.3.132.0.8': 20,
+ '1.3.132.0.9': 20,
'1.3.132.0.10': 32,
'1.3.132.0.15': 21,
- '1.2.840.10045.3.1.1': 24,
- '1.3.132.0.33': 28,
- '1.3.132.0.26': 29,
- '1.2.840.10045.3.1.7': 32,
- '1.3.132.0.27': 29,
'1.3.132.0.16': 36,
'1.3.132.0.17': 36,
+ '1.3.132.0.22': 17,
+ '1.3.132.0.23': 17,
+ '1.3.132.0.24': 24,
+ '1.3.132.0.25': 24,
+ '1.3.132.0.26': 29,
+ '1.3.132.0.27': 29,
+ '1.3.132.0.28': 16,
+ '1.3.132.0.29': 16,
+ '1.3.132.0.30': 20,
+ '1.3.132.0.31': 24,
+ '1.3.132.0.32': 28,
+ '1.3.132.0.33': 28,
'1.3.132.0.34': 48,
+ '1.3.132.0.35': 66,
'1.3.132.0.36': 51,
'1.3.132.0.37': 51,
- '1.3.132.0.35': 66,
'1.3.132.0.38': 72,
'1.3.132.0.39': 72,
}