aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/lib/openssl/x509-internal.rb6
-rw-r--r--ext/openssl/lib/openssl/x509.rb10
3 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 77e3575bb2..87c965b100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 25 13:46:38 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+
+ * ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
+ introduced in r30152 to x509-internal.rb.
+
Mon Jul 25 13:09:42 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Avoid randomly generated
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'