* [zeus 0/7] Merge request
@ 2020-04-28 2:15 akuster
2020-04-28 2:15 ` [zeus 1/7] cve-check: CPE version '-' as all version akuster
` (8 more replies)
0 siblings, 9 replies; 14+ messages in thread
From: akuster @ 2020-04-28 2:15 UTC (permalink / raw)
To: openembedded-core
Please consider these changes for zeus
The following changes since commit 5ac98c776f9b77804a0ee812f47f3ecf593e432f:
kernelsrc.bbclass: Fix externalsrc support (2020-04-06 15:17:05 +0800)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/zeus-next
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/zeus-next
Adrian Bunk (1):
openssl: Upgrade 1.1.1d -> 1.1.1e
Alexander Kanavin (1):
openssl: update to 1.1.1f
Denys Dmytriyenko (1):
openssl: recommend cryptodev-module for corresponding PACKAGECONFIG
Lee Chee Yang (2):
cve-check: CPE version '-' as all version
wic: align layer plugin path
Ovidiu Panait (1):
inetutils: Use alternatives to avoid manpage conflict
Richard Purdie (1):
pseudo: Ensure we use our own libsqlite
meta/classes/cve-check.bbclass | 2 +-
.../inetutils/inetutils_1.9.4.bb | 6 +-
.../openssl/openssl/CVE-2019-1551.patch | 758 ------------------
.../{openssl_1.1.1d.bb => openssl_1.1.1f.bb} | 6 +-
.../recipes-core/meta/cve-update-db-native.bb | 2 +-
meta/recipes-devtools/pseudo/pseudo.inc | 2 +
scripts/lib/wic/help.py | 3 +-
scripts/lib/wic/pluginbase.py | 11 +-
8 files changed, 19 insertions(+), 771 deletions(-)
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch
rename meta/recipes-connectivity/openssl/{openssl_1.1.1d.bb => openssl_1.1.1f.bb} (97%)
--
2.17.1
^ permalink raw reply [flat|nested] 14+ messages in thread* [zeus 1/7] cve-check: CPE version '-' as all version 2020-04-28 2:15 [zeus 0/7] Merge request akuster @ 2020-04-28 2:15 ` akuster 2020-04-28 2:15 ` [zeus 2/7] pseudo: Ensure we use our own libsqlite akuster ` (7 subsequent siblings) 8 siblings, 0 replies; 14+ messages in thread From: akuster @ 2020-04-28 2:15 UTC (permalink / raw) To: openembedded-core From: Lee Chee Yang <chee.yang.lee@intel.com> CPE version could be '-' to mean no version info. Current cve_check treat it as not valid and does not report these CVE but some of these could be a valid vulnerabilities. Since non-valid CVE can be whitelisted, so treat '-' as all version and report all these CVE to capture possible vulnerabilities. Non-valid CVE to be whitelisted separately. [YOCTO #13617] Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c69ee3594079589d27c10db32bc288566ebde9ef) Signed-off-by: Armin Kuster <akuster808@gmail.com> --- meta/classes/cve-check.bbclass | 2 +- meta/recipes-core/meta/cve-update-db-native.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 5d84b93d719..2a530a04899 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -221,7 +221,7 @@ def check_cves(d, patched_cves): (_, _, _, version_start, operator_start, version_end, operator_end) = row #bb.debug(2, "Evaluating row " + str(row)) - if (operator_start == '=' and pv == version_start): + if (operator_start == '=' and pv == version_start) or version_start == '-': vulnerable = True else: if operator_start: diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 575254af40c..1b4f31692ba 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -122,7 +122,7 @@ def parse_node_and_insert(c, node, cveId): product = cpe23[4] version = cpe23[5] - if version != '*': + if version != '*' and version != '-': # Version is defined, this is a '=' match yield [cveId, vendor, product, version, '=', '', ''] else: -- 2.17.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [zeus 2/7] pseudo: Ensure we use our own libsqlite 2020-04-28 2:15 [zeus 0/7] Merge request akuster 2020-04-28 2:15 ` [zeus 1/7] cve-check: CPE version '-' as all version akuster @ 2020-04-28 2:15 ` akuster 2020-04-28 2:15 ` [zeus 3/7] wic: align layer plugin path akuster ` (6 subsequent siblings) 8 siblings, 0 replies; 14+ messages in thread From: akuster @ 2020-04-28 2:15 UTC (permalink / raw) To: openembedded-core From: Richard Purdie <richard.purdie@linuxfoundation.org> pseudo-native is special in that bitbake ends up executing it from the sysroot-components directory before we have any workdirs for the bitbake fakeroot worker. Since we switched to dynamically linking sqlite, it means sqlite from the host system may be found, we really want the version in sysroot-components. Trying to run tasks to create some special environment for pseudo is hard and error prone. The simplest fix is to add an RPATH to the binary so that it can correctly find the sqlite we want. Unfortunately passing $ORIGIN into make doesn't work so well with shell quoting so we have to fix that during do_install. [YOCTO #13814] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3937ca9e2dfabb1ce9bce1d536b60b1e2a43739b) Signed-off-by: Armin Kuster <akuster808@gmail.com> --- meta/recipes-devtools/pseudo/pseudo.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 7ff8e449e9a..50e30064bde 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc @@ -16,6 +16,7 @@ INSANE_SKIP_${PN}-dbg += "libdir" PROVIDES += "virtual/fakeroot" MAKEOPTS = "" +MAKEOPTS_class-native = "'RPATH=-Wl,--rpath=XORIGIN/../../../sqlite3-native/usr/lib/'" inherit siteinfo pkgconfig @@ -115,6 +116,7 @@ do_install () { } do_install_append_class-native () { + chrpath ${D}${bindir}/pseudo -r `chrpath ${D}${bindir}/pseudo | cut -d = -f 2 | sed s/XORIGIN/\\$ORIGIN/` install -d ${D}${sysconfdir} # The fallback files should never be modified install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd -- 2.17.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [zeus 3/7] wic: align layer plugin path 2020-04-28 2:15 [zeus 0/7] Merge request akuster 2020-04-28 2:15 ` [zeus 1/7] cve-check: CPE version '-' as all version akuster 2020-04-28 2:15 ` [zeus 2/7] pseudo: Ensure we use our own libsqlite akuster @ 2020-04-28 2:15 ` akuster 2020-04-28 2:15 ` [zeus 4/7] inetutils: Use alternatives to avoid manpage conflict akuster ` (5 subsequent siblings) 8 siblings, 0 replies; 14+ messages in thread From: akuster @ 2020-04-28 2:15 UTC (permalink / raw) To: openembedded-core From: Lee Chee Yang <chee.yang.lee@intel.com> wic look for external layer source plugin under scripts/lib/ while other tools look for lib/. allow wic to check for source plugin at both scripts/lib/ and lib/ to align with other tools while avoid breaking any existing source plugin in external layer. [YOCTO #13056] Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 986baff26bd96a6265f5fe2d631818fff9f66374) Signed-off-by: Armin Kuster <akuster808@gmail.com> --- scripts/lib/wic/help.py | 3 ++- scripts/lib/wic/pluginbase.py | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 3a40fc0ea29..03d84bd1d72 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -523,7 +523,8 @@ DESCRIPTION Source plugins can also be implemented and added by external layers - any plugins found in a scripts/lib/wic/plugins/source/ - directory in an external layer will also be made available. + or lib/wic/plugins/source/ directory in an external layer will + also be made available. When the wic implementation needs to invoke a partition-specific implementation, it looks for the plugin that has the same name as diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py index f74d6430fd7..d9b4e57747e 100644 --- a/scripts/lib/wic/pluginbase.py +++ b/scripts/lib/wic/pluginbase.py @@ -18,7 +18,7 @@ from wic.misc import get_bitbake_var PLUGIN_TYPES = ["imager", "source"] -SCRIPTS_PLUGIN_DIR = "scripts/lib/wic/plugins" +SCRIPTS_PLUGIN_DIR = ["scripts/lib/wic/plugins", "lib/wic/plugins"] logger = logging.getLogger('wic') @@ -38,10 +38,11 @@ class PluginMgr: cls._plugin_dirs = [os.path.join(os.path.dirname(__file__), 'plugins')] layers = get_bitbake_var("BBLAYERS") or '' for layer_path in layers.split(): - path = os.path.join(layer_path, SCRIPTS_PLUGIN_DIR) - path = os.path.abspath(os.path.expanduser(path)) - if path not in cls._plugin_dirs and os.path.isdir(path): - cls._plugin_dirs.insert(0, path) + for script_plugin_dir in SCRIPTS_PLUGIN_DIR: + path = os.path.join(layer_path, script_plugin_dir) + path = os.path.abspath(os.path.expanduser(path)) + if path not in cls._plugin_dirs and os.path.isdir(path): + cls._plugin_dirs.insert(0, path) if ptype not in PLUGINS: # load all ptype plugins -- 2.17.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [zeus 4/7] inetutils: Use alternatives to avoid manpage conflict 2020-04-28 2:15 [zeus 0/7] Merge request akuster ` (2 preceding siblings ...) 2020-04-28 2:15 ` [zeus 3/7] wic: align layer plugin path akuster @ 2020-04-28 2:15 ` akuster 2020-04-28 2:15 ` [zeus 5/7] openssl: recommend cryptodev-module for corresponding PACKAGECONFIG akuster ` (4 subsequent siblings) 8 siblings, 0 replies; 14+ messages in thread From: akuster @ 2020-04-28 2:15 UTC (permalink / raw) To: openembedded-core From: Ovidiu Panait <ovidiu.panait@windriver.com> Fix the following manpage conflicts: * check_data_file_clashes: Package inetutils-doc wants to install file /usr/share/man/man1/tftp.1 But that file is already provided by package * tftp-hpa-doc * check_data_file_clashes: Package inetutils-doc wants to install file /usr/share/man/man8/tftpd.8 But that file is already provided by package * tftp-hpa-doc * check_data_file_clashes: Package netkit-telnet-doc wants to install file /usr/share/man/man8/telnetd.8 But that file is already provided by package * inetutils-doc Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fc14bfd60ad86094f65ebefbd10dbddc112d2698) Signed-off-by: Armin Kuster <akuster808@gmail.com> --- meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb index 684fbe09e1c..cc9410b94e0 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -143,11 +143,15 @@ ALTERNATIVE_${PN}-traceroute = "traceroute" ALTERNATIVE_${PN}-hostname = "hostname" ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" -ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8" +ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \ + tftpd.8 tftp.1 telnetd.8" ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" +ALTERNATIVE_LINK_NAME[telnetd.8] = "${mandir}/man8/telnetd.8" +ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" +ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" ALTERNATIVE_${PN}-ifconfig = "ifconfig" ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" -- 2.17.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [zeus 5/7] openssl: recommend cryptodev-module for corresponding PACKAGECONFIG 2020-04-28 2:15 [zeus 0/7] Merge request akuster ` (3 preceding siblings ...) 2020-04-28 2:15 ` [zeus 4/7] inetutils: Use alternatives to avoid manpage conflict akuster @ 2020-04-28 2:15 ` akuster 2020-04-28 2:15 ` [zeus 6/7] openssl: Upgrade 1.1.1d -> 1.1.1e akuster ` (3 subsequent siblings) 8 siblings, 0 replies; 14+ messages in thread From: akuster @ 2020-04-28 2:15 UTC (permalink / raw) To: openembedded-core From: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 57fcf9b517fe95e871122946cb99fe7fa9fd2e26) Signed-off-by: Armin Kuster <akuster808@gmail.com> --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index 169824a8bef..a8ca7163090 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -34,7 +34,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux" +PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" -- 2.17.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [zeus 6/7] openssl: Upgrade 1.1.1d -> 1.1.1e 2020-04-28 2:15 [zeus 0/7] Merge request akuster ` (4 preceding siblings ...) 2020-04-28 2:15 ` [zeus 5/7] openssl: recommend cryptodev-module for corresponding PACKAGECONFIG akuster @ 2020-04-28 2:15 ` akuster 2020-04-28 2:15 ` [zeus 7/7] openssl: update to 1.1.1f akuster ` (2 subsequent siblings) 8 siblings, 0 replies; 14+ messages in thread From: akuster @ 2020-04-28 2:15 UTC (permalink / raw) To: openembedded-core From: Adrian Bunk <bunk@stusta.de> Backported patch removed. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 710bc0f8544f54750c8fb7b8affa243932927a24) [AK: bug fix only update] Signed-off-by: Armin Kuster <akuster808@gmail.com> --- .../openssl/openssl/CVE-2019-1551.patch | 758 ------------------ .../{openssl_1.1.1d.bb => openssl_1.1.1e.bb} | 4 +- 2 files changed, 1 insertion(+), 761 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch rename meta/recipes-connectivity/openssl/{openssl_1.1.1d.bb => openssl_1.1.1e.bb} (97%) diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch deleted file mode 100644 index 0cc19cb5f45..00000000000 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch +++ /dev/null @@ -1,758 +0,0 @@ -From 419102400a2811582a7a3d4a4e317d72e5ce0a8f Mon Sep 17 00:00:00 2001 -From: Andy Polyakov <appro@openssl.org> -Date: Wed, 4 Dec 2019 12:48:21 +0100 -Subject: [PATCH] Fix an overflow bug in rsaz_512_sqr - -There is an overflow bug in the x64_64 Montgomery squaring procedure used in -exponentiation with 512-bit moduli. No EC algorithms are affected. Analysis -suggests that attacks against 2-prime RSA1024, 3-prime RSA1536, and DSA1024 as a -result of this defect would be very difficult to perform and are not believed -likely. Attacks against DH512 are considered just feasible. However, for an -attack the target would have to re-use the DH512 private key, which is not -recommended anyway. Also applications directly using the low level API -BN_mod_exp may be affected if they use BN_FLG_CONSTTIME. - -CVE-2019-1551 - -Reviewed-by: Paul Dale <paul.dale@oracle.com> -Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> -(Merged from https://github.com/openssl/openssl/pull/10575) - -CVE: CVE-2019-1551 -Upstream-Status: Backport -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - crypto/bn/asm/rsaz-x86_64.pl | 381 ++++++++++++++++++----------------- - 1 file changed, 197 insertions(+), 184 deletions(-) - -diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl -index b1797b649f0..7534d5cd03e 100755 ---- a/crypto/bn/asm/rsaz-x86_64.pl -+++ b/crypto/bn/asm/rsaz-x86_64.pl -@@ -116,7 +116,7 @@ - subq \$128+24, %rsp - .cfi_adjust_cfa_offset 128+24 - .Lsqr_body: -- movq $mod, %rbp # common argument -+ movq $mod, %xmm1 # common off-load - movq ($inp), %rdx - movq 8($inp), %rax - movq $n0, 128(%rsp) -@@ -134,7 +134,8 @@ - .Loop_sqr: - movl $times,128+8(%rsp) - #first iteration -- movq %rdx, %rbx -+ movq %rdx, %rbx # 0($inp) -+ mov %rax, %rbp # 8($inp) - mulq %rdx - movq %rax, %r8 - movq 16($inp), %rax -@@ -173,31 +174,29 @@ - mulq %rbx - addq %rax, %r14 - movq %rbx, %rax -- movq %rdx, %r15 -- adcq \$0, %r15 -+ adcq \$0, %rdx - -- addq %r8, %r8 #shlq \$1, %r8 -- movq %r9, %rcx -- adcq %r9, %r9 #shld \$1, %r8, %r9 -+ xorq %rcx,%rcx # rcx:r8 = r8 << 1 -+ addq %r8, %r8 -+ movq %rdx, %r15 -+ adcq \$0, %rcx - - mulq %rax -- movq %rax, (%rsp) -- addq %rdx, %r8 -- adcq \$0, %r9 -+ addq %r8, %rdx -+ adcq \$0, %rcx - -- movq %r8, 8(%rsp) -- shrq \$63, %rcx -+ movq %rax, (%rsp) -+ movq %rdx, 8(%rsp) - - #second iteration -- movq 8($inp), %r8 - movq 16($inp), %rax -- mulq %r8 -+ mulq %rbp - addq %rax, %r10 - movq 24($inp), %rax - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r11 - movq 32($inp), %rax - adcq \$0, %rdx -@@ -205,7 +204,7 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r12 - movq 40($inp), %rax - adcq \$0, %rdx -@@ -213,7 +212,7 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r13 - movq 48($inp), %rax - adcq \$0, %rdx -@@ -221,7 +220,7 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r14 - movq 56($inp), %rax - adcq \$0, %rdx -@@ -229,39 +228,39 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r15 -- movq %r8, %rax -+ movq %rbp, %rax - adcq \$0, %rdx - addq %rbx, %r15 -- movq %rdx, %r8 -- movq %r10, %rdx -- adcq \$0, %r8 -+ adcq \$0, %rdx - -- add %rdx, %rdx -- lea (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 -- movq %r11, %rbx -- adcq %r11, %r11 #shld \$1, %r10, %r11 -+ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 -+ addq %r9, %r9 -+ movq %rdx, %r8 -+ adcq %r10, %r10 -+ adcq \$0, %rbx - - mulq %rax -+ addq %rcx, %rax -+ movq 16($inp), %rbp -+ adcq \$0, %rdx - addq %rax, %r9 -+ movq 24($inp), %rax - adcq %rdx, %r10 -- adcq \$0, %r11 -+ adcq \$0, %rbx - - movq %r9, 16(%rsp) - movq %r10, 24(%rsp) -- shrq \$63, %rbx - - #third iteration -- movq 16($inp), %r9 -- movq 24($inp), %rax -- mulq %r9 -+ mulq %rbp - addq %rax, %r12 - movq 32($inp), %rax - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -+ mulq %rbp - addq %rax, %r13 - movq 40($inp), %rax - adcq \$0, %rdx -@@ -269,7 +268,7 @@ - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -+ mulq %rbp - addq %rax, %r14 - movq 48($inp), %rax - adcq \$0, %rdx -@@ -277,9 +276,7 @@ - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -- movq %r12, %r10 -- lea (%rbx,%r12,2), %r12 #shld \$1, %rbx, %r12 -+ mulq %rbp - addq %rax, %r15 - movq 56($inp), %rax - adcq \$0, %rdx -@@ -287,36 +284,40 @@ - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -- shrq \$63, %r10 -+ mulq %rbp - addq %rax, %r8 -- movq %r9, %rax -+ movq %rbp, %rax - adcq \$0, %rdx - addq %rcx, %r8 -- movq %rdx, %r9 -- adcq \$0, %r9 -+ adcq \$0, %rdx - -- movq %r13, %rcx -- leaq (%r10,%r13,2), %r13 #shld \$1, %r12, %r13 -+ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 -+ addq %r11, %r11 -+ movq %rdx, %r9 -+ adcq %r12, %r12 -+ adcq \$0, %rcx - - mulq %rax -+ addq %rbx, %rax -+ movq 24($inp), %r10 -+ adcq \$0, %rdx - addq %rax, %r11 -+ movq 32($inp), %rax - adcq %rdx, %r12 -- adcq \$0, %r13 -+ adcq \$0, %rcx - - movq %r11, 32(%rsp) - movq %r12, 40(%rsp) -- shrq \$63, %rcx - - #fourth iteration -- movq 24($inp), %r10 -- movq 32($inp), %rax -+ mov %rax, %r11 # 32($inp) - mulq %r10 - addq %rax, %r14 - movq 40($inp), %rax - movq %rdx, %rbx - adcq \$0, %rbx - -+ mov %rax, %r12 # 40($inp) - mulq %r10 - addq %rax, %r15 - movq 48($inp), %rax -@@ -325,9 +326,8 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -+ mov %rax, %rbp # 48($inp) - mulq %r10 -- movq %r14, %r12 -- leaq (%rcx,%r14,2), %r14 #shld \$1, %rcx, %r14 - addq %rax, %r8 - movq 56($inp), %rax - adcq \$0, %rdx -@@ -336,32 +336,33 @@ - adcq \$0, %rbx - - mulq %r10 -- shrq \$63, %r12 - addq %rax, %r9 - movq %r10, %rax - adcq \$0, %rdx - addq %rbx, %r9 -- movq %rdx, %r10 -- adcq \$0, %r10 -+ adcq \$0, %rdx - -- movq %r15, %rbx -- leaq (%r12,%r15,2),%r15 #shld \$1, %r14, %r15 -+ xorq %rbx, %rbx # rbx:r13:r14 = r13:r14 << 1 -+ addq %r13, %r13 -+ movq %rdx, %r10 -+ adcq %r14, %r14 -+ adcq \$0, %rbx - - mulq %rax -+ addq %rcx, %rax -+ adcq \$0, %rdx - addq %rax, %r13 -+ movq %r12, %rax # 40($inp) - adcq %rdx, %r14 -- adcq \$0, %r15 -+ adcq \$0, %rbx - - movq %r13, 48(%rsp) - movq %r14, 56(%rsp) -- shrq \$63, %rbx - - #fifth iteration -- movq 32($inp), %r11 -- movq 40($inp), %rax - mulq %r11 - addq %rax, %r8 -- movq 48($inp), %rax -+ movq %rbp, %rax # 48($inp) - movq %rdx, %rcx - adcq \$0, %rcx - -@@ -369,97 +370,99 @@ - addq %rax, %r9 - movq 56($inp), %rax - adcq \$0, %rdx -- movq %r8, %r12 -- leaq (%rbx,%r8,2), %r8 #shld \$1, %rbx, %r8 - addq %rcx, %r9 - movq %rdx, %rcx - adcq \$0, %rcx - -+ mov %rax, %r14 # 56($inp) - mulq %r11 -- shrq \$63, %r12 - addq %rax, %r10 - movq %r11, %rax - adcq \$0, %rdx - addq %rcx, %r10 -- movq %rdx, %r11 -- adcq \$0, %r11 -+ adcq \$0, %rdx - -- movq %r9, %rcx -- leaq (%r12,%r9,2), %r9 #shld \$1, %r8, %r9 -+ xorq %rcx, %rcx # rcx:r8:r15 = r8:r15 << 1 -+ addq %r15, %r15 -+ movq %rdx, %r11 -+ adcq %r8, %r8 -+ adcq \$0, %rcx - - mulq %rax -+ addq %rbx, %rax -+ adcq \$0, %rdx - addq %rax, %r15 -+ movq %rbp, %rax # 48($inp) - adcq %rdx, %r8 -- adcq \$0, %r9 -+ adcq \$0, %rcx - - movq %r15, 64(%rsp) - movq %r8, 72(%rsp) -- shrq \$63, %rcx - - #sixth iteration -- movq 40($inp), %r12 -- movq 48($inp), %rax - mulq %r12 - addq %rax, %r10 -- movq 56($inp), %rax -+ movq %r14, %rax # 56($inp) - movq %rdx, %rbx - adcq \$0, %rbx - - mulq %r12 - addq %rax, %r11 - movq %r12, %rax -- movq %r10, %r15 -- leaq (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 - adcq \$0, %rdx -- shrq \$63, %r15 - addq %rbx, %r11 -- movq %rdx, %r12 -- adcq \$0, %r12 -+ adcq \$0, %rdx - -- movq %r11, %rbx -- leaq (%r15,%r11,2), %r11 #shld \$1, %r10, %r11 -+ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 -+ addq %r9, %r9 -+ movq %rdx, %r12 -+ adcq %r10, %r10 -+ adcq \$0, %rbx - - mulq %rax -+ addq %rcx, %rax -+ adcq \$0, %rdx - addq %rax, %r9 -+ movq %r14, %rax # 56($inp) - adcq %rdx, %r10 -- adcq \$0, %r11 -+ adcq \$0, %rbx - - movq %r9, 80(%rsp) - movq %r10, 88(%rsp) - - #seventh iteration -- movq 48($inp), %r13 -- movq 56($inp), %rax -- mulq %r13 -+ mulq %rbp - addq %rax, %r12 -- movq %r13, %rax -- movq %rdx, %r13 -- adcq \$0, %r13 -+ movq %rbp, %rax -+ adcq \$0, %rdx - -- xorq %r14, %r14 -- shlq \$1, %rbx -- adcq %r12, %r12 #shld \$1, %rbx, %r12 -- adcq %r13, %r13 #shld \$1, %r12, %r13 -- adcq %r14, %r14 #shld \$1, %r13, %r14 -+ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 -+ addq %r11, %r11 -+ movq %rdx, %r13 -+ adcq %r12, %r12 -+ adcq \$0, %rcx - - mulq %rax -+ addq %rbx, %rax -+ adcq \$0, %rdx - addq %rax, %r11 -+ movq %r14, %rax # 56($inp) - adcq %rdx, %r12 -- adcq \$0, %r13 -+ adcq \$0, %rcx - - movq %r11, 96(%rsp) - movq %r12, 104(%rsp) - - #eighth iteration -- movq 56($inp), %rax -+ xorq %rbx, %rbx # rbx:r13 = r13 << 1 -+ addq %r13, %r13 -+ adcq \$0, %rbx -+ - mulq %rax -- addq %rax, %r13 -+ addq %rcx, %rax - adcq \$0, %rdx -- -- addq %rdx, %r14 -- -- movq %r13, 112(%rsp) -- movq %r14, 120(%rsp) -+ addq %r13, %rax -+ adcq %rbx, %rdx - - movq (%rsp), %r8 - movq 8(%rsp), %r9 -@@ -469,6 +472,10 @@ - movq 40(%rsp), %r13 - movq 48(%rsp), %r14 - movq 56(%rsp), %r15 -+ movq %xmm1, %rbp -+ -+ movq %rax, 112(%rsp) -+ movq %rdx, 120(%rsp) - - call __rsaz_512_reduce - -@@ -500,9 +507,9 @@ - .Loop_sqrx: - movl $times,128+8(%rsp) - movq $out, %xmm0 # off-load -- movq %rbp, %xmm1 # off-load - #first iteration - mulx %rax, %r8, %r9 -+ mov %rax, %rbx - - mulx 16($inp), %rcx, %r10 - xor %rbp, %rbp # cf=0, of=0 -@@ -510,40 +517,39 @@ - mulx 24($inp), %rax, %r11 - adcx %rcx, %r9 - -- mulx 32($inp), %rcx, %r12 -+ .byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 # mulx 32($inp), %rcx, %r12 - adcx %rax, %r10 - -- mulx 40($inp), %rax, %r13 -+ .byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 # mulx 40($inp), %rax, %r13 - adcx %rcx, %r11 - -- .byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 # mulx 48($inp), %rcx, %r14 -+ mulx 48($inp), %rcx, %r14 - adcx %rax, %r12 - adcx %rcx, %r13 - -- .byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 # mulx 56($inp), %rax, %r15 -+ mulx 56($inp), %rax, %r15 - adcx %rax, %r14 - adcx %rbp, %r15 # %rbp is 0 - -- mov %r9, %rcx -- shld \$1, %r8, %r9 -- shl \$1, %r8 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -- adcx %rdx, %r8 -- mov 8($inp), %rdx -- adcx %rbp, %r9 -+ mulx %rdx, %rax, $out -+ mov %rbx, %rdx # 8($inp) -+ xor %rcx, %rcx -+ adox %r8, %r8 -+ adcx $out, %r8 -+ adox %rbp, %rcx -+ adcx %rbp, %rcx - - mov %rax, (%rsp) - mov %r8, 8(%rsp) - - #second iteration -- mulx 16($inp), %rax, %rbx -+ .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 # mulx 16($inp), %rax, %rbx - adox %rax, %r10 - adcx %rbx, %r11 - -- .byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r8 -+ mulx 24($inp), $out, %r8 - adox $out, %r11 -+ .byte 0x66 - adcx %r8, %r12 - - mulx 32($inp), %rax, %rbx -@@ -561,24 +567,25 @@ - .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r8 - adox $out, %r15 - adcx %rbp, %r8 -+ mulx %rdx, %rax, $out - adox %rbp, %r8 -+ .byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 # mov 16($inp), %rdx - -- mov %r11, %rbx -- shld \$1, %r10, %r11 -- shld \$1, %rcx, %r10 -- -- xor %ebp,%ebp -- mulx %rdx, %rax, %rcx -- mov 16($inp), %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r9, %r9 -+ adcx %rbp, $out -+ adox %r10, %r10 - adcx %rax, %r9 -- adcx %rcx, %r10 -- adcx %rbp, %r11 -+ adox %rbp, %rbx -+ adcx $out, %r10 -+ adcx %rbp, %rbx - - mov %r9, 16(%rsp) - .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 # mov %r10, 24(%rsp) - - #third iteration -- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r9 -+ mulx 24($inp), $out, %r9 - adox $out, %r12 - adcx %r9, %r13 - -@@ -586,7 +593,7 @@ - adox %rax, %r13 - adcx %rcx, %r14 - -- mulx 40($inp), $out, %r9 -+ .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r9 - adox $out, %r14 - adcx %r9, %r15 - -@@ -594,27 +601,28 @@ - adox %rax, %r15 - adcx %rcx, %r8 - -- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r9 -+ mulx 56($inp), $out, %r9 - adox $out, %r8 - adcx %rbp, %r9 -+ mulx %rdx, %rax, $out - adox %rbp, %r9 -+ mov 24($inp), %rdx - -- mov %r13, %rcx -- shld \$1, %r12, %r13 -- shld \$1, %rbx, %r12 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rcx, %rcx -+ adcx %rbx, %rax -+ adox %r11, %r11 -+ adcx %rbp, $out -+ adox %r12, %r12 - adcx %rax, %r11 -- adcx %rdx, %r12 -- mov 24($inp), %rdx -- adcx %rbp, %r13 -+ adox %rbp, %rcx -+ adcx $out, %r12 -+ adcx %rbp, %rcx - - mov %r11, 32(%rsp) -- .byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 # mov %r12, 40(%rsp) -+ mov %r12, 40(%rsp) - - #fourth iteration -- .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 # mulx 32($inp), %rax, %rbx -+ mulx 32($inp), %rax, %rbx - adox %rax, %r14 - adcx %rbx, %r15 - -@@ -629,25 +637,25 @@ - mulx 56($inp), $out, %r10 - adox $out, %r9 - adcx %rbp, %r10 -+ mulx %rdx, %rax, $out - adox %rbp, %r10 -+ mov 32($inp), %rdx - -- .byte 0x66 -- mov %r15, %rbx -- shld \$1, %r14, %r15 -- shld \$1, %rcx, %r14 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r13, %r13 -+ adcx %rbp, $out -+ adox %r14, %r14 - adcx %rax, %r13 -- adcx %rdx, %r14 -- mov 32($inp), %rdx -- adcx %rbp, %r15 -+ adox %rbp, %rbx -+ adcx $out, %r14 -+ adcx %rbp, %rbx - - mov %r13, 48(%rsp) - mov %r14, 56(%rsp) - - #fifth iteration -- .byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r11 -+ mulx 40($inp), $out, %r11 - adox $out, %r8 - adcx %r11, %r9 - -@@ -658,18 +666,19 @@ - mulx 56($inp), $out, %r11 - adox $out, %r10 - adcx %rbp, %r11 -+ mulx %rdx, %rax, $out -+ mov 40($inp), %rdx - adox %rbp, %r11 - -- mov %r9, %rcx -- shld \$1, %r8, %r9 -- shld \$1, %rbx, %r8 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rcx, %rcx -+ adcx %rbx, %rax -+ adox %r15, %r15 -+ adcx %rbp, $out -+ adox %r8, %r8 - adcx %rax, %r15 -- adcx %rdx, %r8 -- mov 40($inp), %rdx -- adcx %rbp, %r9 -+ adox %rbp, %rcx -+ adcx $out, %r8 -+ adcx %rbp, %rcx - - mov %r15, 64(%rsp) - mov %r8, 72(%rsp) -@@ -682,18 +691,19 @@ - .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r12 - adox $out, %r11 - adcx %rbp, %r12 -+ mulx %rdx, %rax, $out - adox %rbp, %r12 -+ mov 48($inp), %rdx - -- mov %r11, %rbx -- shld \$1, %r10, %r11 -- shld \$1, %rcx, %r10 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r9, %r9 -+ adcx %rbp, $out -+ adox %r10, %r10 - adcx %rax, %r9 -- adcx %rdx, %r10 -- mov 48($inp), %rdx -- adcx %rbp, %r11 -+ adcx $out, %r10 -+ adox %rbp, %rbx -+ adcx %rbp, %rbx - - mov %r9, 80(%rsp) - mov %r10, 88(%rsp) -@@ -703,31 +713,31 @@ - adox %rax, %r12 - adox %rbp, %r13 - -- xor %r14, %r14 -- shld \$1, %r13, %r14 -- shld \$1, %r12, %r13 -- shld \$1, %rbx, %r12 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -- adcx %rax, %r11 -- adcx %rdx, %r12 -+ mulx %rdx, %rax, $out -+ xor %rcx, %rcx - mov 56($inp), %rdx -- adcx %rbp, %r13 -+ adcx %rbx, %rax -+ adox %r11, %r11 -+ adcx %rbp, $out -+ adox %r12, %r12 -+ adcx %rax, %r11 -+ adox %rbp, %rcx -+ adcx $out, %r12 -+ adcx %rbp, %rcx - - .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 # mov %r11, 96(%rsp) - .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 # mov %r12, 104(%rsp) - - #eighth iteration - mulx %rdx, %rax, %rdx -- adox %rax, %r13 -- adox %rbp, %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r13, %r13 -+ adcx %rbp, %rdx -+ adox %rbp, %rbx -+ adcx %r13, %rax -+ adcx %rdx, %rbx - -- .byte 0x66 -- add %rdx, %r14 -- -- movq %r13, 112(%rsp) -- movq %r14, 120(%rsp) - movq %xmm0, $out - movq %xmm1, %rbp - -@@ -741,6 +751,9 @@ - movq 48(%rsp), %r14 - movq 56(%rsp), %r15 - -+ movq %rax, 112(%rsp) -+ movq %rbx, 120(%rsp) -+ - call __rsaz_512_reducex - - addq 64(%rsp), %r8 diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1e.bb similarity index 97% rename from meta/recipes-connectivity/openssl/openssl_1.1.1d.bb rename to meta/recipes-connectivity/openssl/openssl_1.1.1e.bb index a8ca7163090..e5c62cc9bf2 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1e.bb @@ -16,7 +16,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-skip-test_symbol_presence.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ - file://CVE-2019-1551.patch \ file://reproducible.patch \ " @@ -24,8 +23,7 @@ SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[md5sum] = "3be209000dbc7e1b95bcdf47980a3baa" -SRC_URI[sha256sum] = "1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2" +SRC_URI[sha256sum] = "694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe" inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" -- 2.17.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [zeus 7/7] openssl: update to 1.1.1f 2020-04-28 2:15 [zeus 0/7] Merge request akuster ` (5 preceding siblings ...) 2020-04-28 2:15 ` [zeus 6/7] openssl: Upgrade 1.1.1d -> 1.1.1e akuster @ 2020-04-28 2:15 ` akuster 2020-04-28 16:13 ` [OE-core] [zeus 0/7] Merge request Jan Luebbe 2020-04-28 18:07 ` Martin Jansa 8 siblings, 0 replies; 14+ messages in thread From: akuster @ 2020-04-28 2:15 UTC (permalink / raw) To: openembedded-core From: Alexander Kanavin <alex.kanavin@gmail.com> This also un-breaks python3 ptest which got broken with 1.1.1e update. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b4ddf5b9d8cd769b7026663f93c8bc69b55d8cbf) [AK: bugfix only update] Signed-off-by: Armin Kuster <akuster808@gmail.com> --- .../openssl/{openssl_1.1.1e.bb => openssl_1.1.1f.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-connectivity/openssl/{openssl_1.1.1e.bb => openssl_1.1.1f.bb} (98%) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1f.bb similarity index 98% rename from meta/recipes-connectivity/openssl/openssl_1.1.1e.bb rename to meta/recipes-connectivity/openssl/openssl_1.1.1f.bb index e5c62cc9bf2..aa4ef6f48a6 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1e.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1f.bb @@ -23,7 +23,7 @@ SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe" +SRC_URI[sha256sum] = "186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35" inherit lib_package multilib_header multilib_script ptest MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" -- 2.17.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [OE-core] [zeus 0/7] Merge request 2020-04-28 2:15 [zeus 0/7] Merge request akuster ` (6 preceding siblings ...) 2020-04-28 2:15 ` [zeus 7/7] openssl: update to 1.1.1f akuster @ 2020-04-28 16:13 ` Jan Luebbe 2020-04-28 17:09 ` akuster 2020-04-28 18:07 ` Martin Jansa 8 siblings, 1 reply; 14+ messages in thread From: Jan Luebbe @ 2020-04-28 16:13 UTC (permalink / raw) To: akuster, openembedded-core On Mon, 2020-04-27 at 19:15 -0700, akuster wrote: > > Adrian Bunk (1): > openssl: Upgrade 1.1.1d -> 1.1.1e > > Alexander Kanavin (1): > openssl: update to 1.1.1f As 1.1.1g has been released to fix CVE-2020-1967 https://www.openssl.org/news/secadv/20200421.txt maybe we should just update instead of picking Zhang Xiao's "openssl: fix CVE-2020-1967" (which would conflict with this PR). Regards, Jan ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [OE-core] [zeus 0/7] Merge request 2020-04-28 16:13 ` [OE-core] [zeus 0/7] Merge request Jan Luebbe @ 2020-04-28 17:09 ` akuster 2020-05-04 13:42 ` Jan Luebbe 0 siblings, 1 reply; 14+ messages in thread From: akuster @ 2020-04-28 17:09 UTC (permalink / raw) To: Jan Lübbe, openembedded-core On 4/28/20 9:13 AM, Jan Lübbe wrote: > On Mon, 2020-04-27 at 19:15 -0700, akuster wrote: >> Adrian Bunk (1): >> openssl: Upgrade 1.1.1d -> 1.1.1e >> >> Alexander Kanavin (1): >> openssl: update to 1.1.1f > As 1.1.1g has been released to fix CVE-2020-1967 > https://www.openssl.org/news/secadv/20200421.txt > maybe we should just update instead of picking Zhang Xiao's "openssl: > fix CVE-2020-1967" (which would conflict with this PR). Thanks for the information. Once Master and then Dunfell have this update then Zeus can take it. - armin > > Regards, > Jan > ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [OE-core] [zeus 0/7] Merge request 2020-04-28 17:09 ` akuster @ 2020-05-04 13:42 ` Jan Luebbe 2020-05-04 14:18 ` Steve Sakoman 0 siblings, 1 reply; 14+ messages in thread From: Jan Luebbe @ 2020-05-04 13:42 UTC (permalink / raw) To: akuster, openembedded-core; +Cc: Richard Purdie On Tue, 2020-04-28 at 10:09 -0700, akuster wrote: > > On 4/28/20 9:13 AM, Jan Lübbe wrote: > > On Mon, 2020-04-27 at 19:15 -0700, akuster wrote: > > > Adrian Bunk (1): > > > openssl: Upgrade 1.1.1d -> 1.1.1e > > > > > > Alexander Kanavin (1): > > > openssl: update to 1.1.1f > > As 1.1.1g has been released to fix CVE-2020-1967 > > https://www.openssl.org/news/secadv/20200421.txt > > maybe we should just update instead of picking Zhang Xiao's > > "openssl: > > fix CVE-2020-1967" (which would conflict with this PR). > Thanks for the information. > > Once Master and then Dunfell have this update then Zeus can take it. It has landed in master as 8e0283e70b9977c9ac14cdab77907301405c3cee. Richard: Do you want to pick this for dunfell? Thanks, Jan ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [OE-core] [zeus 0/7] Merge request 2020-05-04 13:42 ` Jan Luebbe @ 2020-05-04 14:18 ` Steve Sakoman 0 siblings, 0 replies; 14+ messages in thread From: Steve Sakoman @ 2020-05-04 14:18 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Cc: akuster, Richard Purdie, Jan Luebbe On Mon, May 4, 2020 at 3:42 AM Jan Luebbe <jlu@pengutronix.de> wrote: > > On Tue, 2020-04-28 at 10:09 -0700, akuster wrote: > > > > On 4/28/20 9:13 AM, Jan Lübbe wrote: > > > On Mon, 2020-04-27 at 19:15 -0700, akuster wrote: > > > > Adrian Bunk (1): > > > > openssl: Upgrade 1.1.1d -> 1.1.1e > > > > > > > > Alexander Kanavin (1): > > > > openssl: update to 1.1.1f > > > As 1.1.1g has been released to fix CVE-2020-1967 > > > https://www.openssl.org/news/secadv/20200421.txt > > > maybe we should just update instead of picking Zhang Xiao's > > > "openssl: > > > fix CVE-2020-1967" (which would conflict with this PR). > > Thanks for the information. > > > > Once Master and then Dunfell have this update then Zeus can take it. > > It has landed in master as 8e0283e70b9977c9ac14cdab77907301405c3cee. > Richard: Do you want to pick this for dunfell? I'll put this in my next set of dunfell patches for review. Steve ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [OE-core] [zeus 0/7] Merge request 2020-04-28 2:15 [zeus 0/7] Merge request akuster ` (7 preceding siblings ...) 2020-04-28 16:13 ` [OE-core] [zeus 0/7] Merge request Jan Luebbe @ 2020-04-28 18:07 ` Martin Jansa 2020-04-29 4:35 ` Anuj Mittal 8 siblings, 1 reply; 14+ messages in thread From: Martin Jansa @ 2020-04-28 18:07 UTC (permalink / raw) To: akuster; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1970 bytes --] Hi, can you please include: https://lists.openembedded.org/g/openembedded-core/topic/zeus_patch_qemu_replace/73197049?p=,,,20,0,0,0::recentpostdate%2Fsticky,,,20,2,80,73197049 or did I misunderstood your last reply in that thread? On Tue, Apr 28, 2020 at 4:16 AM akuster <akuster808@gmail.com> wrote: > Please consider these changes for zeus > The following changes since commit > 5ac98c776f9b77804a0ee812f47f3ecf593e432f: > > kernelsrc.bbclass: Fix externalsrc support (2020-04-06 15:17:05 +0800) > > are available in the Git repository at: > > git://git.openembedded.org/openembedded-core-contrib stable/zeus-next > > http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/zeus-next > > Adrian Bunk (1): > openssl: Upgrade 1.1.1d -> 1.1.1e > > Alexander Kanavin (1): > openssl: update to 1.1.1f > > Denys Dmytriyenko (1): > openssl: recommend cryptodev-module for corresponding PACKAGECONFIG > > Lee Chee Yang (2): > cve-check: CPE version '-' as all version > wic: align layer plugin path > > Ovidiu Panait (1): > inetutils: Use alternatives to avoid manpage conflict > > Richard Purdie (1): > pseudo: Ensure we use our own libsqlite > > meta/classes/cve-check.bbclass | 2 +- > .../inetutils/inetutils_1.9.4.bb | 6 +- > .../openssl/openssl/CVE-2019-1551.patch | 758 ------------------ > .../{openssl_1.1.1d.bb => openssl_1.1.1f.bb} | 6 +- > .../recipes-core/meta/cve-update-db-native.bb | 2 +- > meta/recipes-devtools/pseudo/pseudo.inc | 2 + > scripts/lib/wic/help.py | 3 +- > scripts/lib/wic/pluginbase.py | 11 +- > 8 files changed, 19 insertions(+), 771 deletions(-) > delete mode 100644 > meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch > rename meta/recipes-connectivity/openssl/{openssl_1.1.1d.bb => > openssl_1.1.1f.bb} (97%) > > -- > 2.17.1 > > > [-- Attachment #2: Type: text/html, Size: 3317 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [OE-core] [zeus 0/7] Merge request 2020-04-28 18:07 ` Martin Jansa @ 2020-04-29 4:35 ` Anuj Mittal 0 siblings, 0 replies; 14+ messages in thread From: Anuj Mittal @ 2020-04-29 4:35 UTC (permalink / raw) To: Martin.Jansa, akuster808; +Cc: openembedded-core On Tue, 2020-04-28 at 20:07 +0200, Martin Jansa wrote: > Hi, > > can you please include: > https://lists.openembedded.org/g/openembedded-core/topic/zeus_patch_qemu_replace/73197049?p=,,,20,0,0,0::recentpostdate%2Fsticky,,,20,2,80,73197049 > > or did I misunderstood your last reply in that thread? I have included it along with some other patches and it'd be in the next merge request: https://git.openembedded.org/openembedded-core-contrib/log/?h=anujm/zeus Thanks, Anuj > > On Tue, Apr 28, 2020 at 4:16 AM akuster <akuster808@gmail.com> wrote: > > Please consider these changes for zeus > > The following changes since commit > > 5ac98c776f9b77804a0ee812f47f3ecf593e432f: > > > > kernelsrc.bbclass: Fix externalsrc support (2020-04-06 15:17:05 > > +0800) > > > > are available in the Git repository at: > > > > git://git.openembedded.org/openembedded-core-contrib stable/zeus- > > next > > > > http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/zeus-next > > > > Adrian Bunk (1): > > openssl: Upgrade 1.1.1d -> 1.1.1e > > > > Alexander Kanavin (1): > > openssl: update to 1.1.1f > > > > Denys Dmytriyenko (1): > > openssl: recommend cryptodev-module for corresponding > > PACKAGECONFIG > > > > Lee Chee Yang (2): > > cve-check: CPE version '-' as all version > > wic: align layer plugin path > > > > Ovidiu Panait (1): > > inetutils: Use alternatives to avoid manpage conflict > > > > Richard Purdie (1): > > pseudo: Ensure we use our own libsqlite > > > > meta/classes/cve-check.bbclass | 2 +- > > .../inetutils/inetutils_1.9.4.bb | 6 +- > > .../openssl/openssl/CVE-2019-1551.patch | 758 -------------- > > ---- > > .../{openssl_1.1.1d.bb => openssl_1.1.1f.bb} | 6 +- > > .../recipes-core/meta/cve-update-db-native.bb | 2 +- > > meta/recipes-devtools/pseudo/pseudo.inc | 2 + > > scripts/lib/wic/help.py | 3 +- > > scripts/lib/wic/pluginbase.py | 11 +- > > 8 files changed, 19 insertions(+), 771 deletions(-) > > delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE- > > 2019-1551.patch > > rename meta/recipes-connectivity/openssl/{openssl_1.1.1d.bb => > > openssl_1.1.1f.bb} (97%) > > > > ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-05-04 14:19 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-04-28 2:15 [zeus 0/7] Merge request akuster 2020-04-28 2:15 ` [zeus 1/7] cve-check: CPE version '-' as all version akuster 2020-04-28 2:15 ` [zeus 2/7] pseudo: Ensure we use our own libsqlite akuster 2020-04-28 2:15 ` [zeus 3/7] wic: align layer plugin path akuster 2020-04-28 2:15 ` [zeus 4/7] inetutils: Use alternatives to avoid manpage conflict akuster 2020-04-28 2:15 ` [zeus 5/7] openssl: recommend cryptodev-module for corresponding PACKAGECONFIG akuster 2020-04-28 2:15 ` [zeus 6/7] openssl: Upgrade 1.1.1d -> 1.1.1e akuster 2020-04-28 2:15 ` [zeus 7/7] openssl: update to 1.1.1f akuster 2020-04-28 16:13 ` [OE-core] [zeus 0/7] Merge request Jan Luebbe 2020-04-28 17:09 ` akuster 2020-05-04 13:42 ` Jan Luebbe 2020-05-04 14:18 ` Steve Sakoman 2020-04-28 18:07 ` Martin Jansa 2020-04-29 4:35 ` Anuj Mittal
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.