Skip to content

Commit b30e3b3

Browse files
pbatardpbatard
committed
[efi] update UEFI:NTFS to latest
* Also remove Secure Boot notice since (outside of 32-bit ARM and exFAT) our bootloaders and NTFS drivers are now Secure Boot signed.
1 parent 05382d8 commit b30e3b3

File tree

6 files changed

+32
-23
lines changed

6 files changed

+32
-23
lines changed

‎res/appstore/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Identity
1212
Name="19453.net.Rufus"
1313
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
14-
Version="3.17.1841.0" />
14+
Version="3.17.1842.0" />
1515

1616
<Properties>
1717
<DisplayName>Rufus</DisplayName>

‎res/uefi/readme.txt‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,31 @@ See https://github.com/pbatard/uefi-ntfs for more details.
55

66
This image, which you can mount as FAT filesystem or open in 7-zip, contains
77
the following data:
8-
o The NTFS and exFAT UEFI drivers from EfiFs (https://github.com/pbatard/efifs).
9-
These are the \EFI\Rufus\[exfat|ntfs]_[ia32|x64|arm|aa64].efi files, which are
10-
identical to the v1.7 EfiFs binaries published at https://efi.akeo.ie.
11-
o The UEFI:NTFS binaries (https://github.com/pbatard/uefi-ntfs), which were
12-
compiled using Visual Studio 2019 Community Edition.
13-
These are the \EFI\Boot\boot[ia32|x64|arm|aa64].efi files.
8+
9+
o Secure Boot signed NTFS UEFI drivers, derived from ntfs-3g [1].
10+
These drivers are the exact same as the read-only binaries from release 1.2,
11+
except for the addition of Microsoft's Secure Boot signature.
12+
Note that, per Microsoft's current Secure Boot signing policies, the 32-bit
13+
ARM driver (ntfs_arm.efi) is not Secure Boot signed.
14+
15+
o Non Secure Boot signed exFAT UEFI drivers from EfiFs [2].
16+
These drivers are the exact same as the binaries from EfiFs release 1.8 and
17+
because they are licensed under GPLv3, they cannot be Secure Boot signed.
18+
19+
o Secure Boot signed UEFI:NTFS bootloader binaries [3].
20+
These drivers are the exact same as the binaries from release 2.2, except for
21+
the addition of Microsoft's Secure Boot signature.
22+
Note that, per Microsoft's current Secure Boot signing policies, the 32-bit
23+
ARM bootloader (bootarm.efi) is not Secure Boot signed.
24+
25+
The above means that, if booting an NTFS partition on an x86_32, x86_64 or ARM64
26+
system, Secure Boot does not need to be disabled.
1427

1528
The FAT partition was created on Debian GNU/Linux using the following commands
16-
dd if=/dev/zero of=uefi-ntfs.img bs=512 count=1024
29+
dd if=/dev/zero of=uefi-ntfs.img bs=512 count=2048
1730
mkfs.vfat -n UEFI_NTFS uefi-ntfs.img
1831
and then mounting the uefi-ntfs.img image and copying the relevant files.
32+
33+
[1] https://github.com/pbatard/ntfs-3g
34+
[2] https://github.com/pbatard/efifs
35+
[3] https://github.com/pbatard/uefi-ntfs

‎res/uefi/uefi-ntfs.img‎

512 KB
Binary file not shown.

‎src/drive.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ PF_TYPE_DECL(NTAPI, NTSTATUS, NtQueryVolumeInformationFile, (HANDLE, PIO_STATUS_
7272
* Globals
7373
*/
7474
RUFUS_DRIVE_INFO SelectedDrive;
75-
extern BOOL installed_uefi_ntfs, write_as_esp;
75+
extern BOOL write_as_esp;
7676
extern int nWindowsVersion, nWindowsBuildNumber;
7777
uint64_t partition_offset[PI_MAX];
7878
uint64_t persistence_size = 0;
@@ -2271,7 +2271,6 @@ BOOL CreatePartition(HANDLE hDrive, int partition_style, int file_system, BOOL m
22712271
uprintf("Write error: %s", WindowsErrorString());
22722272
return FALSE;
22732273
}
2274-
installed_uefi_ntfs = TRUE;
22752274
}
22762275
pn++;
22772276
}

‎src/rufus.c‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ BOOL enable_HDDs = FALSE, enable_VHDs = TRUE, enable_ntfs_compression = FALSE, n
120120
BOOL advanced_mode_device, advanced_mode_format, allow_dual_uefi_bios, detect_fakes, enable_vmdk, force_large_fat32, usb_debug;
121121
BOOL use_fake_units, preserve_timestamps = FALSE, fast_zeroing = FALSE, app_changed_size = FALSE;
122122
BOOL zero_drive = FALSE, list_non_usb_removable_drives = FALSE, enable_file_indexing, large_drive = FALSE;
123-
BOOL write_as_image = FALSE, write_as_esp = FALSE, installed_uefi_ntfs = FALSE, use_vds = FALSE, ignore_boot_marker = FALSE;
123+
BOOL write_as_image = FALSE, write_as_esp = FALSE, use_vds = FALSE, ignore_boot_marker = FALSE;
124124
BOOL appstore_version = FALSE, is_vds_available = TRUE;
125125
float fScale = 1.0f;
126126
int dialog_showing = 0, selection_default = BT_IMAGE, persistence_unit_selection = -1, imop_win_sel = 0;
@@ -2606,7 +2606,6 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
26062606
fs_type = (int)ComboBox_GetCurItemData(hFileSystem);
26072607
write_as_image = FALSE;
26082608
write_as_esp = FALSE;
2609-
installed_uefi_ntfs = FALSE;
26102609
// Disable all controls except Cancel
26112610
EnableControls(FALSE, FALSE);
26122611
FormatStatus = 0;
@@ -3067,12 +3066,6 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
30673066
PrintInfo(0, MSG_210);
30683067
MessageBeep(MB_OK);
30693068
FlashTaskbar(dialog_handle);
3070-
if (installed_uefi_ntfs && (!ReadSettingBool(SETTING_DISABLE_SECURE_BOOT_NOTICE))) {
3071-
notification_info more_info;
3072-
more_info.id = MORE_INFO_URL;
3073-
more_info.url = SECURE_BOOT_MORE_INFO_URL;
3074-
Notification(MSG_INFO, SETTING_DISABLE_SECURE_BOOT_NOTICE, &more_info, lmprintf(MSG_128, "Secure Boot"), lmprintf(MSG_129));
3075-
}
30763069
} else if (SCODE_CODE(FormatStatus) == ERROR_CANCELLED) {
30773070
SendMessage(hProgress, PBM_SETSTATE, (WPARAM)PBST_PAUSED, 0);
30783071
SetTaskbarProgressState(TASKBAR_PAUSED);

‎src/rufus.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
3333
IDD_DIALOG DIALOGEX 12, 12, 232, 326
3434
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
3535
EXSTYLE WS_EX_ACCEPTFILES
36-
CAPTION "Rufus 3.17.1841"
36+
CAPTION "Rufus 3.17.1842"
3737
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
3838
BEGIN
3939
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
395395
//
396396

397397
VS_VERSION_INFO VERSIONINFO
398-
FILEVERSION 3,17,1841,0
399-
PRODUCTVERSION 3,17,1841,0
398+
FILEVERSION 3,17,1842,0
399+
PRODUCTVERSION 3,17,1842,0
400400
FILEFLAGSMASK 0x3fL
401401
#ifdef _DEBUG
402402
FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
414414
VALUE "Comments", "https://rufus.ie"
415415
VALUE "CompanyName", "Akeo Consulting"
416416
VALUE "FileDescription", "Rufus"
417-
VALUE "FileVersion", "3.17.1841"
417+
VALUE "FileVersion", "3.17.1842"
418418
VALUE "InternalName", "Rufus"
419419
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
420420
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
421421
VALUE "OriginalFilename", "rufus-3.17.exe"
422422
VALUE "ProductName", "Rufus"
423-
VALUE "ProductVersion", "3.17.1841"
423+
VALUE "ProductVersion", "3.17.1842"
424424
END
425425
END
426426
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)