License - Revision history

Jwalton: Update License terms. State current requirement to comply with both licenses.

2020-07-22T13:35:17Z

Update License terms. State current requirement to comply with both licenses.

Rsalz at 20:56, 30 November 2017

2017-11-30T20:56:36Z

Rsalz at 20:53, 30 November 2017

2017-11-30T20:53:55Z

Jwalton: Dropped 'project' from copyright; fixed spelling.

2013-06-29T16:40:28Z

Dropped 'project' from copyright; fixed spelling.

Jwalton: /* Copyright Notice */

2013-06-29T16:13:38Z

Jwalton: /* Sample Programs */

2013-06-29T03:03:39Z

Sample Programs

Jwalton: /* Source Code Patches */

2013-06-29T03:03:19Z

Source Code Patches

Jwalton: /* Copyright Notice */

2013-06-29T02:34:47Z

Jwalton: Added section for Copyright Notice copy/paste. No content yet.

2013-06-28T22:48:03Z

Added section for Copyright Notice copy/paste. No content yet.

Philippe lhardy: /* Wiki Documentation */

2013-04-03T19:16:07Z

Wiki Documentation

@@ Line 5: / Line 5: @@
 # existing content already released under the current or future OpenSSL license.
-The current [https://openssl.org/source/license.html OpenSSL licence] is an "Apache style" license. We are moving to the Apache license soon; see our [https://www.openssl.org/blog/blog/categories/license/ blog posts].
+The current [https://openssl.org/source/license.html OpenSSL license] is a combination of OpenSSL and Apache-style license. Both licenses must be complied with.
 We do not accept patches through the Wiki.

@@ Line 7: / Line 7: @@
 The current [https://openssl.org/source/license.html OpenSSL licence] is an "Apache style" license. We are moving to the Apache license soon; see our [https://www.openssl.org/blog/blog/categories/license/ blog posts].
-== Source Code Patches ==
+We do not accept patches through the Wiki.
 == Wiki Documentation ==

@@ Line 1: / Line 1: @@
-The OpenSSL project and foundation appreciate material and works produced by individuals and oraganizations for the community. Documentation, patches, and sample programs help ensure the library is reliable and easy to use. To ensure the most benefit to the project and community, contributions to this wiki must be either:
+We appreciate material and works produced for the community. Documentation, patches, and sample programs help ensure the library is reliable and easy to use. To ensure the most benefit to the project and community, contributions to this wiki must be either:
 # existing material copied from a public domain source
@@ Line 5: / Line 5: @@
 # existing content already released under the current or future OpenSSL license.
-The current [http://openssl.org/source/license.html OpenSSL licence] is an "Apache style" license. There is general consensus that the interests of the OpenSSL community could be better served with a different license. Some thought has been given to migrating to a pure [http://www.apache.org/licenses/LICENSE-2.0.html Apache] license, although no decisions have been made and other licenses may be considered. Future contributions to OpenSSL will use [http://openssl.com/testing/license/openssl_icla.pdf Individual Contributor] and [http://openssl.com/testing/license/openssl_ccla.pdf Corporate Contributor]
+The current [https://openssl.org/source/license.html OpenSSL licence] is an "Apache style" license. We are moving to the Apache license soon; see our [https://www.openssl.org/blog/blog/categories/license/ blog posts].
 == Source Code Patches ==
@@ Line 16: / Line 15: @@
 If you contribute original sample programs for using the library, then the OpenSSL project will use the OpenSSL license. You should place the following text at the top of the source files:
-<pre>Contents licensed under the terms of the OpenSSL license: http://www.openssl.org/source/license.html</pre>
+<pre>Contents licensed under the terms of the OpenSSL license: https://www.openssl.org/source/license.html</pre>
 == Man Page Documentation ==
@@ Line 34: / Line 34: @@
 <pre>   Copyright OpenSSL <nowiki>[YEAR]</nowiki>
     Contents licensed under the terms of the OpenSSL license
-    See http://www.openssl.org/source/license.html for details</pre>
+    See https://www.openssl.org/source/license.html for details</pre>
 [[Category:Legal]]

@@ Line 30: / Line 30: @@
 == Copyright Notice ==
-Use the following copyright notice for source files, sample rpograms on the wiki, etc.
+Use the following copyright notice for source files, sample programs on the wiki, etc.
-<pre>   Copyright OpenSSL Project <nowiki>[YEAR]</nowiki>
+<pre>   Copyright OpenSSL <nowiki>[YEAR]</nowiki>
     Contents licensed under the terms of the OpenSSL license
     See http://www.openssl.org/source/license.html for details</pre>
 [[Category:Legal]]

@@ Line 32: / Line 32: @@
 Use the following copyright notice for source files, sample rpograms on the wiki, etc.
-<pre>Contents licensed under the terms of the OpenSSL license: http://www.openssl.org/source/license.html</pre>
+<pre>   Copyright OpenSSL Project <nowiki>[YEAR]</nowiki>
 [[Category:Legal]]

@@ Line 10: / Line 10: @@
 == Source Code Patches ==
-If you contribute patches for the library source code, then the OpenSSL project will use the OpenSSL license. Note there are a variety of reasons why such changes may not be accepted and utilized by the project, not all of them readily apparent [note: the topic of [[contributions]] deserves a separate discussion];
+If you contribute patches for the library source code, then the OpenSSL project will use the OpenSSL license. Not all patches will be accepted or Incorporated, and there are a variety of reasons why such changes may not be accepted and utilized by the project (not all of them readily apparent). See [[Contributions]] for a discussion of patches and potential concerns.
 == Sample Programs ==

← Older revision		Revision as of 22:48, 28 June 2013
Line 28:		Line 28:
	All contributions to this wiki are considered to be released under the current OpenSSL License (and any future version of it) and contributors agree the contributed content is original, or copied from a public domain or similar free resource, or copied from OpenSSL.		All contributions to this wiki are considered to be released under the current OpenSSL License (and any future version of it) and contributors agree the contributed content is original, or copied from a public domain or similar free resource, or copied from OpenSSL.

		+	== Copyright Notice ==
		+
		+	Use the following copyright notice for source files, sample rpograms on the wiki, etc.
		+
		+	<pre>Waiting on the project for standard verbiage</pre>

	[[Category:Legal]]		[[Category:Legal]]

← Older revision		Revision as of 19:16, 3 April 2013
Line 29:		Line 29:


−	[[Category:~~License]]~~	+	[[Category:Legal]]
−	~~[[Category:Copyright~~]]