summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-25 06:38:44 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-25 06:38:44 +0000
commite68c8979255e4f562b16994e04520f06312c5f96 (patch)
treedb1b473df2a1f78a709c17e36a9660842c2d26d6 /ext/openssl
parent8ca6536703c1fd95ee8c830e6e2356df1f3054b2 (diff)
* ext/openssl/lib/openssl/{x509.rb,ssl.rb}: Add deprecation warning
for openssl/{x509,ssl} usage. Users should require "openssl" instead of "openssl/ssl" and "openssl/x509". Start of transition period introduced by [ruby-dev:38018]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/lib/openssl.rb1
-rw-r--r--ext/openssl/lib/openssl/ssl.rb1
-rw-r--r--ext/openssl/lib/openssl/x509.rb1
3 files changed, 2 insertions, 1 deletions
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index fb215cdc56..3cff8d9c10 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -20,7 +20,6 @@ require 'openssl/bn'
require 'openssl/cipher'
require 'openssl/config'
require 'openssl/digest'
-require 'openssl/x509'
require 'openssl/ssl-internal'
require 'openssl/x509-internal'
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 3f17f5aa29..15f42d6091 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -1 +1,2 @@
+warn 'deprecated openssl/ssl use: require "openssl" instead of "openssl/ssl"'
require 'openssl'
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index 3f17f5aa29..f1777cdf06 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1 +1,2 @@
+warn 'deprecated openssl/x509 use: require "openssl" instead of "openssl/x509"'
require 'openssl'