Sync trunk

31 files changed, 34 insertions, 1 deletions

diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 92b5d1b1..d03dfa7a 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -626,6 +626,7 @@ static void Init_ossl_locks(void)
  * loading the key:
  *
  *   key4_pem = File.read 'private.secure.pem'
+ *   pass_phrase = 'my secure pass phrase goes here'
  *   key4 = OpenSSL::PKey::RSA.new key4_pem, pass_phrase
  *
  * == RSA Encryption
@@ -790,6 +791,7 @@ static void Init_ossl_locks(void)
  * This example creates a self-signed certificate using an RSA key and a SHA1
  * signature.
  *
+ *   key = OpenSSL::PKey::RSA.new 2048
  *   name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
  *
  *   cert = OpenSSL::X509::Certificate.new
@@ -859,6 +861,7 @@ static void Init_ossl_locks(void)
  * not readable by other users.
  *
  *   ca_key = OpenSSL::PKey::RSA.new 2048
+ *   pass_phrase = 'my secure pass phrase goes here'
  *
  *   cipher = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
  *
diff --git a/test/test_asn1.rb b/test/test_asn1.rb
index 8955d727..fd2118d8 100644
--- a/test/test_asn1.rb
+++ b/test/test_asn1.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 class  OpenSSL::TestASN1 < Test::Unit::TestCase
diff --git a/test/test_bn.rb b/test/test_bn.rb
index 667cb296..848d1feb 100644
--- a/test/test_bn.rb
+++ b/test/test_bn.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_buffering.rb b/test/test_buffering.rb
index 0ca64599..fe07b46a 100644
--- a/test/test_buffering.rb
+++ b/test/test_buffering.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 require 'stringio'
 
diff --git a/test/test_cipher.rb b/test/test_cipher.rb
index 6f92c381..89c176f4 100644
--- a/test/test_cipher.rb
+++ b/test/test_cipher.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_config.rb b/test/test_config.rb
index 4ceb7465..812b28b9 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 class OpenSSL::TestConfig < Test::Unit::TestCase
@@ -167,7 +168,7 @@ __EOC__
   end
 
   def test_value
-    # supress deprecation warnings
+    # suppress deprecation warnings
     OpenSSL::TestUtils.silent do
       assert_equal('CA_default', @it.value('ca', 'default_ca'))
       assert_equal(nil, @it.value('ca', 'no such key'))
diff --git a/test/test_digest.rb b/test/test_digest.rb
index 5390225f..e206ca02 100644
--- a/test/test_digest.rb
+++ b/test/test_digest.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_engine.rb b/test/test_engine.rb
index a7264d0e..3521de63 100644
--- a/test/test_engine.rb
+++ b/test/test_engine.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 class OpenSSL::TestEngine < Test::Unit::TestCase
diff --git a/test/test_fips.rb b/test/test_fips.rb
index 6e4ac6d3..33769c93 100644
--- a/test/test_fips.rb
+++ b/test/test_fips.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_hmac.rb b/test/test_hmac.rb
index f709ebd6..135d26f0 100644
--- a/test/test_hmac.rb
+++ b/test/test_hmac.rb
@@ -1,4 +1,5 @@
 # coding: UTF-8
+# frozen_string_literal: false
 
 require_relative 'utils'
 
diff --git a/test/test_ns_spki.rb b/test/test_ns_spki.rb
index ab07bfbe..4f6e6f59 100644
--- a/test/test_ns_spki.rb
+++ b/test/test_ns_spki.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_ocsp.rb b/test/test_ocsp.rb
index af727d8e..1a969fd7 100644
--- a/test/test_ocsp.rb
+++ b/test/test_ocsp.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_pair.rb b/test/test_pair.rb
index 8e879a67..e17fc19a 100644
--- a/test/test_pair.rb
+++ b/test/test_pair.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_partial_record_read.rb b/test/test_partial_record_read.rb
index 1899a300..71e644a0 100644
--- a/test/test_partial_record_read.rb
+++ b/test/test_partial_record_read.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_pkcs12.rb b/test/test_pkcs12.rb
index c44cee00..ba07d767 100644
--- a/test/test_pkcs12.rb
+++ b/test/test_pkcs12.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_pkcs5.rb b/test/test_pkcs5.rb
index 5e85dde9..f38fd716 100644
--- a/test/test_pkcs5.rb
+++ b/test/test_pkcs5.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 class OpenSSL::TestPKCS5 < Test::Unit::TestCase
diff --git a/test/test_pkcs7.rb b/test/test_pkcs7.rb
index 47bd4f31..ce99db50 100644
--- a/test/test_pkcs7.rb
+++ b/test/test_pkcs7.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_pkey_dh.rb b/test/test_pkey_dh.rb
index 74060f62..a0eca53c 100644
--- a/test/test_pkey_dh.rb
+++ b/test/test_pkey_dh.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_pkey_dsa.rb b/test/test_pkey_dsa.rb
index e4ea1b5b..eb3e4f1c 100644
--- a/test/test_pkey_dsa.rb
+++ b/test/test_pkey_dsa.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 require 'base64'
 
diff --git a/test/test_pkey_ec.rb b/test/test_pkey_ec.rb
index 1693ace0..fe128fd4 100644
--- a/test/test_pkey_ec.rb
+++ b/test/test_pkey_ec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils) && defined?(OpenSSL::PKey::EC)
diff --git a/test/test_pkey_rsa.rb b/test/test_pkey_rsa.rb
index ea042c27..165b1ec9 100644
--- a/test/test_pkey_rsa.rb
+++ b/test/test_pkey_rsa.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 require 'base64'
 
diff --git a/test/test_random.rb b/test/test_random.rb
index e4242acf..8c69d543 100644
--- a/test/test_random.rb
+++ b/test/test_random.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 begin
   require "openssl"
 rescue LoadError
diff --git a/test/test_ssl.rb b/test/test_ssl.rb
index cf96c213..c193ebe3 100644
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_ssl_session.rb b/test/test_ssl_session.rb
index 28d268e7..3294aa7f 100644
--- a/test/test_ssl_session.rb
+++ b/test/test_ssl_session.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb
index 783677a4..72cb9e60 100644
--- a/test/test_x509cert.rb
+++ b/test/test_x509cert.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb
index 9dc1b1cd..7994ddea 100644
--- a/test/test_x509crl.rb
+++ b/test/test_x509crl.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_x509ext.rb b/test/test_x509ext.rb
index 29e9f1dc..e6d49bb6 100644
--- a/test/test_x509ext.rb
+++ b/test/test_x509ext.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_x509name.rb b/test/test_x509name.rb
index a92af534..56e79879 100644
--- a/test/test_x509name.rb
+++ b/test/test_x509name.rb
@@ -1,4 +1,5 @@
 # coding: US-ASCII
+# frozen_string_literal: false
 require_relative 'utils'
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_x509req.rb b/test/test_x509req.rb
index 783581b8..ee2347b5 100644
--- a/test/test_x509req.rb
+++ b/test/test_x509req.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/test_x509store.rb b/test/test_x509store.rb
index f3e144fc..9964cc8f 100644
--- a/test/test_x509store.rb
+++ b/test/test_x509store.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative "utils"
 
 if defined?(OpenSSL::TestUtils)
diff --git a/test/utils.rb b/test/utils.rb
index 9bb81baa..2e9b7395 100644
--- a/test/utils.rb
+++ b/test/utils.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 begin
   require "openssl"