[openssl-commits] [openssl] master update

[Matthias.St.Pierre at ncp-e.com]

The branch master has been updated
       via  f0bbf36599e0dd41e20ee653a7323babc5a4deab (commit)
      from  3c0c6b97e1910258bfac31be407c2d8b8cded76c (commit)


- Log -----------------------------------------------------------------
commit f0bbf36599e0dd41e20ee653a7323babc5a4deab
Author: Steve Linsell <stevenx.linsell at intel.com>
Date:   Sun Jan 28 12:01:04 2018 +0100

    Update copyright year in mkerr.pl
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/5166)

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

Summary of changes:
 util/mkerr.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 51177b9..52a44c9 100755
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -702,7 +702,7 @@ if ( $newstate )  {
     open(OUT, ">$statefile.new")
         || die "Can't write $statefile.new, $!";
     print OUT <<"EOF";
-# Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-$YEAR The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy