ENGINE-109: merge
authorKrista Grothoff <krista@pep-project.org>
Tue, 18 Oct 2016 17:23:39 +0200
changeset 1308df40e76a86fc
parent 1307 f4a8b0035541
parent 1305 dd7f8ddae411
child 1309 e6fe364ab39d
child 1311 9d70c1d3f6b6
child 1312 e90df3390555
ENGINE-109: merge
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Oct 18 17:21:51 2016 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Oct 18 17:23:39 2016 +0200
     1.3 @@ -12,6 +12,7 @@
     1.4  		4354FF691D6EE1A70033069C /* NULL.c in Sources */ = {isa = PBXBuildFile; fileRef = 4354FF681D6EE1A70033069C /* NULL.c */; };
     1.5  		43BA0F461D7964750059172F /* asn1_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 43BA0F451D7964750059172F /* asn1_helper.c */; };
     1.6  		43E9BC6A1DB51A1E00AD2352 /* GroupUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */; };
     1.7 +		43E9BC7F1DB6720E00AD2352 /* UpdateRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */; };
     1.8  		6400FB861B8CA1C6005221E3 /* libnetpgp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 645922521B8BD32B00A5AF93 /* libnetpgp.a */; };
     1.9  		6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E371B8B630200FC617B /* libetpan-ios.a */; };
    1.10  		644297C51BE11CE0002BC73B /* system.db in Resources */ = {isa = PBXBuildFile; fileRef = 64951A1B1BE0FCD800B10E71 /* system.db */; };
    1.11 @@ -193,6 +194,7 @@
    1.12  		4354FF681D6EE1A70033069C /* NULL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NULL.c; path = ../asn.1/NULL.c; sourceTree = "<group>"; };
    1.13  		43BA0F451D7964750059172F /* asn1_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = asn1_helper.c; path = ../src/asn1_helper.c; sourceTree = "<group>"; };
    1.14  		43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupUpdate.c; path = ../asn.1/GroupUpdate.c; sourceTree = "<group>"; };
    1.15 +		43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UpdateRequest.c; path = ../asn.1/UpdateRequest.c; sourceTree = "<group>"; };
    1.16  		644297BF1BE11C65002BC73B /* pEpTrustWords.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpTrustWords.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
    1.17  		644297C11BE11C65002BC73B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    1.18  		646788871CEB3D120001F54C /* map_asn1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = map_asn1.c; path = ../src/map_asn1.c; sourceTree = "<group>"; };
    1.19 @@ -362,6 +364,7 @@
    1.20  		6406CE811CE382F400C14D77 /* asn.1 */ = {
    1.21  			isa = PBXGroup;
    1.22  			children = (
    1.23 +				43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */,
    1.24  				43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */,
    1.25  				4354FF681D6EE1A70033069C /* NULL.c */,
    1.26  				646C40951D510CD700C63EFF /* asn_application.h */,
    1.27 @@ -808,6 +811,7 @@
    1.28  				4354FF651D6EDF300033069C /* sync_impl.c in Sources */,
    1.29  				64A8267E1B455D0800EECAF0 /* message_api.c in Sources */,
    1.30  				64A826851B455D0800EECAF0 /* sqlite3.c in Sources */,
    1.31 +				43E9BC7F1DB6720E00AD2352 /* UpdateRequest.c in Sources */,
    1.32  				646C41361D510CD800C63EFF /* Version.c in Sources */,
    1.33  				646C41081D510CD800C63EFF /* constr_TYPE.c in Sources */,
    1.34  				646C40FE1D510CD800C63EFF /* BOOLEAN.c in Sources */,
     2.1 --- a/src/pgp_gpg.c	Tue Oct 18 17:21:51 2016 +0200
     2.2 +++ b/src/pgp_gpg.c	Tue Oct 18 17:23:39 2016 +0200
     2.3 @@ -1083,6 +1083,11 @@
     2.4              gpgme_import_result =
     2.5                  gpg.gpgme_op_import_result(session->ctx);
     2.6              assert(gpgme_import_result);
     2.7 +            if (!gpgme_import_result) {
     2.8 +                gpg.gpgme_data_release(dh);
     2.9 +                return PEP_UNKNOWN_ERROR;
    2.10 +            }
    2.11 +
    2.12              gpgme_import_status_t import;
    2.13              for (import = gpgme_import_result->imports; 
    2.14                   import; 
     3.1 --- a/test/Makefile	Tue Oct 18 17:21:51 2016 +0200
     3.2 +++ b/test/Makefile	Tue Oct 18 17:23:39 2016 +0200
     3.3 @@ -4,7 +4,10 @@
     3.4  CXX?=g++ -std=gnu++11 -pthread
     3.5  LD?=$(CXX)
     3.6  LDFLAGS?=-L$(HOME)/lib
     3.7 -LDLIBS?=-letpan -lpEpEngine -lstdc++ -L../asn.1 -lasn1 -luuid
     3.8 +LDLIBS?=-letpan -lpEpEngine -lstdc++ -L../asn.1 -lasn1
     3.9 +ifeq ($(BUILD_FOR),Linux)
    3.10 +LDLIBS=$(LDLIBS) -luuid
    3.11 +endif
    3.12  CXXFLAGS?=-std=c++11 -g -O0 -I../src -I../asn.1
    3.13  # CXXFLAGS=-O3 -DNDEBUG
    3.14