[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a2aaf8be7e3c22a61ef89f273aa85f482b955336 (commit)
      from  b06935f439af7150d3ae566922353c3f210e63ed (commit)


- Log -----------------------------------------------------------------
commit a2aaf8be7e3c22a61ef89f273aa85f482b955336
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Nov 1 08:34:13 2015 -0500

    PR1279: Clean up CONTRIBUTING
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CONTRIBUTING | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/CONTRIBUTING b/CONTRIBUTING
index a04dbea..1d46f7b 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -7,9 +7,9 @@ would like to submit a patch, send it to rt at openssl.org with
 the string "[PATCH]" in the subject. Please be sure to include a
 textual explanation of what your patch does.
 
-You can also make GitHub pull requests. If you do this, please also send mail to
-rt at openssl.org with a brief description and a link to the PR so that we can more
-easily keep track of it.
+You can also make GitHub pull requests. If you do this, please also send
+mail to rt at openssl.org with a brief description and a link to the PR so
+that we can more easily keep track of it.
 
 If you are unsure as to whether a feature will be useful for the general
 OpenSSL community please discuss it on the openssl-dev mailing list first.
@@ -19,22 +19,11 @@ reason as to why that feature isn't implemented.
 Patches should be as up to date as possible, preferably relative to the
 current Git or the last snapshot. They should follow our coding style
 (see https://www.openssl.org/policies/codingstyle.html) and compile without
-warnings using the --strict-warnings flag.  OpenSSL compiles on many
-varied platforms: try to ensure you only use portable features.
+warnings using the --strict-warnings flag.  OpenSSL compiles on many varied
+platforms: try to ensure you only use portable features.
 
-Note: For legal reasons, contributions from the US can be accepted only
-if a TSU notification and a copy of the patch are sent to crypt at bis.doc.gov
-(formerly BXA) with a copy to the ENC Encryption Request Coordinator;
-please take some time to look at
-http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
-and
-http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e))
-for the details. If "your encryption source code is too large to serve as
-an email attachment", they are glad to receive it by fax instead; hope you
-have a cheap long-distance plan.
-
-Our preferred format for changes is "diff -u" output. You might
-generate it like this:
+Our preferred format for changes is "diff -u" output. One method is to use
+"git diff"  Another is to generate it something like this:
 
 # cd openssl-work
 # [your changes]