Richard Levitte
49d3b6416b
Following the license change, modify the boilerplates in crypto/poly1305/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7810 )
2018-12-06 15:13:16 +01:00
Richard Levitte
b7617a3a99
Following the license change, modify the boilerplates in crypto/pkcs7/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7809 )
2018-12-06 15:12:24 +01:00
Richard Levitte
54fffdf47c
Following the license change, modify the boilerplates in crypto/pkcs12/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7808 )
2018-12-06 15:11:42 +01:00
Richard Levitte
a5d9549d6e
Following the license change, modify the boilerplates in crypto/perlasm/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7807 )
2018-12-06 15:10:05 +01:00
Richard Levitte
16742672a0
Following the license change, modify the boilerplates in crypto/pem/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7806 )
2018-12-06 15:09:09 +01:00
Richard Levitte
0c49670063
Following the license change, modify the boilerplates in crypto/ocsp/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7805 )
2018-12-06 15:08:20 +01:00
Richard Levitte
3f870de74e
Following the license change, modify the boilerplates in crypto/objects/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7804 )
2018-12-06 15:07:30 +01:00
Richard Levitte
81cae8ce09
Following the license change, modify the boilerplates in crypto/modes/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7803 )
2018-12-06 15:06:37 +01:00
Richard Levitte
2bcb0fc862
Following the license change, modify the boilerplates in crypto/mdc2/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7802 )
2018-12-06 15:04:57 +01:00
Richard Levitte
4911f55362
Following the license change, modify the boilerplates in crypto/mdN/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7801 )
2018-12-06 15:04:11 +01:00
Richard Levitte
8573be06a9
Following the license change, modify the boilerplates in crypto/lhash/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7800 )
2018-12-06 15:02:41 +01:00
Richard Levitte
6f888e05e5
Following the license change, modify the boilerplates in crypto/hmac/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7799 )
2018-12-06 15:01:38 +01:00
Richard Levitte
58efb32c8b
Following the license change, modify the boilerplates in crypto/gmac/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7798 )
2018-12-06 15:00:48 +01:00
Richard Levitte
e06785a515
Following the license change, modify the boilerplates in crypto/kmac/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7797 )
2018-12-06 15:00:00 +01:00
Richard Levitte
7bb803e85b
Following the license change, modify the boilerplates in crypto/kdf/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7796 )
2018-12-06 14:58:41 +01:00
Richard Levitte
aa2d9a76b4
Following the license change, modify the boilerplates in crypto/idea/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7795 )
2018-12-06 14:56:39 +01:00
Richard Levitte
4a8b0c55c0
Following the license change, modify the boilerplates in crypto/evp/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7794 )
2018-12-06 14:54:57 +01:00
Richard Levitte
4ad239b8a2
Following the license change, modify the boilerplates in crypto/err/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7793 )
2018-12-06 14:53:53 +01:00
Richard Levitte
3c120f9165
Following the license change, modify the boilerplates in crypto/engine/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7792 )
2018-12-06 14:52:53 +01:00
Richard Levitte
a7f182b726
Following the license change, modify the boilerplates in crypto/ec/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7791 )
2018-12-06 14:51:47 +01:00
Richard Levitte
b6a34e9abd
Following the license change, modify the boilerplates in crypto/dso/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7790 )
2018-12-06 14:50:38 +01:00
Richard Levitte
3cdbea65b3
Following the license change, modify the boilerplates in crypto/dsa/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7789 )
2018-12-06 14:48:43 +01:00
Richard Levitte
e38873f5ce
Following the license change, modify the boilerplates in crypto/dh/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7788 )
2018-12-06 14:47:24 +01:00
Richard Levitte
2d48d5ddda
Following the license change, modify the boilerplates in crypto/des/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7787 )
2018-12-06 14:46:14 +01:00
Richard Levitte
5477e84273
Following the license change, modify the boilerplates in crypto/ct/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7786 )
2018-12-06 14:44:27 +01:00
Richard Levitte
2044d38232
Following the license change, modify the boilerplates in crypto/conf/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7785 )
2018-12-06 14:43:29 +01:00
Richard Levitte
48f66f8115
Following the license change, modify the boilerplates in crypto/comp/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7784 )
2018-12-06 14:42:18 +01:00
Richard Levitte
08ddd30230
Following the license change, modify the boilerplates in crypto/cms/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7783 )
2018-12-06 14:40:53 +01:00
Richard Levitte
8de396f875
Following the license change, modify the boilerplates in crypto/cmac/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7782 )
2018-12-06 14:39:25 +01:00
Richard Levitte
03d770d935
Following the license change, modify the boilerplates in crypto/chacha/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7781 )
2018-12-06 14:37:22 +01:00
Richard Levitte
a5024e0609
Following the license change, modify the boilerplates in crypto/cast/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7780 )
2018-12-06 14:36:10 +01:00
Richard Levitte
5593d9c952
Following the license change, modify the boilerplates in crypto/camellia/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7779 )
2018-12-06 14:34:55 +01:00
Richard Levitte
0c4fa1f10d
Following the license change, modify the boilerplates in crypto/buffer/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7778 )
2018-12-06 14:32:34 +01:00
Richard Levitte
367ace6870
Following the license change, modify the boilerplates in crypto/bn/
...
[skip ci]
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7777 )
2018-12-06 14:31:21 +01:00
Richard Levitte
04e388ce4c
Following the license change, modify the boilerplates in crypto/blake2/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7776 )
2018-12-06 14:30:07 +01:00
Richard Levitte
09abbca13f
Following the license change, modify the boilerplates in crypto/bio/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7775 )
2018-12-06 14:28:52 +01:00
Richard Levitte
8b00b7b8b3
Following the license change, modify the boilerplates in crypto/bf/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7774 )
2018-12-06 14:27:41 +01:00
Richard Levitte
f3a9534949
Following the license change, modify the boilerplates in crypto/async/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7773 )
2018-12-06 14:25:47 +01:00
Richard Levitte
365a2d9991
Following the license change, modify the boilerplates in crypto/asn1/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7772 )
2018-12-06 14:24:40 +01:00
Richard Levitte
c918d8e283
Following the license change, modify the boilerplates in crypto/aes/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7771 )
2018-12-06 14:23:25 +01:00
Richard Levitte
c7fcbc0981
Following the license change, modify the boilerplates in ms/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7769 )
2018-12-06 14:22:20 +01:00
Richard Levitte
2c18d164f5
Following the license change, modify the boilerplates in ssl/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7768 )
2018-12-06 14:20:59 +01:00
Richard Levitte
909f1a2e51
Following the license change, modify the boilerplates in test/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7767 )
2018-12-06 14:19:22 +01:00
Richard Levitte
9059ab425a
Following the license change, modify the boilerplates in util/, tools/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7766 )
2018-12-06 14:17:23 +01:00
Richard Levitte
dffa752023
Following the license change, modify the boilerplates in apps/
...
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7765 )
2018-12-06 14:15:27 +01:00
Richard Levitte
151333164e
Change license to the Apache License v2.0
...
This applies to the 'master' git branch and OpenSSL version 3.0.0 and
up. Pre-3.0.0 versions retain the previous license.
The boilerplate will change in increments after this change.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7764 )
2018-12-06 13:27:18 +01:00
Richard Levitte
389c09fa09
License: change any non-boilerplate comment referring to "OpenSSL license"
...
Make it just say "the License", which refers back to the standard
boilerplate.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7764 )
2018-12-06 13:26:28 +01:00
Richard Levitte
fcd2d5a612
Refactor the computation of API version limits
...
Previously, the API version limit was indicated with a numeric version
number. This was "natural" in the pre-3.0.0 because the version was
this simple number.
With 3.0.0, the version is divided into three separate numbers, and
it's only the major number that counts, but we still need to be able
to support pre-3.0.0 version limits.
Therefore, we allow OPENSSL_API_COMPAT to be defined with a pre-3.0.0
style numeric version number or with a simple major number, i.e. can
be defined like this for any application:
-D OPENSSL_API_COMPAT=0x10100000L
-D OPENSSL_API_COMPAT=3
Since the pre-3.0.0 numerical version numbers are high, it's easy to
distinguish between a simple major number and a pre-3.0.0 numerical
version number and to thereby support both forms at the same time.
Internally, we define the following macros depending on the value of
OPENSSL_API_COMPAT:
OPENSSL_API_0_9_8
OPENSSL_API_1_0_0
OPENSSL_API_1_1_0
OPENSSL_API_3
They indicate that functions marked for deprecation in the
corresponding major release shall not be built if defined.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724 )
2018-12-06 12:24:48 +01:00
Richard Levitte
0695b19342
util/find-doc-nits: allow #undef
...
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724 )
2018-12-06 12:24:48 +01:00
Richard Levitte
478d4f912c
include/openssl/opensslconf.h.in: allow future deprecation for v4.0
...
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724 )
2018-12-06 12:24:48 +01:00