Apply OID fixes for elliptic curves as supplied by

[openssl.git] / crypto / objects / objects.txt

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 9a969ccd3284a50fb7ed6dbfec56901ddc0775da..ee892f9f6486c7e47c24a1bd1c9dff3c45cc252a 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -6,6 +6,13 @@
 
 iso 2                  : member-body           : ISO Member Body
 
+iso 3                  : identified-organization
+
+identified-organization 132    : certicom-arc
+
+joint-iso-ccitt 23 43  : wap
+wap 13                 : wap-wsg
+
 joint-iso-ccitt 5 1 5  : selected-attribute-types      : Selected Attribute Types
 
 selected-attribute-types 55    : clearance
@@ -24,12 +31,34 @@ ISO-US 10045                : ansi-X9-62            : ANSI X9.62
 !Alias id-fieldType ansi-X9-62 1
 X9-62_id-fieldType 1           : prime-field
 X9-62_id-fieldType 2           : characteristic-two-field
-# ... characteristic-two-field OID subtree
+X9-62_characteristic-two-field 3 : id-characteristic-two-basis
+X9-62_id-characteristic-two-basis 1 : onBasis
+X9-62_id-characteristic-two-basis 2 : tpBasis
+X9-62_id-characteristic-two-basis 3 : ppBasis
 !Alias id-publicKeyType ansi-X9-62 2
 X9-62_id-publicKeyType 1       : id-ecPublicKey
 !Alias ellipticCurve ansi-X9-62 3
 !Alias c-TwoCurve X9-62_ellipticCurve 0
-# ... characteristic 2 curve OIDs
+X9-62_c-TwoCurve 1             : c2pnb163v1
+X9-62_c-TwoCurve 2             : c2pnb163v2
+X9-62_c-TwoCurve 3             : c2pnb163v3
+X9-62_c-TwoCurve 4             : c2pnb176v1
+X9-62_c-TwoCurve 5             : c2tnb191v1
+X9-62_c-TwoCurve 6             : c2tnb191v2
+X9-62_c-TwoCurve 7             : c2tnb191v3
+X9-62_c-TwoCurve 8             : c2onb191v4
+X9-62_c-TwoCurve 9             : c2onb191v5
+X9-62_c-TwoCurve 10            : c2pnb208w1
+X9-62_c-TwoCurve 11            : c2tnb239v1
+X9-62_c-TwoCurve 12            : c2tnb239v2
+X9-62_c-TwoCurve 13            : c2tnb239v3
+X9-62_c-TwoCurve 14            : c2onb239v4
+X9-62_c-TwoCurve 15            : c2onb239v5
+X9-62_c-TwoCurve 16            : c2pnb272w1
+X9-62_c-TwoCurve 17            : c2pnb304w1
+X9-62_c-TwoCurve 18            : c2tnb359v1
+X9-62_c-TwoCurve 19            : c2pnb368w1
+X9-62_c-TwoCurve 20            : c2tnb431r1
 !Alias primeCurve X9-62_ellipticCurve 1
 X9-62_primeCurve 1             : prime192v1
 X9-62_primeCurve 2             : prime192v2
@@ -42,6 +71,49 @@ X9-62_primeCurve 7           : prime256v1
 !global
 X9-62_id-ecSigType 1           : ecdsa-with-SHA1
 
+# SECG curve OIDs from "SEC 2: Recommended Elliptic Curve Domain Parameters"
+# (http://www.secg.org/)
+!Alias secg_ellipticCurve certicom-arc 0
+# SECG prime curves OIDs
+secg-ellipticCurve 6           : secp112r1
+secg-ellipticCurve 7           : secp112r2
+secg-ellipticCurve 28          : secp128r1
+secg-ellipticCurve 29          : secp128r2
+secg-ellipticCurve 9           : secp160k1
+secg-ellipticCurve 8           : secp160r1
+secg-ellipticCurve 30          : secp160r2
+secg-ellipticCurve 31          : secp192k1
+secg-ellipticCurve 32          : secp224k1
+secg-ellipticCurve 33          : secp224r1
+secg-ellipticCurve 10          : secp256k1
+secg-ellipticCurve 34          : secp384r1
+secg-ellipticCurve 35          : secp521r1
+# SECG characteristic two curves OIDs
+secg-ellipticCurve 4           : sect113r1
+secg-ellipticCurve 5           : sect113r2
+secg-ellipticCurve 22          : sect131r1
+secg-ellipticCurve 23          : sect131r2
+secg-ellipticCurve 1           : sect163k1
+secg-ellipticCurve 2           : sect163r1
+secg-ellipticCurve 15          : sect163r2
+secg-ellipticCurve 24          : sect193r1
+secg-ellipticCurve 25          : sect193r2
+secg-ellipticCurve 26          : sect233k1
+secg-ellipticCurve 27          : sect233r1
+secg-ellipticCurve 3           : sect239k1
+secg-ellipticCurve 16          : sect283k1
+secg-ellipticCurve 17          : sect283r1
+secg-ellipticCurve 36          : sect409k1
+secg-ellipticCurve 37          : sect409r1
+secg-ellipticCurve 38          : sect571k1
+secg-ellipticCurve 39          : sect571r1
+
+# WAP/TLS curve OIDs (http://www.wapforum.org/)
+!Alias wap-wsg-idm-ecid wap-wsg 4
+wap-wsg-idm-ecid 1     : wap-wsg-idm-ecid-wtls1
+wap-wsg-idm-ecid 6     : wap-wsg-idm-ecid-wtls6
+wap-wsg-idm-ecid 8     : wap-wsg-idm-ecid-wtls8
+wap-wsg-idm-ecid 9     : wap-wsg-idm-ecid-wtls9
 
 
 ISO-US 113533 7 66 10  : CAST5-CBC             : cast5-cbc
@@ -527,8 +599,8 @@ algorithm 29                : RSA-SHA1-2            : sha1WithRSA
 
 X500 4                 : X509
 X509 3                 : CN                    : commonName
-X509 4                 : S                     : surname
-X509 5                 : SN                    : serialNumber
+X509 4                 : SN                    : surname
+X509 5                 :                       : serialNumber
 X509 6                 : C                     : countryName
 X509 7                 : L                     : localityName
 X509 8                 : ST                    : stateOrProvinceName
@@ -625,10 +697,10 @@ internet 5                : security              : Security
 internet 6             : snmpv2                : SNMPv2
 internet 7             : mail                  : Mail
 
-private 1              : enterprises           : Enterprises
+Private 1              : enterprises           : Enterprises
 
 # RFC 2247
-enterprises 1466 344   : dcobject              : dcObject
+Enterprises 1466 344   : dcobject              : dcObject
 
 # What the hell are these OIDs, really?
 !Cname rle-compression