diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-09-11 08:41:29 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-09-11 08:41:29 +0200 |
| commit | d92c4f802bf7b1df106db05c184bf13330741eed (patch) | |
| tree | 5fe1404ac799a51bbe08a265a167311f0d7725f3 /lib/public_key | |
| parent | 579fb061a9ff803017217b45a0e02dd35518324b (diff) | |
| parent | f7678d40af216e23ca90217d8692a3609867473e (diff) | |
| download | otp-d92c4f802bf7b1df106db05c184bf13330741eed.tar.gz otp-d92c4f802bf7b1df106db05c184bf13330741eed.tar.bz2 otp-d92c4f802bf7b1df106db05c184bf13330741eed.zip | |
Merge branch 'ia/public_key-missing-sha224/OTP-9362'
* ia/public_key-missing-sha224/OTP-9362:
public_key: Add missing references to sha224 and sha384
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/asn1/OTP-PKIX.asn1 | 6 | ||||
| -rw-r--r-- | lib/public_key/src/pubkey_cert.erl | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1 index e94a77a3e7..4f20208bce 100644 --- a/lib/public_key/asn1/OTP-PKIX.asn1 +++ b/lib/public_key/asn1/OTP-PKIX.asn1 @@ -119,6 +119,7 @@ IMPORTS md2WithRSAEncryption, md5WithRSAEncryption, sha1WithRSAEncryption, + sha224WithRSAEncryption, sha256WithRSAEncryption, sha384WithRSAEncryption, sha512WithRSAEncryption @@ -317,6 +318,7 @@ PublicKeyAlgorithm ::= SEQUENCE { SupportedSignatureAlgorithms SIGNATURE-ALGORITHM-CLASS ::= { dsa-with-sha1 | md2-with-rsa-encryption | md5-with-rsa-encryption | sha1-with-rsa-encryption | + sha224-with-rsa-encryption | sha256-with-rsa-encryption | sha384-with-rsa-encryption | sha512-with-rsa-encryption | @@ -365,6 +367,10 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= { ID sha1WithRSAEncryption TYPE NULL } + sha224-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= { + ID sha224WithRSAEncryption + TYPE NULL } + sha256-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= { ID sha256WithRSAEncryption TYPE NULL } diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index b76e32a2a0..f9e2025479 100644 --- a/lib/public_key/src/pubkey_cert.erl +++ b/lib/public_key/src/pubkey_cert.erl @@ -376,8 +376,12 @@ encoded_tbs_cert(Cert) -> digest_type(?sha1WithRSAEncryption) -> sha; +digest_type(?sha224WithRSAEncryption) -> + sha224; digest_type(?sha256WithRSAEncryption) -> sha256; +digest_type(?sha384WithRSAEncryption) -> + sha384; digest_type(?sha512WithRSAEncryption) -> sha512; digest_type(?md5WithRSAEncryption) -> |