[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  402dd5585e1e23f035f86e9c2f3c26341b4a42bf (commit)
      from  4569ff32575399c4ba4bfe42b8e7f2e23823ed87 (commit)


- Log -----------------------------------------------------------------
commit 402dd5585e1e23f035f86e9c2f3c26341b4a42bf
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 14:08:43 2018 +0100

    Following the license change, modify the boilerplates in last few
    
    [skip ci]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7836)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/shared-info.pl | 2 +-
 Configure                     | 2 +-
 VMS/VMSify-conf.pl            | 2 +-
 VMS/translatesyms.pl          | 2 +-
 config                        | 2 +-
 config.com                    | 2 +-
 e_os.h                        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index e3a40a9..3df12a3 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -2,7 +2,7 @@
 # -*- mode: perl; -*-
 # 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/Configure b/Configure
index 5c67591..ffbb8e1 100755
--- a/Configure
+++ b/Configure
@@ -2,7 +2,7 @@
 # -*- mode: perl; -*-
 # 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/VMS/VMSify-conf.pl b/VMS/VMSify-conf.pl
index 21eff11..a3844e5 100644
--- a/VMS/VMSify-conf.pl
+++ b/VMS/VMSify-conf.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # 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/VMS/translatesyms.pl b/VMS/translatesyms.pl
index f61d954..c7d1bc1 100644
--- a/VMS/translatesyms.pl
+++ b/VMS/translatesyms.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 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/config b/config
index b8adf34..27d2f61 100755
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1998-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/config.com b/config.com
index 46ccaa2..1e1b925 100644
--- a/config.com
+++ b/config.com
@@ -1,7 +1,7 @@
 $	! OpenSSL config: determine the architecture and run Configure
 $	! 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/e_os.h b/e_os.h
index 5340593..6cdd35e 100644
--- a/e_os.h
+++ b/e_os.h
@@ -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