Fix compile errors if distro feature openssl-no-weak-ciphers exists
cover Fix compile errors if distro feature openssl-no-weak-ciphers exists
From: Kai Kang <[email protected]>
Patches to add distro feature openssl-no-weak-ciphers have been sent to oe-core.
Jackie Huang (1):
net-snmp: disable des for openssl-no-weak-ciphers
Kai Kang (9):
Set packages conflict with distro feature openssl-no-weak-ciphers
hostapd: disable configs depends on des if openssl not support
krb5: toggle configure option pkinit
libp11: fix compile error if OPENSSL_NO_EC defined
opensc: add PACKAGECONFIG openssl
uftp: set NO_EC if openssl not support ec
stunnel: fix compile error when openssl disable des support
poco: disable package configs NetSSL and Crypto
postgresql: configure without openssl if openssl disable weak ciphers
.../freeradius/freeradius_3.0.14.bb | 5 +- .../recipes-daemons/openhpi/openhpi_3.6.1.bb | 5 +- .../net-snmp/net-snmp-fix-for-disable-des.patch | 32 +++++++++++++ .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 5 +- .../recipes-support/dovecot/dovecot_2.2.29.bb | 4 +- .../ipsec-tools/ipsec-tools_0.8.2.bb | 4 +- .../recipes-support/openvpn/openvpn_2.4.2.bb | 4 +- .../stunnel/stunnel/fix-openssl-no-des.patch | 54 ++++++++++++++++++++++ .../recipes-support/stunnel/stunnel_5.35.bb | 4 +- meta-networking/recipes-support/uftp/uftp_4.9.3.bb | 2 + .../recipes-connectivity/hostapd/hostapd_2.6.bb | 16 +++++++ meta-oe/recipes-connectivity/krb5/krb5_1.15.1.bb | 4 +- .../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 5 +- meta-oe/recipes-devtools/nodejs/nodejs_4.8.3.bb | 5 ++ .../recipes-extended/cfengine/cfengine_3.9.0.bb | 4 +- meta-oe/recipes-extended/mailx/mailx_12.5-5.bb | 5 +- meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb | 4 +- meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 2 + meta-oe/recipes-support/freerdp/freerdp_git.bb | 4 +- ...-src-p11_ec.c-check-OPENSSL_NO_EC-earlier.patch | 46 ++++++++++++++++++ meta-oe/recipes-support/libp11/libp11_0.4.0.bb | 4 +- meta-oe/recipes-support/opensc/opensc_0.16.0.bb | 5 ++ meta-oe/recipes-support/poco/poco_1.7.8.bb | 1 + meta-oe/recipes-support/postgresql/postgresql.inc | 2 + .../python/python-cryptography.inc | 4 +- 25 files changed, 215 insertions(+), 15 deletions(-) create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch create mode 100644 meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch create mode 100644 meta-oe/recipes-support/libp11/libp11/0001-src-p11_ec.c-check-OPENSSL_NO_EC-earlier.patch
Signature · 1 line
2.10.1
PATCH 1/10 Set packages conflict with distro feature openssl-no-weak-ciphers
From: Kai Kang <[email protected]>
Distro feautre openssl-no-weak-ciphers is introduced to disable openssl weak ciphers such as des, md2 etc. So set packages which could not work if openssl disable weak ciphers conflict with distro feature openssl-no-weak-ciphers.
--- meta-networking/recipes-connectivity/freeradius/freeradius_3.0.14.bb | 5 ++++- meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb | 5 ++++- meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb | 4 +++- meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb | 4 +++- meta-networking/recipes-support/openvpn/openvpn_2.4.2.bb | 4 +++- meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 5 ++++- meta-oe/recipes-devtools/nodejs/nodejs_4.8.3.bb | 5 +++++ meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb | 4 +++- meta-oe/recipes-extended/mailx/mailx_12.5-5.bb | 5 ++++- meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb | 4 +++- meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 2 ++ meta-oe/recipes-support/freerdp/freerdp_git.bb | 4 +++- meta-python/recipes-devtools/python/python-cryptography.inc | 4 +++- 13 files changed, 44 insertions(+), 11 deletions(-)
meta-networking/recipes-connectivity/freeradius/freeradius_3.0.14.bb +4 -1
@@ -84,7 +84,10 @@ PACKAGECONFIG[python] = "--with-rlm_python --with-rlm-python-bin=${STAGING_BINDI PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest,curl json-c" PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" -inherit useradd autotools-brokensep update-rc.d systemd +inherit useradd autotools-brokensep update-rc.d systemd distro_features_check + +# requires openssl ec support +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" # This is not a cpan or python based package, but it needs some definitions # from cpan-base and python-dir bbclasses for building rlm_perl and rlm_python
meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb +4 -1
@@ -45,7 +45,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "4718b16e0f749b5ad214a9b04f45dd23" SRC_URI[sha256sum] = "e0a810cb401c4bdcfc9551f2e6afd5a8ca4b411f5ee3bc60c19f82fd6e84a3dc" -inherit autotools pkgconfig ptest update-rc.d systemd +inherit autotools pkgconfig ptest update-rc.d systemd distro_features_check + +# requires net-snmp enable des and openssl md2 support +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" PACKAGES =+ "${PN}-libs"
meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb +3 -1
@@ -18,7 +18,9 @@ DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" LDFLAGS_append_libc-musl = " -ltirpc" -inherit autotools pkgconfig systemd useradd +inherit autotools pkgconfig systemd useradd distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)}"
meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +3 -1
@@ -28,7 +28,9 @@ SRC_URI = "http://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${P SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41" SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d" -inherit autotools systemd +inherit autotools systemd distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" # Options: # --enable-adminport enable admin port
meta-networking/recipes-support/openvpn/openvpn_2.4.2.bb +3 -1
@@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=e9b64491ec98eb6c6493ac5e4118f107" DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -inherit autotools systemd +inherit autotools systemd distro_features_check SRC_URI = "http://swupdate.openvpn.org/community/releases/openvpn-${PV}.tar.gz \ file://openvpn \
@@ -15,6 +15,8 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/openvpn-${PV}.tar.gz \ SRC_URI[md5sum] = "0714019e109a043e858278c9e2ca18e0" SRC_URI[sha256sum] = "b24740c9d44a81eaf2befc4846d51445a520104321e32aaf0c135ed2e098a624" +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" + SYSTEMD_SERVICE_${PN} += "[email protected] [email protected]" SYSTEMD_AUTO_ENABLE = "disable"
meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +4 -1
@@ -17,7 +17,10 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig distro_features_check + +# requires openssl des support +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" PARALLEL_MAKE = ""
meta-oe/recipes-devtools/nodejs/nodejs_4.8.3.bb +5 -0
@@ -17,6 +17,11 @@ SRC_URI[sha256sum] = "d84e7544c2e31a2d0825b4f8b093d169bf8bdb1881ee8cf75ff937918e S = "${WORKDIR}/node-v${PV}" +inherit distro_features_check + +# requires openssl des support +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" + # v8 errors out if you have set CCACHE CCACHE = ""
meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb +3 -1
@@ -23,7 +23,7 @@ SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz SRC_URI[md5sum] = "63da39655cfca30ca885fcc4a1bf8aa4" SRC_URI[sha256sum] = "32a38aedf1199c2361e1335e0d4a1d98f9efa7cd591bcb647f35c7395bb66f2d" -inherit autotools systemd +inherit autotools systemd distro_features_check export EXPLICIT_VERSION="${PV}"
@@ -68,3 +68,5 @@ EOF } RDEPENDS_${PN} += "${BPN}-masterfiles" + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers"
meta-oe/recipes-extended/mailx/mailx_12.5-5.bb +4 -1
@@ -33,7 +33,10 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.( S = "${WORKDIR}/heirloom-mailx-12.5" -inherit autotools-brokensep +inherit autotools-brokensep distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" + CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT"
meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb +3 -1
@@ -5,7 +5,9 @@ DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual EXTRA_OECONF = "--disable-docs" -inherit gnomebase vala gobject-introspection +inherit gnomebase vala gobject-introspection distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" PACKAGECONFIG ??= "" PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper"
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +2 -0
@@ -21,6 +21,8 @@ DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdama inherit autotools-brokensep distro_features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" +# requires opens des support +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} libvncserver" PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
meta-oe/recipes-support/freerdp/freerdp_git.bb +3 -1
@@ -8,7 +8,9 @@ SECTION = "net" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -inherit pkgconfig cmake gitpkgv +inherit pkgconfig cmake gitpkgv distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" PV = "1.2.5+gitr${SRCPV}" PKGV = "${GITPKGVTAG}"
meta-python/recipes-devtools/python/python-cryptography.inc +3 -1
@@ -41,7 +41,9 @@ RDEPENDS_${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " -inherit ptest +inherit ptest distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests
Signature · 1 line
2.10.1
PATCH 2/10 net-snmp: disable des for openssl-no-weak-ciphers
In reply to [email protected]From: Jackie Huang <[email protected]>
net-snmp enables des support by default and fails to build with distro feature openssl-no-weak-ciphers:
| ../../net-snmp-5.7.3/snmplib/scapi.c:82:25: fatal error: openssl/des.h: No such file or directory | #include <openssl/des.h>
To fix the issue:
* add a patch to include des.h only if it's found in openssl
* disable des when openssl-no-weak-ciphers is enabled
--- .../net-snmp/net-snmp-fix-for-disable-des.patch | 32 ++++++++++++++++++++++ .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 5 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 270e952f58a7e5ddeabe5a15e3ddaaadf40017d0 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <[email protected]> +Date: Thu, 22 Jun 2017 10:25:08 +0800 +Subject: [PATCH] net-snmp: fix for --disable-des + +Include des.h only if it's found in openssl so that +the --disable-des works correctly. + +Upstream-Status: Submitted [[email protected]] + +Signed-off-by: Jackie Huang <[email protected]> +--- + snmplib/scapi.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/snmplib/scapi.c b/snmplib/scapi.c +index 16ac829..271684b 100644 +--- a/snmplib/scapi.c ++++ b/snmplib/scapi.c +@@ -79,7 +79,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support) + #include <openssl/hmac.h> + #include <openssl/evp.h> + #include <openssl/rand.h> ++#ifdef HAVE_OPENSSL_DES_H + #include <openssl/des.h> ++#endif + #ifdef HAVE_AES + #include <openssl/aes.h> + #endif +-- +2.11.0 +
meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +4 -1
@@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ file://0002-configure-fix-a-cc-check-issue.patch \ file://0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch \ file://0004-configure-fix-incorrect-variable.patch \ + file://net-snmp-fix-for-disable-des.patch \ " SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e"
@@ -58,7 +59,9 @@ EXTRA_OECONF = "--enable-shared \ --with-defaults \ --with-install-prefix=${D} \ --with-persistent-directory=${localstatedir}/lib/net-snmp \ - ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" + ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', '--disable-des', '', d)} \ +" # net-snmp needs to have mib-modules=smux enabled to enable quagga to support snmp EXTRA_OECONF += "--with-mib-modules=smux"
Signature · 1 line
2.10.1
PATCH 3/10 hostapd: disable configs depends on des if openssl not support
In reply to [email protected]From: Kai Kang <[email protected]>
Distro feature 'openssl-no-weak-ciphers' is introduced to disable openssl weak ciphers support which include des. Check the distro feature to disable hostapd configs which depend on des.
--- meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb +16 -0
@@ -26,6 +26,22 @@ do_configure() { } do_compile() { + COMMENT="# Disable configs depend on DES" + if ${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', 'true', 'false', d)} \ + && ! grep -q "$COMMENT" ${B}/.config; then + echo >> ${B}/.config + echo "$COMMENT" >> ${B}/.config + for config in CONFIG_EAP_MSCHAPV2 CONFIG_EAP_PEAP CONFIG_EAP_IKEV2 \ + CONFIG_EAP_TLS CONFIG_EAP_UNAUTH_TLS CONFIG_EAP_TTLS \ + CONFIG_EAP_FAST CONFIG_INTERNAL_LIBTOMMATH; do + sed -i -e "s/^$config=.*/#&/" ${B}/.config + echo "$config=n" >>${B}/.config + done + + sed -i 's/^CONFIG_TLS=.*/#&/' ${B}/.config + echo 'CONFIG_TLS=internal' >>${B}/.config + fi + export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" make }
Signature · 1 line
2.10.1
PATCH 4/10 krb5: toggle configure option pkinit
In reply to [email protected]From: Kai Kang <[email protected]>
Toggle configure option pkinit of krb5 according to distro feature openssl-no-weak-ciphers. openssl-no-weak-ciphers is introduced to disable openssl weak ciphers support which include des. It could not build plugin pkinit without openssl des support.
--- meta-oe/recipes-connectivity/krb5/krb5_1.15.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-connectivity/krb5/krb5_1.15.1.bb +3 -1
@@ -43,7 +43,9 @@ PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath" +EXTRA_OECONF += "--without-tcl --with-system-et --disable-rpath \ + ${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', '--disable-pkinit', '--enable-pkinit', d)} \ + " CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \ ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \ ac_cv_file__etc_TIMEZONE=no"
Signature · 1 line
2.10.1
PATCH 5/10 libp11: fix compile error if OPENSSL_NO_EC defined
In reply to [email protected]From: Kai Kang <[email protected]>
Function compute_key_fn src/p11_ec.c uses types EC_POINT and EC_KEY which are defined in ec.h. If OPENSSL_NO_EC is defined, no header file ec.h exists and causes compile errors.
../../git/src/p11_ec.c:45:8: error: unknown type name 'EC_POINT' const EC_POINT *, const EC_KEY *,
^~~~~~~~
../../git/src/p11_ec.c:45:26: error: unknown type name 'EC_KEY'
const EC_POINT *, const EC_KEY *,
^~~~~~So check OPENSSL_NO_EC earlier in src/p11_ec.c to fix the error.
--- ...-src-p11_ec.c-check-OPENSSL_NO_EC-earlier.patch | 46 ++++++++++++++++++++++ meta-oe/recipes-support/libp11/libp11_0.4.0.bb | 4 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/libp11/libp11/0001-src-p11_ec.c-check-OPENSSL_NO_EC-earlier.patch
meta-oe/recipes-support/libp11/libp11/0001-src-p11_ec.c-check-OPENSSL_NO_EC-earlier.patch new file +46 -0
@@ -0,0 +1,46 @@ +Upstream-Status: Submitted [https://github.com/OpenSC/libp11] + +src/p11_ec.c: check OPENSSL_NO_EC earlier + +Function compute_key_fn uses types EC_POINT and EC_KEY which are defined +in ec.h. If OPENSSL_NO_EC is defined, no header file ec.h exists and +causes compile errors. + +../../git/src/p11_ec.c:45:8: error: unknown type name 'EC_POINT' +const EC_POINT *, const EC_KEY *, + ^~~~~~~~ +../../git/src/p11_ec.c:45:26: error: unknown type name 'EC_KEY' +const EC_POINT *, const EC_KEY *, + ^~~~~~ +So check OPENSSL_NO_EC earlier in src/p11_ec.c. + +Signed-off-by: Kai Kang <[email protected]> +--- + src/p11_ec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/p11_ec.c b/src/p11_ec.c +index 6b49775..fdf1f59 100644 +--- a/src/p11_ec.c ++++ b/src/p11_ec.c +@@ -37,6 +37,8 @@ + #include <openssl/ecdh.h> + #endif + ++#ifndef OPENSSL_NO_EC ++ + #if OPENSSL_VERSION_NUMBER >= 0x10100004L + typedef int (*compute_key_fn)(unsigned char **, size_t *, + const EC_POINT *, const EC_KEY *); +@@ -49,8 +51,6 @@ static compute_key_fn ossl_ecdh_compute_key; + + static int ec_ex_index = 0; + +-#ifndef OPENSSL_NO_EC +- + /********** Manage EC ex_data */ + + /* NOTE: ECDH also uses ECDSA ex_data and *not* ECDH ex_data */ +-- +2.10.1 +
meta-oe/recipes-support/libp11/libp11_0.4.0.bb +3 -1
@@ -8,7 +8,9 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" -SRC_URI = "git://github.com/OpenSC/libp11.git" +SRC_URI = "git://github.com/OpenSC/libp11.git \ + file://0001-src-p11_ec.c-check-OPENSSL_NO_EC-earlier.patch \ + " SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3" S = "${WORKDIR}/git"
Signature · 1 line
2.10.1
PATCH 6/10 opensc: add PACKAGECONFIG openssl
In reply to [email protected]From: Kai Kang <[email protected]>
Add PACKAGECONFIG openssl to enable or disable build with openssl for opensc. Check DISTRO_FEATURE openssl-no-weak-ciphers. If it exists then remove PACKAGECONFIG openssl for opensc.
--- meta-oe/recipes-support/opensc/opensc_0.16.0.bb | 5 +++++ 1 file changed, 5 insertions(+)
meta-oe/recipes-support/opensc/opensc_0.16.0.bb +5 -0
@@ -21,6 +21,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" inherit autotools pkgconfig +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" + +PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', 'openssl', '', d)}" + EXTRA_OECONF = " \ --disable-static \ --enable-openct \
Signature · 1 line
2.10.1
Re: [meta-oe][PATCH 06/10] opensc: add PACKAGECONFIG openssl
Quoted 29 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: den 5 juli 2017 10:11
To: [email protected]
Subject: [oe] [meta-oe][PATCH 06/10] opensc: add PACKAGECONFIG opensslFrom: Kai Kang <[email protected]>
Add PACKAGECONFIG openssl to enable or disable build with openssl for opensc. Check
DISTRO_FEATUREopenssl-no-weak-ciphers. If it exists then remove PACKAGECONFIG openssl for opensc.Signed-off-by Kai Kang <[email protected]>--- meta-oe/recipes-support/opensc/opensc_0.16.0.bb | 5 +++++ 1 file changed, 5 insertions(+)meta- renamed from meta-oe/recipes-support/opensc/opensc_0.16.0.bb +0
-0oe/recipes-support/opensc/opensc_0.16.0.bb
index fd67181..fa7c81d 100644meta-oe/recipes-support/opensc/opensc_0.16.0.bb +0
-0@@ -21,6 +21,11 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
inherit autotools pkgconfig
meta-oe/recipes-support/opensc/opensc_0.16.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" · line 27
Quoted 4 lines
meta-oe/recipes-support/opensc/opensc_0.16.0.bb +4
-0+PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" + +PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', 'openssl', '', d)}"
It is a bad idea to use _remove like this, because it makes it impossible to enable openssl again in a bbappend or via local.conf. It is better to do it like this:
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', '', 'openssl', d)}" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
You should do it similarly for poco and postgresql as well.
Quoted 6 lines
+
EXTRA_OECONF = " \ --disable-static \ --enable-openct \--
2.10.1
//Peter
Re: [meta-oe][PATCH 06/10] opensc: add PACKAGECONFIG openssl
Quoted 27 lines · Peter Kjellerstedt
Quoted 27 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: den 5 juli 2017 10:11
To: [email protected]
Subject: [oe] [meta-oe][PATCH 06/10] opensc: add PACKAGECONFIG opensslFrom: Kai Kang <[email protected]>
Add PACKAGECONFIG openssl to enable or disable build with openssl for opensc. Check
DISTRO_FEATUREopenssl-no-weak-ciphers. If it exists then remove PACKAGECONFIG openssl for opensc.Signed-off-by Kai Kang <[email protected]>--- meta-oe/recipes-support/opensc/opensc_0.16.0.bb | 5 +++++ 1 file changed, 5 insertions(+)meta- renamed from meta-oe/recipes-support/opensc/opensc_0.16.0.bb +0
-0oe/recipes-support/opensc/opensc_0.16.0.bb
index fd67181..fa7c81d 100644meta-oe/recipes-support/opensc/opensc_0.16.0.bb +0
-0@@ -21,6 +21,11 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
Quoted 8 lines
meta-oe/recipes-support/opensc/opensc_0.16.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" · line 27
Quoted 6 lines
inherit autotools pkgconfig
meta-oe/recipes-support/opensc/opensc_0.16.0.bb +4
-0+PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" + +PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', 'openssl', '', d)}"It is a bad idea to use
_removelike this, because it makes it impossible to enable openssl again in a bbappend or via local.conf.
I do this intendedly that if distro feature 'openssl-no-weak-ciphers' exists, package config openssl should be removed since opensc will compile failed. If this is not a good solution, just set CONFLICT_DISTRO_FEATURES as for other packages.
Thanks,
Kai
Quoted 17 lines
It is better to do it
like this:PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', '', 'openssl', d)}" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
You should do it similarly for poco and postgresql as well.
Quoted 6 lines
+
EXTRA_OECONF = " \ --disable-static \ --enable-openct \--
2.10.1//Peter
Signature · 2 lines
Regards, Neil | Kai Kang
PATCH 7/10 uftp: set NO_EC if openssl not support ec
In reply to [email protected]From: Kai Kang <[email protected]>
Distro feature openssl-no-weak-ciphers is introduced to make openssl disable weak ciphers support which include ec algorithm. So set NO_EC for uftp if openssl doesn't support ec.
--- meta-networking/recipes-support/uftp/uftp_4.9.3.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-support/uftp/uftp_4.9.3.bb +2 -0
@@ -11,6 +11,8 @@ SRC_URI[sha256sum] = "9e9215af0315257c6cc4f40fbc6161057e861be1fff10a38a5564f699e DEPENDS = "openssl" +EXTRA_OEMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', 'NO_EC=1', '', d)}" + do_install () { oe_runmake install DESTDIR=${D} }
Signature · 1 line
2.10.1
PATCH 8/10 stunnel: fix compile error when openssl disable des support
In reply to [email protected]From: Kai Kang <[email protected]>
When openssl disable des support with configure option 'no-des', it doesn't provide des related header file and functions. That causes stunnel compile failed. Fix it by checking macro OPENSSL_NO_DES to use openssl des related library conditionaly.
--- .../stunnel/stunnel/fix-openssl-no-des.patch | 54 ++++++++++++++++++++++ .../recipes-support/stunnel/stunnel_5.35.bb | 4 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch new file +54 -0
@@ -0,0 +1,54 @@ +Upstream-Status: Pending + +When openssl disable des support with configure option 'no-des', it doesn't +provide des related header file and functions. That causes stunnel compile +failed. Fix it by checking macro OPENSSL_NO_DES to use openssl des related +library conditionaly. + +Signed-off-by: Kai Kang <[email protected]> +--- +diff --git a/src/common.h b/src/common.h +index f7d38b0..bf485af 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -471,7 +471,9 @@ extern char *sys_errlist[]; + #ifndef OPENSSL_NO_MD4 + #include <openssl/md4.h> + #endif /* !defined(OPENSSL_NO_MD4) */ ++#ifndef OPENSSL_NO_DES + #include <openssl/des.h> ++#endif + #ifndef OPENSSL_NO_DH + #include <openssl/dh.h> + #if OPENSSL_VERSION_NUMBER<0x10100000L +diff --git a/src/protocol.c b/src/protocol.c +index 587df09..8198eb6 100644 +--- a/src/protocol.c ++++ b/src/protocol.c +@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE); + NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE); + NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE); + NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE); +-#ifndef OPENSSL_NO_MD4 ++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) + NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *); + NOEXPORT char *ntlm1(); + NOEXPORT char *ntlm3(char *, char *, char *, char *); +@@ -1175,7 +1175,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { + fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host); + if(opt->protocol_username && opt->protocol_password) { + if(!strcasecmp(opt->protocol_authentication, "ntlm")) { +-#ifndef OPENSSL_NO_MD4 ++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) + ntlm(c, opt); + #else + s_log(LOG_ERR, "NTLM authentication is not available"); +@@ -1216,7 +1216,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) { + return NULL; + } + +-#ifndef OPENSSL_NO_MD4 ++#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) + + /* + * NTLM code is based on the following documentation:
meta-networking/recipes-support/stunnel/stunnel_5.35.bb +3 -1
@@ -7,7 +7,9 @@ DEPENDS = "openssl zlib tcp-wrappers" RDEPENDS_${PN} += "perl" -SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz" +SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ + file://fix-openssl-no-des.patch \ +" SRC_URI[md5sum] = "9079f5fafbccaf88b7d92b227d78249a" SRC_URI[sha256sum] = "ffa386ae4c825f35f35157c285e7402a6d58779ad8c3822f74a9d355b54aba1d"
Signature · 1 line
2.10.1
PATCH 9/10 poco: disable package configs NetSSL and Crypto
In reply to [email protected]From: Kai Kang <[email protected]>
Distro feature openssl-no-weak-ciphers will disable openssl des support that causes poco compile failure. Disable package configs NetSSL and Crypto for poco if distro feature openssl-no-weak-ciphers exists.
--- meta-oe/recipes-support/poco/poco_1.7.8.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-support/poco/poco_1.7.8.bb +1 -0
@@ -34,6 +34,7 @@ EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON" # Foundation is built anyway and doesn't need to be listed explicitly # these don't have dependencies outside oe-core PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip" +PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', 'NetSSL Crypto', '', d)}" PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF"
Signature · 1 line
2.10.1
PATCH 10/10 postgresql: configure without openssl if openssl disable weak ciphers
In reply to [email protected]From: Kai Kang <[email protected]>
Distro feature 'openssl-no-weak-ciphers' is introduced to disable openssl weak ciphers. If it exists, openssl des support is disabled that causes postgresql build failed.
Remove PACKAGECONFIG 'openssl' if distro feature 'openssl-no-weak-ciphers' exists.
--- meta-oe/recipes-support/postgresql/postgresql.inc | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-support/postgresql/postgresql.inc +2 -0
@@ -65,6 +65,8 @@ PACKAGECONFIG[nls] = "--enable-nls,--disable-nls,," PACKAGECONFIG[libxml] = "--with-libxml,--without-libxml,libxml2,libxml2" PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl" +PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'openssl-no-weak-ciphers', 'openssl', '', d)}" + EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ --datadir=${datadir}/${BPN} \ --sysconfdir=${sysconfdir}/${BPN} \
Signature · 1 line
2.10.1
Quoted 3 lines · On 5 July 2017 at 09:11, <[email protected]> wrote:
Patches to add distro feature openssl-no-weak-ciphers have been sent to oe-core.
FWIW I'm still not very keen on a distro feature for this.
Ross
Quoted 8 lines · Ross
On 5 July 2017 at 09:11, <[email protected] <mailto:[email protected]>> wrote:
Patches to add distro feature openssl-no-weak-ciphers have been sent to oe-core.
FWIW I'm still not very keen on a distro feature for this.
How about use a global variable rather than a distro feature and check whether it has been set?
Thanks,
Kai
Quoted 2 lines
Ross
Signature · 2 lines
Regards, Neil | Kai Kang
Quoted 5 lines · Kang Kai
Quoted 4 lines · Ross
On 5 July 2017 at 09:11, <[email protected]
<mailto:[email protected]>> wrote:
Quoted 7 lines
Quoted 4 lines
Patches to add distro feature openssl-no-weak-ciphers have been sent to oe-core.
FWIW I'm still not very keen on a distro feature for this.
How about use a global variable rather than a distro feature and check whether it has been set?
Does there need to be a bitbake variable at all? Can't other packages detect which ciphers are supported by openssl by checking the openssl headers etc in sysroot?
Quoted 12 lines
Thanks,
KaiQuoted 1 line
Ross
--
Regards,
Neil | Kai Kang
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel