From ce9b996409fbd8a34ccb21dc5785216d7e6a830b Mon Sep 17 00:00:00 2001 From: David von Oheimb Date: Sun, 23 Dec 2018 09:58:36 +0100 Subject: [PATCH] replace 'OpenSSL license' by 'Apache License 2.0' Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell Reviewed-by: Nicola Tuveri (Merged from https://github.com/openssl/openssl/pull/8527) --- crypto/crmf/crmf_asn.c | 2 +- crypto/crmf/crmf_err.c | 2 +- crypto/crmf/crmf_int.h | 2 +- crypto/crmf/crmf_lib.c | 2 +- crypto/crmf/crmf_pbm.c | 2 +- doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod | 2 +- doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod | 2 +- doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod | 2 +- doc/man3/OSSL_CRMF_MSG_set_validity.pod | 2 +- doc/man3/OSSL_CRMF_pbmp_new.pod | 2 +- include/openssl/crmf.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crypto/crmf/crmf_asn.c b/crypto/crmf/crmf_asn.c index d0ab6e95bc..8810cb4358 100644 --- 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 f3405b112f..62dc6bfce6 100644 --- 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 db1547b0ef..f908eac8bf 100644 --- 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 49deca75f8..6a259f96a8 100644 --- 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 60d06d4a3c..09e4ffada1 100644 --- 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 fbce7027f2..0ddfc719d2 100644 --- a/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod +++ b/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod @@ -58,7 +58,7 @@ B 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. diff --git a/doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod b/doc/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.pod index 851bd130cc..5709b178b6 100644 --- 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. diff --git a/doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod b/doc/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.pod index 9e33a4a275..cad175c04b 100644 --- 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. diff --git a/doc/man3/OSSL_CRMF_MSG_set_validity.pod b/doc/man3/OSSL_CRMF_MSG_set_validity.pod index b6ea32eab2..588c8b7b76 100644 --- 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. diff --git a/doc/man3/OSSL_CRMF_pbmp_new.pod b/doc/man3/OSSL_CRMF_pbmp_new.pod index a83209b51a..651c4307be 100644 --- 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. diff --git a/include/openssl/crmf.h b/include/openssl/crmf.h index b4221a9e44..a265223fe5 100644 --- 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 -- 2.25.1