As per http://www.apache.org/dev/crypto.html#inform add a crypto notice to each of...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@786654 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 389e9a5..1e16414 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -35,6 +35,7 @@ KNOWN ISSUES IN THIS RELEASE:
 * Security manager URLs
 * Symlinking static resources
 * Viewing the Tomcat Change Log
+* Cryptographic software notice
 * When all else fails
 
 
@@ -43,8 +44,8 @@ Dependency Changes:
 ===================
 Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 6.0 and later.
 
-In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler for compiling
-JSP pages.  This means you no longer need to have the complete
+In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler for
+compiling JSP pages.  This means you no longer need to have the complete
 Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
 (JRE) is sufficient.  The Eclipse JDT Java compiler is bundled with the 
 binary Tomcat distributions.  Tomcat can also be configured to use the
@@ -170,6 +171,34 @@ Viewing the Tomcat Change Log:
 See changelog.html in this directory.
 
 
+=============================
+Cryptographic software notice
+=============================
+This distribution includes cryptographic software.  The country in 
+which you currently reside may have restrictions on the import, 
+possession, use, and/or re-export to another country, of 
+encryption software.  BEFORE using any encryption software, please 
+check your country's laws, regulations and policies concerning the
+import, possession, or use, and re-export of encryption software, to 
+see if this is permitted.  See <http://www.wassenaar.org/> for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity 
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms.  The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS 
+Export Administration Regulations, Section 740.13) for both object 
+code and source code.
+
+The following provides more details on the included cryptographic
+software:
+  - Tomcat includes code designed to work with JSSE
+  - Tomcat includes code designed to work with OpenSSL
+
+
 ====================
 When all else fails:
 ====================