[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Thu Dec 6 14:32:23 UTC 2018
The branch master has been updated
via 0e9725bcb90770d967351b977407b174bbd91869 (commit)
from 55e0593c81f3c09218cb9e4d653bd51187fb186f (commit)
- Log -----------------------------------------------------------------
commit 0e9725bcb90770d967351b977407b174bbd91869
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Dec 6 14:03:01 2018 +0100
Following the license change, modify the boilerplates in crypto/
[skip ci]
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7827)
-----------------------------------------------------------------------
Summary of changes:
crypto/LPdir_nyi.c | 2 +-
crypto/LPdir_unix.c | 2 +-
crypto/LPdir_vms.c | 2 +-
crypto/LPdir_win.c | 2 +-
crypto/LPdir_win32.c | 2 +-
crypto/LPdir_wince.c | 2 +-
crypto/alphacpuid.pl | 2 +-
crypto/aria/aria.c | 2 +-
crypto/arm64cpuid.pl | 2 +-
crypto/arm_arch.h | 2 +-
crypto/armcap.c | 2 +-
crypto/armv4cpuid.pl | 2 +-
crypto/c64xpluscpuid.pl | 2 +-
crypto/cpt_err.c | 2 +-
crypto/cryptlib.c | 2 +-
crypto/ctype.c | 2 +-
crypto/cversion.c | 2 +-
crypto/dllmain.c | 2 +-
crypto/ebcdic.c | 2 +-
crypto/ex_data.c | 2 +-
crypto/getenv.c | 2 +-
crypto/ia64cpuid.S | 2 +-
crypto/init.c | 2 +-
crypto/mem.c | 2 +-
crypto/mem_clr.c | 2 +-
crypto/mem_dbg.c | 2 +-
crypto/mem_sec.c | 2 +-
crypto/mips_arch.h | 2 +-
crypto/o_dir.c | 2 +-
crypto/o_fips.c | 2 +-
crypto/o_fopen.c | 2 +-
crypto/o_init.c | 2 +-
crypto/o_str.c | 2 +-
crypto/o_time.c | 2 +-
crypto/pariscid.pl | 2 +-
crypto/ppc_arch.h | 2 +-
crypto/ppccap.c | 2 +-
crypto/ppccpuid.pl | 2 +-
crypto/s390x_arch.h | 2 +-
crypto/s390xcap.c | 2 +-
crypto/s390xcpuid.pl | 2 +-
crypto/sparc_arch.h | 2 +-
crypto/sparccpuid.S | 2 +-
crypto/sparcv9cap.c | 2 +-
crypto/threads_none.c | 2 +-
crypto/threads_pthread.c | 2 +-
crypto/threads_win.c | 2 +-
crypto/txt_db/txt_db.c | 2 +-
crypto/uid.c | 2 +-
crypto/vms_rms.h | 2 +-
crypto/x86_64cpuid.pl | 2 +-
crypto/x86cpuid.pl | 2 +-
52 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/crypto/LPdir_nyi.c b/crypto/LPdir_nyi.c
index b02449f..a154078 100644
--- a/crypto/LPdir_nyi.c
+++ b/crypto/LPdir_nyi.c
@@ -1,7 +1,7 @@
/*
* Copyright 2004-2016 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/LPdir_unix.c b/crypto/LPdir_unix.c
index b102289..f2c8619 100644
--- a/crypto/LPdir_unix.c
+++ b/crypto/LPdir_unix.c
@@ -1,7 +1,7 @@
/*
* Copyright 2004-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/crypto/LPdir_vms.c b/crypto/LPdir_vms.c
index e35363f..5104326 100644
--- a/crypto/LPdir_vms.c
+++ b/crypto/LPdir_vms.c
@@ -1,7 +1,7 @@
/*
* Copyright 2004-2016 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/LPdir_win.c b/crypto/LPdir_win.c
index 1dc1ef1..83cbe1f 100644
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -1,7 +1,7 @@
/*
* Copyright 2004-2016 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/LPdir_win32.c b/crypto/LPdir_win32.c
index edceb98..b29e096 100644
--- a/crypto/LPdir_win32.c
+++ b/crypto/LPdir_win32.c
@@ -1,7 +1,7 @@
/*
* Copyright 2004-2016 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/LPdir_wince.c b/crypto/LPdir_wince.c
index a24e738..ebf8962 100644
--- a/crypto/LPdir_wince.c
+++ b/crypto/LPdir_wince.c
@@ -1,7 +1,7 @@
/*
* Copyright 2004-2016 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/alphacpuid.pl b/crypto/alphacpuid.pl
index 6c7fd4c..5abb82d 100644
--- a/crypto/alphacpuid.pl
+++ b/crypto/alphacpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2010-2016 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/aria/aria.c b/crypto/aria/aria.c
index 293bcc7..8cba74e 100644
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -2,7 +2,7 @@
* Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2017, Oracle and/or its affiliates. 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/arm64cpuid.pl b/crypto/arm64cpuid.pl
index 06c8add..f25c637 100755
--- a/crypto/arm64cpuid.pl
+++ b/crypto/arm64cpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2015-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/crypto/arm_arch.h b/crypto/arm_arch.h
index f11b543..5b156d3 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -1,7 +1,7 @@
/*
* Copyright 2011-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/crypto/armcap.c b/crypto/armcap.c
index 1b3c272..e97bdd1 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -1,7 +1,7 @@
/*
* Copyright 2011-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/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
index ab007c1..3a7be6e 100644
--- a/crypto/armv4cpuid.pl
+++ b/crypto/armv4cpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2015-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/crypto/c64xpluscpuid.pl b/crypto/c64xpluscpuid.pl
index b7b11d5..a807e7f 100644
--- a/crypto/c64xpluscpuid.pl
+++ b/crypto/c64xpluscpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2012-2016 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/cpt_err.c b/crypto/cpt_err.c
index 4147b1c..8c11da8 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -2,7 +2,7 @@
* Generated by util/mkerr.pl DO NOT EDIT
* 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/crypto/cryptlib.c b/crypto/cryptlib.c
index 1cd77c9..9cf264b 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -2,7 +2,7 @@
* Copyright 1998-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. 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/ctype.c b/crypto/ctype.c
index 813be25..e7aa606 100644
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -1,7 +1,7 @@
/*
* Copyright 2017 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/cversion.c b/crypto/cversion.c
index b3fc30d..db25fd6 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -1,7 +1,7 @@
/*
* Copyright 1995-2016 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/dllmain.c b/crypto/dllmain.c
index 0838c55..6f12741 100644
--- a/crypto/dllmain.c
+++ b/crypto/dllmain.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016-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/crypto/ebcdic.c b/crypto/ebcdic.c
index 2a8ca61..970ffc0 100644
--- a/crypto/ebcdic.c
+++ b/crypto/ebcdic.c
@@ -1,7 +1,7 @@
/*
* Copyright 2000-2016 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/ex_data.c b/crypto/ex_data.c
index 08dc7c4..33f43bf 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.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/crypto/getenv.c b/crypto/getenv.c
index 7e98b64..a49a06f 100644
--- a/crypto/getenv.c
+++ b/crypto/getenv.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/crypto/ia64cpuid.S b/crypto/ia64cpuid.S
index 92c5512..a09f855 100644
--- a/crypto/ia64cpuid.S
+++ b/crypto/ia64cpuid.S
@@ -1,6 +1,6 @@
// Copyright 2004-2017 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/init.c b/crypto/init.c
index fc6aade..1736f2d 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016-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/crypto/mem.c b/crypto/mem.c
index 780053f..5feece3 100644
--- a/crypto/mem.c
+++ b/crypto/mem.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/crypto/mem_clr.c b/crypto/mem_clr.c
index 35bfb74..d76ef73 100644
--- a/crypto/mem_clr.c
+++ b/crypto/mem_clr.c
@@ -1,7 +1,7 @@
/*
* Copyright 2002-2016 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/mem_dbg.c b/crypto/mem_dbg.c
index 0489e97..703cc30 100644
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.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/crypto/mem_sec.c b/crypto/mem_sec.c
index 9e0f670..cd332c4 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -2,7 +2,7 @@
* Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2004-2014, Akamai Technologies. 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/mips_arch.h b/crypto/mips_arch.h
index 75043e7..0ac3bfa 100644
--- a/crypto/mips_arch.h
+++ b/crypto/mips_arch.h
@@ -1,7 +1,7 @@
/*
* Copyright 2011-2016 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/o_dir.c b/crypto/o_dir.c
index fca9c75..6857a2e 100644
--- a/crypto/o_dir.c
+++ b/crypto/o_dir.c
@@ -1,7 +1,7 @@
/*
* Copyright 2004-2016 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/o_fips.c b/crypto/o_fips.c
index 050ea9c..ac768e5 100644
--- a/crypto/o_fips.c
+++ b/crypto/o_fips.c
@@ -1,7 +1,7 @@
/*
* Copyright 2011-2016 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/o_fopen.c b/crypto/o_fopen.c
index 7d51ad7..b2eeeac 100644
--- a/crypto/o_fopen.c
+++ b/crypto/o_fopen.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016-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/crypto/o_init.c b/crypto/o_init.c
index ed6b130..a0b4256 100644
--- a/crypto/o_init.c
+++ b/crypto/o_init.c
@@ -1,7 +1,7 @@
/*
* Copyright 2011-2016 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/o_str.c b/crypto/o_str.c
index a835769..02578db 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -1,7 +1,7 @@
/*
* Copyright 2003-2017 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/o_time.c b/crypto/o_time.c
index 6d764f5..f0e3e47 100644
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -1,7 +1,7 @@
/*
* Copyright 2001-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/crypto/pariscid.pl b/crypto/pariscid.pl
index 5a231c4..47fdce9 100644
--- a/crypto/pariscid.pl
+++ b/crypto/pariscid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2009-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/crypto/ppc_arch.h b/crypto/ppc_arch.h
index 65cf96f..f235358 100644
--- a/crypto/ppc_arch.h
+++ b/crypto/ppc_arch.h
@@ -1,7 +1,7 @@
/*
* Copyright 2014-2016 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/ppccap.c b/crypto/ppccap.c
index 8b7d765..4214762 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -1,7 +1,7 @@
/*
* Copyright 2009-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/crypto/ppccpuid.pl b/crypto/ppccpuid.pl
index 9d1cada..b1241a7 100755
--- a/crypto/ppccpuid.pl
+++ b/crypto/ppccpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2007-2016 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/s390x_arch.h b/crypto/s390x_arch.h
index 3bed655..501283e 100644
--- a/crypto/s390x_arch.h
+++ b/crypto/s390x_arch.h
@@ -1,7 +1,7 @@
/*
* Copyright 2017-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/crypto/s390xcap.c b/crypto/s390xcap.c
index c04e52d..9772bd5 100644
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -1,7 +1,7 @@
/*
* Copyright 2010-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/crypto/s390xcpuid.pl b/crypto/s390xcpuid.pl
index 5e18aef..790fbc2 100755
--- a/crypto/s390xcpuid.pl
+++ b/crypto/s390xcpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2009-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/crypto/sparc_arch.h b/crypto/sparc_arch.h
index 99eafb3..4207afe 100644
--- a/crypto/sparc_arch.h
+++ b/crypto/sparc_arch.h
@@ -1,7 +1,7 @@
/*
* Copyright 2012-2016 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/sparccpuid.S b/crypto/sparccpuid.S
index 95acd2f..4771dd5 100644
--- a/crypto/sparccpuid.S
+++ b/crypto/sparccpuid.S
@@ -1,6 +1,6 @@
! Copyright 2005-2016 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/sparcv9cap.c b/crypto/sparcv9cap.c
index c8c5675..ec82566 100644
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -1,7 +1,7 @@
/*
* Copyright 2005-2016 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/threads_none.c b/crypto/threads_none.c
index 4b1940a..ff95556 100644
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016-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/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 5a59779..0a6c903 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016-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/crypto/threads_win.c b/crypto/threads_win.c
index d8fdfb7..4779543 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016-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/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index c4e1782..6744c03 100644
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.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/crypto/uid.c b/crypto/uid.c
index f7ae261..6635639 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -1,7 +1,7 @@
/*
* Copyright 2001-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/crypto/vms_rms.h b/crypto/vms_rms.h
index 3b994a0..ae74ba6 100644
--- a/crypto/vms_rms.h
+++ b/crypto/vms_rms.h
@@ -1,7 +1,7 @@
/*
* Copyright 2011-2016 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/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index 6423e80..6b33737 100644
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2005-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/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
index d43dda4..f15d557 100644
--- a/crypto/x86cpuid.pl
+++ b/crypto/x86cpuid.pl
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2004-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
More information about the openssl-commits
mailing list