[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  10f60797e7df6208075acdb08cf3167fae667b47 (commit)
      from  5af2ad682e809c04bdc79357ac8cb6571139e098 (commit)


- Log -----------------------------------------------------------------
commit 10f60797e7df6208075acdb08cf3167fae667b47
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 31 16:40:36 2016 +0100

    Mark VC templates correctly.
    
    VC-noCE-common and VC-WIN64-common were missing this line:
    
            template         => 1,
    
    Fixes GH#1809
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1811)
    (cherry picked from commit be1f4812111aa76f12db91d9059ead3b43314b4c)

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

Summary of changes:
 Configurations/10-main.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 287f554..adb40e3 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1276,6 +1276,7 @@ sub vms_info {
     },
     "VC-noCE-common" => {
         inherit_from     => [ "VC-common" ],
+        template         => 1,
         cflags           => add(picker(default => "-DUNICODE -D_UNICODE",
                                        debug   =>
                                        sub {
@@ -1312,6 +1313,7 @@ sub vms_info {
     },
     "VC-WIN64-common" => {
         inherit_from     => [ "VC-noCE-common" ],
+        template         => 1,
         ex_libs          => add(sub {
             my @ex_libs = ();
             push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);