diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-08 07:42:09 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-08 07:42:09 +0200 |
| commit | e058f26dabb1fa69dd691adac14bcfbe25a93e72 (patch) | |
| tree | 047cd6126dce99394a9111dca2ebe51467369f6c /lib/ssl/src/ssl_internal.hrl | |
| parent | a78b39a0e9ff2cfd13273ab077dc852d70565647 (diff) | |
| parent | a9b0039e971322b5ece78280e37df86b3ec0a843 (diff) | |
| download | otp-e058f26dabb1fa69dd691adac14bcfbe25a93e72.tar.gz otp-e058f26dabb1fa69dd691adac14bcfbe25a93e72.tar.bz2 otp-e058f26dabb1fa69dd691adac14bcfbe25a93e72.zip | |
Merge branch 'ia/ssl-forgot-DH-params-DER' into dev
* ia/ssl-forgot-DH-params-DER:
Add missed DER dh option.
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 3862dc75de..ddb05e70f6 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -69,6 +69,7 @@ password, % cacerts, % [der_encoded()] cacertfile, % file() + dh, % der_encoded() dhfile, % file() ciphers, % %% Local policy for the server if it want's to reuse the session |