commit ce9b996409fbd8a34ccb21dc5785216d7e6a830b
author David von Oheimb <David.von.Oheimb@siemens.com> Sun Dec 23 09:58:36 2018 +0100
committer Nicola Tuveri <nic.tuv@gmail.com> Wed Mar 20 10:33:39 2019 +0200
tree ff6d3716209200405a28726511fdc3b6c85ba795
parent a12864a5dec04c5e7cf75eaadc83c19871047a25

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)

crypto/crmf/crmf_asn.c

diff --git a/crypto/crmf/crmf_asn.c b/crypto/crmf/crmf_asn.c
index d0ab6e9..8810cb4 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

crypto/crmf/crmf_err.c

diff --git a/crypto/crmf/crmf_err.c b/crypto/crmf/crmf_err.c
index f3405b1..62dc6bf 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

crypto/crmf/crmf_int.h

diff --git a/crypto/crmf/crmf_int.h b/crypto/crmf/crmf_int.h
index db1547b..f908eac 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

crypto/crmf/crmf_lib.c

diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c
index 49deca7..6a259f9 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

crypto/crmf/crmf_pbm.c

diff --git a/crypto/crmf/crmf_pbm.c b/crypto/crmf/crmf_pbm.c
index 60d06d4..09e4ffa 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