change openssl build type from VC-WIN64A to VC-WIN64A-masm

Paul Monson · Paul Monson · commit bda97d9417c9 · 2019-03-11T10:08:40.000-07:00
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -1098,6 +1098,7 @@ Zubin Mithra
 Florian Mladitsch
 Doug Moen
 Juliette Monsel
+Paul Monson
 The Dragon De Monsyne
 Bastien Montagne
 Skip Montanaro
diff --git a/Misc/NEWS.d/next/Security/2019-02-08-13-58-03.bpo-35926.uIEgyE.rst b/Misc/NEWS.d/next/Security/2019-02-08-13-58-03.bpo-35926.uIEgyE.rst
@@ -0,0 +1 @@
+Update to OpenSSL 1.1.1a
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
@@ -11,7 +11,8 @@
   </ItemDefinitionGroup>
   <PropertyGroup>
     <_DLLSuffix>-1_1</_DLLSuffix>
-    <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64</_DLLSuffix>
+    <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
+    <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm64</_DLLSuffix>
   </PropertyGroup>
   <ItemGroup>
     <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
@@ -37,7 +37,7 @@
     <ConfigurationType>Makefile</ConfigurationType>
     <Bitness>64</Bitness>
     <ArchName>amd64</ArchName>
-    <OpenSSLPlatform>VC-WIN64A</OpenSSLPlatform>
+    <OpenSSLPlatform>VC-WIN64A-masm</OpenSSLPlatform>
     <SupportSigning>true</SupportSigning>
   </PropertyGroup>
 
