summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-25 04:51:26 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-25 04:51:26 +0000
commit8ca6536703c1fd95ee8c830e6e2356df1f3054b2 (patch)
tree9e832698299340971a554685378b4ee10eab4b16 /ext/openssl
parentca9f321901c8bf8054f0eba3402f8eb17f184e22 (diff)
* backport r32662 from trunk.
* ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition introduced in r30152 to x509-internal.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/lib/openssl/x509-internal.rb6
-rw-r--r--ext/openssl/lib/openssl/x509.rb10
2 files changed, 7 insertions, 9 deletions
diff --git a/ext/openssl/lib/openssl/x509-internal.rb b/ext/openssl/lib/openssl/x509-internal.rb
index 11dc2f2722..47e3a6f876 100644
--- a/ext/openssl/lib/openssl/x509-internal.rb
+++ b/ext/openssl/lib/openssl/x509-internal.rb
@@ -148,5 +148,11 @@ module OpenSSL
alias parse parse_openssl
end
end
+
+ class StoreContext
+ def cleanup
+ warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
+ end
+ end
end
end
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index aae75a366e..3f17f5aa29 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1,9 +1 @@
-module OpenSSL
- module X509
- class StoreContext
- def cleanup
- warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
- end
- end
- end
-end
+require 'openssl'