Author: jleroux
Date: Thu Feb 15 14:39:49 2018
New Revision: 1824317
URL: http://svn.apache.org/viewvc?rev=1824317&view=rev
Log:
"Applied fix from trunk for revision: 1824316 "
------------------------------------------------------------------------
r1824316 | jleroux | 2018-02-15 15:38:51 +0100 (jeu., 15 févr. 2018) | 7 lines
Improved: Use Tomcat default ciphers
(OFBIZ-10223)
Tomcat provides a default ciphers definition better to use it and let Tomcat
handles that for us, we know Tomcat security is strong
Thanks: Paul Foxworthy for the help understanding the syntax :)
------------------------------------------------------------------------
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 15 14:39:49 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821600,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1822882,1823324,1823467,1823562,1823876,1824260,1824316
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml?rev=1824317&r1=1824316&r2=1824317&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml
Thu Feb 15 14:39:49 2018
@@ -148,7 +148,6 @@ under the License.
<property name="keystoreType" value="JKS"/>
<property name="keyAlias" value="ofbiz"/>
<property name="keyPass" value="changeit"/>
- <property name="ciphers"
value="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5"/>
</property>
</container>
<container name="catalina-container-test" loaders="test"
class="org.apache.ofbiz.catalina.container.CatalinaContainer">
@@ -207,7 +206,6 @@ under the License.
<property name="keystoreFile"
value="framework/base/config/ofbizssl.jks"/>
<property name="keystorePass" value="changeit"/>
<property name="keystoreType" value="JKS"/>
- <property name="ciphers"
value="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5"/>
</property>
</container>
<!--
