diff options
| author | Andreas Schultz <[email protected]> | 2012-04-08 03:39:52 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-22 14:00:45 +0200 |
| commit | 0bcbe96a1a68fef87efc43719853edcee2f58720 (patch) | |
| tree | a4b20a1ce363ada409ab05ac61e15b2083da28d4 /lib/ssl/src/ssl_cipher.erl | |
| parent | 7682bd59933f20cba5c32df96a58f252924478a9 (diff) | |
| download | otp-0bcbe96a1a68fef87efc43719853edcee2f58720.tar.gz otp-0bcbe96a1a68fef87efc43719853edcee2f58720.tar.bz2 otp-0bcbe96a1a68fef87efc43719853edcee2f58720.zip | |
ssl: Make signature handling version dependant
TLS 1.2 introduces changes on how signatures
are calculate and encoded. This makes the
signature handling version aware
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 9e1fbe20f4..8b6d5ea4ea 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -35,7 +35,8 @@ -export([security_parameters/3, suite_definition/1, decipher/5, cipher/5, suite/1, suites/1, anonymous_suites/0, - openssl_suite/1, openssl_suite_name/1, filter/2]). + openssl_suite/1, openssl_suite_name/1, filter/2, + hash_algorithm/1, sign_algorithm/1]). -compile(inline). @@ -608,7 +609,7 @@ hash_algorithm(sha512) -> ?SHA512; hash_algorithm(?NULL) -> null; hash_algorithm(?MD5) -> md5; hash_algorithm(?SHA) -> sha; -%%hash_algorithm(?SHA224) -> sha224; +hash_algorithm(?SHA224) -> sha224; hash_algorithm(?SHA256) -> sha256; hash_algorithm(?SHA384) -> sha384; hash_algorithm(?SHA512) -> sha512. |