summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorShourya Shukla <shouryashukla.oo@gmail.com>2020-04-27 10:29:50 +0530
committerRichard Levitte <levitte@openssl.org>2020-04-29 15:27:22 +0200
commita6ed19dc9a9fc263a3b2e6b990e2face28a1a70d (patch)
treec1dc5c37deab6173f91c51f52dc1df4afdd73252 /apps
parent5e427a435b3b1db0fb0626b26e031f71bde65f7a (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 'apps')
-rw-r--r--apps/include/apps_ui.h2
-rw-r--r--apps/include/fmt.h2
-rw-r--r--apps/include/opt.h2
-rw-r--r--apps/kdf.c2
-rw-r--r--apps/lib/apps_ui.c2
-rw-r--r--apps/lib/fmt.c2
-rw-r--r--apps/mac.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h
index 55a6b510a4..8c6a48113d 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 01acf86694..ef18fc0dd0 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 1bf46215d5..b4753dc42e 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 9a69682b57..8d11807f5f 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 bcfe555478..ae0f5f217c 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 5cb4c041a8..2cdd55e924 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 07a6e915e3..30f0daabcc 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