[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  4d0eac19993b07408285e631e0ca81ee006d228a (commit)
      from  188a9bd950837c70661aa6849894e4e02d129031 (commit)


- Log -----------------------------------------------------------------
commit 4d0eac19993b07408285e631e0ca81ee006d228a
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Jun 13 08:51:13 2017 -0400

    Update copyright on progs.h
    
    The generating script got updated, but the generated file did not.
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/3668)

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

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

diff --git a/apps/progs.pl b/apps/progs.pl
index 7713440..94a4962 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1995-2016 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
@@ -32,7 +32,7 @@ print <<'EOF';
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2016 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