[dbx] fix UTC epoch being interpreted as local time for DBX timestamp comparison

* Per MS documentation, _mktime64() *ALTERS* the time being passed to first add/substract
  the timezone offset before converting to an epoch.
* This resulted in our evaluated epoch from the DBX GitHub commit being a few hours more
  recent than the epoch we store for our embedded files (which is UTC) for timezones that
  are behind of UTC, since their epoch have an offset added to convert localtime to UTC.
* Fix this by using _mkgmtime64() that does not suffer an unwanted time manipulation.
* For safety, also use -u for epoch format conversion in our script just in case.
* Closes #2762.
* Also comment the "unsupported check; not verifying file integrity" warning for XZ
  decompression, improve XZ ARM64 support and add an exception for some Samsung UFDs.

Author: pbatard

res/dbx/dbx_update.sh

@@ -9,7 +9,7 @@ get_commit_date() {
   if [[ "${url}" =~ ^"${github_url}" ]]; then
     parts=($(awk -F'contents/' '{ for(i=1;i<=NF;i++) print $i }' <<< ${url}))
     date_url="${parts[0]}commits?path=${parts[1]//\//%2F}&page=1&per_page=1"
-    epoch="$(curl -s -L ${date_url} | python -m json.tool | grep -m1 \"date\": | sed -e 's/^.*\"date\":.*\"\(.*\)\".*/\1/' | date -f - +%s)"
+    epoch="$(curl -s -L ${date_url} | python -m json.tool | grep -m1 \"date\": | sed -e 's/^.*\"date\":.*\"\(.*\)\".*/\1/' | date -u -f - +%s)"
   fi
   echo ${epoch:-0}
 }

src/bled/decompress_unxz.c

@@ -11,9 +11,6 @@
 #include "bb_archive.h"
 
 #define XZ_EXTERN static
-// We get XZ_OPTIONS_ERROR in xz_dec_stream if this is not defined
-#define XZ_DEC_ANY_CHECK
-
 #define XZ_BUFSIZE BB_BUFSIZE
 
 #include "xz_dec_bcj.c"
@@ -89,7 +86,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_xz_stream(transformer_state_t *xstate
 
 #ifdef XZ_DEC_ANY_CHECK
 		if (ret == XZ_UNSUPPORTED_CHECK) {
-			bb_error_msg("unsupported check; not verifying file integrity");
+//			bb_error_msg("unsupported check; not verifying file integrity");
 			continue;
 		}
 #endif

src/bled/xz_config.h

@@ -10,11 +10,18 @@
 #ifndef XZ_CONFIG_H
 #define XZ_CONFIG_H
 
+// We get XZ_OPTIONS_ERROR in xz_dec_stream if this is not defined
+#define XZ_DEC_ANY_CHECK
+
 /* Uncomment as needed to enable BCJ filter decoders. */
+#if defined(_M_AMD64) || defined(__x86_64__) || defined(_M_IX86) || defined(__i386__)
 #define XZ_DEC_X86
+#endif
 /* #define XZ_DEC_POWERPC */
 /* #define XZ_DEC_IA64 */
-/* #define XZ_DEC_ARM */
+#if defined (_M_ARM) || defined(__arm__) || defined (_M_ARM64) || defined(__aarch64__)
+#define XZ_DEC_ARM
+#endif
 /* #define XZ_DEC_ARMTHUMB */
 /* #define XZ_DEC_SPARC */
 

src/dev.c

@@ -419,8 +419,8 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
 //#define FORCED_DEVICE
 #ifdef FORCED_DEVICE
 #define FORCED_VID 0x04E8
-#define FORCED_PID 0x61ED
-#define FORCED_NAME "Samsung uSD Card Reader USB Device"
+#define FORCED_PID 0x6300
+#define FORCED_NAME "Samsung Type-C USB Device"
 #endif
 
 void ClearDrives(void)
@@ -929,7 +929,7 @@ BOOL GetDevices(DWORD devnum)
 					((score = IsHDD(drive_index, (uint16_t)props.vid, (uint16_t)props.pid, buffer)) > 0)) {
 					uprintf("Device eliminated because it was detected as a Hard Drive (score %d > 0)", score);
 					if (!list_non_usb_removable_drives)
-						uprintf("If this device is not a Hard Drive, please e-mail the author of this application");
+						uprintf("If this device is not a Hard Drive or SSD, please e-mail the author of this application");
 					uprintf("NOTE: You can enable the listing of Hard Drives under 'advanced drive properties'");
 					safe_free(devint_detail_data);
 					break;

src/hdd_vs_ufd.h

@@ -250,6 +250,7 @@ static vidpid_score_t vidpid_score[] = {
 	{ 0x04e8, 0x0101, -20 },	// Connect3D Flash Drive
 	{ 0x04e8, 0x1a23, -20 },	// 2 GB UFD
 	{ 0x04e8, 0x5120, -20 },	// 4 GB UFD
+	{ 0x04e8, 0x6300, -20 },	// 256 GB UFD (MUF-256DA/APC)
 	{ 0x04e8, 0x6818, -20 },	// 8 GB UFD
 	{ 0x04e8, 0x6845, -20 },	// 16 GB UFD
 	{ 0x04e8, 0x685E, -20 },	// 16 GB UFD

src/net.c

@@ -493,7 +493,7 @@ static void CheckForDBXUpdates(int verbose)
 			continue;
 		t.tm_year -= 1900;
 		t.tm_mon -= 1;
-		timestamp = _mktime64(&t);
+		timestamp = _mkgmtime64(&t);
 		vuprintf("DBX update timestamp is %" PRId64, timestamp);
 		static_sprintf(reg_name, "DBXTimestamp_%s", efi_archname[i + 1]);
 		// Check if we have an external DBX that is newer than embedded/last downloaded

src/rufus.rc

@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 4.10.2259"
+CAPTION "Rufus 4.10.2260"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -407,8 +407,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,10,2259,0
- PRODUCTVERSION 4,10,2259,0
+ FILEVERSION 4,10,2260,0
+ PRODUCTVERSION 4,10,2260,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -426,13 +426,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.10.2259"
+            VALUE "FileVersion", "4.10.2260"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2025 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.10.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.10.2259"
+            VALUE "ProductVersion", "4.10.2260"
         END
     END
     BLOCK "VarFileInfo"