diff options
author | Shourya Shukla <shouryashukla.oo@gmail.com> | 2020-04-27 10:29:50 +0530 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-04-29 15:27:22 +0200 |
commit | a6ed19dc9a9fc263a3b2e6b990e2face28a1a70d (patch) | |
tree | c1dc5c37deab6173f91c51f52dc1df4afdd73252 /test | |
parent | 5e427a435b3b1db0fb0626b26e031f71bde65f7a (diff) |
Amend references to "OpenSSL license"
A small number of files contain references to the "OpenSSL license"
which has been deprecated and replaced by the "Apache License 2.0".
Amend the occurences.
Fixes #11649
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11663)
Diffstat (limited to 'test')
-rw-r--r-- | test/bio_memleak_test.c | 2 | ||||
-rw-r--r-- | test/bn_internal_test.c | 2 | ||||
-rw-r--r-- | test/cmsapitest.c | 2 | ||||
-rw-r--r-- | test/drbg_extra_test.c | 2 | ||||
-rw-r--r-- | test/drbg_extra_test.h | 2 | ||||
-rw-r--r-- | test/recipes/03-test_internal_bn.t | 2 | ||||
-rw-r--r-- | test/recipes/03-test_internal_rsa_sp800_56b.t | 2 | ||||
-rwxr-xr-x | test/recipes/20-test_kdf.t | 2 | ||||
-rw-r--r-- | test/recipes/20-test_mac.t | 2 | ||||
-rw-r--r-- | test/recipes/30-test_evp_data/evpaessiv.txt | 2 | ||||
-rw-r--r-- | test/recipes/90-test_bio_memleak.t | 2 | ||||
-rw-r--r-- | test/rsa_sp800_56b_test.c | 2 | ||||
-rw-r--r-- | test/ssl-tests/30-extended-master-secret.cnf.in | 2 | ||||
-rw-r--r-- | test/ssl_ctx_test.c | 2 | ||||
-rw-r--r-- | test/testutil/options.c | 2 | ||||
-rw-r--r-- | test/testutil/test_options.c | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/test/bio_memleak_test.c b/test/bio_memleak_test.c index 49ee712a49..beadd79c43 100644 --- a/test/bio_memleak_test.c +++ b/test/bio_memleak_test.c @@ -1,7 +1,7 @@ /* * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/bn_internal_test.c b/test/bn_internal_test.c index f3e874960d..31d51cb804 100644 --- a/test/bn_internal_test.c +++ b/test/bn_internal_test.c @@ -1,7 +1,7 @@ /* * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/cmsapitest.c b/test/cmsapitest.c index 2ac330a8fa..697daa814d 100644 --- a/test/cmsapitest.c +++ b/test/cmsapitest.c @@ -1,7 +1,7 @@ /* * Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/drbg_extra_test.c b/test/drbg_extra_test.c index 642f744932..8d7b8fbf8f 100644 --- a/test/drbg_extra_test.c +++ b/test/drbg_extra_test.c @@ -1,7 +1,7 @@ /* * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/drbg_extra_test.h b/test/drbg_extra_test.h index 4c771573d1..5153dafe23 100644 --- a/test/drbg_extra_test.h +++ b/test/drbg_extra_test.h @@ -1,7 +1,7 @@ /* * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/recipes/03-test_internal_bn.t b/test/recipes/03-test_internal_bn.t index 8aed18ac30..0b73314988 100644 --- a/test/recipes/03-test_internal_bn.t +++ b/test/recipes/03-test_internal_bn.t @@ -1,7 +1,7 @@ #! /usr/bin/env perl # Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (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 diff --git a/test/recipes/03-test_internal_rsa_sp800_56b.t b/test/recipes/03-test_internal_rsa_sp800_56b.t index 2f5e003492..8a379908fc 100644 --- a/test/recipes/03-test_internal_rsa_sp800_56b.t +++ b/test/recipes/03-test_internal_rsa_sp800_56b.t @@ -1,7 +1,7 @@ #! /usr/bin/env perl # Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (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 diff --git a/test/recipes/20-test_kdf.t b/test/recipes/20-test_kdf.t index a03f6997b4..b308ae6d6b 100755 --- a/test/recipes/20-test_kdf.t +++ b/test/recipes/20-test_kdf.t @@ -1,7 +1,7 @@ #! /usr/bin/env perl # Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (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 diff --git a/test/recipes/20-test_mac.t b/test/recipes/20-test_mac.t index 6a2c094a0f..cfca431fcc 100644 --- a/test/recipes/20-test_mac.t +++ b/test/recipes/20-test_mac.t @@ -1,7 +1,7 @@ #! /usr/bin/env perl # Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (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 diff --git a/test/recipes/30-test_evp_data/evpaessiv.txt b/test/recipes/30-test_evp_data/evpaessiv.txt index 5419918352..022aa33281 100644 --- a/test/recipes/30-test_evp_data/evpaessiv.txt +++ b/test/recipes/30-test_evp_data/evpaessiv.txt @@ -1,7 +1,7 @@ # # Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (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 diff --git a/test/recipes/90-test_bio_memleak.t b/test/recipes/90-test_bio_memleak.t index 93f7f928a7..061e5460ad 100644 --- a/test/recipes/90-test_bio_memleak.t +++ b/test/recipes/90-test_bio_memleak.t @@ -1,7 +1,7 @@ #! /usr/bin/env perl # Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (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 diff --git a/test/rsa_sp800_56b_test.c b/test/rsa_sp800_56b_test.c index b928655794..bb14887e98 100644 --- a/test/rsa_sp800_56b_test.c +++ b/test/rsa_sp800_56b_test.c @@ -1,7 +1,7 @@ /* * Copyright 2018-2019 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/ssl-tests/30-extended-master-secret.cnf.in b/test/ssl-tests/30-extended-master-secret.cnf.in index 84d3e3cfd2..281718e6b5 100644 --- a/test/ssl-tests/30-extended-master-secret.cnf.in +++ b/test/ssl-tests/30-extended-master-secret.cnf.in @@ -1,7 +1,7 @@ # -*- mode: perl; -*- # Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. # -# Licensed under the OpenSSL license (the "License"). You may not use +# Licensed under the Apache License 2.0 (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 diff --git a/test/ssl_ctx_test.c b/test/ssl_ctx_test.c index 58ca60a788..9558aebe71 100644 --- a/test/ssl_ctx_test.c +++ b/test/ssl_ctx_test.c @@ -1,7 +1,7 @@ /* * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/testutil/options.c b/test/testutil/options.c index 0b10f7f0d4..35dfa320c4 100644 --- a/test/testutil/options.c +++ b/test/testutil/options.c @@ -1,7 +1,7 @@ /* * Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 diff --git a/test/testutil/test_options.c b/test/testutil/test_options.c index 99e6d2940a..25774fe0f9 100644 --- a/test/testutil/test_options.c +++ b/test/testutil/test_options.c @@ -1,7 +1,7 @@ /* * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (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 |