From c7677d4a903d687695430a62135094bc98665858 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Thu, 5 Jul 2018 09:28:41 +0200
Subject: [PATCH] Update Amebis URL

---
 MSI/MSICA              |  2 +-
 Makefile               |  2 +-
 ZRColaInstall/main.cpp |  2 +-
 include/Debug.props    | 14 +++++++-------
 include/Release.props  | 14 +++++++-------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/MSI/MSICA b/MSI/MSICA
index d0dcb3d..b90f3d7 160000
--- a/MSI/MSICA
+++ b/MSI/MSICA
@@ -1 +1 @@
-Subproject commit d0dcb3d357022dcdde74141bd8c6fd5d16a7bab9
+Subproject commit b90f3d76971a044c2318f2bd9605ab8194028438
diff --git a/Makefile b/Makefile
index df92178..74e0f82 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
 !INCLUDE "include\MSIBuildCfg.mak"
 
 PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
-PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
+PUBLISH_PACKAGE_URL=https://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
 
 ######################################################################
 # Main targets
diff --git a/ZRColaInstall/main.cpp b/ZRColaInstall/main.cpp
index b71cd3d..6fb23c0 100644
--- a/ZRColaInstall/main.cpp
+++ b/ZRColaInstall/main.cpp
@@ -79,7 +79,7 @@ extern "C" void WinMainCRTStartup()
     };
     FormatMessage(
         FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_STRING,
-        TEXT("/i \"http://www.amebis.si/prenos/ZRCola/_latest/ZRCola%1%2.msi\" /l* \"%3ZRCola%1%2.log\""),
+        TEXT("/i \"https://www.amebis.si/prenos/ZRCola/_latest/ZRCola%1%2.msi\" /l* \"%3ZRCola%1%2.log\""),
         0,
         0,
         (LPTSTR)&pszParams,
diff --git a/include/Debug.props b/include/Debug.props
index d653c0a..c03b7d3 100644
--- a/include/Debug.props
+++ b/include/Debug.props
@@ -41,13 +41,13 @@
   <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-	<!--
-		To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
-		<SignFile> switches to SHA256 if the signing certificate is SHA256.
-		Reverted to signtool.exe until we can drop Windows XP and Vista support.
-	-->
-	<!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
-	<Exec Command="signtool.exe sign /du &quot;http://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /q &quot;$(TargetPath)&quot;" />
+    <!--
+        To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
+        <SignFile> switches to SHA256 if the signing certificate is SHA256.
+        Reverted to signtool.exe until we can drop Windows XP and Vista support.
+    -->
+    <!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
+    <Exec Command="signtool.exe sign /du &quot;https://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /q &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/include/Release.props b/include/Release.props
index 939115d..866dff4 100644
--- a/include/Release.props
+++ b/include/Release.props
@@ -41,13 +41,13 @@
   <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-	<!--
-		To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
-		<SignFile> switches to SHA256 if the signing certificate is SHA256.
-		Reverted to signtool.exe until we can drop Windows XP and Vista support.
-	-->
-	<!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
-	<Exec Command="signtool.exe sign /du &quot;http://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /t &quot;%ManifestTimestampUrl%&quot; /q &quot;$(TargetPath)&quot;" />
+    <!--
+        To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
+        <SignFile> switches to SHA256 if the signing certificate is SHA256.
+        Reverted to signtool.exe until we can drop Windows XP and Vista support.
+    -->
+    <!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
+    <Exec Command="signtool.exe sign /du &quot;https://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /t &quot;%ManifestTimestampUrl%&quot; /q &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>
\ No newline at end of file