diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-13 14:48:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-03-13 14:48:35 +0100 |
| commit | 56207dab54862aee071db6f911ad3a447f1cab8f (patch) | |
| tree | a24b52b521fbe54e2c9a8df3da6e3efdd9a03a07 /lib/public_key/asn1/PKCS-1.asn1 | |
| parent | 9285e0f558b1f39a241431e46691841bc0284d57 (diff) | |
| parent | 006f45a738a6612958381b2fcbf48586c008d911 (diff) | |
| download | otp-56207dab54862aee071db6f911ad3a447f1cab8f.tar.gz otp-56207dab54862aee071db6f911ad3a447f1cab8f.tar.bz2 otp-56207dab54862aee071db6f911ad3a447f1cab8f.zip | |
Merge branch 'ia/public_key/ISO-oids/OTP-10873' into maint
* ia/public_key/ISO-oids/OTP-10873:
public_key & ssl: Add support for ISO oids 1.3.14.3.2.29 and 1.3.14.3.2.27
Diffstat (limited to 'lib/public_key/asn1/PKCS-1.asn1')
| -rw-r--r-- | lib/public_key/asn1/PKCS-1.asn1 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/public_key/asn1/PKCS-1.asn1 b/lib/public_key/asn1/PKCS-1.asn1 index c83289e779..b5754790e7 100644 --- a/lib/public_key/asn1/PKCS-1.asn1 +++ b/lib/public_key/asn1/PKCS-1.asn1 @@ -35,7 +35,9 @@ sha384WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 12 } sha512WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 13 } sha224WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 14 } - +-- ISO oid - equvivalent to sha1WithRSAEncryption +sha-1WithRSAEncryption OBJECT IDENTIFIER ::= { + iso(1) identified-organization(3) oiw(14) secsig(3) algorithms(2) sha-1WithRSAEncryption(29)} id-sha1 OBJECT IDENTIFIER ::= { iso(1) identified-organization(3) oiw(14) secsig(3) |