diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-11-30 18:05:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-12-09 10:36:21 +0100 |
| commit | ca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc (patch) | |
| tree | a659ba8406cc794ce0dc55260319d2f7a7189933 /lib/public_key/asn1 | |
| parent | ac3cbe8bee6b826004c02a1d21f8093899716b33 (diff) | |
| download | otp-ca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc.tar.gz otp-ca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc.tar.bz2 otp-ca0ee66eb4ea52e8c36aaf683cdef32e4d2cb9bc.zip | |
Converted pk12 test suite files to pem and adjusted our framework
to deal with changes to the pkits suite.
Diffstat (limited to 'lib/public_key/asn1')
| -rw-r--r-- | lib/public_key/asn1/OTP-PKIX.asn1 | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1 index ad704191a9..fbf531df40 100644 --- a/lib/public_key/asn1/OTP-PKIX.asn1 +++ b/lib/public_key/asn1/OTP-PKIX.asn1 @@ -91,7 +91,7 @@ IMPORTS id-ce-certificateIssuer, CertificateIssuer, id-ce-holdInstructionCode, HoldInstructionCode, id-ce-invalidityDate, InvalidityDate - + FROM PKIX1Implicit88 { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) id-mod(0) id-pkix1-implicit(19) } @@ -114,8 +114,20 @@ IMPORTS id-ecPublicKey, EcpkParameters, 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) }; - + id-mod-pkix1-algorithms(17) } + + md2WithRSAEncryption, + md5WithRSAEncryption, + sha1WithRSAEncryption, + sha256WithRSAEncryption, + sha384WithRSAEncryption, + sha512WithRSAEncryption + + FROM PKCS-1 { + iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1) + modules(0) pkcs-1(1) + }; + -- -- Certificate -- @@ -295,6 +307,9 @@ PublicKeyAlgorithm ::= SEQUENCE { SupportedSignatureAlgorithms SIGNATURE-ALGORITHM-CLASS ::= { dsa-with-sha1 | md2-with-rsa-encryption | md5-with-rsa-encryption | sha1-with-rsa-encryption | + sha256-with-rsa-encryption | + sha384-with-rsa-encryption | + sha512-with-rsa-encryption | ecdsa-with-sha1 } SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= { @@ -340,6 +355,18 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= { ID sha1WithRSAEncryption TYPE NULL } + sha256-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= { + ID sha256WithRSAEncryption + TYPE NULL } + + sha384-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= { + ID sha384WithRSAEncryption + TYPE NULL } + + sha512-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= { + ID sha512WithRSAEncryption + TYPE NULL } + -- Certificate.signature -- See PKCS #1 (RFC 2313). XXX |