diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
commit | 9722c6ee87766a45a337c094d1293de81cdcb106 (patch) | |
tree | 08b57716ae3c02fef2bc870b634019e692fd70e6 /meta-openembedded/meta-oe/recipes-crypto | |
parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
parent | 5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff) | |
download | openbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-crypto')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.11.0.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.9.0.bb) | 11 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb) | 15 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.18.bb (renamed from meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.17.bb) | 4 |
4 files changed, 19 insertions, 15 deletions
diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.9.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.11.0.bb index a7d25d567..c2d644b41 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_2.11.0.bb @@ -1,15 +1,12 @@ -# Copyright (C) 2018 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Crypto and TLS for C++11" +SUMMARY = "Crypto and TLS for C++11" HOMEPAGE = "https://botan.randombit.net" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://license.txt;md5=f4c145d4d70a3244a053c9f90d4841fc" SECTION = "libs" -SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tgz" -SRC_URI[md5sum] = "db8403d6a2f10c20fde3f3c76be9a045" -SRC_URI[sha256sum] = "305564352334dd63ae63db039077d96ae52dfa57a3248871081719b6a9f2d119" +SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" +SRC_URI[md5sum] = "2dba13b0d25d0e9d2a6f9867c62c9f2e" +SRC_URI[sha256sum] = "f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be" S = "${WORKDIR}/Botan-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb index 51cecf5d2..ae5988b57 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb @@ -16,9 +16,13 @@ DEPENDS = " \ util-linux \ " +RDEPENDS_${PN} = " \ + libdevmapper \ +" + SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "41d8b985ef69242852b93e95d53e8e28" -SRC_URI[sha256sum] = "a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897" +SRC_URI[md5sum] = "1654c8d2aa0dac51c8d1d755df61ae6c" +SRC_URI[sha256sum] = "94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61" inherit autotools gettext pkgconfig @@ -31,13 +35,15 @@ PACKAGECONFIG ??= " \ cryptsetup-reencrypt \ integritysetup \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - udev \ kernel_crypto \ internal-argon2 \ blkid \ luks-adjust-xts-keysize \ openssl \ " +PACKAGECONFIG_append_class-target = " \ + udev \ +" PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" @@ -48,7 +54,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't # recognized. @@ -63,6 +69,7 @@ PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" +PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" RRECOMMENDS_${PN} = "kernel-module-aes-generic \ kernel-module-dm-crypt \ diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb index 46c66a1b2..799070972 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14d5a68b28755c04ebdba226e888b157" DEPENDS = "libtool" S = "${WORKDIR}/git" -SRCREV = "3c56934f44a8f5a1257c342942e6e034fc6f20be" -PV = "1.1.4+git${SRCPV}" +SRCREV = "5649050d201856bf06c8738b5d2aa1710c86ac2f" +PV = "1.1.5" SRC_URI = " \ git://github.com/smuellerDD/libkcapi.git \ " diff --git a/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.17.bb b/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.18.bb index 8d9302f30..53b3ddc26 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.17.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.18.bb @@ -5,8 +5,8 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=47203c753972e855179dfffe15188bee" SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "0f71e2680187a1558b5461e6879342c5" -SRC_URI[sha256sum] = "0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577de1190e9ffa17766ac2b1" +SRC_URI[md5sum] = "3ca9ebc13b6b4735acae0a6a4c4f9a95" +SRC_URI[sha256sum] = "6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1" inherit autotools |