PKey (DH|DSA|RSA) cleanup and rewrite (EVP_PKEY is now wrapped), final cleaning for ossl.h

1 files changed, 0 insertions, 47 deletions

diff --git a/lib/openssl/pkey.rb b/lib/openssl/pkey.rb
index 609511a..7067130 100644
--- a/lib/openssl/pkey.rb
+++ b/lib/openssl/pkey.rb
@@ -23,20 +23,6 @@ module PKey
 
 if defined? DSA
   class DSA
-    def DSA::new(arg, pass=nil)
-      if arg.kind_of? Fixnum
-	DSA::generate(arg) {|p,n|
-	  if block_given? then yield [p,n] end
-	}
-      else
-	DSA::new_from_pem(arg, pass)
-      end
-    end # DSA::new
-    #
-    # DSA::new_from_pem(PEM string, pass) is built-in
-    # DSA::new_from_fixnum(size) is an alias to DSA::generate(size)
-    # DSA::generate(size) is built-in; yields p,n
-    # 
     def sign(digest, data)
       unless private?
 	raise OpenSSL::PKey::DSAError, "Cannot sign with public key!"
@@ -61,20 +47,6 @@ end #defined? DSA
 
 if defined? RSA
   class RSA
-    def RSA::new(arg, pass=nil)
-      if arg.kind_of? Fixnum
-	RSA::generate(arg) {|p,n|
-	  if block_given? then yield [p,n] end
-	}
-      else
-	RSA::new_from_pem(arg, pass)
-      end
-    end # RSA::new
-    #
-    # RSA::new_from_pem(PEM string, pass) is built-in
-    # RSA::new_from_fixnum(size) is an alias to RSA::generate(size)
-    # RSA::generate(size) is built-in; yields p,n
-    # 
     def sign(digest, data)
       unless self.private?
 	raise OpenSSL::PKey::RSAError, "Cannot sign with public key!"
@@ -99,25 +71,6 @@ if defined? RSA
   end # RSA
 end # defined? RSA
 
-if defined? DH
-  class DH
-    def DH::new(arg, gen = 2)
-      if arg.kind_of? Fixnum
-	DH::generate(arg, gen) {|p,n|
-	  if block_given? then yield [p,n] end
-	}
-      else
-	DH::new_from_pem(arg)
-      end
-    end # DH::new
-    #
-    # DH::new_from_pem(PEM string, pass) is built-in
-    # DH::new_from_fixnum(size, gen) is an alias to DH::generate(size, gen)
-    # DH::generate(size, gen) is built-in; yields p,n
-    #
-  end # DH
-end # defined? DH
-
 end # PKey
 end # OpenSSL