[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  a7848d1fe23bc801773226b43bd8c870d9678c5b (commit)
      from  afd47fb2a1684f98b349aa2c92c35401f7653907 (commit)


- Log -----------------------------------------------------------------
commit a7848d1fe23bc801773226b43bd8c870d9678c5b
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Apr 20 09:36:54 2016 -0400

    Add copyright/contribution section.

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

Summary of changes:
 policies/codingstyle.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/policies/codingstyle.txt b/policies/codingstyle.txt
index 2333cfb..6c436b9 100644
--- a/policies/codingstyle.txt
+++ b/policies/codingstyle.txt
@@ -553,6 +553,23 @@ Do this instead:
     if ((p = BN_new()) == NULL)...
     if (strcmp(a, "FOO") == 0) ...
 
+                Chapter 22: Copyright and Contributions
+
+All source files should start with the following text (with appropriate
+comment characters at the start of each line and the year(s) updated):
+
+    Copyright 20xx-20yy The OpenSSL Project Authors. All Rights Reserved.
+
+    Licensed under the OpenSSL license (the "License").  You may not use
+    this file except in compliance with the License.  You can obtain a copy
+    in the file LICENSE in the source distribution or at
+    https://www.openssl.org/source/license.html
+
+All non-trivial contributions must be covered by a Contributor's Licensing
+Agreement (CLA).  This gives the OpenSSL project the right to distribute
+the contributed code.  For information on the CLAs, see
+https://www.openssl.org/policies/cla.html
+
 
                 Appendix A: References