Add ed25519 as a static library to the project

# Conflicts:
#	Sparkle.xcodeproj/project.pbxproj
This commit is contained in:
Tony Arnold authored and Kornel committed 2020-06-10 12:14:30 +01:00
1 parent 63aa96a076
commit 93a8aca7fd
6 files changed
+186 -1

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
[submodule "Vendor/ed25519"]
path = Vendor/ed25519
url = https://github.com/orlp/ed25519
+3
View File
@@ -0,0 +1,3 @@
// Copyright © 2019 Sparkle Project. All rights reserved.
#include "ed25519-Shared.xcconfig"
+3
View File
@@ -0,0 +1,3 @@
// Copyright © 2019 Sparkle Project. All rights reserved.
#include "ed25519-Shared.xcconfig"
+14
View File
@@ -0,0 +1,14 @@
// Copyright © 2019 Sparkle Project. All rights reserved.
// Deployment
SKIP_INSTALL = YES
// Packaging
EXECUTABLE_PREFIX = lib
PRODUCT_NAME = $(TARGET_NAME)
// Search Paths
ALWAYS_SEARCH_USER_PATHS = NO
// Disable Warnings - this is a third-party project, and we'll trust that the maintainers know what they're doing.
WARNING_CFLAGS = $(inherited) -Wno-cast-qual -Wno-conversion -Wno-sign-conversion
+162 -1
View File
@@ -431,6 +431,23 @@
EA1E282622B64693004AA304 /* bscommon.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 72B09CEA1CEA18900052EF9E /* bscommon.h */; };
EA1E282722B64694004AA304 /* bspatch.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 611142E810FB1BE5009810AA /* bspatch.h */; };
EA1E282822B64694004AA304 /* sais.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7223E7621AD1AEFF008E3161 /* sais.h */; };
EA1E284522B660ED004AA304 /* seed.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283522B660ED004AA304 /* seed.c */; };
EA1E284622B660ED004AA304 /* fe.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283622B660ED004AA304 /* fe.c */; };
EA1E284722B660ED004AA304 /* verify.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283722B660ED004AA304 /* verify.c */; };
EA1E284822B660ED004AA304 /* ge.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283822B660ED004AA304 /* ge.c */; };
EA1E284922B660ED004AA304 /* sc.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283922B660ED004AA304 /* sc.c */; };
EA1E284A22B660ED004AA304 /* sign.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283A22B660ED004AA304 /* sign.c */; };
EA1E284B22B660ED004AA304 /* key_exchange.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283C22B660ED004AA304 /* key_exchange.c */; };
EA1E284C22B660ED004AA304 /* add_scalar.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283D22B660ED004AA304 /* add_scalar.c */; };
EA1E284D22B660ED004AA304 /* keypair.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E284022B660ED004AA304 /* keypair.c */; };
EA1E284E22B660ED004AA304 /* sha512.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E284222B660ED004AA304 /* sha512.c */; };
EA1E284F22B66115004AA304 /* precomp_data.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283422B660ED004AA304 /* precomp_data.h */; };
EA1E285022B66115004AA304 /* sha512.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283B22B660ED004AA304 /* sha512.h */; };
EA1E285122B66115004AA304 /* ed25519.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283E22B660ED004AA304 /* ed25519.h */; };
EA1E285222B66115004AA304 /* fe.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283F22B660ED004AA304 /* fe.h */; };
EA1E285322B66115004AA304 /* fixedint.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E284122B660ED004AA304 /* fixedint.h */; };
EA1E285422B66115004AA304 /* sc.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E284322B660ED004AA304 /* sc.h */; };
EA1E285522B66115004AA304 /* ge.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E284422B660ED004AA304 /* ge.h */; };
F8761EB11ADC5068000C9034 /* SUCodeSigningVerifierTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */; };
F8761EB31ADC50EB000C9034 /* SparkleTestCodeSignApp.zip in Resources */ = {isa = PBXBuildFile; fileRef = F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */; };
/* End PBXBuildFile section */
@@ -769,6 +786,23 @@
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
};
EA1E283222B660C6004AA304 /* Copy Headers */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
EA1E284F22B66115004AA304 /* precomp_data.h in Copy Headers */,
EA1E285022B66115004AA304 /* sha512.h in Copy Headers */,
EA1E285122B66115004AA304 /* ed25519.h in Copy Headers */,
EA1E285222B66115004AA304 /* fe.h in Copy Headers */,
EA1E285322B66115004AA304 /* fixedint.h in Copy Headers */,
EA1E285422B66115004AA304 /* sc.h in Copy Headers */,
EA1E285522B66115004AA304 /* ge.h in Copy Headers */,
);
name = "Copy Headers";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@@ -1246,6 +1280,27 @@
EA1E281422B64548004AA304 /* bsdiff-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Debug.xcconfig"; sourceTree = "<group>"; };
EA1E281522B64549004AA304 /* bsdiff-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Release.xcconfig"; sourceTree = "<group>"; };
EA1E281622B64549004AA304 /* bsdiff-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Shared.xcconfig"; sourceTree = "<group>"; };
EA1E282D22B660BE004AA304 /* libed25519.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libed25519.a; sourceTree = BUILT_PRODUCTS_DIR; };
EA1E283422B660ED004AA304 /* precomp_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = precomp_data.h; sourceTree = "<group>"; };
EA1E283522B660ED004AA304 /* seed.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = seed.c; sourceTree = "<group>"; };
EA1E283622B660ED004AA304 /* fe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe.c; sourceTree = "<group>"; };
EA1E283722B660ED004AA304 /* verify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify.c; sourceTree = "<group>"; };
EA1E283822B660ED004AA304 /* ge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge.c; sourceTree = "<group>"; };
EA1E283922B660ED004AA304 /* sc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sc.c; sourceTree = "<group>"; };
EA1E283A22B660ED004AA304 /* sign.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sign.c; sourceTree = "<group>"; };
EA1E283B22B660ED004AA304 /* sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha512.h; sourceTree = "<group>"; };
EA1E283C22B660ED004AA304 /* key_exchange.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key_exchange.c; sourceTree = "<group>"; };
EA1E283D22B660ED004AA304 /* add_scalar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = add_scalar.c; sourceTree = "<group>"; };
EA1E283E22B660ED004AA304 /* ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ed25519.h; sourceTree = "<group>"; };
EA1E283F22B660ED004AA304 /* fe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fe.h; sourceTree = "<group>"; };
EA1E284022B660ED004AA304 /* keypair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keypair.c; sourceTree = "<group>"; };
EA1E284122B660ED004AA304 /* fixedint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixedint.h; sourceTree = "<group>"; };
EA1E284222B660ED004AA304 /* sha512.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha512.c; sourceTree = "<group>"; };
EA1E284322B660ED004AA304 /* sc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sc.h; sourceTree = "<group>"; };
EA1E284422B660ED004AA304 /* ge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge.h; sourceTree = "<group>"; };
EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ed25519-Release.xcconfig"; sourceTree = "<group>"; };
EA1E285822B6622E004AA304 /* ed25519-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ed25519-Debug.xcconfig"; sourceTree = "<group>"; };
EA1E285922B6622E004AA304 /* ed25519-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ed25519-Shared.xcconfig"; sourceTree = "<group>"; };
F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUCodeSigningVerifierTest.m; sourceTree = "<group>"; };
F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp.zip; sourceTree = "<group>"; };
FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigFrameworkDebug.xcconfig; sourceTree = "<group>"; };
@@ -1401,6 +1456,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
EA1E282B22B660BE004AA304 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -1423,6 +1485,7 @@
726B2B5D1C645FC900388755 /* UI Tests.xctest */,
721C24451CB753E6005440CB /* Updater.app */,
EA1E280F22B64522004AA304 /* libbsdiff.a */,
EA1E282D22B660BE004AA304 /* libed25519.a */,
);
name = Products;
sourceTree = "<group>";
@@ -1499,6 +1562,7 @@
isa = PBXGroup;
children = (
14732BB61960ECE800593899 /* bsdiff */,
EA1E283322B660ED004AA304 /* ed25519 */,
);
path = Vendor;
sourceTree = "<group>";
@@ -2046,6 +2110,31 @@
name = Deprecated;
sourceTree = "<group>";
};
EA1E283322B660ED004AA304 /* ed25519 */ = {
isa = PBXGroup;
children = (
EA1E283422B660ED004AA304 /* precomp_data.h */,
EA1E283522B660ED004AA304 /* seed.c */,
EA1E283622B660ED004AA304 /* fe.c */,
EA1E283722B660ED004AA304 /* verify.c */,
EA1E283822B660ED004AA304 /* ge.c */,
EA1E283922B660ED004AA304 /* sc.c */,
EA1E283A22B660ED004AA304 /* sign.c */,
EA1E283B22B660ED004AA304 /* sha512.h */,
EA1E283C22B660ED004AA304 /* key_exchange.c */,
EA1E283D22B660ED004AA304 /* add_scalar.c */,
EA1E283E22B660ED004AA304 /* ed25519.h */,
EA1E283F22B660ED004AA304 /* fe.h */,
EA1E284022B660ED004AA304 /* keypair.c */,
EA1E284122B660ED004AA304 /* fixedint.h */,
EA1E284222B660ED004AA304 /* sha512.c */,
EA1E284322B660ED004AA304 /* sc.h */,
EA1E284422B660ED004AA304 /* ge.h */,
);
name = ed25519;
path = ed25519/src;
sourceTree = "<group>";
};
FA1941C40D94A6EA00DD942E /* Configurations */ = {
isa = PBXGroup;
children = (
@@ -2089,6 +2178,9 @@
149B78641B7D3A4800D7D62C /* ConfigUnitTestCoverage.xcconfig */,
7205C46C1E13244800E370AE /* ConfigUnitTestDebug.xcconfig */,
7205C46D1E13245600E370AE /* ConfigUnitTestRelease.xcconfig */,
EA1E285822B6622E004AA304 /* ed25519-Debug.xcconfig */,
EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */,
EA1E285922B6622E004AA304 /* ed25519-Shared.xcconfig */,
14732BC91960F70A00593899 /* make-release-package.sh */,
721D8A831D498F1D0032E472 /* set-agent-signing.sh */,
729BB3CE1D50344A007C4276 /* set-ats-exceptions-downloader-service.sh */,
@@ -2546,6 +2638,23 @@
productReference = EA1E280F22B64522004AA304 /* libbsdiff.a */;
productType = "com.apple.product-type.library.static";
};
EA1E282C22B660BE004AA304 /* ed25519 */ = {
isa = PBXNativeTarget;
buildConfigurationList = EA1E282E22B660BE004AA304 /* Build configuration list for PBXNativeTarget "ed25519" */;
buildPhases = (
EA1E282A22B660BE004AA304 /* Sources */,
EA1E282B22B660BE004AA304 /* Frameworks */,
EA1E283222B660C6004AA304 /* Copy Headers */,
);
buildRules = (
);
dependencies = (
);
name = ed25519;
productName = ed25519;
productReference = EA1E282D22B660BE004AA304 /* libed25519.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -2617,6 +2726,9 @@
EA1E280E22B64522004AA304 = {
CreatedOnToolsVersion = 10.2.1;
};
EA1E282C22B660BE004AA304 = {
CreatedOnToolsVersion = 10.2.1;
};
};
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */;
@@ -2691,6 +2803,7 @@
726B2B5C1C645FC900388755 /* UI Tests */,
7205C43D1E13049400E370AE /* generate_appcast */,
EA1E280E22B64522004AA304 /* bsdiff */,
EA1E282C22B660BE004AA304 /* ed25519 */,
);
};
/* End PBXProject section */
@@ -2975,7 +3088,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "ln -sfh \"pt_BR.lproj\" \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/pt.lproj\"";
shellScript = "ln -sfh \"pt_BR.lproj\" \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/pt.lproj\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -3339,6 +3452,23 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
EA1E282A22B660BE004AA304 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
EA1E284622B660ED004AA304 /* fe.c in Sources */,
EA1E284822B660ED004AA304 /* ge.c in Sources */,
EA1E284722B660ED004AA304 /* verify.c in Sources */,
EA1E284C22B660ED004AA304 /* add_scalar.c in Sources */,
EA1E284D22B660ED004AA304 /* keypair.c in Sources */,
EA1E284522B660ED004AA304 /* seed.c in Sources */,
EA1E284B22B660ED004AA304 /* key_exchange.c in Sources */,
EA1E284A22B660ED004AA304 /* sign.c in Sources */,
EA1E284922B660ED004AA304 /* sc.c in Sources */,
EA1E284E22B660ED004AA304 /* sha512.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -4084,6 +4214,27 @@
};
name = Release;
};
EA1E282F22B660BE004AA304 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = EA1E285822B6622E004AA304 /* ed25519-Debug.xcconfig */;
buildSettings = {
};
name = Debug;
};
EA1E283022B660BE004AA304 /* Coverage */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */;
buildSettings = {
};
name = Coverage;
};
EA1E283122B660BE004AA304 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */;
buildSettings = {
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -4287,6 +4438,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
EA1E282E22B660BE004AA304 /* Build configuration list for PBXNativeTarget "ed25519" */ = {
isa = XCConfigurationList;
buildConfigurations = (
EA1E282F22B660BE004AA304 /* Debug */,
EA1E283022B660BE004AA304 /* Coverage */,
EA1E283122B660BE004AA304 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
Vendored Submodule
+1
Submodule Vendor/ed25519 added at 7fa6712ef5.