diff options
author | Richard Levitte <levitte@openssl.org> | 2018-12-06 13:34:05 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-12-06 14:43:29 +0100 |
commit | 2044d382323d3471ba475634e267a787286a99b2 (patch) | |
tree | 51a7c11fa01624eec72ec23b7060a67db5332164 /crypto | |
parent | 48f66f811568e3623095c118616e031d6bc4e0d6 (diff) |
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)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/conf/conf_api.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_def.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_def.h | 2 | ||||
-rw-r--r-- | crypto/conf/conf_err.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_lcl.h | 2 | ||||
-rw-r--r-- | crypto/conf/conf_lib.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_mall.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_mod.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_sap.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf_ssl.c | 2 | ||||
-rw-r--r-- | crypto/conf/keysets.pl | 4 |
11 files changed, 12 insertions, 12 deletions
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 5e57d749ce..4248de60e1 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.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/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 7f0d70ea69..8a34218748 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.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/crypto/conf/conf_def.h b/crypto/conf/conf_def.h index 73e88baa8b..275df0c27d 100644 --- a/crypto/conf/conf_def.h +++ b/crypto/conf/conf_def.h @@ -3,7 +3,7 @@ * Generated by crypto/conf/keysets.pl * * 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/crypto/conf/conf_err.c b/crypto/conf/conf_err.c index f7613584ec..e3e8b0ee25 100644 --- a/crypto/conf/conf_err.c +++ b/crypto/conf/conf_err.c @@ -2,7 +2,7 @@ * Generated by util/mkerr.pl DO NOT EDIT * 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/crypto/conf/conf_lcl.h b/crypto/conf/conf_lcl.h index 6e1f7fe00d..1bc9c701ac 100644 --- a/crypto/conf/conf_lcl.h +++ b/crypto/conf/conf_lcl.h @@ -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/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 07110d8502..860ac6765b 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -1,7 +1,7 @@ /* * Copyright 2000-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/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 7e86948e89..e1d0e7aef3 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -1,7 +1,7 @@ /* * Copyright 2002-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/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 51f262e774..4ce3951ddc 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -1,7 +1,7 @@ /* * Copyright 2002-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/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 2b3e23ee14..c0876cbbc0 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -1,7 +1,7 @@ /* * Copyright 2002-2016 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/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c index 024bdb4808..a1b24b22e2 100644 --- a/crypto/conf/conf_ssl.c +++ b/crypto/conf/conf_ssl.c @@ -1,7 +1,7 @@ /* * Copyright 2015-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/crypto/conf/keysets.pl b/crypto/conf/keysets.pl index cfa230ec3a..cb3c3787b7 100644 --- a/crypto/conf/keysets.pl +++ b/crypto/conf/keysets.pl @@ -1,7 +1,7 @@ #! /usr/bin/env perl # 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 @@ -63,7 +63,7 @@ print <<"EOF"; * Generated by crypto/conf/keysets.pl * * Copyright 1995-$YEAR 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 |