Merge remote-tracking branch 'origin/v4.3' into v4.3

Fedict · Mar 7, 2018 · de38036 · de38036
2 parents 04ac78b + 22e2f1a
commit de38036
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/installers/quickinstaller/QuickInstaller.nsi b/installers/quickinstaller/QuickInstaller.nsi
@@ -769,15 +769,15 @@ Function nsdCardData
 	beid::ReadCardData
 	Pop $retval
 
-	Pop $lastname
-	Pop $firstletterthirdname
-	Pop $firstname
-
 	;for testing
 	;StrCpy $retval 004180
 
 	${If} $retval == '0'
 
+		Pop $lastname
+		Pop $firstletterthirdname
+		Pop $firstname
+
 		;all went well, show a succes message on this final page
 		${NSD_CreateLabel} 0 40% 100% 36u "$(ls_testcomplete_pre) $firstname $(ls_testcomplete_post)"
 		Pop $Label

diff --git a/plugins_tools/certreg/certreg.c b/plugins_tools/certreg/certreg.c
@@ -137,8 +137,9 @@ BOOL StoreUserCerts (PCCERT_CONTEXT pCertContext, unsigned char KeyUsageBits, BY
 							//QMessageBox::information(NULL,strCaption,strMessage);
 						}
 					}
-					//pPrevCert = NULL;
-					//continue;
+					//pDesiredCert and pPrevCert are freed, so set pPrevCert = NULL and search again
+					pPrevCert = NULL;
+					continue;
 				}
 			}
 			pPrevCert = pDesiredCert;

diff --git a/plugins_tools/certreg/certreg.vcxproj b/plugins_tools/certreg/certreg.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -20,12 +20,12 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/scripts/windows/sign_certreg.bat b/scripts/windows/sign_certreg.bat
@@ -12,12 +12,16 @@
 set OUR_CURRENT_PATH="%cd%"
 @echo OUR_CURRENT_PATH = %OUR_CURRENT_PATH% 
 
+set MDRVCERTPATH=%~dp0..\..\cardcomm\minidriver\makemsi
+
 ::need current dir to be pointing at the one of the wxs files, or light.exe can't find the paths
 @cd %~dp0..\..\installers\eid-mw\Windows
 @if %ERRORLEVEL%==1 goto 
 ::sign the certreg tool
 @echo [INFO] sign the certreg tool
-%SIGNTOOL_PATH%\SignTool.exe sign /n "FedICT - BE0367302178" /t http://timestamp.verisign.com/scripts/timestamp.dll /v "%~dp0..\..\plugins_tools\certreg\Release\certreg.exe"
+::%SIGNTOOL_PATH%\SignTool.exe sign /n "FedICT - BE0367302178" /t http://timestamp.verisign.com/scripts/timestamp.dll /v "%~dp0..\..\plugins_tools\certreg\Release\certreg.exe"
+"%SIGNTOOL_PATH%\signtool" sign /as /fd SHA256 /ac "%MDRVCERTPATH%\MSCV-GlobalSign Root CA.cer" /s MY /n "Fedict" /sha1 "2259EF223A51E91964D7F4695706091194E018BB" /tr http://timestamp.globalsign.com/?signature=sha2 /td SHA256 /v "%~dp0..\..\plugins_tools\certreg\Release\certreg.exe"
+
 @if "%ERRORLEVEL%" == "1" goto signtool_failed
 @echo [INFO] copy the certreg tool
 copy %~dp0..\..\plugins_tools\certreg\Release\certreg.exe %~dp0