UBUNTU: [Config] updateconfigs for CRYPTO_LIB_BLAKE2S

BugLink: https://bugs.launchpad.net/bugs/1981649
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules
index 9e76a99600f064730bf0d7b22685bf5cf5b8e111..02b9d26af0e3860645f808bf61ad58f26b2add4f 100644 (file)
--- a/debian.master/abi/amd64/generic.modules
+++ b/debian.master/abi/amd64/generic.modules
@@ -2567,7 +2567,6 @@ libahci
 libahci_platform
 libarc4
 libblake2s
-libblake2s-generic
 libceph
 libchacha
 libchacha20poly1305

diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules
index 9f7ebaa233baecffd7a21e8fb85e4384f479625b..9c7861766c2e65c29a46f490cbf943d6b1d1d6e6 100644 (file)
--- a/debian.master/abi/arm64/generic-64k.modules
+++ b/debian.master/abi/arm64/generic-64k.modules
@@ -2779,7 +2779,6 @@ lib80211_crypt_tkip
 lib80211_crypt_wep
 libarc4
 libblake2s
-libblake2s-generic
 libceph
 libchacha
 libchacha20poly1305

diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules
index af9c3f2320b03e715cac9f84979f29e765fdc17f..08dfb03dcf29d181c093d46bab101a8b25ff2727 100644 (file)
--- a/debian.master/abi/arm64/generic.modules
+++ b/debian.master/abi/arm64/generic.modules
@@ -2779,7 +2779,6 @@ lib80211_crypt_tkip
 lib80211_crypt_wep
 libarc4
 libblake2s
-libblake2s-generic
 libceph
 libchacha
 libchacha20poly1305

diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules
index 54fcef08a8e997c179fda2d25a5c8a45d5ac6dc1..7c12824b1a417396d7e4d9792ca245ddc6edc054 100644 (file)
--- a/debian.master/abi/armhf/generic-lpae.modules
+++ b/debian.master/abi/armhf/generic-lpae.modules
@@ -2630,7 +2630,6 @@ lib80211_crypt_tkip
 lib80211_crypt_wep
 libarc4
 libblake2s
-libblake2s-generic
 libceph
 libchacha
 libchacha20poly1305

diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules
index d7f13b1858070342996417e8f47766fdd4aa7bfe..ecbdd49b53bb2bc8a7bb4fa019c4ce5c440a79de 100644 (file)
--- a/debian.master/abi/armhf/generic.modules
+++ b/debian.master/abi/armhf/generic.modules
@@ -2687,7 +2687,6 @@ lib80211_crypt_tkip
 lib80211_crypt_wep
 libarc4
 libblake2s
-libblake2s-generic
 libceph
 libchacha
 libchacha20poly1305

diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules
index 79b5f30032e86968add96afe47f638df269dc7ed..209457f58878f44d0999d1d0ba92b1c6dd776917 100644 (file)
--- a/debian.master/abi/ppc64el/generic.modules
+++ b/debian.master/abi/ppc64el/generic.modules
@@ -2389,7 +2389,6 @@ libahci
 libahci_platform
 libarc4
 libblake2s
-libblake2s-generic
 libceph
 libchacha
 libchacha20poly1305

diff --git a/debian.master/abi/s390x/generic.modules b/debian.master/abi/s390x/generic.modules
index c8c523958c15713a9374b417a34c03045882fa17..3e3f786f913285b3be9fd5ecbd1db601ec72db82 100644 (file)
--- a/debian.master/abi/s390x/generic.modules
+++ b/debian.master/abi/s390x/generic.modules
@@ -391,7 +391,6 @@ l2tp_ip6
 l2tp_netlink
 lcs
 libblake2s
-libblake2s-generic
 libceph
 libchacha
 libchacha20poly1305

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 1d35cb971e3fd38ded3ce90b5dfb73461894fc32..0198a24b1a46733b85853f5839e04f4f685edecc 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -323,7 +323,6 @@ CONFIG_CRYPTO_USER_API_RNG_CAVP                 policy<{'amd64': 'n', 'arm64': '
 CONFIG_CRYPTO_USER_API_AEAD                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_CRYPTO_STATS                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_CRYPTO_LIB_BLAKE2S                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_CRYPTO_LIB_CHACHA                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_CRYPTO_LIB_CURVE25519                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_CRYPTO_LIB_POLY1305                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index eedf7214874e86fbf4a9bcafdd60fda04e0a7859..4eba8bf6268c696ed184927e1d0e5f7b88e57392 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2232,7 +2232,7 @@ CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
@@ -2418,8 +2418,7 @@ CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m