Remove arm64 helper signing and loading.

Yubico · Oct 6, 2023 · a39f830 · a39f830
1 parent 300d743
commit a39f830
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/lib/desktop/init.dart b/lib/desktop/init.dart
@@ -154,16 +154,6 @@ Future<Widget> initialize(List<String> argv) async {
     exe = Uri.file(Platform.resolvedExecutable)
         .resolve(relativePath)
         .toFilePath();
-
-    if (Platform.isMacOS && Platform.version.contains('arm64')) {
-      // See if there is an arm64 specific helper on arm64 Mac.
-      final arm64exe = Uri.file(exe)
-          .resolve('../helper-arm64/authenticator-helper')
-          .toFilePath();
-      if (await File(arm64exe).exists()) {
-        exe = arm64exe;
-      }
-    }
   }
 
   final rpcFuture = _initHelper(exe!);

diff --git a/macos/release-macos.sh b/macos/release-macos.sh
@@ -17,26 +17,22 @@ then
 	echo
 	echo "# Sign the main binaries, with the entitlements"
 	codesign -f --timestamp --options runtime --entitlements helper.entitlements --sign 'Application' Yubico\ Authenticator.app/Contents/Resources/helper/authenticator-helper
-	codesign -f --timestamp --options runtime --entitlements helper.entitlements --sign 'Application' Yubico\ Authenticator.app/Contents/Resources/helper-arm64/authenticator-helper
 else
 	echo "#################"
 	echo "# No parameters given, this will be app store"
 	echo "#################"
 	echo
 	echo "# Sign the main binaries, with sandbox enabled, without hardened runtime"
 	codesign -f --timestamp --entitlements helper-sandbox.entitlements --sign 'Application' Yubico\ Authenticator.app/Contents/Resources/helper/authenticator-helper
-	codesign -f --timestamp --entitlements helper-sandbox.entitlements --sign 'Application' Yubico\ Authenticator.app/Contents/Resources/helper-arm64/authenticator-helper
 fi
 
 echo "# Sign the dylib and so files, without entitlements"
 cd Yubico\ Authenticator.app/
-codesign -f --timestamp --options runtime --sign 'Application' $(find Contents/Resources/helper/ -name "*.dylib" -o -name "*.so")
-codesign -f --timestamp --options runtime --sign 'Application' $(find Contents/Resources/helper-arm64/ -name "*.dylib" -o -name "*.so")
+codesign -f --timestamp --options runtime --sign 'Application' $(find Contents/Resources/helper/_internal/ -name "*.dylib" -o -name "*.so")
 cd ..
 
 echo "# Sign the Python binary (if it exists), without entitlements"
-codesign -f --timestamp --options runtime --sign 'Application' Yubico\ Authenticator.app/Contents/Resources/helper-arm64/Python
-codesign -f --timestamp --options runtime --sign 'Application' Yubico\ Authenticator.app/Contents/Resources/helper/Python
+codesign -f --timestamp --options runtime --sign 'Application' Yubico\ Authenticator.app/Contents/Resources/helper/_internal/Python
 
 echo "# Sign the GUI"
 codesign -f --timestamp --options runtime --sign 'Application' --entitlements Release.entitlements --deep "Yubico Authenticator.app"