diff --git "a/\t\t\tRelease.entitlements" "b/\t\t\tRelease.entitlements" new file mode 100644 index 00000000..0f5cadd9 --- /dev/null +++ "b/\t\t\tRelease.entitlements" @@ -0,0 +1,24 @@ + + + + + com.apple.developer.networking.networkextension + + packet-tunnel-provider + + com.apple.security.app-sandbox + + com.apple.security.application-groups + + group.org.amnezia.AmneziaVPN + + com.apple.security.network.client + + com.apple.security.network.server + + keychain-access-groups + + $(AppIdentifierPrefix)org.amnezia.AmneziaVPN.network-extension + + + diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake index d3be7d47..488d0741 100644 --- a/client/cmake/ios.cmake +++ b/client/cmake/ios.cmake @@ -156,13 +156,13 @@ get_filename_component(QT_BIN_DIR_DETECTED "${QtCore_location}/../../../../../bi COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $ -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} ) - SET(SIGN_CMD codesign --deep --force --sign 'Apple Distribution: Privacy Technologies OU \(X7UJ388FXK\)' --timestamp --options runtime $) - message(${SIGN_CMD}) + # SET(SIGN_CMD codesign --deep --force --sign 'Apple Distribution: Privacy Technologies OU \(X7UJ388FXK\)' --timestamp --options runtime $) + # message(${SIGN_CMD}) - add_custom_command(TARGET ${PROJECT} POST_BUILD - COMMAND ${SIGN_CMD} - ) + # add_custom_command(TARGET ${PROJECT} POST_BUILD + # COMMAND ${SIGN_CMD} + # ) # add_custom_command(TARGET ${PROJECT} POST_BUILD # COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/ios/scripts/sign_macos_appstore.sh $ diff --git a/client/ios/app/Info.plist.in b/client/ios/app/Info.plist.in index 590c946b..c2d3471d 100644 --- a/client/ios/app/Info.plist.in +++ b/client/ios/app/Info.plist.in @@ -24,6 +24,8 @@ ${MACOSX_BUNDLE_BUNDLE_VERSION} NSHumanReadableCopyright ${MACOSX_BUNDLE_COPYRIGHT} + LSApplicationCategoryType + public.app-category.utilities ITSAppUsesNonExemptEncryption UISupportedInterfaceOrientations~ipad diff --git a/client/ios/app/main.entitlements b/client/ios/app/main.entitlements index 052abf4b..e65e88c7 100644 --- a/client/ios/app/main.entitlements +++ b/client/ios/app/main.entitlements @@ -2,38 +2,29 @@ - com.apple.application-identifier - X7UJ388FXK.org.amnezia.AmneziaVPN - + com.apple.application-identifier + X7UJ388FXK.org.amnezia.AmneziaVPN com.apple.developer.networking.networkextension packet-tunnel-provider - - keychain-access-groups - - $(DEVELOPMENT_TEAM).* - - com.apple.developer.team-identifier - $(DEVELOPMENT_TEAM) - + X7UJ388FXK com.apple.security.app-sandbox - - com.apple.security.application-groups - - $(DEVELOPMENT_TEAM).$(GROUP_ID_MACOS) - - - com.apple.security.network.client - - - com.apple.security.network.server - - + com.apple.security.application-groups + + group.org.amnezia.AmneziaVPN + com.apple.security.files.user-selected.read-write - + com.apple.security.network.client + + com.apple.security.network.server + + keychain-access-groups + + $(AppIdentifierPrefix)org.amnezia.AmneziaVPN + diff --git a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements index fee97bb6..1d6ec4a1 100644 --- a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements +++ b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements @@ -2,23 +2,27 @@ - com.apple.security.app-sandbox - - com.apple.security.network.client - - com.apple.security.network.server - + com.apple.application-identifier + X7UJ388FXK.org.amnezia.AmneziaVPN.network-extension com.apple.developer.networking.networkextension packet-tunnel-provider + com.apple.developer.team-identifier + X7UJ388FXK + com.apple.security.app-sandbox + com.apple.security.application-groups group.org.amnezia.AmneziaVPN + com.apple.security.network.client + + com.apple.security.network.server + keychain-access-groups - $(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN + $(AppIdentifierPrefix)org.amnezia.AmneziaVPN.network-extension diff --git a/client/ios/scripts/openvpn.sh b/client/ios/scripts/openvpn.sh index db55542d..75a89ac0 100755 --- a/client/ios/scripts/openvpn.sh +++ b/client/ios/scripts/openvpn.sh @@ -11,9 +11,11 @@ EOF cd 3rd/OpenVPNAdapter - if $XCODEBUILD -scheme OpenVPNAdapter -configuration Release -xcconfig Configuration/amnezia.xcconfig -sdk macosx14.2 -destination 'generic/platform=MacOS' -project OpenVPNAdapter.xcodeproj ; then + if $XCODEBUILD -scheme OpenVPNAdapter -configuration Release -xcconfig Configuration/amnezia.xcconfig -sdk macosx14.5 -destination 'generic/platform=MacOS' -project OpenVPNAdapter.xcodeproj ; then echo "OpenVPNAdapter built successfully" else echo "OpenVPNAdapter build failed" fi + + rm -rf ./build/Release-iphoneos/OpenVPNAdapter.framework/Versions/A/_CodeSignature cd ../../