review openssl rb parts (based on MRI 2.6)

Author: kares

lib/jopenssl23/openssl/buffering.rb

@@ -316,20 +316,15 @@ def do_write(s)
     @wbuffer << s
     @wbuffer.force_encoding(Encoding::BINARY)
     @sync ||= false
-    if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
-      remain = idx ? idx + $/.size : @wbuffer.length
-      nwritten = 0
-      while remain > 0
-        str = @wbuffer[nwritten,remain]
+    if @sync or @wbuffer.size > BLOCK_SIZE
+      until @wbuffer.empty?
         begin
-          nwrote = syswrite(str)
+          nwrote = syswrite(@wbuffer)
         rescue Errno::EAGAIN
           retry
         end
-        remain -= nwrote
-        nwritten += nwrote
+        @wbuffer[0, nwrote] = ""
       end
-      @wbuffer[0,nwritten] = ""
     end
   end
 
@@ -409,9 +404,7 @@ def puts(*args)
     end
     args.each{|arg|
       s << arg.to_s
-      if $/ && /\n\z/ !~ s
-        s << "\n"
-      end
+      s.sub!(/(?<!\n)\z/, "\n")
     }
     do_write(s)
     nil

lib/jopenssl23/openssl/ssl.rb

@@ -17,55 +17,55 @@ module OpenSSL
   module SSL
     class SSLContext
       unless const_defined? :DEFAULT_PARAMS # JRuby does it in Java
-        DEFAULT_PARAMS = { # :nodoc:
-          :min_version => OpenSSL::SSL::TLS1_VERSION,
-          :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-          :verify_hostname => true,
-          :options => -> {
-            opts = OpenSSL::SSL::OP_ALL
-            opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
-            opts |= OpenSSL::SSL::OP_NO_COMPRESSION
-            opts
-          }.call
-        }
+      DEFAULT_PARAMS = { # :nodoc:
+        :min_version => OpenSSL::SSL::TLS1_VERSION,
+        :verify_mode => OpenSSL::SSL::VERIFY_PEER,
+        :verify_hostname => true,
+        :options => -> {
+          opts = OpenSSL::SSL::OP_ALL
+          opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
+          opts |= OpenSSL::SSL::OP_NO_COMPRESSION
+          opts
+        }.call
+      }
 
-        if !(OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL") &&
-            OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000)
-          DEFAULT_PARAMS.merge!(
-              ciphers: %w{
-              ECDHE-ECDSA-AES128-GCM-SHA256
-              ECDHE-RSA-AES128-GCM-SHA256
-              ECDHE-ECDSA-AES256-GCM-SHA384
-              ECDHE-RSA-AES256-GCM-SHA384
-              DHE-RSA-AES128-GCM-SHA256
-              DHE-DSS-AES128-GCM-SHA256
-              DHE-RSA-AES256-GCM-SHA384
-              DHE-DSS-AES256-GCM-SHA384
-              ECDHE-ECDSA-AES128-SHA256
-              ECDHE-RSA-AES128-SHA256
-              ECDHE-ECDSA-AES128-SHA
-              ECDHE-RSA-AES128-SHA
-              ECDHE-ECDSA-AES256-SHA384
-              ECDHE-RSA-AES256-SHA384
-              ECDHE-ECDSA-AES256-SHA
-              ECDHE-RSA-AES256-SHA
-              DHE-RSA-AES128-SHA256
-              DHE-RSA-AES256-SHA256
-              DHE-RSA-AES128-SHA
-              DHE-RSA-AES256-SHA
-              DHE-DSS-AES128-SHA256
-              DHE-DSS-AES256-SHA256
-              DHE-DSS-AES128-SHA
-              DHE-DSS-AES256-SHA
-              AES128-GCM-SHA256
-              AES256-GCM-SHA384
-              AES128-SHA256
-              AES256-SHA256
-              AES128-SHA
-              AES256-SHA
-            }.join(":"),
-              )
-        end
+      if !(OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL") &&
+           OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000)
+        DEFAULT_PARAMS.merge!(
+          ciphers: %w{
+            ECDHE-ECDSA-AES128-GCM-SHA256
+            ECDHE-RSA-AES128-GCM-SHA256
+            ECDHE-ECDSA-AES256-GCM-SHA384
+            ECDHE-RSA-AES256-GCM-SHA384
+            DHE-RSA-AES128-GCM-SHA256
+            DHE-DSS-AES128-GCM-SHA256
+            DHE-RSA-AES256-GCM-SHA384
+            DHE-DSS-AES256-GCM-SHA384
+            ECDHE-ECDSA-AES128-SHA256
+            ECDHE-RSA-AES128-SHA256
+            ECDHE-ECDSA-AES128-SHA
+            ECDHE-RSA-AES128-SHA
+            ECDHE-ECDSA-AES256-SHA384
+            ECDHE-RSA-AES256-SHA384
+            ECDHE-ECDSA-AES256-SHA
+            ECDHE-RSA-AES256-SHA
+            DHE-RSA-AES128-SHA256
+            DHE-RSA-AES256-SHA256
+            DHE-RSA-AES128-SHA
+            DHE-RSA-AES256-SHA
+            DHE-DSS-AES128-SHA256
+            DHE-DSS-AES256-SHA256
+            DHE-DSS-AES128-SHA
+            DHE-DSS-AES256-SHA
+            AES128-GCM-SHA256
+            AES256-GCM-SHA384
+            AES128-SHA256
+            AES256-SHA256
+            AES128-SHA
+            AES256-SHA
+          }.join(":"),
+        )
+      end
       end
 
       if defined?(OpenSSL::PKey::DH)
@@ -111,6 +111,21 @@ class SSLContext
       # callback must return an SSLContext for the server name or nil.
       attr_accessor :servername_cb
 
+      # call-seq:
+      #    SSLContext.new           -> ctx
+      #    SSLContext.new(:TLSv1)   -> ctx
+      #    SSLContext.new("SSLv23") -> ctx
+      #
+      # Creates a new SSL context.
+      #
+      # If an argument is given, #ssl_version= is called with the value. Note
+      # that this form is deprecated. New applications should use #min_version=
+      # and #max_version= as necessary.
+      # def initialize(version = nil)
+      #   self.options |= OpenSSL::SSL::OP_ALL
+      #   self.ssl_version = version if version
+      # end
+
       ##
       # call-seq:
       #   ctx.set_params(params = {}) -> params

lib/jopenssl23/openssl/x509.rb

@@ -14,6 +14,54 @@
 
 module OpenSSL
   module X509
+    # class ExtensionFactory
+    #   def create_extension(*arg)
+    #     if arg.size > 1
+    #       create_ext(*arg)
+    #     else
+    #       send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
+    #     end
+    #   end
+    #
+    #   def create_ext_from_array(ary)
+    #     raise ExtensionError, "unexpected array form" if ary.size > 3
+    #     create_ext(ary[0], ary[1], ary[2])
+    #   end
+    #
+    #   def create_ext_from_string(str) # "oid = critical, value"
+    #     oid, value = str.split(/=/, 2)
+    #     oid.strip!
+    #     value.strip!
+    #     create_ext(oid, value)
+    #   end
+    #
+    #   def create_ext_from_hash(hash)
+    #     create_ext(hash["oid"], hash["value"], hash["critical"])
+    #   end
+    # end
+    #
+    # class Extension
+    #   def ==(other)
+    #     return false unless Extension === other
+    #     to_der == other.to_der
+    #   end
+    #
+    #   def to_s # "oid = critical, value"
+    #     str = self.oid
+    #     str << " = "
+    #     str << "critical, " if self.critical?
+    #     str << self.value.gsub(/\n/, ", ")
+    #   end
+    #
+    #   def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
+    #     {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
+    #   end
+    #
+    #   def to_a
+    #     [ self.oid, self.value, self.critical? ]
+    #   end
+    # end
+
     class Name
       module RFC2253DN
         Special = ',=+<>#;'
@@ -117,6 +165,13 @@ def pretty_print(q)
       end
     end
 
+    # class Attribute
+    #   def ==(other)
+    #     return false unless Attribute === other
+    #     to_der == other.to_der
+    #   end
+    # end
+
     class StoreContext
       def cleanup
         warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
@@ -135,5 +190,19 @@ def pretty_print(q)
         }
       end
     end
+
+    # class CRL
+    #   def ==(other)
+    #     return false unless CRL === other
+    #     to_der == other.to_der
+    #   end
+    # end
+
+    # class Request
+    #   def ==(other)
+    #     return false unless Request === other
+    #     to_der == other.to_der
+    #   end
+    # end
   end
 end