From: Seonah Moon Date: Thu, 1 Oct 2015 04:27:10 +0000 (+0900) Subject: Add default cipher list for TV X-Git-Tag: accepted/tizen/common/20160805.130015^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fcurl.git;a=commitdiff_plain;h=b2de04c8dc16051b65b63ee95a3d01df3720133b Add default cipher list for TV Change-Id: I91579c36473a9619d00990c5897831006d89670f Signed-off-by: Seonah Moon --- diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h index c8e32af..b96980c 100644 --- a/lib/vtls/openssl.h +++ b/lib/vtls/openssl.h @@ -113,8 +113,21 @@ bool Curl_ossl_cert_status_request(void); #endif #define curlssl_cert_status_request() Curl_ossl_cert_status_request() +#if defined TIZEN_TV_EXT +#define DEFAULT_CIPHER_SELECTION \ +"ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:" \ +"DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:ECDH-RSA-AES256-SHA:" \ +"ECDH-ECDSA-AES256-SHA:AES256-SHA:ECDHE-RSA-AES128-GCM-SHA256:" \ +"ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:" \ +"DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:" \ +"AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:" \ +"ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:" \ +"EDH-DSS-DES-CBC3-SHA:ECDH-RSA-DES-CBC3-SHA:ECDH-ECDSA-DES-CBC3-SHA:" \ +"DES-CBC3-SHA:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA" +#else #define DEFAULT_CIPHER_SELECTION \ "ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH" +#endif #endif /* USE_OPENSSL */ #endif /* HEADER_CURL_SSLUSE_H */ diff --git a/packaging/curl.spec b/packaging/curl.spec index eb90041..ee677b2 100644 --- a/packaging/curl.spec +++ b/packaging/curl.spec @@ -61,7 +61,7 @@ cp %{SOURCE1001} . export CPPFLAGS="-DHAVE_PK11_CREATEGENERICOBJECT" -%if "%{?profile}" == "tv" +%if "%{profile}" == "tv" CFLAGS+=" -DTIZEN_TV_EXT" %reconfigure --without-nss --without-gnutls --with-openssl --disable-ipv6 \ %else