diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h
index 9ae2f0609..1cafa6ec2 100644
--- a/include/mbedtls/cipher.h
+++ b/include/mbedtls/cipher.h
@@ -992,9 +992,9 @@ int mbedtls_cipher_auth_decrypt( mbedtls_cipher_context_t *ctx,
  * \param iv            The nonce to use. This must be a readable buffer of
  *                      at least \p iv_len Bytes and may be \c NULL if \p
  *                      iv_len is \c 0.
- * \param iv_len        The length of the nonce. For AEAD ciphers, this must satisfy the
- *                      constraints imposed by the cipher used. For NIST_KW,
- *                      this must be \c 0.
+ * \param iv_len        The length of the nonce. For AEAD ciphers, this must
+ *                      satisfy the constraints imposed by the cipher used.
+ *                      For NIST_KW, this must be \c 0.
  * \param ad            The additional data to authenticate. This must be a
  *                      readable buffer of at least \p ad_len Bytes, and may
  *                      be \c NULL is \p ad_len is \c 0.
@@ -1047,9 +1047,9 @@ int mbedtls_cipher_auth_encrypt_ext( mbedtls_cipher_context_t *ctx,
  * \param iv            The nonce to use. This must be a readable buffer of
  *                      at least \p iv_len Bytes and may be \c NULL if \p
  *                      iv_len is \c 0.
- * \param iv_len        The length of the nonce. For AEAD ciphers, this must satisfy the
- *                      constraints imposed by the cipher used. For NIST_KW,
- *                      this must be \c 0.
+ * \param iv_len        The length of the nonce. For AEAD ciphers, this must
+ *                      satisfy the constraints imposed by the cipher used.
+ *                      For NIST_KW, this must be \c 0.
  * \param ad            The additional data to authenticate. This must be a
  *                      readable buffer of at least \p ad_len Bytes, and may
  *                      be \c NULL is \p ad_len is \c 0.
diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index b77d3696f..47a763cc8 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -1345,7 +1345,7 @@ void auth_crypt_tv( int cipher_id, data_t * key, data_t * iv,
      * Authenticate and decrypt, and check result
      */
 
-    /* We can't pass a NULL output buffer to this funciton */
+    /* We can't pass a NULL output buffer to this function */
     ASSERT_ALLOC( decrypt_buf, cipher->len ? cipher->len : 1 );
     outlen = 0;
     ret = mbedtls_cipher_auth_decrypt( &ctx, iv->x, iv->len, ad->x, ad->len,