[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  51cbee35162aecb4ca37ea9688461c79f975aff5 (commit)
       via  0589680ee6377fd7c845c72a7c9ba6fb46fc743f (commit)
      from  d40a1f72b6a298ee34c9de2c96b222d70609ce4c (commit)


- Log -----------------------------------------------------------------
commit 51cbee35162aecb4ca37ea9688461c79f975aff5
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Sep 27 09:23:08 2015 +0200

    Update year in Windows builds.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 0589680ee6377fd7c845c72a7c9ba6fb46fc743f
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Sep 26 20:20:38 2015 +0200

    Harmonize util/mkrc.pl with header move.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 Configure    | 2 +-
 util/mkrc.pl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configure b/Configure
index d7b8190..e1edfa9 100755
--- a/Configure
+++ b/Configure
@@ -2068,7 +2068,7 @@ BEGIN
 	    VALUE "ProductVersion", "$version\\0"
 	    // Optional:
 	    //VALUE "Comments", "\\0"
-	    VALUE "LegalCopyright", "Copyright © 1998-2005 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
+	    VALUE "LegalCopyright", "Copyright © 1998-2015 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
 	    //VALUE "LegalTrademarks", "\\0"
 	    //VALUE "PrivateBuild", "\\0"
 	    //VALUE "SpecialBuild", "\\0"
diff --git a/util/mkrc.pl b/util/mkrc.pl
index 83ee6a4..e20a502 100755
--- a/util/mkrc.pl
+++ b/util/mkrc.pl
@@ -1,6 +1,6 @@
 #!/bin/env perl
 #
-open FD,"crypto/opensslv.h";
+open FD,"include/openssl/opensslv.h";
 while(<FD>) {
     if (/OPENSSL_VERSION_NUMBER\s+(0x[0-9a-f]+)/i) {
 	$ver = hex($1);
@@ -57,7 +57,7 @@ BEGIN
             VALUE "ProductVersion", "$version\\0"
             // Optional:
             //VALUE "Comments", "\\0"
-            VALUE "LegalCopyright", "Copyright © 1998-2006 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
+            VALUE "LegalCopyright", "Copyright © 1998-2015 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
             //VALUE "LegalTrademarks", "\\0"
             //VALUE "PrivateBuild", "\\0"
             //VALUE "SpecialBuild", "\\0"