diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-11-12 12:04:58 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-11-12 12:04:58 +0100 |
| commit | 49f6d49d77adb123800f5ff7b7726a8aecb3a87c (patch) | |
| tree | 34af4f57091cac8d80b294c07b503bbac4f796f0 /lib/ssl/src/ssl_internal.hrl | |
| parent | 7bfe74c3aca1a676a989d33e27059b59bad083c5 (diff) | |
| parent | 7400f4e990c0e33c0b1f1638f055a2a7c76b4fa3 (diff) | |
| download | otp-49f6d49d77adb123800f5ff7b7726a8aecb3a87c.tar.gz otp-49f6d49d77adb123800f5ff7b7726a8aecb3a87c.tar.bz2 otp-49f6d49d77adb123800f5ff7b7726a8aecb3a87c.zip | |
Merge branch 'ia/ssl-decryption-error/OTP-8930' into dev
* ia/ssl-decryption-error/OTP-8930:
Added "DECRYPTION_FAILED ALERT" for block decipher failure.
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index d2dee4d861..4148032cb7 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -105,10 +105,10 @@ -type cache_ref() :: term(). -type certdb_ref() :: term(). -type key_algo() :: null | rsa | dhe_rsa | dhe_dss | dh_anon. --type enum_algo() :: integer(). +-type oid() :: tuple(). -type public_key() :: #'RSAPublicKey'{} | integer(). -type public_key_params() :: #'Dss-Parms'{} | term(). --type public_key_info() :: {enum_algo(), public_key(), public_key_params()}. +-type public_key_info() :: {oid(), public_key(), public_key_params()}. -type der_cert() :: binary(). -type private_key() :: #'RSAPrivateKey'{} | #'DSAPrivateKey'{}. -type issuer() :: tuple(). |