diff --git a/_sign.cmd b/_sign.cmd index 6ce08968..bd5df53d 100644 --- a/_sign.cmd +++ b/_sign.cmd @@ -1,9 +1,8 @@ @echo off -:retry -set /p password=Please enter PFX password: -"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /v /fd SHA1 /f D:\Secured\akeo\sha1\akeo.p12 /p %password% /tr http://timestamp.comodoca.com/rfc3161 /td SHA1 %1 -if ERRORLEVEL 1 goto retry -"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /as /v /fd SHA256 /f D:\Secured\akeo\akeo.p12 /p %password% /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1 -if ERRORLEVEL 1 goto retry -set password= +:retry_sha1 +"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /v /sha1 655f6413a8f721e3286ace95025c9e0ea132a984 /fd SHA1 /tr http://timestamp.comodoca.com/rfc3161 /td SHA1 %1 +if ERRORLEVEL 1 goto retry_sha1 +:retry_sha256 +"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /as /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1 +if ERRORLEVEL 1 goto retry_sha256 exit diff --git a/src/rufus.c b/src/rufus.c index 973b7067..e53bf3dd 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -624,7 +624,7 @@ static void SetProposedLabel(int ComboIndex) } // Else if no existing label is available, propose one according to the size (eg: "256MB", "8GB") - if ((safe_stricmp(no_label, DriveLabel.String[ComboIndex]) == 0) || (safe_stricmp(no_label, empty) == 0) + if ((_stricmp(no_label, DriveLabel.String[ComboIndex]) == 0) || (_stricmp(no_label, empty) == 0) || (safe_stricmp(lmprintf(MSG_207), DriveLabel.String[ComboIndex]) == 0)) { SetWindowTextU(hLabel, SelectedDrive.proposed_label); } else { diff --git a/src/rufus.rc b/src/rufus.rc index 9af543a7..6011a1a6 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.10.970" +CAPTION "Rufus 2.10.971" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -320,8 +320,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,10,970,0 - PRODUCTVERSION 2,10,970,0 + FILEVERSION 2,10,971,0 + PRODUCTVERSION 2,10,971,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -338,13 +338,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.10.970" + VALUE "FileVersion", "2.10.971" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.10.970" + VALUE "ProductVersion", "2.10.971" END END BLOCK "VarFileInfo"