diff options
author | jkim <jkim@FreeBSD.org> | 2014-10-15 19:12:05 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2014-10-15 19:12:05 +0000 |
commit | 411d431d45a87a859fd5507449dc4529d6ee1c08 (patch) | |
tree | c23fa858f36ae42eb7fe9898b481a136f3f8733b /crypto/openssl/doc/ssl | |
parent | cfb0e0275efcad3cdfca0ae280949467ed709e9f (diff) | |
parent | 9a02b27a6e11c9667427250a26589d17ad31e847 (diff) | |
download | FreeBSD-src-411d431d45a87a859fd5507449dc4529d6ee1c08.zip FreeBSD-src-411d431d45a87a859fd5507449dc4529d6ee1c08.tar.gz |
Merge OpenSSL 1.0.1j.
Diffstat (limited to 'crypto/openssl/doc/ssl')
-rw-r--r-- | crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod index b34c68a..7a27eef 100644 --- a/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod +++ b/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod @@ -48,12 +48,13 @@ even if he gets hold of the normal (certified) key, as this key was only used for signing. In order to perform a DH key exchange the server must use a DH group -(DH parameters) and generate a DH key. The server will always generate a new -DH key during the negotiation, when the DH parameters are supplied via -callback and/or when the SSL_OP_SINGLE_DH_USE option of -L<SSL_CTX_set_options(3)|SSL_CTX_set_options(3)> is set. It will -immediately create a DH key, when DH parameters are supplied via -SSL_CTX_set_tmp_dh() and SSL_OP_SINGLE_DH_USE is not set. In this case, +(DH parameters) and generate a DH key. +The server will always generate a new DH key during the negotiation +if either the DH parameters are supplied via callback or the +SSL_OP_SINGLE_DH_USE option of SSL_CTX_set_options(3) is set (or both). +It will immediately create a DH key if DH parameters are supplied via +SSL_CTX_set_tmp_dh() and SSL_OP_SINGLE_DH_USE is not set. +In this case, it may happen that a key is generated on initialization without later being needed, while on the other hand the computer time during the negotiation is being saved. @@ -139,7 +140,7 @@ partly left out.) dh_tmp = dh_512; break; case 1024: - if (!dh_1024) + if (!dh_1024) dh_1024 = get_dh1024(); dh_tmp = dh_1024; break; |