Don't blindly assume inputs are strings

Author: stouset

lib/aead/cipher.rb

@@ -109,11 +109,14 @@ def nonce_len
   # @return [String] the generated AEAD
   #
   def encrypt(nonce, aad, plaintext)
-    if nonce.respond_to?(:force_encoding)
-      nonce    .force_encoding('ASCII-8BIT')
-      aad      .force_encoding('ASCII-8BIT')
-      plaintext.force_encoding('ASCII-8BIT')
-    end
+    nonce.force_encoding('ASCII-8BIT') if
+      nonce.respond_to?(:force_encoding)
+
+    aad.force_encoding('ASCII-8BIT') if
+      aad.respond_to?(:force_encoding)
+
+    plaintext.force_encoding('ASCII-8BIT') if
+      plaintext.respond_to?(:force_encoding)
 
     _verify_nonce_bytesize(nonce, self.nonce_len)
     _verify_plaintext_presence(plaintext)
@@ -135,11 +138,14 @@ def encrypt(nonce, aad, plaintext)
   # @return [String] the original plaintext
   #
   def decrypt(nonce, aad, aead)
-    if nonce.respond_to?(:force_encoding)
-      nonce.force_encoding('ASCII-8BIT')
-      aad  .force_encoding('ASCII-8BIT')
-      aead .force_encoding('ASCII-8BIT')
-    end
+    nonce.force_encoding('ASCII-8BIT') if
+      nonce.respond_to?(:force_encoding)
+
+    aad.force_encoding('ASCII-8BIT') if
+      aad.respond_to?(:force_encoding)
+
+    aead.force_encoding('ASCII-8BIT') if
+      aead.respond_to?(:force_encoding)
 
     _verify_nonce_bytesize(nonce, self.nonce_len)