Skip to content

Commit

Permalink
Update xcod projects + fix build.
Browse files Browse the repository at this point in the history
  • Loading branch information
@geekbeast
geekbeast committed Sep 28, 2015
1 parent a66ee0e commit 14238b8
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 22 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ gtest-1.7.0/Makefile
gtest-1.7.0/cmake_install.cmake
gtest-1.7.0/libgtest.a
gtest-1.7.0/libgtest_main.a
krypto-lib/krypto.xcodeproj/project.xcworkspace/xcuserdata/mtamayo.xcuserdatad/UserInterfaceState.xcuserstate
2 changes: 1 addition & 1 deletion krypto-api/src/main/java/com/kryptnostic/krypto/engine/KryptnosticEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class KryptnosticEngine {
public static final String PRIVATE_KEY = "KryptnosticEngine.PrivateKey";
public static final String SEARCH_PRIVATE_KEY = "KryptnosticEngine.SearchPrivateKey";
public static final String CLIENT_HASH_FUNCTION = "KryptnosticEngine.ClientHashFunction";

static {
final String osName = System.getProperty( "os.name" ).toLowerCase();
final String libraryName = "libmain";
Expand Down
4 changes: 0 additions & 4 deletions krypto-cli/krypto-cli.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
DBEE40581B7E69A70066EE7A /* libkrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DBEE40571B7E69A70066EE7A /* libkrypto.a */; };
DBEE40611B7E71C70066EE7A /* test_bitmatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE40591B7E71C70066EE7A /* test_bitmatrix.cpp */; };
DBEE40621B7E71C70066EE7A /* test_bitvector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE405A1B7E71C70066EE7A /* test_bitvector.cpp */; };
DBEE40631B7E71C70066EE7A /* test_hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE405B1B7E71C70066EE7A /* test_hash.cpp */; };
DBEE40641B7E71C70066EE7A /* test_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE405C1B7E71C70066EE7A /* test_main.cpp */; };
DBEE40651B7E71C70066EE7A /* test_mqt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE405D1B7E71C70066EE7A /* test_mqt.cpp */; };
DBEE40661B7E71C70066EE7A /* test_priv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE405E1B7E71C70066EE7A /* test_priv.cpp */; };
Expand All @@ -35,7 +34,6 @@
DBEE40571B7E69A70066EE7A /* libkrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libkrypto.a; path = "../../../Library/Developer/Xcode/DerivedData/krypto-gtuwxarymtkevfancbsoikmjbcmz/Build/Products/Debug/libkrypto.a"; sourceTree = "<group>"; };
DBEE40591B7E71C70066EE7A /* test_bitmatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_bitmatrix.cpp; sourceTree = "<group>"; };
DBEE405A1B7E71C70066EE7A /* test_bitvector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_bitvector.cpp; sourceTree = "<group>"; };
DBEE405B1B7E71C70066EE7A /* test_hash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_hash.cpp; sourceTree = "<group>"; };
DBEE405C1B7E71C70066EE7A /* test_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_main.cpp; sourceTree = "<group>"; };
DBEE405D1B7E71C70066EE7A /* test_mqt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_mqt.cpp; sourceTree = "<group>"; };
DBEE405E1B7E71C70066EE7A /* test_priv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_priv.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -69,7 +67,6 @@
children = (
DBEE40591B7E71C70066EE7A /* test_bitmatrix.cpp */,
DBEE405A1B7E71C70066EE7A /* test_bitvector.cpp */,
DBEE405B1B7E71C70066EE7A /* test_hash.cpp */,
DBEE405C1B7E71C70066EE7A /* test_main.cpp */,
DBEE405D1B7E71C70066EE7A /* test_mqt.cpp */,
DBEE405E1B7E71C70066EE7A /* test_priv.cpp */,
Expand Down Expand Up @@ -165,7 +162,6 @@
DBEE40661B7E71C70066EE7A /* test_priv.cpp in Sources */,
DBEE40681B7E71C70066EE7A /* test_trivial.cpp in Sources */,
DBEE40641B7E71C70066EE7A /* test_main.cpp in Sources */,
DBEE40631B7E71C70066EE7A /* test_hash.cpp in Sources */,
DBEE40671B7E71C70066EE7A /* test_public.cpp in Sources */,
DBEE40621B7E71C70066EE7A /* test_bitvector.cpp in Sources */,
);
Expand Down
32 changes: 16 additions & 16 deletions krypto-lib/krypto.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
3AC8383F1B8CF205003B6E2B /* KryptnosticClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC838381B8CF205003B6E2B /* KryptnosticClient.h */; };
3AC838401B8CF205003B6E2B /* KryptnosticJniMapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC838391B8CF205003B6E2B /* KryptnosticJniMapper.h */; };
3AC838411B8CF205003B6E2B /* KryptnosticServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC8383A1B8CF205003B6E2B /* KryptnosticServer.h */; };
3AC838421B8CF205003B6E2B /* TypeConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC8383B1B8CF205003B6E2B /* TypeConverter.h */; };
3AC838431B8CF205003B6E2B /* UUID.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC8383C1B8CF205003B6E2B /* UUID.h */; };
DB2D5F831BB9010B00539BD1 /* test_search.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB2D5F811BB9010B00539BD1 /* test_search.cpp */; settings = {ASSET_TAGS = (); }; };
DB2D5F841BB9010B00539BD1 /* test_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB2D5F821BB9010B00539BD1 /* test_server.cpp */; settings = {ASSET_TAGS = (); }; };
DB2E68691AB0F0E100CA2C07 /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = DB2E68671AB0F0E100CA2C07 /* gtest-all.cc */; };
DB2E686A1AB0F0E100CA2C07 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = DB2E68681AB0F0E100CA2C07 /* gtest.h */; };
DBCB8B551AB0F06E00772347 /* BitMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = DBCB8B4C1AB0F06E00772347 /* BitMatrix.h */; };
Expand All @@ -22,7 +22,6 @@
DBCB8B591AB0F06E00772347 /* test_bitvector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBCB8B521AB0F06E00772347 /* test_bitvector.cpp */; };
DBCB8B5A1AB0F06E00772347 /* test_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBCB8B531AB0F06E00772347 /* test_main.cpp */; };
DBCB8B5B1AB0F06E00772347 /* test_trivial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBCB8B541AB0F06E00772347 /* test_trivial.cpp */; };
DBEE40341B7E63FA0066EE7A /* test_hash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE40301B7E63FA0066EE7A /* test_hash.cpp */; };
DBEE40351B7E63FA0066EE7A /* test_mqt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE40311B7E63FA0066EE7A /* test_mqt.cpp */; };
DBEE40361B7E63FA0066EE7A /* test_priv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE40321B7E63FA0066EE7A /* test_priv.cpp */; };
DBEE40371B7E63FA0066EE7A /* test_public.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DBEE40331B7E63FA0066EE7A /* test_public.cpp */; };
Expand All @@ -32,7 +31,6 @@
DBEE40551B7E65A30066EE7A /* PrivateKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DBEE404E1B7E65A30066EE7A /* PrivateKey.h */; };
DBEE40561B7E65A30066EE7A /* PublicKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DBEE404F1B7E65A30066EE7A /* PublicKey.h */; };
DBEE406E1B7E73670066EE7A /* SearchPrivateKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DBEE406C1B7E73670066EE7A /* SearchPrivateKey.h */; };
DBEE406F1B7E73670066EE7A /* SearchPublicKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DBEE406D1B7E73670066EE7A /* SearchPublicKey.h */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -51,8 +49,8 @@
3AC838381B8CF205003B6E2B /* KryptnosticClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KryptnosticClient.h; sourceTree = "<group>"; };
3AC838391B8CF205003B6E2B /* KryptnosticJniMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KryptnosticJniMapper.h; sourceTree = "<group>"; };
3AC8383A1B8CF205003B6E2B /* KryptnosticServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KryptnosticServer.h; sourceTree = "<group>"; };
3AC8383B1B8CF205003B6E2B /* TypeConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeConverter.h; sourceTree = "<group>"; };
3AC8383C1B8CF205003B6E2B /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = "<group>"; };
DB2D5F811BB9010B00539BD1 /* test_search.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_search.cpp; sourceTree = "<group>"; };
DB2D5F821BB9010B00539BD1 /* test_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_server.cpp; sourceTree = "<group>"; };
DB2E68671AB0F0E100CA2C07 /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = "<group>"; };
DB2E68681AB0F0E100CA2C07 /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest.h; sourceTree = "<group>"; };
DBAD36831A3A9EAE00E13DBD /* krypto-cli.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "krypto-cli.xcodeproj"; path = "../krypto-cli/krypto-cli.xcodeproj"; sourceTree = "<group>"; };
Expand All @@ -63,7 +61,6 @@
DBCB8B521AB0F06E00772347 /* test_bitvector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_bitvector.cpp; sourceTree = "<group>"; };
DBCB8B531AB0F06E00772347 /* test_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_main.cpp; sourceTree = "<group>"; };
DBCB8B541AB0F06E00772347 /* test_trivial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_trivial.cpp; sourceTree = "<group>"; };
DBEE40301B7E63FA0066EE7A /* test_hash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_hash.cpp; sourceTree = "<group>"; };
DBEE40311B7E63FA0066EE7A /* test_mqt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_mqt.cpp; sourceTree = "<group>"; };
DBEE40321B7E63FA0066EE7A /* test_priv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_priv.cpp; sourceTree = "<group>"; };
DBEE40331B7E63FA0066EE7A /* test_public.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_public.cpp; sourceTree = "<group>"; };
Expand All @@ -73,7 +70,6 @@
DBEE404E1B7E65A30066EE7A /* PrivateKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateKey.h; sourceTree = "<group>"; };
DBEE404F1B7E65A30066EE7A /* PublicKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublicKey.h; sourceTree = "<group>"; };
DBEE406C1B7E73670066EE7A /* SearchPrivateKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchPrivateKey.h; sourceTree = "<group>"; };
DBEE406D1B7E73670066EE7A /* SearchPublicKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchPublicKey.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -155,10 +151,7 @@
3AC838381B8CF205003B6E2B /* KryptnosticClient.h */,
3AC838391B8CF205003B6E2B /* KryptnosticJniMapper.h */,
3AC8383A1B8CF205003B6E2B /* KryptnosticServer.h */,
3AC8383B1B8CF205003B6E2B /* TypeConverter.h */,
3AC8383C1B8CF205003B6E2B /* UUID.h */,
DBEE406C1B7E73670066EE7A /* SearchPrivateKey.h */,
DBEE406D1B7E73670066EE7A /* SearchPublicKey.h */,
DBEE40491B7E65A30066EE7A /* BridgeKey.h */,
DBEE404C1B7E65A30066EE7A /* MultiQuadTuple.h */,
DBEE404D1B7E65A30066EE7A /* MultiQuadTupleChain.h */,
Expand All @@ -181,7 +174,8 @@
DBCB8B501AB0F06E00772347 /* cpp */ = {
isa = PBXGroup;
children = (
DBEE40301B7E63FA0066EE7A /* test_hash.cpp */,
DB2D5F811BB9010B00539BD1 /* test_search.cpp */,
DB2D5F821BB9010B00539BD1 /* test_server.cpp */,
DBEE40311B7E63FA0066EE7A /* test_mqt.cpp */,
DBEE40321B7E63FA0066EE7A /* test_priv.cpp */,
DBEE40331B7E63FA0066EE7A /* test_public.cpp */,
Expand Down Expand Up @@ -210,13 +204,10 @@
3AC838411B8CF205003B6E2B /* KryptnosticServer.h in Headers */,
DBCB8B561AB0F06E00772347 /* BitVector.h in Headers */,
DBEE40541B7E65A30066EE7A /* MultiQuadTupleChain.h in Headers */,
DBEE406F1B7E73670066EE7A /* SearchPublicKey.h in Headers */,
DBEE40501B7E65A30066EE7A /* BridgeKey.h in Headers */,
3AC8383D1B8CF205003B6E2B /* ClientHashFunction.h in Headers */,
DBEE40561B7E65A30066EE7A /* PublicKey.h in Headers */,
3AC838431B8CF205003B6E2B /* UUID.h in Headers */,
3AC8383E1B8CF205003B6E2B /* com_kryptnostic_krypto_engine_KryptnosticEngine.h in Headers */,
3AC838421B8CF205003B6E2B /* TypeConverter.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -296,10 +287,11 @@
DBCB8B591AB0F06E00772347 /* test_bitvector.cpp in Sources */,
DBCB8B581AB0F06E00772347 /* test_bitmatrix.cpp in Sources */,
DBEE40351B7E63FA0066EE7A /* test_mqt.cpp in Sources */,
DB2D5F841BB9010B00539BD1 /* test_server.cpp in Sources */,
DBCB8B5A1AB0F06E00772347 /* test_main.cpp in Sources */,
DBCB8B5B1AB0F06E00772347 /* test_trivial.cpp in Sources */,
DB2D5F831BB9010B00539BD1 /* test_search.cpp in Sources */,
DBEE40361B7E63FA0066EE7A /* test_priv.cpp in Sources */,
DBEE40341B7E63FA0066EE7A /* test_hash.cpp in Sources */,
DBEE40371B7E63FA0066EE7A /* test_public.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -411,6 +403,10 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
./contrib,
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-ftemplate-depth=8192",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -436,6 +432,10 @@
);
LLVM_LTO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-ftemplate-depth=8192",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
Binary file removed ...odeproj/project.xcworkspace/xcuserdata/mtamayo.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion krypto-lib/src/mainTest/cpp/test_search.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TEST(SearchKeyTest, testShare){
BitVector<N> expectedAddress = sk_src.getMetadataAddress(objectIndexPair, token);

//source client prepares the sharing pair
std::pair<BitVector<N>, BitMatrix<N> > objectSharePair = sk_src.getObjectSharePair(sourceObjectSearchPair, pk_src);
std::pair<BitVector<N>, BitMatrix<N> > objectSharePair = sk_src.getObjectSharePairFromObjectSearchPair(sourceObjectSearchPair, pk_src);

//destination client receives the sharing pair and prepares the upload pair
std::pair<BitVector<2*N>, BitMatrix<N> > destinationObjectSearchPair = sk_dst.getObjectSearchPairFromObjectSharePair(objectSharePair, pk_dst);
Expand Down

0 comments on commit 14238b8

Please sign in to comment.