Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable hardened runtime (for notarizing) #117

Merged
merged 4 commits into from
Sep 29, 2022
Merged

Enable hardened runtime (for notarizing) #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa7dad9
More build script changes
davidrothera Sep 28, 2022
c9ec82e
Enable hardened runtime
davidrothera Sep 29, 2022
b0aef73
Change to sign with developer ID certificate
davidrothera Sep 29, 2022
0506a3e
v0.15
davidrothera Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dmg/createdmg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ tmpdir=$(mktemp -d -t yubiswitch)
echo "Tempdir: $tmpdir"

echo "Copying skeleton contents to $tmpdir"
cp -R skeleton $tmpdir
cp -R skeleton/ $tmpdir

echo "Copying $SRC_BINARY to $tmpdir"
rsync -a $SRC_BINARY/ $tmpdir
rsync -a $SRC_BINARY $tmpdir/

echo "Creating new disk image at $OUTPUT"
hdiutil create -volName yubiswitch -srcfolder $tmpdir $OUTPUT
Expand Down
5 changes: 5 additions & 0 deletions yubiswitch.helper/com.pallotron.yubiswitch.helper.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
2 changes: 1 addition & 1 deletion yubiswitch.helper/yubiswitch-helper-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<string>2.0</string>
<key>SMAuthorizedClients</key>
<array>
<string>identifier "com.pallotron.yubiswitch" and anchor apple generic and certificate leaf[subject.CN] = "Apple Development: David Rothera (G54X79V8CR)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
<string>anchor apple generic and identifier "com.pallotron.yubiswitch" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = YX97W249KL)</string>
</array>
</dict>
</plist>
39 changes: 32 additions & 7 deletions yubiswitch.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@
59EF40691B13D19A0000BB5F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
59EF406B1B13D1A60000BB5F /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
59EF407C1B13E1490000BB5F /* yubiswitch-helper-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "yubiswitch-helper-Info.plist"; sourceTree = "<group>"; };
63AE428128E63FB00058E8B4 /* yubiswitch.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = yubiswitch.entitlements; sourceTree = "<group>"; };
63AE428328E63FB50058E8B4 /* com.pallotron.yubiswitch.helper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = com.pallotron.yubiswitch.helper.entitlements; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -212,6 +214,7 @@
593AE45E1B1371B700FCA848 /* yubiswitch.helper */ = {
isa = PBXGroup;
children = (
63AE428328E63FB50058E8B4 /* com.pallotron.yubiswitch.helper.entitlements */,
59EF407C1B13E1490000BB5F /* yubiswitch-helper-Info.plist */,
593AE45F1B1371B700FCA848 /* main.c */,
59EF40681B13CDC20000BB5F /* yubiswitch-helper-launchd.plist */,
Expand Down Expand Up @@ -270,6 +273,7 @@
59E5CF1417EC2A9000898135 /* yubiswitch */ = {
isa = PBXGroup;
children = (
63AE428128E63FB00058E8B4 /* yubiswitch.entitlements */,
593B4E0617F09362003195DE /* AboutWindowController.h */,
593B4E0717F09362003195DE /* AboutWindowController.m */,
593B4E0817F09362003195DE /* AboutWindowController.xib */,
Expand Down Expand Up @@ -367,10 +371,11 @@
593AE45C1B1371B700FCA848 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = YX97W249KL;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
};
59E5CF0A17EC2A9000898135 = {
DevelopmentTeam = YX97W249KL;
ProvisioningStyle = Manual;
};
};
};
Expand Down Expand Up @@ -538,10 +543,14 @@
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_ENTITLEMENTS = yubiswitch.helper/com.pallotron.yubiswitch.helper.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = YX97W249KL;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = YX97W249KL;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -572,10 +581,14 @@
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_ENTITLEMENTS = yubiswitch.helper/com.pallotron.yubiswitch.helper.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = YX97W249KL;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = YX97W249KL;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
Expand Down Expand Up @@ -671,16 +684,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = yubiswitch/yubiswitch.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = YX97W249KL;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = YX97W249KL;
ENABLE_HARDENED_RUNTIME = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "yubiswitch/yubiswitch-Prefix.pch";
INFOPLIST_FILE = "yubiswitch/yubiswitch-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks ";
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
WRAPPER_EXTENSION = app;
};
name = Debug;
Expand All @@ -689,16 +708,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = yubiswitch/yubiswitch.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = YX97W249KL;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = YX97W249KL;
ENABLE_HARDENED_RUNTIME = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "yubiswitch/yubiswitch-Prefix.pch";
INFOPLIST_FILE = "yubiswitch/yubiswitch-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks ";
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
6 changes: 3 additions & 3 deletions yubiswitch/yubiswitch-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.14</string>
<string>0.15</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.14</string>
<string>0.15</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand All @@ -39,7 +39,7 @@
<key>SMPrivilegedExecutables</key>
<dict>
<key>com.pallotron.yubiswitch.helper</key>
<string>identifier &quot;com.pallotron.yubiswitch.helper&quot; and anchor apple generic and certificate leaf[subject.CN] = &quot;Apple Development: David Rothera (G54X79V8CR)&quot; and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
<string>anchor apple generic and identifier &quot;com.pallotron.yubiswitch.helper&quot; and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = YX97W249KL)</string>
</dict>
</dict>
</plist>
5 changes: 5 additions & 0 deletions yubiswitch/yubiswitch.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>