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)
diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h index 55a6b51..8c6a481 100644 --- a/apps/include/apps_ui.h +++ b/apps/include/apps_ui.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/apps/include/fmt.h b/apps/include/fmt.h index 01acf86..ef18fc0 100644 --- a/apps/include/fmt.h +++ b/apps/include/fmt.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/apps/include/opt.h b/apps/include/opt.h index 1bf4621..b4753dc 100644 --- a/apps/include/opt.h +++ b/apps/include/opt.h
@@ -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/apps/kdf.c b/apps/kdf.c index 9a69682..8d11807 100644 --- a/apps/kdf.c +++ b/apps/kdf.c
@@ -1,7 +1,7 @@ /* * Copyright 2019-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/apps/lib/apps_ui.c b/apps/lib/apps_ui.c index bcfe555..ae0f5f2 100644 --- a/apps/lib/apps_ui.c +++ b/apps/lib/apps_ui.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/apps/lib/fmt.c b/apps/lib/fmt.c index 5cb4c04..2cdd55e 100644 --- a/apps/lib/fmt.c +++ b/apps/lib/fmt.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/apps/mac.c b/apps/mac.c index 07a6e91..30f0daa 100644 --- a/apps/mac.c +++ b/apps/mac.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