replace 'OpenSSL license' by 'Apache License 2.0'

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/8527)

diff --git a/crypto/crmf/crmf_asn.c b/crypto/crmf/crmf_asn.c
index d0ab6e95bc2289c1c5dfb738c8c98fd5608bc78a..8810cb4358da0cb7abfc10750302e90a5142b278 100644 (file)
--- a/crypto/crmf/crmf_asn.c
+++ b/crypto/crmf/crmf_asn.c
@@ -3,7 +3,7 @@
  * Copyright Nokia 2007-2018
  * Copyright Siemens AG 2015-2018
  *
- * 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/crmf/crmf_err.c b/crypto/crmf/crmf_err.c
index f3405b112f8addccf2b5e1a3d56392a5662e5e4a..62dc6bfce6cbbf465aed91383f1f5d25e5c85bc4 100644 (file)
--- a/crypto/crmf/crmf_err.c
+++ b/crypto/crmf/crmf_err.c
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * Copyright 1995-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/crypto/crmf/crmf_int.h b/crypto/crmf/crmf_int.h
index db1547b0eff03f7ab02a2c95b180bebcb2d8ce45..f908eac8bf064c01295055a9d785437b4531b86e 100644 (file)
--- a/crypto/crmf/crmf_int.h
+++ b/crypto/crmf/crmf_int.h
@@ -3,7 +3,7 @@
  * Copyright Nokia 2007-2018
  * Copyright Siemens AG 2015-2018
  *
- * 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/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c
index 49deca75f83a4e383efef1af0e7111fb12474ce3..6a259f96a816dcee7acf7f6c787829f18bca3497 100644 (file)
--- a/crypto/crmf/crmf_lib.c
+++ b/crypto/crmf/crmf_lib.c
@@ -3,7 +3,7 @@
  * Copyright Nokia 2007-2018
  * Copyright Siemens AG 2015-2018
  *
- * 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/crmf/crmf_pbm.c b/crypto/crmf/crmf_pbm.c
index 60d06d4a3c53e1674f91a03999599c557e684f93..09e4ffada1618f00143b2f75298faf30bf617e1d 100644 (file)
--- a/crypto/crmf/crmf_pbm.c
+++ b/crypto/crmf/crmf_pbm.c
@@ -3,7 +3,7 @@
  * Copyright Nokia 2007-2018
  * Copyright Siemens AG 2015-2018
  *
- * 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/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod b/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
index fbce7027f2d3e19189beaf6e2f4f109124ec6487..0ddfc719d2d5fb2f69654a851f072fe4c657e798 100644 (file)
--- a/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
+++ b/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
@@ -58,7 +58,7 @@ B<RFC 4211>
 
 Copyright 2007-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod b/doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod
index 851bd130cc0e723cc0f756e7c501ad37c22a2a8a..5709b178b64e85552c74b64eed5b4d49f16f929d 100644 (file)
--- a/doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod
+++ b/doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod
@@ -98,7 +98,7 @@ RFC 4211
 
 Copyright 2007-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod b/doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod
index 9e33a4a275baf6de4f3c3221509629247b1ba05b..cad175c04ba2e9e492daa0052906c03d260b19d7 100644 (file)
--- a/doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod
+++ b/doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod
@@ -41,7 +41,7 @@ RFC 4211
 
 Copyright 2007-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man3/OSSL_CRMF_MSG_set_validity.pod b/doc/man3/OSSL_CRMF_MSG_set_validity.pod
index b6ea32eab2bb9f1215bbbcb47203ecdf9025756b..588c8b7b76d685844b0e36e62d20103fb6250a81 100644 (file)
--- a/doc/man3/OSSL_CRMF_MSG_set_validity.pod
+++ b/doc/man3/OSSL_CRMF_MSG_set_validity.pod
@@ -97,7 +97,7 @@ RFC 4211
 
 Copyright 2007-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/doc/man3/OSSL_CRMF_pbmp_new.pod b/doc/man3/OSSL_CRMF_pbmp_new.pod
index a83209b51ae7e8dc56a3af7dad17695f268ae085..651c4307be8a7a877757a3fd7fe8a55b10683220 100644 (file)
--- a/doc/man3/OSSL_CRMF_pbmp_new.pod
+++ b/doc/man3/OSSL_CRMF_pbmp_new.pod
@@ -70,7 +70,7 @@ RFC 4211 section 4.4
 
 Copyright 2007-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
 L<https://www.openssl.org/source/license.html>.

diff --git a/include/openssl/crmf.h b/include/openssl/crmf.h
index b4221a9e4446caed625e0ce356d1c8dd81891d8f..a265223fe5bc2408d94b597527d93537c640e31b 100644 (file)
--- a/include/openssl/crmf.h
+++ b/include/openssl/crmf.h
@@ -3,7 +3,7 @@
  * Copyright Nokia 2007-2018
  * Copyright Siemens AG 2015-2018
  *
- * 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