rubysl-openssl 1.0.2 → 2.0.0

data/lib/rubysl/openssl.rb

@@ -11,19 +11,15 @@
   (See the file 'LICENCE'.)
 
 = Version
-  $Id: openssl.rb 29856 2010-11-22 07:21:45Z shyouhei $
+  $Id$
 =end
 
-require 'thread'
-require "digest"
 require 'openssl/openssl'
-
 require 'openssl/bn'
 require 'openssl/cipher'
 require 'openssl/config'
 require 'openssl/digest'
-require 'openssl/pkcs7'
-require 'openssl/ssl-internal'
-require 'openssl/x509-internal'
+require 'openssl/x509'
+require 'openssl/ssl'
 
-require 'rubysl/openssl/version'
+require "rubysl/openssl/version"

data/lib/rubysl/openssl/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module OpenSSL
-    VERSION = "1.0.2"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-openssl.gemspec

@@ -17,10 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 1.8.7"
+  spec.required_ruby_version = "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
 end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-openssl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library OpenSSL.
 email:
 - brixen@gmail.com
@@ -74,13 +60,14 @@ extensions:
 - ext/rubysl/openssl/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- ext/rubysl/openssl/extconf.h
+- ext/rubysl/openssl/.gitignore
+- ext/rubysl/openssl/deprecation.rb
 - ext/rubysl/openssl/extconf.rb
 - ext/rubysl/openssl/openssl_missing.c
 - ext/rubysl/openssl/openssl_missing.h
@@ -141,12 +128,7 @@ files:
 - lib/openssl/cipher.rb
 - lib/openssl/config.rb
 - lib/openssl/digest.rb
-- lib/openssl/net/ftptls.rb
-- lib/openssl/net/telnets.rb
-- lib/openssl/pkcs7.rb
-- lib/openssl/ssl-internal.rb
 - lib/openssl/ssl.rb
-- lib/openssl/x509-internal.rb
 - lib/openssl/x509.rb
 - lib/rubysl/openssl.rb
 - lib/rubysl/openssl/version.rb
@@ -170,17 +152,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ~>
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby standard library OpenSSL.

data/ext/rubysl/openssl/extconf.h

@@ -1,50 +0,0 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#define HAVE_ASSERT_H 1
-#define HAVE_OPENSSL_SSL_H 1
-#define HAVE_OPENSSL_CONF_API_H 1
-#define HAVE_ERR_PEEK_LAST_ERROR 1
-#define HAVE_BN_MOD_ADD 1
-#define HAVE_BN_MOD_SQR 1
-#define HAVE_BN_MOD_SUB 1
-#define HAVE_BN_PSEUDO_RAND_RANGE 1
-#define HAVE_BN_RAND_RANGE 1
-#define HAVE_CONF_GET1_DEFAULT_CONFIG_FILE 1
-#define HAVE_EVP_CIPHER_CTX_SET_PADDING 1
-#define HAVE_EVP_CIPHERFINAL_EX 1
-#define HAVE_EVP_CIPHERINIT_EX 1
-#define HAVE_EVP_DIGESTFINAL_EX 1
-#define HAVE_EVP_DIGESTINIT_EX 1
-#define HAVE_EVP_MD_CTX_CLEANUP 1
-#define HAVE_EVP_MD_CTX_CREATE 1
-#define HAVE_EVP_MD_CTX_DESTROY 1
-#define HAVE_EVP_MD_CTX_INIT 1
-#define HAVE_HMAC_CTX_CLEANUP 1
-#define HAVE_HMAC_CTX_INIT 1
-#define HAVE_PEM_DEF_CALLBACK 1
-#define HAVE_PKCS5_PBKDF2_HMAC_SHA1 1
-#define HAVE_X509V3_SET_NCONF 1
-#define HAVE_X509V3_EXT_NCONF_NID 1
-#define HAVE_X509_CRL_ADD0_REVOKED 1
-#define HAVE_X509_CRL_SET_ISSUER_NAME 1
-#define HAVE_X509_CRL_SET_VERSION 1
-#define HAVE_X509_CRL_SORT 1
-#define HAVE_OBJ_NAME_DO_ALL_SORTED 1
-#define HAVE_SSL_SESSION_GET_ID 1
-#define HAVE_OPENSSL_CLEANSE 1
-#define HAVE_VA_ARGS_MACRO 1
-#define HAVE_SSLV2_METHOD 1
-#define HAVE_SSLV2_SERVER_METHOD 1
-#define HAVE_SSLV2_CLIENT_METHOD 1
-#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1
-#define HAVE_OPENSSL_ENGINE_H 1
-#define HAVE_ENGINE_ADD 1
-#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
-#define HAVE_ENGINE_GET_DIGEST 1
-#define HAVE_ENGINE_GET_CIPHER 1
-#define HAVE_ENGINE_CLEANUP 1
-#define HAVE_OPENSSL_OCSP_H 1
-#define HAVE_ST_FLAGS 1
-#define HAVE_ST_ENGINE 1
-#define HAVE_ST_SINGLE 1
-#endif

data/lib/openssl/net/ftptls.rb

@@ -1,53 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2003 Blaz Grilc <farmer@gmx.co.uk>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Requirements
-
-= Version
-  $Id: ftptls.rb 13657 2007-10-08 11:16:54Z gotoyuzo $
-  
-= Notes
-  Tested on FreeBSD 5-CURRENT and 4-STABLE
-  - ruby 1.6.8 (2003-01-17) [i386-freebsd5]
-  - OpenSSL 0.9.7a Feb 19 2003
-  - ruby-openssl-0.2.0.p0
-  tested on ftp server: glftpd 1.30
-=end
-
-require 'socket'
-require 'openssl'
-require 'net/ftp'
-
-module Net
-  class FTPTLS < FTP
-    def connect(host, port=FTP_PORT)
-      @hostname = host
-      super
-    end
-
-    def login(user = "anonymous", passwd = nil, acct = nil)
-       store = OpenSSL::X509::Store.new
-       store.set_default_paths
-       ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
-       ctx.cert_store = store
-       ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-       ctx.key = nil
-       ctx.cert = nil
-       voidcmd("AUTH TLS")
-       @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
-       @sock.connect
-       @sock.post_connection_check(@hostname)
-       super(user, passwd, acct)
-       voidcmd("PBSZ 0")
-    end
-  end
-end

data/lib/openssl/net/telnets.rb

@@ -1,251 +0,0 @@
-=begin
-= $RCSfile$ -- SSL/TLS enhancement for Net::Telnet.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id: telnets.rb 13657 2007-10-08 11:16:54Z gotoyuzo $
-  
-  2001/11/06: Contiributed to Ruby/OpenSSL project.
-
-== class Net::Telnet
-
-This class will initiate SSL/TLS session automaticaly if the server
-sent OPT_STARTTLS. Some options are added for SSL/TLS.
-
-  host = Net::Telnet::new({
-           "Host"       => "localhost",
-           "Port"       => "telnets",
-           ## follows are new options.
-           'CertFile'   => "user.crt",
-           'KeyFile'    => "user.key",
-           'CAFile'     => "/some/where/certs/casert.pem",
-           'CAPath'     => "/some/where/caserts",
-           'VerifyMode' => SSL::VERIFY_PEER,
-           'VerifyCallback' => verify_proc
-         })
-
-Or, the new options ('Cert', 'Key' and 'CACert') are available from
-Michal Rokos's OpenSSL module.
-
-  cert_data = File.open("user.crt"){|io| io.read }
-  pkey_data = File.open("user.key"){|io| io.read }
-  cacert_data = File.open("your_ca.pem"){|io| io.read }
-  host = Net::Telnet::new({
-           "Host"       => "localhost",
-           "Port"       => "telnets",
-           'Cert'       => OpenSSL::X509::Certificate.new(cert_data)
-           'Key'        => OpenSSL::PKey::RSA.new(pkey_data)
-           'CACert'     => OpenSSL::X509::Certificate.new(cacert_data)
-           'CAFile'     => "/some/where/certs/casert.pem",
-           'CAPath'     => "/some/where/caserts",
-           'VerifyMode' => SSL::VERIFY_PEER,
-           'VerifyCallback' => verify_proc
-         })
-
-This class is expected to be a superset of usual Net::Telnet.
-=end
-
-require "net/telnet"
-require "openssl"
-
-module Net
-  class Telnet
-    attr_reader :ssl
-
-    OPT_STARTTLS       =  46.chr # "\056" # "\x2e" # Start TLS
-    TLS_FOLLOWS        =   1.chr # "\001" # "\x01" # FOLLOWS (for STARTTLS)
-
-    alias preprocess_orig preprocess
-
-    def ssl?; @ssl; end
-
-    def preprocess(string)
-      # combine CR+NULL into CR
-      string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
-
-      # combine EOL into "\n"
-      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
-
-      string.gsub(/#{IAC}(
-                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
-                   [#{DO}#{DONT}#{WILL}#{WONT}][#{OPT_BINARY}-#{OPT_EXOPL}]|
-                   #{SB}[#{OPT_BINARY}-#{OPT_EXOPL}]
-                     (#{IAC}#{IAC}|[^#{IAC}])+#{IAC}#{SE}
-                 )/xno) do
-        if    IAC == $1  # handle escaped IAC characters
-          IAC
-        elsif AYT == $1  # respond to "IAC AYT" (are you there)
-          self.write("nobody here but us pigeons" + EOL)
-          ''
-        elsif DO[0] == $1[0]  # respond to "IAC DO x"
-          if    OPT_BINARY[0] == $1[1]
-            @telnet_option["BINARY"] = true
-            self.write(IAC + WILL + OPT_BINARY)
-          elsif OPT_STARTTLS[0] == $1[1]
-            self.write(IAC + WILL + OPT_STARTTLS)
-            self.write(IAC + SB + OPT_STARTTLS + TLS_FOLLOWS + IAC + SE)
-          else
-            self.write(IAC + WONT + $1[1..1])
-          end
-          ''
-        elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
-          self.write(IAC + WONT + $1[1..1])
-          ''
-        elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
-          if    OPT_BINARY[0] == $1[1]
-            self.write(IAC + DO + OPT_BINARY)
-          elsif OPT_ECHO[0] == $1[1]
-            self.write(IAC + DO + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = true
-            self.write(IAC + DO + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
-          if    OPT_ECHO[0] == $1[1]
-            self.write(IAC + DONT + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = false
-            self.write(IAC + DONT + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif SB[0] == $1[0]    # respond to "IAC SB xxx IAC SE"
-          if    OPT_STARTTLS[0] == $1[1] && TLS_FOLLOWS[0] == $2[0]
-            @sock = OpenSSL::SSL::SSLSocket.new(@sock)
-            @sock.cert            = @options['Cert'] unless @sock.cert
-            @sock.key             = @options['Key'] unless @sock.key
-            @sock.ca_cert         = @options['CACert']
-            @sock.ca_file         = @options['CAFile']
-            @sock.ca_path         = @options['CAPath']
-            @sock.timeout         = @options['Timeout']
-            @sock.verify_mode     = @options['VerifyMode']
-            @sock.verify_callback = @options['VerifyCallback']
-            @sock.verify_depth    = @options['VerifyDepth']
-            @sock.connect
-            if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
-              @sock.post_connection_check(@options['Host'])
-            end
-            @ssl = true
-          end
-          ''
-        else
-          ''
-        end
-      end
-    end # preprocess
-    
-    alias waitfor_org waitfor
-
-    def waitfor(options)
-      time_out = @options["Timeout"]
-      waittime = @options["Waittime"]
-
-      if options.kind_of?(Hash)
-        prompt   = if options.has_key?("Match")
-                     options["Match"]
-                   elsif options.has_key?("Prompt")
-                     options["Prompt"]
-                   elsif options.has_key?("String")
-                     Regexp.new( Regexp.quote(options["String"]) )
-                   end
-        time_out = options["Timeout"]  if options.has_key?("Timeout")
-        waittime = options["Waittime"] if options.has_key?("Waittime")
-      else
-        prompt = options
-      end
-
-      if time_out == false
-        time_out = nil
-      end
-
-      line = ''
-      buf = ''
-      @rest = '' unless @rest
-
-      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
-        unless IO::select([@sock], nil, nil, time_out)
-          raise TimeoutError, "timed-out; wait for the next data"
-        end
-        begin
-          c = @rest + @sock.sysread(1024 * 1024)
-          @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-          if @options["Telnetmode"]   
-            pos = 0
-            catch(:next){
-              while true
-                case c[pos]
-                when IAC[0]
-                  case c[pos+1]
-                  when DO[0], DONT[0], WILL[0], WONT[0]
-                    throw :next unless c[pos+2]
-                    pos += 3
-                  when SB[0]
-                    ret = detect_sub_negotiation(c, pos)
-                    throw :next unless ret
-                    pos = ret
-                  when nil
-                    throw :next
-                  else
-                    pos += 2
-                  end
-                when nil
-                  throw :next
-                else
-                  pos += 1
-                end
-              end
-            }
-
-            buf = preprocess(c[0...pos])
-            @rest = c[pos..-1]
-          end
-          @log.print(buf) if @options.has_key?("Output_log")
-          line.concat(buf)
-          yield buf if block_given?   
-        rescue EOFError # End of file reached
-          if line == ''
-            line = nil
-            yield nil if block_given? 
-          end
-          break
-        end
-      end
-      line
-    end
-
-    private
-
-    def detect_sub_negotiation(data, pos)
-      return nil if data.length < pos+6  # IAC SB x param IAC SE
-      pos += 3
-      while true
-        case data[pos]
-        when IAC[0]
-          if data[pos+1] == SE[0]
-            pos += 2
-            return pos
-          else
-            pos += 2
-          end
-        when nil
-          return nil
-        else
-          pos += 1
-        end
-      end
-    end
-
-  end
-end