From 16a166dd35ffde44eff0f4f96a4d064ee95ab3f4 Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 9 Dec 2010 17:18:54 +0000
Subject: * ext/openssl/ossl_x509store.c (ossl_x509stctx_cleanup): removing C  
 implementation of `cleanup`.

* ext/openssl/lib/openssl/x509.rb: adding ruby implementation of
  `cleanup`.  OpenSSL::X509::StoreContext#cleanup is deprecated since
  reusing the underlying struct doesn't make sense. [ruby-dev:42546]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/openssl/lib/openssl.rb      |  1 +
 ext/openssl/lib/openssl/x509.rb | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'ext/openssl/lib')

diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 3cff8d9c10..fb215cdc56 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -20,6 +20,7 @@ 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/x509.rb b/ext/openssl/lib/openssl/x509.rb
index 3f17f5aa29..aae75a366e 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1 +1,9 @@
-require 'openssl'
+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
-- 
cgit v1.2.3