diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-01 18:27:11 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-13 05:51:39 +0300 |
commit | 6e60e8b2b2bab889379b380a28a167a0edd9d1d3 (patch) | |
tree | f12f54d5ba8e74e67e5fad3651a1e125bb8f4191 /import-layers/yocto-poky/meta/recipes-support/libgcrypt | |
parent | 509842add85b53e13164c1569a1fd43d5b8d91c5 (diff) | |
download | openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.tar.xz |
Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/libgcrypt')
5 files changed, 16 insertions, 13 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch index f6c4ca76f3..0a4dfe6773 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch @@ -2,7 +2,7 @@ CVE: CVE-2017-9526 Upstream-Status: Backport Signed-off-by: Ross Burton <ross.burton@intel.com> -From b3cab278eb9c2ceda79f980bc26460d97f260041 Mon Sep 17 00:00:00 2001 +From 4a1768d683f6572ad86d833508c70e6b3dc1efdc Mon Sep 17 00:00:00 2001 From: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be> Date: Thu, 19 Jan 2017 17:00:15 +0100 Subject: [PATCH] ecc: Store EdDSA session key in secure memory. diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch index 7180e7af2c..384fa964ae 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/CVE-2017-7526.patch @@ -5,7 +5,7 @@ CVE: CVE-2017-7526 Upstream-Status: Backport Signed-off-by: Ross Burton <ross.burton@intel.com> -From 56bd068335500207dea2cece9cc662bcd9658951 Mon Sep 17 00:00:00 2001 +From 12ee400c39e0ebb5fb819c3926d459c278fc99fd Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Tue, 4 Apr 2017 17:38:05 +0900 Subject: [PATCH 1/5] mpi: Simplify mpi_powm. @@ -186,7 +186,7 @@ index a780ebd1..7b3dc318 100644 2.11.0 -From 6e237c8c48d257dc315e364791d284c6bf3fa703 Mon Sep 17 00:00:00 2001 +From a4b275c4d5378837e820fdc84f4ada876f9c8ccd Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Sat, 24 Jun 2017 20:46:20 +0900 Subject: [PATCH 2/5] Same computation for square and multiply. @@ -287,7 +287,7 @@ index 7b3dc318..3cba6903 100644 2.11.0 -From bf059348dafc1b8d29e07b9426d870ead853db84 Mon Sep 17 00:00:00 2001 +From 129c1960e55603ec3f6fd1cd9cd51b22e9a9a7ef Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Thu, 29 Jun 2017 11:48:44 +0900 Subject: [PATCH 3/5] rsa: Add exponent blinding. @@ -390,7 +390,7 @@ index b6c73741..25e29b5c 100644 2.11.0 -From 09b9df2675a24e679b7944352ad6385e9e68474f Mon Sep 17 00:00:00 2001 +From 8e1a6289b7d11a8bf6c94affa06c9794e7216e26 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Thu, 29 Jun 2017 12:36:27 +0900 Subject: [PATCH 4/5] rsa: Fix exponent blinding. @@ -422,7 +422,7 @@ index 25e29b5c..33f92ebd 100644 2.11.0 -From 1323fdcf6f2f9fd1da8c5adf396650f15a2a1260 Mon Sep 17 00:00:00 2001 +From 4e5497752172edc444029af645f28cb88ce93906 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Thu, 29 Jun 2017 12:40:19 +0900 Subject: [PATCH 5/5] rsa: More fix. diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc index 00870e3d27..3403579a70 100644 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt.inc @@ -12,7 +12,7 @@ LICENSE_dumpsexp-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff" -DEPENDS = "libgpg-error libcap" +DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \ @@ -28,7 +28,10 @@ BINCONFIG = "${bindir}/libgcrypt-config" inherit autotools texinfo binconfig-disabled pkgconfig -EXTRA_OECONF = "--disable-asm --with-capabilities" +EXTRA_OECONF = "--disable-asm" + +PACKAGECONFIG ??= "capabilities" +PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap" do_configure_prepend () { # Else this could be used in preference to the one in aclocal-copy @@ -48,4 +51,4 @@ FILES_dumpsexp-dev += "${bindir}/dumpsexp" ARM_INSTRUCTION_SET = "arm" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb deleted file mode 100644 index ddd7c5392c..0000000000 --- a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libgcrypt.inc - -SRC_URI[md5sum] = "bb5b00cb70b1215833857fd690080fbb" -SRC_URI[sha256sum] = "c98470cf6a781f2af4bdfda710ad39f0f54b5044e8c43b878d4005737d6c213f" diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb new file mode 100644 index 0000000000..da0a1fe7fb --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb @@ -0,0 +1,4 @@ +require libgcrypt.inc + +SRC_URI[md5sum] = "eac6d11999650e8a1493674c1bdbc7f8" +SRC_URI[sha256sum] = "fc0aec7714d75d812b665bd510d66031b1b2ce8fa855cc2c02238c954ea36982" |