From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0d869b022b7cc1f103227579c9175d9b2bd167b Date: Mon, 11 Jul 2016 14:41:27 +0100 Message-ID: <20160711134130.E45051078E81@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3441469159259795345==" List-Id: --===============3441469159259795345== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via d0d869b022b7cc1f103227579c9175d9b2bd167b (commit) via 7959134a5564345adb1f16b42cf3d7666be9aa42 (commit) from 913a442a2aad8f359462d2dbaa8f29a69ed3ebd6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d0d869b022b7cc1f103227579c9175d9b2bd167b Merge: 7959134 913a442 Author: Arne Fitzenreiter Date: Mon Jul 11 15:39:53 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 7959134a5564345adb1f16b42cf3d7666be9aa42 Author: Arne Fitzenreiter Date: Mon Jul 11 10:42:51 2016 +0200 kernel: disable amd ccp support =20 ccp based trng of the apu2 produce none random data. Aes accleration is also not used because IPFire prefere AES-NI if this is supported. =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 4 +--- config/kernel/kernel.config.i586-ipfire-pae | 4 +--- config/kernel/kernel.config.x86_64-ipfire | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c= onfig.i586-ipfire index 3c027e0..834f369 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -5976,9 +5976,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=3Dm CONFIG_CRYPTO_DEV_GEODE=3Dm CONFIG_CRYPTO_DEV_HIFN_795X=3Dm CONFIG_CRYPTO_DEV_HIFN_795X_RNG=3Dy -CONFIG_CRYPTO_DEV_CCP=3Dy -CONFIG_CRYPTO_DEV_CCP_DD=3Dm -CONFIG_CRYPTO_DEV_CCP_CRYPTO=3Dm +# CONFIG_CRYPTO_DEV_CCP is not set CONFIG_ASYMMETRIC_KEY_TYPE=3Dm CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=3Dm CONFIG_PUBLIC_KEY_ALGO_RSA=3Dm diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.config.i586-ipfire-pae index 1e6f545..b4e34b2 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -6015,9 +6015,7 @@ CONFIG_CRYPTO_DEV_PADLOCK=3Dm CONFIG_CRYPTO_DEV_PADLOCK_AES=3Dm CONFIG_CRYPTO_DEV_PADLOCK_SHA=3Dm CONFIG_CRYPTO_DEV_GEODE=3Dm -CONFIG_CRYPTO_DEV_CCP=3Dy -CONFIG_CRYPTO_DEV_CCP_DD=3Dm -CONFIG_CRYPTO_DEV_CCP_CRYPTO=3Dm +# CONFIG_CRYPTO_DEV_CCP is not set CONFIG_ASYMMETRIC_KEY_TYPE=3Dm CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=3Dm CONFIG_PUBLIC_KEY_ALGO_RSA=3Dm diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel= .config.x86_64-ipfire index f3772dc..70754d1 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -5847,9 +5847,7 @@ CONFIG_CRYPTO_HW=3Dy CONFIG_CRYPTO_DEV_PADLOCK=3Dm CONFIG_CRYPTO_DEV_PADLOCK_AES=3Dm CONFIG_CRYPTO_DEV_PADLOCK_SHA=3Dm -CONFIG_CRYPTO_DEV_CCP=3Dy -CONFIG_CRYPTO_DEV_CCP_DD=3Dm -CONFIG_CRYPTO_DEV_CCP_CRYPTO=3Dm +CONFIG_CRYPTO_DEV_CCP is not set CONFIG_ASYMMETRIC_KEY_TYPE=3Dm CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=3Dm CONFIG_PUBLIC_KEY_ALGO_RSA=3Dm hooks/post-receive -- IPFire 2.x development tree --===============3441469159259795345==--