aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2017-08-29 15:09:49 +0900
committerKazuki Yamaguchi <k@rhe.jp>2017-08-29 15:09:49 +0900
commit4d6a3b911df844dfe97d19482900261745d4a061 (patch)
tree7e65c3fb8fd9636d2190157241850c164dbcd762
parentb3825945d11dd2f18f9f3b07a7a2b61b7b752591 (diff)
downloadruby-openssl-4d6a3b911df844dfe97d19482900261745d4a061.tar.gz
ssl: mark OpenSSL::SSL::SSLContext::DEFAULT_{1024,2048} as private
Follow-up commit eaffc69e40ab ("ssl: move default DH parameters from OpenSSL::PKey::DH", 2017-01-23). Those constants shouldn't be used directly.
-rw-r--r--lib/openssl/ssl.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/openssl/ssl.rb b/lib/openssl/ssl.rb
index ced46b0d..ec0a4537 100644
--- a/lib/openssl/ssl.rb
+++ b/lib/openssl/ssl.rb
@@ -30,7 +30,6 @@ module OpenSSL
}
if defined?(OpenSSL::PKey::DH)
- # :nodoc:
DEFAULT_1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
-----BEGIN DH PARAMETERS-----
MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
@@ -38,8 +37,8 @@ AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
-----END DH PARAMETERS-----
_end_of_pem_
+ private_constant :DEFAULT_1024
- # :nodoc:
DEFAULT_2048 = OpenSSL::PKey::DH.new <<-_end_of_pem_
-----BEGIN DH PARAMETERS-----
MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
@@ -50,9 +49,9 @@ YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
-----END DH PARAMETERS-----
_end_of_pem_
+ private_constant :DEFAULT_2048
- # :nodoc:
- DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen|
+ DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen| # :nodoc:
warn "using default DH parameters." if $VERBOSE
case keylen
when 1024 then DEFAULT_1024