Prefer `frozen_string_literal: true`.

43 files changed, 65 insertions, 66 deletions

diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb
index 1d51d065..6af7d562 100644
--- a/ext/openssl/deprecation.rb
+++ b/ext/openssl/deprecation.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module OpenSSL
   def self.deprecated_warning_flag
     unless flag = (@deprecated_warning_flag ||= nil)
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 28e73436..344d7596 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Info
   'OpenSSL for Ruby 2' project
diff --git a/lib/openssl.rb b/lib/openssl.rb
index 1dd5faa7..7ba2229a 100644
--- a/lib/openssl.rb
+++ b/lib/openssl.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Info
   'OpenSSL for Ruby 2' project
diff --git a/lib/openssl/bn.rb b/lib/openssl/bn.rb
index 8d1ebefb..0a5e11b4 100644
--- a/lib/openssl/bn.rb
+++ b/lib/openssl/bn.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 #
 # = Ruby-space definitions that completes C-space funcs for BN
diff --git a/lib/openssl/buffering.rb b/lib/openssl/buffering.rb
index 5d1586e5..5d0ed3b6 100644
--- a/lib/openssl/buffering.rb
+++ b/lib/openssl/buffering.rb
@@ -1,5 +1,5 @@
 # coding: binary
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 #= Info
 #  'OpenSSL for Ruby 2' project
@@ -40,7 +40,7 @@ module OpenSSL::Buffering
   def initialize(*)
     super
     @eof = false
-    @rbuffer = ""
+    @rbuffer = String.new
     @sync = @io.sync
   end
 
@@ -312,7 +312,7 @@ module OpenSSL::Buffering
   # buffer is flushed to the underlying socket.
 
   def do_write(s)
-    @wbuffer = "" unless defined? @wbuffer
+    @wbuffer = String.new unless defined? @wbuffer
     @wbuffer << s
     @wbuffer.force_encoding(Encoding::BINARY)
     @sync ||= false
@@ -398,7 +398,7 @@ module OpenSSL::Buffering
   # See IO#puts for full details.
 
   def puts(*args)
-    s = ""
+    s = String.new
     if args.empty?
       s << "\n"
     end
@@ -416,7 +416,7 @@ module OpenSSL::Buffering
   # See IO#print for full details.
 
   def print(*args)
-    s = ""
+    s = String.new
     args.each{ |arg| s << arg.to_s }
     do_write(s)
     nil
diff --git a/lib/openssl/cipher.rb b/lib/openssl/cipher.rb
index af721b3a..8ad8c35d 100644
--- a/lib/openssl/cipher.rb
+++ b/lib/openssl/cipher.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # = Ruby-space predefined Cipher subclasses
 #
diff --git a/lib/openssl/config.rb b/lib/openssl/config.rb
index 48d8be00..ef83c57b 100644
--- a/lib/openssl/config.rb
+++ b/lib/openssl/config.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Ruby-space definitions that completes C-space funcs for Config
 
@@ -53,9 +53,8 @@ module OpenSSL
       def parse_config(io)
         begin
           parse_config_lines(io)
-        rescue ConfigError => e
-          e.message.replace("error in line #{io.lineno}: " + e.message)
-          raise
+        rescue => error
+          raise ConfigError, "error in line #{io.lineno}: " + error.message
         end
       end
 
diff --git a/lib/openssl/digest.rb b/lib/openssl/digest.rb
index 810c2ebe..c9539119 100644
--- a/lib/openssl/digest.rb
+++ b/lib/openssl/digest.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # = Ruby-space predefined Digest subclasses
 #
diff --git a/lib/openssl/pkcs5.rb b/lib/openssl/pkcs5.rb
index 959447df..8dedc4be 100644
--- a/lib/openssl/pkcs5.rb
+++ b/lib/openssl/pkcs5.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Ruby/OpenSSL Project
 # Copyright (C) 2017 Ruby/OpenSSL Project Authors
diff --git a/lib/openssl/pkey.rb b/lib/openssl/pkey.rb
index 8a547c34..ecb112f7 100644
--- a/lib/openssl/pkey.rb
+++ b/lib/openssl/pkey.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Ruby/OpenSSL Project
 # Copyright (C) 2017 Ruby/OpenSSL Project Authors
diff --git a/lib/openssl/ssl.rb b/lib/openssl/ssl.rb
index 96fad7c4..8554ada0 100644
--- a/lib/openssl/ssl.rb
+++ b/lib/openssl/ssl.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Info
   'OpenSSL for Ruby 2' project
diff --git a/lib/openssl/x509.rb b/lib/openssl/x509.rb
index aa29fbe5..1d2a5aac 100644
--- a/lib/openssl/x509.rb
+++ b/lib/openssl/x509.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # = Ruby-space definitions that completes C-space funcs for X509 and subclasses
 #
diff --git a/test/test_asn1.rb b/test/test_asn1.rb
index 8d8839dd..5f457551 100644
--- a/test/test_asn1.rb
+++ b/test/test_asn1.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
@@ -167,7 +167,7 @@ class  OpenSSL::TestASN1 < OpenSSL::TestCase
     assert_equal(OpenSSL::ASN1::OctetString, ext.value[2].class)
     extv = OpenSSL::ASN1.decode(ext.value[2].value)
     assert_equal(OpenSSL::ASN1::BitString, extv.class)
-    str = "\000"; str[0] = 0b00000110.chr
+    str = +"\000"; str[0] = 0b00000110.chr
     assert_equal(str, extv.value)
 
     ext = extensions.value[0].value[2]  # subjetKeyIdentifier
diff --git a/test/test_bn.rb b/test/test_bn.rb
index 4f07841f..547d334c 100644
--- a/test/test_bn.rb
+++ b/test/test_bn.rb
@@ -1,5 +1,5 @@
 # coding: us-ascii
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 require "prime"
 
diff --git a/test/test_buffering.rb b/test/test_buffering.rb
index c85a6f02..5f2ba9d4 100644
--- a/test/test_buffering.rb
+++ b/test/test_buffering.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
@@ -10,7 +10,7 @@ class OpenSSL::TestBuffering < OpenSSL::TestCase
     attr_accessor :sync
 
     def initialize
-      @io = ""
+      @io = String.new
       def @io.sync
         true
       end
diff --git a/test/test_cipher.rb b/test/test_cipher.rb
index 6a41af1c..f6ec4980 100644
--- a/test/test_cipher.rb
+++ b/test/test_cipher.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_config.rb b/test/test_config.rb
index 8096375c..dba66b08 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_digest.rb b/test/test_digest.rb
index f9f059ae..e47fc0a3 100644
--- a/test/test_digest.rb
+++ b/test/test_digest.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_engine.rb b/test/test_engine.rb
index bb1123d5..232ba866 100644
--- a/test/test_engine.rb
+++ b/test/test_engine.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL) && defined?(OpenSSL::Engine)
diff --git a/test/test_fips.rb b/test/test_fips.rb
index a577d789..8cd474f9 100644
--- a/test/test_fips.rb
+++ b/test/test_fips.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_hmac.rb b/test/test_hmac.rb
index 4cd177b8..9cb3c5a8 100644
--- a/test/test_hmac.rb
+++ b/test/test_hmac.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_kdf.rb b/test/test_kdf.rb
index 5e1db80c..f4790c96 100644
--- a/test/test_kdf.rb
+++ b/test/test_kdf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_ns_spki.rb b/test/test_ns_spki.rb
index aa1e6182..052507de 100644
--- a/test/test_ns_spki.rb
+++ b/test/test_ns_spki.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
@@ -9,7 +9,7 @@ class OpenSSL::TestNSSPI < OpenSSL::TestCase
     # This request data is adopt from the specification of
     # "Netscape Extensions for User Key Generation".
     # -- http://wp.netscape.com/eng/security/comm4-keygen.html
-    @b64  = "MIHFMHEwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAnX0TILJrOMUue+PtwBRE6XfV"
+    @b64 = +"MIHFMHEwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAnX0TILJrOMUue+PtwBRE6XfV"
     @b64 << "WtKQbsshxk5ZhcUwcwyvcnIq9b82QhJdoACdD34rqfCAIND46fXKQUnb0mvKzQID"
     @b64 << "AQABFhFNb3ppbGxhSXNNeUZyaWVuZDANBgkqhkiG9w0BAQQFAANBAAKv2Eex2n/S"
     @b64 << "r/7iJNroWlSzSMtTiQTEB+ADWHGj9u1xrUrOilq/o2cuQxIfZcNZkYAkWP4DubqW"
diff --git a/test/test_ocsp.rb b/test/test_ocsp.rb
index 2ecc0e5a..a490a153 100644
--- a/test/test_ocsp.rb
+++ b/test/test_ocsp.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_pair.rb b/test/test_pair.rb
index 08c15a0f..e9cf98df 100644
--- a/test/test_pair.rb
+++ b/test/test_pair.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 require_relative 'ut_eof'
 
@@ -128,11 +128,11 @@ module OpenSSL::TestPairM
     ssl_pair {|s1, s2|
       s2.write "a\nbcd"
       assert_equal("a\n", s1.gets)
-      result = ""
+      result = String.new
       result << s1.readpartial(10) until result.length == 3
       assert_equal("bcd", result)
       s2.write "efg"
-      result = ""
+      result = String.new
       result << s1.readpartial(10) until result.length == 3
       assert_equal("efg", result)
       s2.close
@@ -242,22 +242,22 @@ module OpenSSL::TestPairM
   def test_read_with_outbuf
     ssl_pair { |s1, s2|
       s1.write("abc\n")
-      buf = ""
+      buf = String.new
       ret = s2.read(2, buf)
       assert_same ret, buf
       assert_equal "ab", ret
 
-      buf = "garbage"
+      buf = +"garbage"
       ret = s2.read(2, buf)
       assert_same ret, buf
       assert_equal "c\n", ret
 
-      buf = "garbage"
+      buf = +"garbage"
       assert_equal :wait_readable, s2.read_nonblock(100, buf, exception: false)
       assert_equal "", buf
 
       s1.close
-      buf = "garbage"
+      buf = +"garbage"
       assert_equal nil, s2.read(100, buf)
       assert_equal "", buf
     }
diff --git a/test/test_pkcs12.rb b/test/test_pkcs12.rb
index de8e35ed..fdbe753b 100644
--- a/test/test_pkcs12.rb
+++ b/test/test_pkcs12.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_pkcs7.rb b/test/test_pkcs7.rb
index 5b356fbc..d0d9dcaf 100644
--- a/test/test_pkcs7.rb
+++ b/test/test_pkcs7.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_pkey_dh.rb b/test/test_pkey_dh.rb
index 8c8fbaee..6397e76d 100644
--- a/test/test_pkey_dh.rb
+++ b/test/test_pkey_dh.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL) && defined?(OpenSSL::PKey::DH)
diff --git a/test/test_pkey_dsa.rb b/test/test_pkey_dsa.rb
index d6519498..2c839b7d 100644
--- a/test/test_pkey_dsa.rb
+++ b/test/test_pkey_dsa.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL) && defined?(OpenSSL::PKey::DSA)
diff --git a/test/test_pkey_ec.rb b/test/test_pkey_ec.rb
index c4eb2ead..1278a8b1 100644
--- a/test/test_pkey_ec.rb
+++ b/test/test_pkey_ec.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL) && defined?(OpenSSL::PKey::EC)
diff --git a/test/test_pkey_rsa.rb b/test/test_pkey_rsa.rb
index 38375c61..a9587aa1 100644
--- a/test/test_pkey_rsa.rb
+++ b/test/test_pkey_rsa.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_random.rb b/test/test_random.rb
index d5a37454..33af3757 100644
--- a/test/test_random.rb
+++ b/test/test_random.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_ssl.rb b/test/test_ssl.rb
index 46be4df9..45277555 100644
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
@@ -292,12 +292,12 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
   def test_sysread_and_syswrite
     start_server { |port|
       server_connect(port) { |ssl|
-        str = "x" * 100 + "\n"
+        str = +("x" * 100 + "\n")
         ssl.syswrite(str)
         newstr = ssl.sysread(str.bytesize)
         assert_equal(str, newstr)
 
-        buf = ""
+        buf = String.new
         ssl.syswrite(str)
         assert_same buf, ssl.sysread(str.size, buf)
         assert_equal(str, buf)
diff --git a/test/test_ssl_session.rb b/test/test_ssl_session.rb
index e199f86d..89726d44 100644
--- a/test/test_ssl_session.rb
+++ b/test/test_ssl_session.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_x509attr.rb b/test/test_x509attr.rb
index 6864eec7..2919d23d 100644
--- a/test/test_x509attr.rb
+++ b/test/test_x509attr.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb
index d246622d..ed0758a6 100644
--- a/test/test_x509cert.rb
+++ b/test/test_x509cert.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb
index 9006481d..a6d0adc5 100644
--- a/test/test_x509crl.rb
+++ b/test/test_x509crl.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_x509ext.rb b/test/test_x509ext.rb
index 6614f7a6..7ad010d1 100644
--- a/test/test_x509ext.rb
+++ b/test/test_x509ext.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
diff --git a/test/test_x509name.rb b/test/test_x509name.rb
index 6b97b236..4ec5db20 100644
--- a/test/test_x509name.rb
+++ b/test/test_x509name.rb
@@ -1,5 +1,5 @@
 # coding: ASCII-8BIT
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative 'utils'
 
 if defined?(OpenSSL)
@@ -389,7 +389,7 @@ class OpenSSL::TestX509Name < OpenSSL::TestCase
     dn.each { |x| name.add_entry(*x) }
 
     str = name.to_utf8
-    expected = "CN=フー\\, バー,DC=ruby-lang,DC=org".force_encoding("UTF-8")
+    expected = String.new("CN=フー\\, バー,DC=ruby-lang,DC=org").force_encoding("UTF-8")
     assert_equal expected, str
     assert_equal Encoding.find("UTF-8"), str.encoding
 
diff --git a/test/test_x509req.rb b/test/test_x509req.rb
index b6022a6e..bace06b3 100644
--- a/test/test_x509req.rb
+++ b/test/test_x509req.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/test_x509store.rb b/test/test_x509store.rb
index 6412249b..8223c9b7 100644
--- a/test/test_x509store.rb
+++ b/test/test_x509store.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require_relative "utils"
 
 if defined?(OpenSSL)
diff --git a/test/ut_eof.rb b/test/ut_eof.rb
index bd62fd50..cf1f2d42 100644
--- a/test/ut_eof.rb
+++ b/test/ut_eof.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'test/unit'
 
 if defined?(OpenSSL)
@@ -18,12 +18,12 @@ module OpenSSL::TestEOF
       assert_nil(f.read(1))
     }
     open_file("") {|f|
-      s = "x"
+      s = +"x"
       assert_equal("", f.read(nil, s))
       assert_equal("", s)
     }
     open_file("") {|f|
-      s = "x"
+      s = +"x"
       assert_nil(f.read(10, s))
       assert_equal("", s)
     }
@@ -75,12 +75,12 @@ module OpenSSL::TestEOF
       assert_equal("", f.read(0))
     }
     open_file("a") {|f|
-      s = "x"
+      s = +"x"
       assert_equal("a", f.read(nil, s))
       assert_equal("a", s)
     }
     open_file("a") {|f|
-      s = "x"
+      s = +"x"
       assert_equal("a", f.read(10, s))
       assert_equal("a", s)
     }
diff --git a/test/utils.rb b/test/utils.rb
index b5820b03..acece979 100644
--- a/test/utils.rb
+++ b/test/utils.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 begin
   require "openssl"