From 77c55807ad660e8171d2c25e72aaf02c0db5b9c9 Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Fri, 10 May 2024 10:08:01 +0200 Subject: [PATCH 1/3] opendds: version bump 3.28.0 -> 3.28.1 tested: ishapes demo at Raspberry Pi 4 ptest at Raspberry Pi 4 FAIL: tests/DCPS/MetaStruct/run_test.pl @see: https://github.com/OpenDDS/OpenDDS/commit/26d2d2e6f38df67c94c6ef308fc5e15041fd9c95 ptest at qemu Signed-off-by: Jan Vermaete --- ...gov-gen-uses-openssl-API-incorrectly.patch | 58 ------------------- .../{opendds_3.28.0.bb => opendds_3.28.1.bb} | 3 +- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 recipes-connectivity/opendds/opendds/0002-gov-gen-uses-openssl-API-incorrectly.patch rename recipes-connectivity/opendds/{opendds_3.28.0.bb => opendds_3.28.1.bb} (91%) diff --git a/recipes-connectivity/opendds/opendds/0002-gov-gen-uses-openssl-API-incorrectly.patch b/recipes-connectivity/opendds/opendds/0002-gov-gen-uses-openssl-API-incorrectly.patch deleted file mode 100644 index 387027f..0000000 --- a/recipes-connectivity/opendds/opendds/0002-gov-gen-uses-openssl-API-incorrectly.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5a9bc8545f771742e48d31e1635e15f156cc9c17 Mon Sep 17 00:00:00 2001 -From: "Justin R. Wilson" -Date: Wed, 17 Apr 2024 12:59:03 -0500 -Subject: [PATCH] `gov_gen` uses openssl API incorrectly - -Problem -------- - -The `gov_gen` application generates governance files for testing and -signs them with openssl. `gov_gen` has a bug on Debian -12.5 (openssl 3.0.11) where a null argument is passed. - -Solution --------- - -Pass `mem` as the "in"" parameter and use `PKCS7_STREAM`. - -Upstream-Status: Backport [https://github.com/OpenDDS/OpenDDS/commit/270cae56421462db367cbe8d89cccd752108dd20] - ---- - docs/news.d/gov-gen.rst | 5 +++++ - tests/security/attributes/gov_gen.cpp | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - create mode 100644 docs/news.d/gov-gen.rst - -diff --git a/docs/news.d/gov-gen.rst b/docs/news.d/gov-gen.rst -new file mode 100644 -index 0000000000..4a628c1659 ---- /dev/null -+++ b/docs/news.d/gov-gen.rst -@@ -0,0 +1,5 @@ -+.. news-prs: 4591 -+ -+.. news-start-section: Fixes -+- Fixed incorrect usage of OpenSSL in ``gov_gen`` application. -+.. news-end-section -diff --git a/tests/security/attributes/gov_gen.cpp b/tests/security/attributes/gov_gen.cpp -index ee1adbdf44..b35dd89ed4 100644 ---- a/tests/security/attributes/gov_gen.cpp -+++ b/tests/security/attributes/gov_gen.cpp -@@ -403,7 +403,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) - return EXIT_FAILURE; - } - -- PKCS7* p7 = PKCS7_sign(cert, key, NULL, NULL, PKCS7_TEXT | PKCS7_DETACHED); -+ PKCS7* p7 = PKCS7_sign(cert, key, NULL, mem, PKCS7_TEXT | PKCS7_DETACHED | PKCS7_STREAM); - if (!p7) { - std::cerr << "ERROR: could not sign" << std::endl; - print_ssl_error(); -@@ -418,7 +418,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) - - } - -- if (!SMIME_write_PKCS7(out, p7, mem, PKCS7_TEXT | PKCS7_DETACHED)) { -+ if (!SMIME_write_PKCS7(out, p7, mem, PKCS7_TEXT | PKCS7_DETACHED | PKCS7_STREAM)) { - std::cerr << "ERROR: could not write " << outpath << std::endl; - print_ssl_error(); - return EXIT_FAILURE; diff --git a/recipes-connectivity/opendds/opendds_3.28.0.bb b/recipes-connectivity/opendds/opendds_3.28.1.bb similarity index 91% rename from recipes-connectivity/opendds/opendds_3.28.0.bb rename to recipes-connectivity/opendds/opendds_3.28.1.bb index f956711..3cda9f5 100644 --- a/recipes-connectivity/opendds/opendds_3.28.0.bb +++ b/recipes-connectivity/opendds/opendds_3.28.1.bb @@ -12,11 +12,10 @@ SRC_URI = "\ git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds \ ${@bb.utils.contains('PACKAGECONFIG', 'doc-group3', '${DOC_TAO3_URI};name=ace_tao;unpack=0;subdir=git', '${DOC_TAO2_URI};name=ace_tao;unpack=0;subdir=git', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'ishapes', 'file://0001-adding-the-ishapes-demo.patch', '', d)} \ - file://0002-gov-gen-uses-openssl-API-incorrectly.patch \ file://0010-WIP-test-filter-tests-that-should-not-run-on-the-tar.patch \ " require opendds.inc -SRCREV = "27ebd797b830c3b6426087d1398e580ca4f74780" +SRCREV = "802922c55923db381e0a55f6e435186b60946964" SRC_URI[ace_tao.sha256sum] = "${@bb.utils.contains('PACKAGECONFIG', 'doc-group3', '${DOC_TAO3_SHA256SUM}', '${DOC_TAO2_SHA256SUM}', d)}" From cdeef1a7dc4bed1a6b1380768a7094dea51fdc6d Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Fri, 10 May 2024 23:07:06 +0200 Subject: [PATCH 2/3] qemu: increased the memory size to have all ptest passing Signed-off-by: Jan Vermaete --- kas/qemu.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas/qemu.yaml b/kas/qemu.yaml index 3f9f246..9e3c598 100644 --- a/kas/qemu.yaml +++ b/kas/qemu.yaml @@ -55,4 +55,4 @@ local_conf_header: DISTRO_FEATURES:append = " systemd usrmerge" VIRTUAL-RUNTIME_init_manager = "systemd" qemu: | - QB_MEM = "-m 4096" + QB_MEM = "-m 8192" From 6baf48696d5e4eb7e0fa1750e31ad64892c0c48c Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Fri, 10 May 2024 23:08:12 +0200 Subject: [PATCH 3/3] kas: doc: corrected the ptest filename Signed-off-by: Jan Vermaete --- kas/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kas/README.md b/kas/README.md index 60d4d14..8cdb3c2 100644 --- a/kas/README.md +++ b/kas/README.md @@ -31,7 +31,7 @@ Building cd meta-opendds kas build kas/rpi.yaml:kas/opendds.yaml; # Just OpenDDS for RPi kas build kas/rpi.yaml:kas/opendds.yaml:kas/ishapes.yaml; # iShapes demo -kas build kas/rpi.yaml:kas/opendds.yaml:kas/ptests.yaml; # OpenDDS with Yocto ptests +kas build kas/rpi.yaml:kas/opendds.yaml:kas/ptest.yaml; # OpenDDS with Yocto ptests ``` ### Qemu @@ -39,7 +39,7 @@ kas build kas/rpi.yaml:kas/opendds.yaml:kas/ptests.yaml; # OpenDDS with Yocto pt ``` cd meta-opendds kas build kas/qemu.yaml:kas/opendds.yaml; -kas build kas/qemu.yaml:kas/opendds.yaml:kas/ptests.yaml; # OpenDDS with Yocto ptests +kas build kas/qemu.yaml:kas/opendds.yaml:kas/ptest.yaml; # OpenDDS with Yocto ptests ``` Deploying @@ -76,7 +76,7 @@ A detailed log of the run can be found on the `/tmp` of the device. #### Start QEMU ``` -kas sheel kas/qemu.yaml:kas/opendds.yaml:kas/ptests.yaml +kas shell kas/qemu.yaml:kas/opendds.yaml:kas/ptest.yaml cd tmp/deploy/images/qemux86-64 runqemu core-image-minimal-qemux86-64.rootfs.qemuboot.conf qemux86-64 nographic ```