@@ -25,14 +25,6 @@ CONFIG_CICADA_PHY=m
# CONFIG_CRC_T10DIF is not set
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_PCBC=y
-# CONFIG_CRYPTO_SERPENT is not set
-CONFIG_CRYPTO_TEST=m
-# CONFIG_CRYPTO_XTS is not set
CONFIG_DAVICOM_PHY=m
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEFAULT_CFQ is not set
@@ -569,70 +569,79 @@ CONFIG_CRYPTO_AES_586=y
CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CCM is not set
+CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_CRC32C_INTEL=m
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_DEV_GEODE is not set
# CONFIG_CRYPTO_DEV_HIFN_795X is not set
# CONFIG_CRYPTO_DEV_PADLOCK is not set
CONFIG_CRYPTO_ECB=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_KHAZAD is not set
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCOMP=m
CONFIG_CRYPTO_PCOMP2=y
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_586=m
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYSTALHD=m
# CONFIG_CS5535_MFGPT is not set
@@ -2428,6 +2437,7 @@ CONFIG_RIONET_RX_SIZE=128
CONFIG_RIONET_TX_SIZE=128
# CONFIG_ROCKETPORT is not set
# CONFIG_ROMFS_FS is not set
+CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RT2X00 is not set
CONFIG_RTC_CLASS=y
# CONFIG_RTC_DEBUG is not set
@@ -2800,6 +2810,7 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_SUNGEM is not set
CONFIG_SUNRPC=y
CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_GSS=m
CONFIG_SUN_PARTITION=y
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
@@ -25,14 +25,6 @@ CONFIG_CRC7=m
CONFIG_CRC_T10DIF=y
CONFIG_CRYPTO_ARC4=y
CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_SERPENT=m
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_XTS=m
# CONFIG_DAVICOM_PHY is not set
CONFIG_DEBUG_INFO=y
CONFIG_DEFAULT_CFQ=y
Sync with the traditional Ubuntu kernel config options in regards to crypto options. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> --- debian.goldfish/config/armhf/config.common.armhf | 8 --- debian.goldfish/config/config.common.ubuntu | 71 ++++++++++++++---------- debian.goldfish/config/i386/config.common.i386 | 8 --- 3 files changed, 41 insertions(+), 46 deletions(-)