Merge tag 'for-5.6/io_uring-vfs-2020-01-29' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 5575d48..cdb51d4 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -511,10 +511,10 @@ config CRYPTO_ESSIV
          encryption.
 
          This driver implements a crypto API template that can be
-         instantiated either as a skcipher or as a aead (depending on the
+         instantiated either as an skcipher or as an AEAD (depending on the
          type of the first template argument), and which defers encryption
          and decryption requests to the encapsulated cipher after applying
-         ESSIV to the input IV. Note that in the aead case, it is assumed
+         ESSIV to the input IV. Note that in the AEAD case, it is assumed
          that the keys are presented in the same format used by the authenc
          template, and that the IV appears at the end of the authenticated
          associated data (AAD) region (which is how dm-crypt uses it.)