selinux: vsock: Set SID for socket returned by accept()

[mirror_ubuntu-focal-kernel.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9e524044d3128654d59a05f2ee7101d376f13cfc..b2cc0ad3792adcd3f4d3d929c9e9ff07f82c04f8 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -309,6 +309,7 @@ config CRYPTO_AEGIS128
 config CRYPTO_AEGIS128_SIMD
        bool "Support SIMD acceleration for AEGIS-128"
        depends on CRYPTO_AEGIS128 && ((ARM || ARM64) && KERNEL_MODE_NEON)
+       depends on !ARM || CC_IS_CLANG || GCC_VERSION >= 40800
        default y
 
 config CRYPTO_AEGIS128_AESNI_SSE2
@@ -499,10 +500,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.)