Browse Source

Merge branch 'master' into doxygen_doc

pull/22/head
Krista Bennett 1 year ago
parent
commit
c1354247fd
35 changed files with 2219 additions and 1007 deletions
  1. +17
    -0
      .gitignore
  2. +485
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3.xcodeproj/project.pbxproj
  3. +7
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  4. +22
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3/Info.plist
  5. +18
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3/PEPSQLITE3.h
  6. +12
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_iOS/PEPSQLITE3_iOS.h
  7. +12
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_iOS/PEPSQLITE3_iOS.m
  8. +12
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_macOS/PEPSQLITE3_macOS.h
  9. +12
    -0
      build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_macOS/PEPSQLITE3_macOS.m
  10. +1259
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.pbxproj
  11. +7
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  12. +22
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1/Info.plist
  13. +18
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1/pEpASN1.h
  14. +12
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1_iOS/pEpASN1_iOS.h
  15. +12
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1_iOS/pEpASN1_iOS.m
  16. +12
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1_macOS/pEpASN1_macOS.h
  17. +12
    -0
      build-mac/Subprojects/pEpASN1/pEpASN1_macOS/pEpASN1_macOS.m
  18. +196
    -925
      build-mac/pEpEngine.xcodeproj/project.pbxproj
  19. +13
    -0
      build-mac/pEpEngine_macOS/pEpEngine_macOS.h
  20. +13
    -0
      build-mac/pEpEngine_macOS/pEpEngine_macOS.m
  21. +3
    -2
      build-windows/generate_code.cmd
  22. +5
    -2
      build-windows/libpEpasn1/libpEpasn1.vcxproj
  23. +11
    -2
      build-windows/pEpEngine.vcxproj
  24. +22
    -3
      build-windows/pEpEngine.vcxproj.filters
  25. +0
    -6
      scripts/git/post-checkout
  26. +0
    -6
      scripts/git/post-commit
  27. +0
    -6
      scripts/git/post-merge-commit
  28. +0
    -3
      scripts/git/pre-commit
  29. +4
    -15
      src/Makefile
  30. +0
    -5
      src/pEpEngine.c
  31. +0
    -10
      src/pEpEngine.h
  32. +0
    -10
      src/pEp_internal.h
  33. +1
    -1
      src/platform.h
  34. +0
    -4
      sync/gen_statemachine.ysl2
  35. +0
    -7
      templates/commit_hash.h

+ 17
- 0
.gitignore View File

@ -95,6 +95,23 @@ venv2/
cleangit.py
newgit
# Xcode related ignores
build/
DerivedData/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/
*.moved-aside
*.xccheckout
*.xcscmblueprint
xcshareddata
# ignore generated test data
test/655_16F07F382FB3CF5DF977005D1069C7CACF9C23C6.asc


+ 485
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3.xcodeproj/project.pbxproj View File

@ -0,0 +1,485 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
15A326372612055F009D07EB /* PEPSQLITE3_iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 15A326362612055F009D07EB /* PEPSQLITE3_iOS.m */; };
15A326382612055F009D07EB /* PEPSQLITE3_iOS.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 15A326352612055F009D07EB /* PEPSQLITE3_iOS.h */; };
15A32656261205E7009D07EB /* PEPSQLITE3_macOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A32655261205E7009D07EB /* PEPSQLITE3_macOS.h */; };
15A32658261205E7009D07EB /* PEPSQLITE3_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 15A32657261205E7009D07EB /* PEPSQLITE3_macOS.m */; };
15A326722612063B009D07EB /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 15A326282611F6D3009D07EB /* sqlite3.c */; };
15A3267C2612065A009D07EB /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A326292611F6D3009D07EB /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
15A3268426120671009D07EB /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 15A326292611F6D3009D07EB /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
15A326C626120858009D07EB /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 15A326282611F6D3009D07EB /* sqlite3.c */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
15A326312612055F009D07EB /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
15A326382612055F009D07EB /* PEPSQLITE3_iOS.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
15A3260B2611F646009D07EB /* PEPSQLITE3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSQLITE3.h; sourceTree = "<group>"; };
15A3260C2611F646009D07EB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
15A326282611F6D3009D07EB /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../../../../../sqlite/sqlite3.c; sourceTree = "<group>"; };
15A326292611F6D3009D07EB /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../../../../../sqlite/sqlite3.h; sourceTree = "<group>"; };
15A326332612055F009D07EB /* libPEPSQLITE3_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPSQLITE3_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
15A326352612055F009D07EB /* PEPSQLITE3_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSQLITE3_iOS.h; sourceTree = "<group>"; };
15A326362612055F009D07EB /* PEPSQLITE3_iOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSQLITE3_iOS.m; sourceTree = "<group>"; };
15A32653261205E7009D07EB /* libPEPSQLITE3_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPSQLITE3_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
15A32655261205E7009D07EB /* PEPSQLITE3_macOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPSQLITE3_macOS.h; sourceTree = "<group>"; };
15A32657261205E7009D07EB /* PEPSQLITE3_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSQLITE3_macOS.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
15A326302612055F009D07EB /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
15A32651261205E7009D07EB /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
15A325FE2611F646009D07EB = {
isa = PBXGroup;
children = (
15A3260A2611F646009D07EB /* PEPSQLITE3 */,
15A326342612055F009D07EB /* PEPSQLITE3_iOS */,
15A32654261205E7009D07EB /* PEPSQLITE3_macOS */,
15A326092611F646009D07EB /* Products */,
);
sourceTree = "<group>";
};
15A326092611F646009D07EB /* Products */ = {
isa = PBXGroup;
children = (
15A326332612055F009D07EB /* libPEPSQLITE3_iOS.a */,
15A32653261205E7009D07EB /* libPEPSQLITE3_macOS.a */,
);
name = Products;
sourceTree = "<group>";
};
15A3260A2611F646009D07EB /* PEPSQLITE3 */ = {
isa = PBXGroup;
children = (
15A326272611F6BC009D07EB /* src */,
15A3260B2611F646009D07EB /* PEPSQLITE3.h */,
15A3260C2611F646009D07EB /* Info.plist */,
);
path = PEPSQLITE3;
sourceTree = "<group>";
};
15A326272611F6BC009D07EB /* src */ = {
isa = PBXGroup;
children = (
15A326292611F6D3009D07EB /* sqlite3.h */,
15A326282611F6D3009D07EB /* sqlite3.c */,
);
path = src;
sourceTree = "<group>";
};
15A326342612055F009D07EB /* PEPSQLITE3_iOS */ = {
isa = PBXGroup;
children = (
15A326352612055F009D07EB /* PEPSQLITE3_iOS.h */,
15A326362612055F009D07EB /* PEPSQLITE3_iOS.m */,
);
path = PEPSQLITE3_iOS;
sourceTree = "<group>";
};
15A32654261205E7009D07EB /* PEPSQLITE3_macOS */ = {
isa = PBXGroup;
children = (
15A32655261205E7009D07EB /* PEPSQLITE3_macOS.h */,
15A32657261205E7009D07EB /* PEPSQLITE3_macOS.m */,
);
path = PEPSQLITE3_macOS;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
15A3264F261205E7009D07EB /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
15A3267C2612065A009D07EB /* sqlite3.h in Headers */,
15A32656261205E7009D07EB /* PEPSQLITE3_macOS.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
15A326812612066D009D07EB /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
15A3268426120671009D07EB /* sqlite3.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
15A326322612055F009D07EB /* PEPSQLITE3_iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 15A326392612055F009D07EB /* Build configuration list for PBXNativeTarget "PEPSQLITE3_iOS" */;
buildPhases = (
15A326812612066D009D07EB /* Headers */,
15A3262F2612055F009D07EB /* Sources */,
15A326302612055F009D07EB /* Frameworks */,
15A326312612055F009D07EB /* CopyFiles */,
15A3268926120716009D07EB /* Copy Artefacts & Headers to Custom Build Dir */,
);
buildRules = (
);
dependencies = (
);
name = PEPSQLITE3_iOS;
productName = PEPSQLITE3_iOS;
productReference = 15A326332612055F009D07EB /* libPEPSQLITE3_iOS.a */;
productType = "com.apple.product-type.library.static";
};
15A32652261205E7009D07EB /* PEPSQLITE3_macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 15A32659261205E7009D07EB /* Build configuration list for PBXNativeTarget "PEPSQLITE3_macOS" */;
buildPhases = (
15A3264F261205E7009D07EB /* Headers */,
15A32650261205E7009D07EB /* Sources */,
15A32651261205E7009D07EB /* Frameworks */,
15A3268A26120757009D07EB /* Copy Artefacts & Headers to Custom Build Dir */,
);
buildRules = (
);
dependencies = (
);
name = PEPSQLITE3_macOS;
productName = PEPSQLITE3_macOS;
productReference = 15A32653261205E7009D07EB /* libPEPSQLITE3_macOS.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
15A325FF2611F646009D07EB /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1240;
TargetAttributes = {
15A326322612055F009D07EB = {
CreatedOnToolsVersion = 12.4;
};
15A32652261205E7009D07EB = {
CreatedOnToolsVersion = 12.4;
};
};
};
buildConfigurationList = 15A326022611F646009D07EB /* Build configuration list for PBXProject "PEPSQLITE3" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 15A325FE2611F646009D07EB;
productRefGroup = 15A326092611F646009D07EB /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
15A326322612055F009D07EB /* PEPSQLITE3_iOS */,
15A32652261205E7009D07EB /* PEPSQLITE3_macOS */,
);
};
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
15A3268926120716009D07EB /* Copy Artefacts & Headers to Custom Build Dir */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Copy Artefacts & Headers to Custom Build Dir";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${TARGET_BUILD_DIR}\"/usr/local/include/sqlite3.h ${CUSTOM_INCLUDE_DIR}\ncp \"${TARGET_BUILD_DIR}/libPEPSQLITE3_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
showEnvVarsInLog = 0;
};
15A3268A26120757009D07EB /* Copy Artefacts & Headers to Custom Build Dir */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Copy Artefacts & Headers to Custom Build Dir";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${TARGET_BUILD_DIR}\"/usr/local/include/sqlite3.h ${CUSTOM_INCLUDE_DIR}\ncp \"${TARGET_BUILD_DIR}/libPEPSQLITE3_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
15A3262F2612055F009D07EB /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
15A326372612055F009D07EB /* PEPSQLITE3_iOS.m in Sources */,
15A326722612063B009D07EB /* sqlite3.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
15A32650261205E7009D07EB /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
15A32658261205E7009D07EB /* PEPSQLITE3_macOS.m in Sources */,
15A326C626120858009D07EB /* sqlite3.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
15A3260E2611F646009D07EB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
15A3260F2611F646009D07EB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
15A3263A2612055F009D07EB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
15A3263B2612055F009D07EB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
15A3265A261205E7009D07EB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
EXECUTABLE_PREFIX = lib;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
};
15A3265B261205E7009D07EB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
EXECUTABLE_PREFIX = lib;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
15A326022611F646009D07EB /* Build configuration list for PBXProject "PEPSQLITE3" */ = {
isa = XCConfigurationList;
buildConfigurations = (
15A3260E2611F646009D07EB /* Debug */,
15A3260F2611F646009D07EB /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
15A326392612055F009D07EB /* Build configuration list for PBXNativeTarget "PEPSQLITE3_iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
15A3263A2612055F009D07EB /* Debug */,
15A3263B2612055F009D07EB /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
15A32659261205E7009D07EB /* Build configuration list for PBXNativeTarget "PEPSQLITE3_macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
15A3265A261205E7009D07EB /* Debug */,
15A3265B261205E7009D07EB /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 15A325FF2611F646009D07EB /* Project object */;
}

+ 7
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3.xcodeproj/project.xcworkspace/contents.xcworkspacedata View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>

+ 22
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3/Info.plist View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>

+ 18
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3/PEPSQLITE3.h View File

@ -0,0 +1,18 @@
//
// PEPSQLITE3.h
// PEPSQLITE3
//
// Created by Andreas Buff on 29.03.21.
//
#import <Foundation/Foundation.h>
//! Project version number for PEPSQLITE3.
FOUNDATION_EXPORT double PEPSQLITE3VersionNumber;
//! Project version string for PEPSQLITE3.
FOUNDATION_EXPORT const unsigned char PEPSQLITE3VersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <PEPSQLITE3/PublicHeader.h>

+ 12
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_iOS/PEPSQLITE3_iOS.h View File

@ -0,0 +1,12 @@
//
// PEPSQLITE3_iOS.h
// PEPSQLITE3_iOS
//
// Created by Andreas Buff on 29.03.21.
//
#import <Foundation/Foundation.h>
@interface PEPSQLITE3_iOS : NSObject
@end

+ 12
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_iOS/PEPSQLITE3_iOS.m View File

@ -0,0 +1,12 @@
//
// PEPSQLITE3_iOS.m
// PEPSQLITE3_iOS
//
// Created by Andreas Buff on 29.03.21.
//
#import "PEPSQLITE3_iOS.h"
@implementation PEPSQLITE3_iOS
@end

+ 12
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_macOS/PEPSQLITE3_macOS.h View File

@ -0,0 +1,12 @@
//
// PEPSQLITE3_macOS.h
// PEPSQLITE3_macOS
//
// Created by Andreas Buff on 29.03.21.
//
#import <Foundation/Foundation.h>
@interface PEPSQLITE3_macOS : NSObject
@end

+ 12
- 0
build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3_macOS/PEPSQLITE3_macOS.m View File

@ -0,0 +1,12 @@
//
// PEPSQLITE3_macOS.m
// PEPSQLITE3_macOS
//
// Created by Andreas Buff on 29.03.21.
//
#import "PEPSQLITE3_macOS.h"
@implementation PEPSQLITE3_macOS
@end

+ 1259
- 0
build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.pbxproj
File diff suppressed because it is too large
View File


+ 7
- 0
build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.xcworkspace/contents.xcworkspacedata View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>

+ 22
- 0
build-mac/Subprojects/pEpASN1/pEpASN1/Info.plist View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>

+ 18
- 0
build-mac/Subprojects/pEpASN1/pEpASN1/pEpASN1.h View File

@ -0,0 +1,18 @@
//
// pEpASN1.h
// pEpASN1
//
// Created by Andreas Buff on 26.03.21.
//
#import <Foundation/Foundation.h>
//! Project version number for pEpASN1.
FOUNDATION_EXPORT double pEpASN1VersionNumber;
//! Project version string for pEpASN1.
FOUNDATION_EXPORT const unsigned char pEpASN1VersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <pEpASN1/PublicHeader.h>

+ 12
- 0
build-mac/Subprojects/pEpASN1/pEpASN1_iOS/pEpASN1_iOS.h View File

@ -0,0 +1,12 @@
//
// pEpASN1_iOS.h
// pEpASN1_iOS
//
// Created by Andreas Buff on 26.03.21.
//
#import <Foundation/Foundation.h>
@interface pEpASN1_iOS : NSObject
@end

+ 12
- 0
build-mac/Subprojects/pEpASN1/pEpASN1_iOS/pEpASN1_iOS.m View File

@ -0,0 +1,12 @@
//
// pEpASN1_iOS.m
// pEpASN1_iOS
//
// Created by Andreas Buff on 26.03.21.
//
#import "pEpASN1_iOS.h"
@implementation pEpASN1_iOS
@end

+ 12
- 0
build-mac/Subprojects/pEpASN1/pEpASN1_macOS/pEpASN1_macOS.h View File

@ -0,0 +1,12 @@
//
// pEpASN1_macOS.h
// pEpASN1_macOS
//
// Created by Andreas Buff on 26.03.21.
//
#import <Foundation/Foundation.h>
@interface pEpASN1_macOS : NSObject
@end

+ 12
- 0
build-mac/Subprojects/pEpASN1/pEpASN1_macOS/pEpASN1_macOS.m View File

@ -0,0 +1,12 @@
//
// pEpASN1_macOS.m
// pEpASN1_macOS
//
// Created by Andreas Buff on 26.03.21.
//
#import "pEpASN1_macOS.h"
@implementation pEpASN1_macOS
@end

+ 196
- 925
build-mac/pEpEngine.xcodeproj/project.pbxproj
File diff suppressed because it is too large
View File


+ 13
- 0
build-mac/pEpEngine_macOS/pEpEngine_macOS.h View File

@ -0,0 +1,13 @@
//
// pEpEngine_macOS.h
// pEpEngine_macOS
//
// Created by Andreas Buff on 02.12.20.
// Copyright © 2020 pp Security S.A. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface pEpEngine_macOS : NSObject
@end

+ 13
- 0
build-mac/pEpEngine_macOS/pEpEngine_macOS.m View File

@ -0,0 +1,13 @@
//
// pEpEngine_macOS.m
// pEpEngine_macOS
//
// Created by Andreas Buff on 02.12.20.
// Copyright © 2020 pp Security S.A. All rights reserved.
//
#import "pEpEngine_macOS.h"
@implementation pEpEngine_macOS
@end

+ 3
- 2
build-windows/generate_code.cmd View File

@ -20,6 +20,7 @@ MOVE system.db "%ProgramData%\pEp\system.db"
CD ..\sync
:: Make sure YML2 is installed
PY -m pip install --upgrade pip
PY -m pip install wheel
PY -m pip install yml2
@ -72,10 +73,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO end
DEL *-sample.c
CD %engine_directory%\..
RD /S/Q pEp
MKDIR pEp
XCOPY pEpEngine\src\*.h pEp\ /Y/F/I
XCOPY libpEpAdapter\*.hh pEp\ /Y/F/I
XCOPY libpEpAdapter\*.hxx pEp\ /Y/F/I
:end


+ 5
- 2
build-windows/libpEpasn1/libpEpasn1.vcxproj View File

@ -61,7 +61,7 @@
<SubSystem>Windows</SubSystem>
</Link>
<PreBuildEvent>
<Command>IF EXIST ".\Debug\libpEpasn1.tlog\unsuccessfulbuild" CALL ..\generate_code.cmd</Command>
<Command>IF NOT EXIST "..\..\..\pEp" CALL ..\generate_code.cmd</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -81,7 +81,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>IF EXIST ".\Release\libpEpasn1.tlog\unsuccessfulbuild" CALL ..\generate_code.cmd</Command>
<Command>IF NOT EXIST "..\..\..\pEp" CALL ..\generate_code.cmd</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@ -98,4 +98,7 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<Target Name="CustomClean" BeforeTargets="Clean">
<RemoveDir Directories="..\..\..\pEp" />
</Target>
</Project>

+ 11
- 2
build-windows/pEpEngine.vcxproj View File

@ -86,10 +86,11 @@
<SuppressStartupBanner>false</SuppressStartupBanner>
</Link>
<PreBuildEvent>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" -p sequoia-openpgp-ffi</Command>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml"</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)sequoia\target\debug\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>
<Command>xcopy "$(SolutionDir)sequoia\target\debug\sq.exe" "$(TargetDir)" /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -118,13 +119,15 @@
<AdditionalLibraryDirectories>$(SolutionDir)sequoia\target\release;C:\msys64\mingw32\lib</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" --release -p sequoia-openpgp-ffi</Command>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" --release</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)sequoia\target\release\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>
<Command>xcopy "$(SolutionDir)sequoia\target\release\sq.exe" "$(TargetDir)" /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\aux_mime_msg.c" />
<ClCompile Include="..\src\base64.c" />
<ClCompile Include="..\src\baseprotocol.c" />
<ClCompile Include="..\src\blacklist.c" />
@ -151,6 +154,7 @@
<ClCompile Include="..\src\pgp_sequoia.c" />
<ClCompile Include="..\src\platform_windows.cpp" />
<ClCompile Include="..\src\resource_id.c" />
<ClCompile Include="..\src\security_checks.c" />
<ClCompile Include="..\src\sqlite3.c" />
<ClCompile Include="..\src\stringlist.c" />
<ClCompile Include="..\src\stringpair.c" />
@ -166,11 +170,13 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\asn1_helper.h" />
<ClInclude Include="..\src\aux_mime_msg.h" />
<ClInclude Include="..\src\base64.h" />
<ClInclude Include="..\src\baseprotocol.h" />
<ClInclude Include="..\src\blacklist.h" />
<ClInclude Include="..\src\bloblist.h" />
<ClInclude Include="..\src\cryptotech.h" />
<ClInclude Include="..\src\distribution_codec.h" />
<ClInclude Include="..\src\dynamic_api.h" />
<ClInclude Include="..\src\email.h" />
<ClInclude Include="..\src\etpan_mime.h" />
@ -179,6 +185,7 @@
<ClInclude Include="..\src\identity_list.h" />
<ClInclude Include="..\src\internal_format.h" />
<ClInclude Include="..\src\keymanagement.h" />
<ClInclude Include="..\src\keyreset_command.h" />
<ClInclude Include="..\src\KeySync_fsm.h" />
<ClInclude Include="..\src\key_reset.h" />
<ClInclude Include="..\src\labeled_int_list.h" />
@ -196,7 +203,9 @@
<ClInclude Include="..\src\platform_windows.h" />
<ClInclude Include="..\src\resource.h" />
<ClInclude Include="..\src\resource_id.h" />
<ClInclude Include="..\src\security_checks.h" />
<ClInclude Include="..\src\sqlite3.h" />
<ClInclude Include="..\src\status_to_string.h" />
<ClInclude Include="..\src\stringlist.h" />
<ClInclude Include="..\src\stringpair.h" />
<ClInclude Include="..\src\sync_api.h" />


+ 22
- 3
build-windows/pEpEngine.vcxproj.filters View File

@ -129,6 +129,12 @@
<ClCompile Include="..\src\internal_format.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="..\src\aux_mime_msg.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="..\src\security_checks.c">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\keymanagement.h">
@ -272,13 +278,26 @@
<ClInclude Include="..\src\internal_format.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\src\aux_mime_msg.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\src\distribution_codec.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\src\keyreset_command.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\src\security_checks.h">
<Filter>Headerdateien</Filter>
</ClInclude>
<ClInclude Include="..\src\status_to_string.h">
<Filter>Headerdateien</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\LICENSE.txt" />
</ItemGroup>
<ItemGroup>
<None Include="generate_code.cmd">
<Filter>Quelldateien</Filter>
</None>
<None Include="generate_code.cmd" />
</ItemGroup>
</Project>

+ 0
- 6
scripts/git/post-checkout View File

@ -1,6 +0,0 @@
#! /bin/sh
# Commit hash header file - if we don't run this, it won't build.
commit_hash="$(git rev-parse HEAD)"
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$commit_hash\"/" templates/commit_hash.h > src/commit_hash.h

+ 0
- 6
scripts/git/post-commit View File

@ -1,6 +0,0 @@
#! /bin/sh
# Commit hash header file - if we don't run this, it won't build.
commit_hash="$(git rev-parse HEAD)"
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$commit_hash\"/" templates/commit_hash.h > src/commit_hash.h

+ 0
- 6
scripts/git/post-merge-commit View File

@ -1,6 +0,0 @@
#! /bin/sh
# Commit hash header file - if we don't run this, it won't build.
commit_hash="$(git rev-parse HEAD)"
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$commit_hash\"/" templates/commit_hash.h > src/commit_hash.h

+ 0
- 3
scripts/git/pre-commit View File

@ -1,3 +0,0 @@
#! /bin/sh
rm src/commit_hash.h

+ 4
- 15
src/Makefile View File

@ -48,9 +48,6 @@ else
$(error I do not know how to make for $(BUILD_FOR) on $(BUILD_ON))
endif
# Commit hash header file - if we don't run this, it won't build.
COMMIT_HASH:=$(shell git rev-parse HEAD)
ifdef SQLITE3_FROM_OS
NO_SOURCE+= sqlite3.c
CPPFLAGS+= -DSQLITE3_FROM_OS
@ -74,7 +71,7 @@ all: $(TARGET)
-include Makefile.protocols
%.d: %.c commit_hash.h
%.d: %.c
@set -e; rm -f $@; \
$(CC) -MM $(CFLAGS) $(CPPFLAGS) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
@ -90,28 +87,20 @@ $(TARGET): libpEpEngine.a
.PHONY: objects clean install_headers install uninstall beinstall
commit_hash.h:
ifeq (,$(COMMIT_HASH))
$(shell cp ../templates/commit_hash.h commit_hash.h)
else
sed "s/\(PEP_CURRENT_COMMIT_HASH\ \).*/\1\"$(COMMIT_HASH)\"/" ../templates/commit_hash.h > commit_hash.h
endif
objects: $(ALL_OBJECTS) commit_hash.h
objects: $(ALL_OBJECTS)
libpEpEngine.a: $(ALL_OBJECTS) commit_hash.h
libpEpEngine.a: $(ALL_OBJECTS)
$(AR) -rc $@ $^
clean:
rm -f *.d *.o *.a $(TARGET) *.dll *.so *.zip *.d.* *.def *~
rm -Rf $(TARGET).dSYM
rm -f KeySync_fsm.* Sync_actions.c Sync_event.* Sync_func.* Sync_impl.* sync_codec.* distribution_codec.*
rm -f commit_hash.h
# CAVEAT:
# install_headers is needed for building *STANDALONE* pEp MIME - it is NOT used for built-in functionality!!!
install_headers: $(TARGET) commit_hash.h
install_headers: $(TARGET)
mkdir -p $(PREFIX)/include/pEp
cp pEpEngine.h keymanagement.h message_api.h dynamic_api.h stringlist.h \
timestamp.h identity_list.h bloblist.h stringpair.h message.h mime.h \


+ 0
- 5
src/pEpEngine.c View File

@ -216,7 +216,6 @@ DYNAMIC_API PEP_STATUS config_passphrase_for_new_keys(PEP_SESSION session, bool
return status;
}
DYNAMIC_API void config_service_log(PEP_SESSION session, bool enable)
{
assert(session);
@ -224,10 +223,6 @@ DYNAMIC_API void config_service_log(PEP_SESSION session, bool enable)
session->service_log = enable;
}
DYNAMIC_API const char* get_commit_hash() {
return PEP_CURRENT_COMMIT_HASH;
}
DYNAMIC_API PEP_STATUS log_event(
PEP_SESSION session,
const char *title,


+ 0
- 10
src/pEpEngine.h View File

@ -529,16 +529,6 @@ DYNAMIC_API PEP_STATUS encrypt_and_sign(
DYNAMIC_API PEP_STATUS probe_encrypt(PEP_SESSION session, const char *fpr);
/**
* <!-- get_commit_hash() -->
*
* @brief Get the commit hash of this build
*
* @retval commit_hash string constant referring to the commit hash
*
*/
DYNAMIC_API const char* get_commit_hash();
/**
* <!-- set_debug_color() -->
*


+ 0
- 10
src/pEp_internal.h View File

@ -7,16 +7,6 @@
#ifndef PEP_INTERNAL_H
#define PEP_INTERNAL_H
#if defined __has_include
# if __has_include ("commit_hash.h")
# include "commit_hash.h"
# else
# define PEP_CURRENT_COMMIT_HASH = "DUMMY_COMMIT_HASH_ERROR"
# endif
#else
# include "commit_hash.h"
#endif
// maximum attachment size to import as key 25MB, maximum of 20 attachments
#define MAX_KEY_SIZE (25 * 1024 * 1024)
#define MAX_KEYS_TO_IMPORT 20


+ 1
- 1
src/platform.h View File

@ -11,7 +11,7 @@
extern "C" {
#endif
#ifdef WIN32
#ifdef _WIN32
#include "platform_windows.h"
#else
#include "platform_unix.h"


+ 0
- 4
sync/gen_statemachine.ysl2 View File

@ -691,10 +691,6 @@ tstylesheet {
message *_m = NULL;
char *_data = NULL;
// FIX ENGINE-814: skip identities without key
if (EMPTYSTR(li->ident->fpr))
continue;
_data = malloc(size);
assert(_data);
if (!_data) {


+ 0
- 7
templates/commit_hash.h View File

@ -1,7 +0,0 @@
#ifndef COMMIT_HASH_H
#define COMMIT_HASH_H
#define PEP_CURRENT_COMMIT_HASH "DUMMY_COMMIT_HASH_ERROR"
#endif

Loading…
Cancel
Save