diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-05-03 12:28:39 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-08 10:39:22 +0200 |
| commit | 01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c (patch) | |
| tree | 3af15623a00b5d1bab96f039120ce2b67de2b5e1 /lib/public_key/asn1/OTP-PKIX.asn1 | |
| parent | cb1305212e71855890bbfb0a509a007543529d24 (diff) | |
| download | otp-01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c.tar.gz otp-01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c.tar.bz2 otp-01f5de8764b200bdd0d5e4ff69fba4523b3c2c7c.zip | |
ssl & public_key: Use standard name
Diffstat (limited to 'lib/public_key/asn1/OTP-PKIX.asn1')
| -rw-r--r-- | lib/public_key/asn1/OTP-PKIX.asn1 | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1 index 4a9d401345..911a156d6c 100644 --- a/lib/public_key/asn1/OTP-PKIX.asn1 +++ b/lib/public_key/asn1/OTP-PKIX.asn1 @@ -103,7 +103,7 @@ IMPORTS md5WithRSAEncryption, sha1WithRSAEncryption, rsaEncryption, RSAPublicKey, - dhpublicnumber, DomainParameters, DHPublicKey, + dhpublicnumber, DomainParameters, DHPublicKey, id-keyExchangeAlgorithm, KEA-Parms-Id, --KEA-PublicKey, ecdsa-with-SHA1, ecdsa-with-SHA224, ecdsa-with-SHA256, ecdsa-with-SHA384, ecdsa-with-SHA512, @@ -112,7 +112,7 @@ IMPORTS gnBasis, tpBasis, Trinomial, ppBasis, Pentanomial, - id-ecPublicKey, EcpkParameters, ECPoint + id-ecPublicKey, EcpkParameters, ECParameters, ECPoint FROM PKIX1Algorithms88 { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) id-mod(0) id-mod-pkix1-algorithms(17) } @@ -510,22 +510,6 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= { ID ppBasis TYPE Pentanomial } - -- Elliptic Curve parameters may be specified explicitly, - -- specified implicitly through a "named curve", or - -- inherited from the CA - - OTPEcpkParameters ::= CHOICE { - ecParameters OTPECParameters, - namedCurve OBJECT IDENTIFIER, - implicitlyCA NULL } - - OTPECParameters ::= SEQUENCE { -- Elliptic curve parameters - version ECPVer, - fieldID OTPFieldID, - curve Curve, - base ECPoint, -- Base point G - order INTEGER, -- Order n of the base point - cofactor INTEGER OPTIONAL } -- The integer h = #E(Fq)/n -- SubjectPublicKeyInfo.algorithm |