diff mbox series

[Cosmic] UBUNTU: [Config] Disable the Speck cipher

Message ID 1534880368-6440-1-git-send-email-tyhicks@canonical.com
State New
Headers show
Series [Cosmic] UBUNTU: [Config] Disable the Speck cipher | expand

Commit Message

Tyler Hicks Aug. 21, 2018, 7:39 p.m. UTC
The Speck cipher was introduced upstream in v4.17 as a block cipher to
use for encrypting data at rest in low powered mobile devices. The
authors then decided to not use Speck and have since given their
blessing to remove the cipher since there are no other known users. The
cipher itself is controversial to some people due to its origin.

Disable it in Ubuntu due to the controversy surrounding Speck, the lack
of kernel code that makes use of it, and its likely eventual removal
from the upstream tree.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 debian.master/abi/4.17.0-8.9/amd64/generic              | 6 ------
 debian.master/abi/4.17.0-8.9/amd64/generic.modules      | 1 -
 debian.master/abi/4.17.0-8.9/amd64/lowlatency           | 6 ------
 debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules   | 1 -
 debian.master/abi/4.17.0-8.9/arm64/generic              | 6 ------
 debian.master/abi/4.17.0-8.9/arm64/generic.modules      | 2 --
 debian.master/abi/4.17.0-8.9/arm64/snapdragon           | 6 ------
 debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules   | 2 --
 debian.master/abi/4.17.0-8.9/armhf/generic              | 6 ------
 debian.master/abi/4.17.0-8.9/armhf/generic-lpae         | 6 ------
 debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules | 2 --
 debian.master/abi/4.17.0-8.9/armhf/generic.modules      | 2 --
 debian.master/abi/4.17.0-8.9/i386/generic               | 6 ------
 debian.master/abi/4.17.0-8.9/i386/generic.modules       | 1 -
 debian.master/abi/4.17.0-8.9/i386/lowlatency            | 6 ------
 debian.master/abi/4.17.0-8.9/i386/lowlatency.modules    | 1 -
 debian.master/abi/4.17.0-8.9/ppc64el/generic            | 6 ------
 debian.master/abi/4.17.0-8.9/ppc64el/generic.modules    | 1 -
 debian.master/abi/4.17.0-8.9/s390x/generic              | 6 ------
 debian.master/abi/4.17.0-8.9/s390x/generic.modules      | 1 -
 debian.master/config/config.common.ubuntu               | 4 ++--
 21 files changed, 2 insertions(+), 76 deletions(-)

Comments

Kamal Mostafa Aug. 22, 2018, 6:42 p.m. UTC | #1
Acked-by: Kamal Mostafa <kamal@canonical.com>

On Tue, Aug 21, 2018 at 07:39:28PM +0000, Tyler Hicks wrote:
> The Speck cipher was introduced upstream in v4.17 as a block cipher to
> use for encrypting data at rest in low powered mobile devices. The
> authors then decided to not use Speck and have since given their
> blessing to remove the cipher since there are no other known users. The
> cipher itself is controversial to some people due to its origin.
> 
> Disable it in Ubuntu due to the controversy surrounding Speck, the lack
> of kernel code that makes use of it, and its likely eventual removal
> from the upstream tree.
> 
> Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
> ---
>  debian.master/abi/4.17.0-8.9/amd64/generic              | 6 ------
>  debian.master/abi/4.17.0-8.9/amd64/generic.modules      | 1 -
>  debian.master/abi/4.17.0-8.9/amd64/lowlatency           | 6 ------
>  debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules   | 1 -
>  debian.master/abi/4.17.0-8.9/arm64/generic              | 6 ------
>  debian.master/abi/4.17.0-8.9/arm64/generic.modules      | 2 --
>  debian.master/abi/4.17.0-8.9/arm64/snapdragon           | 6 ------
>  debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules   | 2 --
>  debian.master/abi/4.17.0-8.9/armhf/generic              | 6 ------
>  debian.master/abi/4.17.0-8.9/armhf/generic-lpae         | 6 ------
>  debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules | 2 --
>  debian.master/abi/4.17.0-8.9/armhf/generic.modules      | 2 --
>  debian.master/abi/4.17.0-8.9/i386/generic               | 6 ------
>  debian.master/abi/4.17.0-8.9/i386/generic.modules       | 1 -
>  debian.master/abi/4.17.0-8.9/i386/lowlatency            | 6 ------
>  debian.master/abi/4.17.0-8.9/i386/lowlatency.modules    | 1 -
>  debian.master/abi/4.17.0-8.9/ppc64el/generic            | 6 ------
>  debian.master/abi/4.17.0-8.9/ppc64el/generic.modules    | 1 -
>  debian.master/abi/4.17.0-8.9/s390x/generic              | 6 ------
>  debian.master/abi/4.17.0-8.9/s390x/generic.modules      | 1 -
>  debian.master/config/config.common.ubuntu               | 4 ++--
>  21 files changed, 2 insertions(+), 76 deletions(-)
> 
> diff --git a/debian.master/abi/4.17.0-8.9/amd64/generic b/debian.master/abi/4.17.0-8.9/amd64/generic
> index f7f16eb4762d..1c244693a67d 100644
> --- a/debian.master/abi/4.17.0-8.9/amd64/generic
> +++ b/debian.master/abi/4.17.0-8.9/amd64/generic
> @@ -11698,12 +11698,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
> diff --git a/debian.master/abi/4.17.0-8.9/amd64/generic.modules b/debian.master/abi/4.17.0-8.9/amd64/generic.modules
> index e0a402bc846a..134a39f9dea0 100644
> --- a/debian.master/abi/4.17.0-8.9/amd64/generic.modules
> +++ b/debian.master/abi/4.17.0-8.9/amd64/generic.modules
> @@ -4316,7 +4316,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
>  spectrum_cs
>  speedfax
>  speedstep-lib
> diff --git a/debian.master/abi/4.17.0-8.9/amd64/lowlatency b/debian.master/abi/4.17.0-8.9/amd64/lowlatency
> index cd4be444506b..093dff9065f9 100644
> --- a/debian.master/abi/4.17.0-8.9/amd64/lowlatency
> +++ b/debian.master/abi/4.17.0-8.9/amd64/lowlatency
> @@ -11706,12 +11706,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
> diff --git a/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules b/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules
> index dc29cc6f3f21..3b22220552ec 100644
> --- a/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules
> +++ b/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules
> @@ -4317,7 +4317,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
>  spectrum_cs
>  speedfax
>  speedstep-lib
> diff --git a/debian.master/abi/4.17.0-8.9/arm64/generic b/debian.master/abi/4.17.0-8.9/arm64/generic
> index 50c6fc1a4049..86e98648c049 100644
> --- a/debian.master/abi/4.17.0-8.9/arm64/generic
> +++ b/debian.master/abi/4.17.0-8.9/arm64/generic
> @@ -11305,12 +11305,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
> diff --git a/debian.master/abi/4.17.0-8.9/arm64/generic.modules b/debian.master/abi/4.17.0-8.9/arm64/generic.modules
> index ea41e083b56b..b7bab000dfa3 100644
> --- a/debian.master/abi/4.17.0-8.9/arm64/generic.modules
> +++ b/debian.master/abi/4.17.0-8.9/arm64/generic.modules
> @@ -4373,8 +4373,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
> -speck-neon
>  speedfax
>  speedtch
>  spi-altera
> diff --git a/debian.master/abi/4.17.0-8.9/arm64/snapdragon b/debian.master/abi/4.17.0-8.9/arm64/snapdragon
> index de92a798d628..46c46d7ad1de 100644
> --- a/debian.master/abi/4.17.0-8.9/arm64/snapdragon
> +++ b/debian.master/abi/4.17.0-8.9/arm64/snapdragon
> @@ -11321,12 +11321,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
> diff --git a/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules b/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules
> index 0656c6b0321d..10e5b9107f17 100644
> --- a/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules
> +++ b/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules
> @@ -4335,8 +4335,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
> -speck-neon
>  speedfax
>  speedtch
>  spi-altera
> diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic b/debian.master/abi/4.17.0-8.9/armhf/generic
> index f691dc5d34b4..c8fd0a72f0f3 100644
> --- a/debian.master/abi/4.17.0-8.9/armhf/generic
> +++ b/debian.master/abi/4.17.0-8.9/armhf/generic
> @@ -11151,12 +11151,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/ata/pata_platform 0x00000000	__pata_platform_probe
> diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae
> index 68a190221c2b..39d14e16f50e 100644
> --- a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae
> +++ b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae
> @@ -11090,12 +11090,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/ata/pata_platform 0x00000000	__pata_platform_probe
> diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules
> index 85d844098459..56b12f09b308 100644
> --- a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules
> +++ b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules
> @@ -4422,8 +4422,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
> -speck-neon
>  speedfax
>  speedtch
>  spi-altera
> diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic.modules b/debian.master/abi/4.17.0-8.9/armhf/generic.modules
> index 3eb68caf871c..90e0fc74d7de 100644
> --- a/debian.master/abi/4.17.0-8.9/armhf/generic.modules
> +++ b/debian.master/abi/4.17.0-8.9/armhf/generic.modules
> @@ -4524,8 +4524,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
> -speck-neon
>  speedfax
>  speedtch
>  spi-altera
> diff --git a/debian.master/abi/4.17.0-8.9/i386/generic b/debian.master/abi/4.17.0-8.9/i386/generic
> index 61425ad44774..073d82ed7cb1 100644
> --- a/debian.master/abi/4.17.0-8.9/i386/generic
> +++ b/debian.master/abi/4.17.0-8.9/i386/generic
> @@ -11685,12 +11685,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/acpi/sbshc 0x00000000	acpi_smbus_read
> diff --git a/debian.master/abi/4.17.0-8.9/i386/generic.modules b/debian.master/abi/4.17.0-8.9/i386/generic.modules
> index adf34c7c91f5..dfef4df8a74f 100644
> --- a/debian.master/abi/4.17.0-8.9/i386/generic.modules
> +++ b/debian.master/abi/4.17.0-8.9/i386/generic.modules
> @@ -4424,7 +4424,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
>  spectrum_cs
>  speedfax
>  speedtch
> diff --git a/debian.master/abi/4.17.0-8.9/i386/lowlatency b/debian.master/abi/4.17.0-8.9/i386/lowlatency
> index 45c9f2a7b1b9..387466c6f25d 100644
> --- a/debian.master/abi/4.17.0-8.9/i386/lowlatency
> +++ b/debian.master/abi/4.17.0-8.9/i386/lowlatency
> @@ -11693,12 +11693,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/acpi/sbshc 0x00000000	acpi_smbus_read
> diff --git a/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules b/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules
> index 0bafe914061d..1d52724e03a3 100644
> --- a/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules
> +++ b/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules
> @@ -4425,7 +4425,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
>  spectrum_cs
>  speedfax
>  speedtch
> diff --git a/debian.master/abi/4.17.0-8.9/ppc64el/generic b/debian.master/abi/4.17.0-8.9/ppc64el/generic
> index cbe53ca308a8..c50ea4fbe8d7 100644
> --- a/debian.master/abi/4.17.0-8.9/ppc64el/generic
> +++ b/debian.master/abi/4.17.0-8.9/ppc64el/generic
> @@ -11140,12 +11140,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/ata/libahci 0x00000000	ahci_check_ready
> diff --git a/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules b/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules
> index 1000eb561df5..3fd38caa6763 100644
> --- a/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules
> +++ b/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules
> @@ -4030,7 +4030,6 @@ speakup_ltlk
>  speakup_soft
>  speakup_spkout
>  speakup_txprt
> -speck
>  speedfax
>  speedtch
>  spi-altera
> diff --git a/debian.master/abi/4.17.0-8.9/s390x/generic b/debian.master/abi/4.17.0-8.9/s390x/generic
> index b22c3741c541..6d826ff17ab5 100644
> --- a/debian.master/abi/4.17.0-8.9/s390x/generic
> +++ b/debian.master/abi/4.17.0-8.9/s390x/generic
> @@ -5769,12 +5769,6 @@ EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
>  EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
>  EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
> -EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
>  EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
>  EXPORT_SYMBOL_GPL drivers/dax/device_dax 0x00000000	alloc_dax_region
> diff --git a/debian.master/abi/4.17.0-8.9/s390x/generic.modules b/debian.master/abi/4.17.0-8.9/s390x/generic.modules
> index 8140fb58737b..4c52b31dbf10 100644
> --- a/debian.master/abi/4.17.0-8.9/s390x/generic.modules
> +++ b/debian.master/abi/4.17.0-8.9/s390x/generic.modules
> @@ -709,7 +709,6 @@ smc_diag
>  smsc
>  smsgiucv_app
>  softdog
> -speck
>  spl
>  splat
>  st
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 115d63e5ec3c..fdc27fe4faa3 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -2003,8 +2003,8 @@ CONFIG_CRYPTO_SKEIN=y
>  CONFIG_CRYPTO_SM3=m
>  CONFIG_CRYPTO_SM3_ARM64_CE=m
>  CONFIG_CRYPTO_SM4=m
> -CONFIG_CRYPTO_SPECK=m
> -CONFIG_CRYPTO_SPECK_NEON=m
> +# CONFIG_CRYPTO_SPECK is not set
> +# CONFIG_CRYPTO_SPECK_NEON is not set
>  CONFIG_CRYPTO_TEA=m
>  CONFIG_CRYPTO_TEST=m
>  CONFIG_CRYPTO_TGR192=m
> -- 
> 2.7.4
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Seth Forshee Aug. 23, 2018, 8 p.m. UTC | #2
On Tue, Aug 21, 2018 at 07:39:28PM +0000, Tyler Hicks wrote:
> The Speck cipher was introduced upstream in v4.17 as a block cipher to
> use for encrypting data at rest in low powered mobile devices. The
> authors then decided to not use Speck and have since given their
> blessing to remove the cipher since there are no other known users. The
> cipher itself is controversial to some people due to its origin.
> 
> Disable it in Ubuntu due to the controversy surrounding Speck, the lack
> of kernel code that makes use of it, and its likely eventual removal
> from the upstream tree.
> 
> Signed-off-by: Tyler Hicks <tyhicks@canonical.com>

Applied to cosmic/master-next, with adjustments to the abi file paths.
Thanks!
diff mbox series

Patch

diff --git a/debian.master/abi/4.17.0-8.9/amd64/generic b/debian.master/abi/4.17.0-8.9/amd64/generic
index f7f16eb4762d..1c244693a67d 100644
--- a/debian.master/abi/4.17.0-8.9/amd64/generic
+++ b/debian.master/abi/4.17.0-8.9/amd64/generic
@@ -11698,12 +11698,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
diff --git a/debian.master/abi/4.17.0-8.9/amd64/generic.modules b/debian.master/abi/4.17.0-8.9/amd64/generic.modules
index e0a402bc846a..134a39f9dea0 100644
--- a/debian.master/abi/4.17.0-8.9/amd64/generic.modules
+++ b/debian.master/abi/4.17.0-8.9/amd64/generic.modules
@@ -4316,7 +4316,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
 spectrum_cs
 speedfax
 speedstep-lib
diff --git a/debian.master/abi/4.17.0-8.9/amd64/lowlatency b/debian.master/abi/4.17.0-8.9/amd64/lowlatency
index cd4be444506b..093dff9065f9 100644
--- a/debian.master/abi/4.17.0-8.9/amd64/lowlatency
+++ b/debian.master/abi/4.17.0-8.9/amd64/lowlatency
@@ -11706,12 +11706,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
diff --git a/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules b/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules
index dc29cc6f3f21..3b22220552ec 100644
--- a/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules
+++ b/debian.master/abi/4.17.0-8.9/amd64/lowlatency.modules
@@ -4317,7 +4317,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
 spectrum_cs
 speedfax
 speedstep-lib
diff --git a/debian.master/abi/4.17.0-8.9/arm64/generic b/debian.master/abi/4.17.0-8.9/arm64/generic
index 50c6fc1a4049..86e98648c049 100644
--- a/debian.master/abi/4.17.0-8.9/arm64/generic
+++ b/debian.master/abi/4.17.0-8.9/arm64/generic
@@ -11305,12 +11305,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
diff --git a/debian.master/abi/4.17.0-8.9/arm64/generic.modules b/debian.master/abi/4.17.0-8.9/arm64/generic.modules
index ea41e083b56b..b7bab000dfa3 100644
--- a/debian.master/abi/4.17.0-8.9/arm64/generic.modules
+++ b/debian.master/abi/4.17.0-8.9/arm64/generic.modules
@@ -4373,8 +4373,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
-speck-neon
 speedfax
 speedtch
 spi-altera
diff --git a/debian.master/abi/4.17.0-8.9/arm64/snapdragon b/debian.master/abi/4.17.0-8.9/arm64/snapdragon
index de92a798d628..46c46d7ad1de 100644
--- a/debian.master/abi/4.17.0-8.9/arm64/snapdragon
+++ b/debian.master/abi/4.17.0-8.9/arm64/snapdragon
@@ -11321,12 +11321,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/acpi/nfit/nfit 0x00000000	__acpi_nfit_notify
diff --git a/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules b/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules
index 0656c6b0321d..10e5b9107f17 100644
--- a/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules
+++ b/debian.master/abi/4.17.0-8.9/arm64/snapdragon.modules
@@ -4335,8 +4335,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
-speck-neon
 speedfax
 speedtch
 spi-altera
diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic b/debian.master/abi/4.17.0-8.9/armhf/generic
index f691dc5d34b4..c8fd0a72f0f3 100644
--- a/debian.master/abi/4.17.0-8.9/armhf/generic
+++ b/debian.master/abi/4.17.0-8.9/armhf/generic
@@ -11151,12 +11151,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/ata/pata_platform 0x00000000	__pata_platform_probe
diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae
index 68a190221c2b..39d14e16f50e 100644
--- a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae
+++ b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae
@@ -11090,12 +11090,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/ata/pata_platform 0x00000000	__pata_platform_probe
diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules
index 85d844098459..56b12f09b308 100644
--- a/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules
+++ b/debian.master/abi/4.17.0-8.9/armhf/generic-lpae.modules
@@ -4422,8 +4422,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
-speck-neon
 speedfax
 speedtch
 spi-altera
diff --git a/debian.master/abi/4.17.0-8.9/armhf/generic.modules b/debian.master/abi/4.17.0-8.9/armhf/generic.modules
index 3eb68caf871c..90e0fc74d7de 100644
--- a/debian.master/abi/4.17.0-8.9/armhf/generic.modules
+++ b/debian.master/abi/4.17.0-8.9/armhf/generic.modules
@@ -4524,8 +4524,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
-speck-neon
 speedfax
 speedtch
 spi-altera
diff --git a/debian.master/abi/4.17.0-8.9/i386/generic b/debian.master/abi/4.17.0-8.9/i386/generic
index 61425ad44774..073d82ed7cb1 100644
--- a/debian.master/abi/4.17.0-8.9/i386/generic
+++ b/debian.master/abi/4.17.0-8.9/i386/generic
@@ -11685,12 +11685,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/acpi/sbshc 0x00000000	acpi_smbus_read
diff --git a/debian.master/abi/4.17.0-8.9/i386/generic.modules b/debian.master/abi/4.17.0-8.9/i386/generic.modules
index adf34c7c91f5..dfef4df8a74f 100644
--- a/debian.master/abi/4.17.0-8.9/i386/generic.modules
+++ b/debian.master/abi/4.17.0-8.9/i386/generic.modules
@@ -4424,7 +4424,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
 spectrum_cs
 speedfax
 speedtch
diff --git a/debian.master/abi/4.17.0-8.9/i386/lowlatency b/debian.master/abi/4.17.0-8.9/i386/lowlatency
index 45c9f2a7b1b9..387466c6f25d 100644
--- a/debian.master/abi/4.17.0-8.9/i386/lowlatency
+++ b/debian.master/abi/4.17.0-8.9/i386/lowlatency
@@ -11693,12 +11693,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/acpi/sbshc 0x00000000	acpi_smbus_read
diff --git a/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules b/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules
index 0bafe914061d..1d52724e03a3 100644
--- a/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules
+++ b/debian.master/abi/4.17.0-8.9/i386/lowlatency.modules
@@ -4425,7 +4425,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
 spectrum_cs
 speedfax
 speedtch
diff --git a/debian.master/abi/4.17.0-8.9/ppc64el/generic b/debian.master/abi/4.17.0-8.9/ppc64el/generic
index cbe53ca308a8..c50ea4fbe8d7 100644
--- a/debian.master/abi/4.17.0-8.9/ppc64el/generic
+++ b/debian.master/abi/4.17.0-8.9/ppc64el/generic
@@ -11140,12 +11140,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/ata/libahci 0x00000000	ahci_check_ready
diff --git a/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules b/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules
index 1000eb561df5..3fd38caa6763 100644
--- a/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules
+++ b/debian.master/abi/4.17.0-8.9/ppc64el/generic.modules
@@ -4030,7 +4030,6 @@  speakup_ltlk
 speakup_soft
 speakup_spkout
 speakup_txprt
-speck
 speedfax
 speedtch
 spi-altera
diff --git a/debian.master/abi/4.17.0-8.9/s390x/generic b/debian.master/abi/4.17.0-8.9/s390x/generic
index b22c3741c541..6d826ff17ab5 100644
--- a/debian.master/abi/4.17.0-8.9/s390x/generic
+++ b/debian.master/abi/4.17.0-8.9/s390x/generic
@@ -5769,12 +5769,6 @@  EXPORT_SYMBOL_GPL crypto/serpent_generic 0x00000000	serpent_setkey
 EXPORT_SYMBOL_GPL crypto/sm3_generic 0x00000000	sm3_zero_message_hash
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_expand_key
 EXPORT_SYMBOL_GPL crypto/sm4_generic 0x00000000	crypto_sm4_set_key
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck128_setkey
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_decrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_encrypt
-EXPORT_SYMBOL_GPL crypto/speck 0x00000000	crypto_speck64_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	__twofish_setkey
 EXPORT_SYMBOL_GPL crypto/twofish_common 0x00000000	twofish_setkey
 EXPORT_SYMBOL_GPL drivers/dax/device_dax 0x00000000	alloc_dax_region
diff --git a/debian.master/abi/4.17.0-8.9/s390x/generic.modules b/debian.master/abi/4.17.0-8.9/s390x/generic.modules
index 8140fb58737b..4c52b31dbf10 100644
--- a/debian.master/abi/4.17.0-8.9/s390x/generic.modules
+++ b/debian.master/abi/4.17.0-8.9/s390x/generic.modules
@@ -709,7 +709,6 @@  smc_diag
 smsc
 smsgiucv_app
 softdog
-speck
 spl
 splat
 st
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 115d63e5ec3c..fdc27fe4faa3 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2003,8 +2003,8 @@  CONFIG_CRYPTO_SKEIN=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m