Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into feature/trace_macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@jovfer
jovfer authored May 30, 2017
2 parents d9f35ca + d6732b2 commit 93f0b2c
Show file tree
Hide file tree
Showing 14 changed files with 943 additions and 182 deletions.
1 change: 0 additions & 1 deletion include/sovrin_anoncreds.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ extern "C" {


extern sovrin_error_t sovrin_verifier_verify_proof(sovrin_handle_t command_handle,
sovrin_handle_t wallet_handle,
const char * proof_request_json,
const char * proof_json,
const char * schemas_json,
Expand Down
36 changes: 22 additions & 14 deletions wrappers/ios/libsovrin-pod/libsovrin-demo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@
3E2A7F951EC36186006194EC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3E2A7F941EC36186006194EC /* Assets.xcassets */; };
3E2A7F981EC36187006194EC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3E2A7F961EC36187006194EC /* LaunchScreen.storyboard */; };
3E2A7FA31EC36187006194EC /* AnoncredsDemo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E2A7FA21EC36187006194EC /* AnoncredsDemo.mm */; };
3E2FFA3F1ED5C06E00536EAD /* Anoncreds.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E2FFA3E1ED5C06E00536EAD /* Anoncreds.m */; };
3E2FFA441ED5C37100536EAD /* WalletUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E2FFA431ED5C37100536EAD /* WalletUtils.m */; };
3E2FFA471ED5CC5E00536EAD /* AnoncredsUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E2FFA461ED5CC5E00536EAD /* AnoncredsUtils.m */; };
3E9CDB9A1ECC841700B1980D /* SignusDemo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E9CDB991ECC841700B1980D /* SignusDemo.mm */; };
3ED5BE4C1EC4967C00881380 /* libsovrin.framework in Resources */ = {isa = PBXBuildFile; fileRef = 3EF020DC1EC45A9B00CF985C /* libsovrin.framework */; };
3ED5BE4F1EC4984900881380 /* libsovrin.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3EF020DC1EC45A9B00CF985C /* libsovrin.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3ED5BE511EC4986100881380 /* libsovrin.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3EF020DC1EC45A9B00CF985C /* libsovrin.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3EC6BCF51EDC0A4500A290DE /* libsovrin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EC6BCF41EDC0A4500A290DE /* libsovrin.framework */; };
3EC6BCF61EDC0A5600A290DE /* libsovrin.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3EC6BCF41EDC0A4500A290DE /* libsovrin.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3ED5BE521EC98D6600881380 /* TestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EF020D71EC4593900CF985C /* TestUtils.m */; };
3ED5BE541EC9D8F200881380 /* LedgerDemo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3ED5BE531EC9D8F200881380 /* LedgerDemo.mm */; };
3ED5BE571EC9DA9700881380 /* PoolUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ED5BE561EC9DA9700881380 /* PoolUtils.m */; };
3EF020D81EC4593900CF985C /* TestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EF020D71EC4593900CF985C /* TestUtils.m */; };
3EF020DB1EC4595500CF985C /* Environment.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EF020DA1EC4595500CF985C /* Environment.m */; };
3EF020DD1EC45A9B00CF985C /* libsovrin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EF020DC1EC45A9B00CF985C /* libsovrin.framework */; };
3EF020DE1EC45AA300CF985C /* libsovrin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EF020DC1EC45A9B00CF985C /* libsovrin.framework */; };
4E342A88B72D9633DC35144B /* libPods-libsovrin-demo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 920EA9D52354D5FE353162A1 /* libPods-libsovrin-demo.a */; };
C417EEF3998DF20C9FE62376 /* libPods-libsovrin-demo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 920EA9D52354D5FE353162A1 /* libPods-libsovrin-demo.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -46,7 +45,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
3ED5BE4F1EC4984900881380 /* libsovrin.framework in CopyFiles */,
3EC6BCF61EDC0A5600A290DE /* libsovrin.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -56,7 +55,6 @@
dstPath = "";
dstSubfolderSpec = 6;
files = (
3ED5BE511EC4986100881380 /* libsovrin.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -77,15 +75,20 @@
3E2A7F9E1EC36187006194EC /* libsovrin-demoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "libsovrin-demoTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
3E2A7FA21EC36187006194EC /* AnoncredsDemo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AnoncredsDemo.mm; sourceTree = "<group>"; };
3E2A7FA41EC36187006194EC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3E2FFA3E1ED5C06E00536EAD /* Anoncreds.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Anoncreds.m; sourceTree = "<group>"; };
3E2FFA421ED5C37100536EAD /* WalletUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WalletUtils.h; sourceTree = "<group>"; };
3E2FFA431ED5C37100536EAD /* WalletUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WalletUtils.m; sourceTree = "<group>"; };
3E2FFA451ED5CC5E00536EAD /* AnoncredsUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnoncredsUtils.h; sourceTree = "<group>"; };
3E2FFA461ED5CC5E00536EAD /* AnoncredsUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnoncredsUtils.m; sourceTree = "<group>"; };
3E9CDB991ECC841700B1980D /* SignusDemo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SignusDemo.mm; sourceTree = "<group>"; };
3EC6BCF41EDC0A4500A290DE /* libsovrin.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libsovrin.framework; path = "../../../../../../Library/Developer/Xcode/DerivedData/libsovrin-fpqoyzkovibgszalhhmmnlcetkfp/Build/Products/Debug-iphoneos/libsovrin.framework"; sourceTree = "<group>"; };
3ED5BE531EC9D8F200881380 /* LedgerDemo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LedgerDemo.mm; sourceTree = "<group>"; };
3ED5BE551EC9DA9700881380 /* PoolUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PoolUtils.h; sourceTree = "<group>"; };
3ED5BE561EC9DA9700881380 /* PoolUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PoolUtils.m; sourceTree = "<group>"; };
3EF020D61EC4593900CF985C /* TestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestUtils.h; sourceTree = "<group>"; };
3EF020D71EC4593900CF985C /* TestUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestUtils.m; sourceTree = "<group>"; };
3EF020D91EC4595500CF985C /* Environment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Environment.h; sourceTree = "<group>"; };
3EF020DA1EC4595500CF985C /* Environment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Environment.m; sourceTree = "<group>"; };
3EF020DC1EC45A9B00CF985C /* libsovrin.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libsovrin.framework; path = "../../../../../../Library/Developer/Xcode/DerivedData/libsovrin-dlmogskbrwrmnoceaqqsbyhvursy/Build/Products/Debug-iphoneos/libsovrin.framework"; sourceTree = "<group>"; };
920EA9D52354D5FE353162A1 /* libPods-libsovrin-demo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-libsovrin-demo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
A49C6DA8781C6A9455450851 /* Pods-libsovrin-demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-libsovrin-demo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-libsovrin-demo/Pods-libsovrin-demo.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -95,8 +98,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3EF020DD1EC45A9B00CF985C /* libsovrin.framework in Frameworks */,
C417EEF3998DF20C9FE62376 /* libPods-libsovrin-demo.a in Frameworks */,
3EC6BCF51EDC0A4500A290DE /* libsovrin.framework in Frameworks */,
4E342A88B72D9633DC35144B /* libPods-libsovrin-demo.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -105,7 +107,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3EF020DE1EC45AA300CF985C /* libsovrin.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -159,6 +160,7 @@
3E2A7FA21EC36187006194EC /* AnoncredsDemo.mm */,
3E9CDB991ECC841700B1980D /* SignusDemo.mm */,
3ED5BE531EC9D8F200881380 /* LedgerDemo.mm */,
3E2FFA3E1ED5C06E00536EAD /* Anoncreds.m */,
3E2A7FA41EC36187006194EC /* Info.plist */,
);
path = "libsovrin-demoTests";
Expand All @@ -185,14 +187,18 @@
3EF020DA1EC4595500CF985C /* Environment.m */,
3ED5BE551EC9DA9700881380 /* PoolUtils.h */,
3ED5BE561EC9DA9700881380 /* PoolUtils.m */,
3E2FFA421ED5C37100536EAD /* WalletUtils.h */,
3E2FFA431ED5C37100536EAD /* WalletUtils.m */,
3E2FFA451ED5CC5E00536EAD /* AnoncredsUtils.h */,
3E2FFA461ED5CC5E00536EAD /* AnoncredsUtils.m */,
);
name = TestUtils;
sourceTree = "<group>";
};
84DF55ECAD03C4B4CEE16BD1 /* Frameworks */ = {
isa = PBXGroup;
children = (
3EF020DC1EC45A9B00CF985C /* libsovrin.framework */,
3EC6BCF41EDC0A4500A290DE /* libsovrin.framework */,
920EA9D52354D5FE353162A1 /* libPods-libsovrin-demo.a */,
);
name = Frameworks;
Expand Down Expand Up @@ -306,7 +312,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3ED5BE4C1EC4967C00881380 /* libsovrin.framework in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -378,10 +383,13 @@
files = (
3E2A7FA31EC36187006194EC /* AnoncredsDemo.mm in Sources */,
3EF020DB1EC4595500CF985C /* Environment.m in Sources */,
3E2FFA441ED5C37100536EAD /* WalletUtils.m in Sources */,
3ED5BE571EC9DA9700881380 /* PoolUtils.m in Sources */,
3E9CDB9A1ECC841700B1980D /* SignusDemo.mm in Sources */,
3E2FFA471ED5CC5E00536EAD /* AnoncredsUtils.m in Sources */,
3EF020D81EC4593900CF985C /* TestUtils.m in Sources */,
3ED5BE541EC9D8F200881380 /* LedgerDemo.mm in Sources */,
3E2FFA3F1ED5C06E00536EAD /* Anoncreds.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading

0 comments on commit 93f0b2c

Please sign in to comment.