Merge branch 'maint'bpoint

* maint:
  Ruby/OpenSSL 2.0.4
  History.md: add entries for 2.0.1-2.0.3
  History.md: wrap at 80 characters
  extconf.rb: simplify searching libraries logic
  Search SSL libraries by testing various filename patterns
  openssl: fix broken openssl check
  openssl: fix broken openssl check
  x509store: clear error queue after calling X509_LOOKUP_load_file()
  tool/sync-with-trunk: 'LASY' -> 'LAST'
  Update .travis.yml and Dockerfile
  test/test_x509store: skip OpenSSL::TestX509Store#test_set_errors
  Fix documentation for OpenSSL::Cipher#final
  Fix typos
  ssl: check return value of SSL_set_fd()
  test/test_ssl: fix typo in test_sysread_and_syswrite
  Fix typos
  test/test_pkey_ec: do not use dummy 0 order

1 files changed, 4 insertions, 4 deletions

diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index e7801f7e..21fcb1b6 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -23,7 +23,7 @@
 #define GetCipher(obj, ctx) do { \
     GetCipherInit((obj), (ctx)); \
     if (!(ctx)) { \
-	ossl_raise(rb_eRuntimeError, "Cipher not inititalized!"); \
+	ossl_raise(rb_eRuntimeError, "Cipher not initialized!"); \
     } \
 } while (0)
 
@@ -118,7 +118,7 @@ ossl_cipher_initialize(VALUE self, VALUE str)
     name = StringValueCStr(str);
     GetCipherInit(self, ctx);
     if (ctx) {
-	ossl_raise(rb_eRuntimeError, "Cipher already inititalized!");
+	ossl_raise(rb_eRuntimeError, "Cipher already initialized!");
     }
     AllocCipher(self, ctx);
     if (!(cipher = EVP_get_cipherbyname(name))) {
@@ -414,7 +414,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
  *  Returns the remaining data held in the cipher object. Further calls to
  *  Cipher#update or Cipher#final will return garbage. This call should always
  *  be made as the last call of an encryption or decryption operation, after
- *  after having fed the entire plaintext or ciphertext to the Cipher instance.
+ *  having fed the entire plaintext or ciphertext to the Cipher instance.
  *
  *  If an authenticated cipher was used, a CipherError is raised if the tag
  *  could not be authenticated successfully. Only call this method after
@@ -1003,7 +1003,7 @@ Init_ossl_cipher(void)
      * An example using the GCM (Galois/Counter Mode). You have 16 bytes _key_,
      * 12 bytes (96 bits) _nonce_ and the associated data _auth_data_. Be sure
      * not to reuse the _key_ and _nonce_ pair. Reusing an nonce ruins the
-     * security gurantees of GCM mode.
+     * security guarantees of GCM mode.
      *
      *   cipher = OpenSSL::Cipher::AES.new(128, :GCM).encrypt
      *   cipher.key = key