[openssl-commits] [openssl] master update

Richard Levitte levitte at openssl.org
Thu Dec 6 13:22:51 UTC 2018 

The branch master has been updated
       via  c7fcbc0981c9453beb63add748aa61ef51edd086 (commit)
      from  2c18d164f52a77b9ecc1f835b83aec476334ebbc (commit)


- Log -----------------------------------------------------------------
commit c7fcbc0981c9453beb63add748aa61ef51edd086
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:10:33 2018 +0100

    Following the license change, modify the boilerplates in ms/
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7769)

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

Summary of changes:
 ms/applink.c        | 2 +-
 ms/cmp.pl           | 2 +-
 ms/uplink-common.pl | 2 +-
 ms/uplink-ia64.pl   | 2 +-
 ms/uplink-x86.pl    | 2 +-
 ms/uplink-x86_64.pl | 2 +-
 ms/uplink.c         | 2 +-
 ms/uplink.h         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ms/applink.c b/ms/applink.c
index 238dbff..d19966a 100644
--- a/ms/applink.c
+++ b/ms/applink.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/ms/cmp.pl b/ms/cmp.pl
index 265ce56..6222b1f 100755
--- a/ms/cmp.pl
+++ b/ms/cmp.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # 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/ms/uplink-common.pl b/ms/uplink-common.pl
index e2ab594..f894ce0 100755
--- a/ms/uplink-common.pl
+++ b/ms/uplink-common.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2008-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/ms/uplink-ia64.pl b/ms/uplink-ia64.pl
index 0636f13..7287544 100755
--- a/ms/uplink-ia64.pl
+++ b/ms/uplink-ia64.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2008-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/ms/uplink-x86.pl b/ms/uplink-x86.pl
index e79cff7..300ed0d 100755
--- a/ms/uplink-x86.pl
+++ b/ms/uplink-x86.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2008-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/ms/uplink-x86_64.pl b/ms/uplink-x86_64.pl
index 1f24450..9efe5ab 100755
--- a/ms/uplink-x86_64.pl
+++ b/ms/uplink-x86_64.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2008-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/ms/uplink.c b/ms/uplink.c
index 7f7abfb..02d466f 100644
--- a/ms/uplink.c
+++ b/ms/uplink.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/ms/uplink.h b/ms/uplink.h
index f6cd038..b9cc1f9 100644
--- a/ms/uplink.h
+++ b/ms/uplink.h
@@ -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

More information about the openssl-commits mailing list