diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/lib/openssl.rb | 1 | ||||
| -rw-r--r-- | ext/openssl/lib/openssl/ssl.rb | 1 | ||||
| -rw-r--r-- | ext/openssl/lib/openssl/x509.rb | 1 |
4 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Mon Jul 25 15:36:07 2011 Hiroshi Nakamura <nahi@ruby-lang.org> + + * 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]. + Mon Jul 25 13:50:33 2011 Hiroshi Nakamura <nahi@ruby-lang.org> * backport r32662 from trunk. 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' |