From 92aa6f0cc46ee80a2a3ed8d2039cdb531f928fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 17 Nov 2014 12:41:56 +0100 Subject: [PATCH] nodejs: Revert "nodejs: disable ssl2 and ssl3 when openssl is not built" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e712638b4adc6e18b3ce99ab37b94530e9aa786f. The config options --without-ssl2 and --without-ssl3 are intended to be used if nodejs is built with the bundled OpenSSL library for excluding the SSL2 and SSL3 features. Both options are actual only evaluated if --without-ssl is not set: $ cat configure | grep configure_openssl -n -A 13 619:def configure_openssl(o): 620- o['variables']['node_use_openssl'] = b(not options.without_ssl) 621- o['variables']['node_shared_openssl'] = b(options.shared_openssl) 622- o['variables']['openssl_no_asm'] = ( 623- 1 if options.openssl_no_asm else 0) 624- 625- if options.without_ssl: 626- return 627- 628- if options.ssl2: 629- o['defines'] += ['OPENSSL_NO_SSL2=1'] 630- 631- if options.ssl3: 632- o['defines'] += ['OPENSSL_NO_SSL3=1'] [Peter: adjusted commit text to make it clear that it is a revert] Signed-off-by: Jörg Krause Tested-by: Fabio Porcedda Acked-by: Fabio Porcedda Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 32e19b795..312aaa9d0 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -75,8 +75,7 @@ define NODEJS_CONFIGURE_CMDS --prefix=/usr \ --without-snapshot \ --shared-zlib \ - $(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,\ - --without-ssl --without-ssl2 --without-ssl3) \ + $(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \ $(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \ --without-dtrace \ --without-etw \