Merge branch 'master' of https://gitea.pep.foundation/pEp.foundation/pEpEngine into zos_support2

.gitlab-ci-files/common-prepare.yml

@@ -8,15 +8,44 @@
   - 'which rsync || ( sudo apt-get update -y && sudo apt-get install rsync -y )'
   - 'which make || ( sudo apt-get update -y && sudo apt-get install make -y )'
 
+.add_ssh_keys: &add_ssh_keys
+  # Add the SSH key (stored in the SSH_PRIVATE_KEY variable) to the agent.
+  - eval $(ssh-agent -s)
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+
+.verify_ssh_host_keys: &verify_ssh_host_keys
+  # Verify SSH host keys
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
+  - echo "${SSH_KNOWN_HOSTS}" >> ~/.ssh/known_hosts
+  - chmod 644 ~/.ssh/known_hosts
+
 .standard_job:
   tags: [kvm]
   before_script:
     - *ensure_docker
-    - *ensure_rsync
 
 .make_in_docker:
   extends: .standard_job
   script:
     - docker login -u ${DOCKER_REGISTRY_USER} -p ${DOCKER_REGISTRY_PASS} ${DOCKER_REGISTRY_HOST}
     - cd scripts/${CI_DISTRO_TARGET}
-    - make
+    - make ${MAKE_TARGET}
+
+.upload_pkg:
+  extends: .standard_job
+  before_script:
+    - *ensure_rsync
+    - *add_ssh_keys
+    - *verify_ssh_host_keys
+  script:
+    - docker login -u ${DOCKER_REGISTRY_USER} -p ${DOCKER_REGISTRY_PASS} ${DOCKER_REGISTRY_HOST}
+    - cd scripts/${CI_DISTRO_TARGET}
+    - make ${MAKE_TARGET}
+    - pwd
+    - cd out
+    - time rsync -avP -e "ssh -p ${PKG_HOST_SSH_PORT}" depot@${PKG_HOST}:files/pkgs/RHEL/8/pEpEngine/SHA256SUMS || true
+    - if sha256sum --ignore-missing --check SHA256SUMS ; then echo "Package already exists... Exiting..." && exit ; else true ; fi
+    - sha256sum ./*.rpm | tee --append SHA256SUMS
+    - cat ./SHA256SUMS
+    - time rsync -azvP -e "ssh -p ${PKG_HOST_SSH_PORT}" --rsync-path="mkdir -p /home/depot/files/pkgs/RHEL/8/pEpEngine && rsync" ./*.rpm SHA256SUMS depot@${PKG_HOST}:files/pkgs/RHEL/8/pEpEngine/

.gitlab-ci.yml

@@ -2,7 +2,9 @@ include:
   - '.gitlab-ci-files/common-prepare.yml'
 
 stages:
+  - deps
   - build
+  - packages
 
 
 # Debian
@@ -11,6 +13,7 @@ debian10:build:
   extends: .make_in_docker
   stage: build
   variables:
+    MAKE_TARGET: "build"
     CI_DISTRO_TARGET: "debian10"
     DEBIAN_FRONTEND: "noninteractive"
   rules:
@@ -20,6 +23,7 @@ debian10:tagged-build:
   extends: .make_in_docker
   stage: build
   variables:
+    MAKE_TARGET: "build"
     CI_DISTRO_TARGET: "debian10"
     DEBIAN_FRONTEND: "noninteractive"
     TAGGED_BUILD: "true"
@@ -28,10 +32,22 @@ debian10:tagged-build:
 
 # CentOS
 
+centos8:deps:
+  extends: .make_in_docker
+  stage: deps
+  variables:
+    MAKE_TARGET: "deps"
+    CI_DISTRO_TARGET: "centos8"
+  rules:
+    - changes:
+        - DEPENDENCIES
+
+
 centos8:build:
   extends: .make_in_docker
   stage: build
   variables:
+    MAKE_TARGET: "build"
     CI_DISTRO_TARGET: "centos8"
   rules:
     - if: '$CI_COMMIT_TAG  !~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
@@ -40,6 +56,29 @@ centos8:tagged-build:
   extends: .make_in_docker
   stage: build
   variables:
+    MAKE_TARGET: "build"
+    CI_DISTRO_TARGET: "centos8"
+    TAGGED_BUILD: "true"
+  rules:
+    - if: '$CI_COMMIT_TAG  =~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
+
+centos8:rpm:
+  extends: .make_in_docker
+  stage: packages
+  needs: ["centos8:build"]
+  variables:
+    MAKE_TARGET: "rpm"
+    CI_DISTRO_TARGET: "centos8"
+  rules:
+    - if: '$CI_COMMIT_TAG  !~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
+
+
+centos8:rpm:tagged-build:
+  extends: .upload_pkg
+  stage: packages
+  needs: ["centos8:tagged-build"]
+  variables:
+    MAKE_TARGET: "rpm"
     CI_DISTRO_TARGET: "centos8"
     TAGGED_BUILD: "true"
   rules:

api/basic_api.yml2

@@ -169,7 +169,7 @@ protocol session {
 
         // exceptions
 
-        throws any doc="error status";
+        throws any doc="any other value on error";
     }
 
 
@@ -219,6 +219,8 @@ protocol session {
             ciphersuite for a crypt tech implementation is implementation 
             defined.
             """;
+            
+       throws illegal_value doc="illegal parameter values";
     }
 
 
@@ -237,6 +239,10 @@ protocol session {
         use string description doc="string with long description for event or NULL if omitted";
 
         use string comment doc="string with user defined comment or NULL if omitted";
+        
+        // exceptions
+
+       throws illegal_value doc="illegal parameter values";
     }
 
 
@@ -259,6 +265,10 @@ protocol session {
             results were returned, but no ID found (no reason this 
             should ever occur).
             """;
+            
+       throws illegal_value doc="illegal parameter value";
+       
+       throws out_of_memory doc="out of memory";
     }
 
 
@@ -267,13 +277,22 @@ protocol session {
         // parms
 
         use hash fpr doc="fingerprint of key to mark";
+        
+        // exceptions
+            
+       throws illegal_value doc="illegal parameter value";
+       
+       throws cannot_set_trust:
     }
 
 
     method mark_as_compromized doc="deprecated to fix misspelling. Please move to mark_as_compromised"
 
 
-    method import_key doc="import key from data"
+    method import_key_with_fpr_return 
+    doc="""
+        import keys from data, return optional list of fprs imported
+        """;
     {
         // parms
 
@@ -283,9 +302,29 @@ protocol session {
 
         create identity_list private_keys 
         doc="""
-            list of private keys that have been imported. private_keys can 
-            be left NULL, it is then ignored.
+            list of identities containing the private keys that have been imported. Private_keys
+            and imported_keys can be left NULL, it is then ignored.
+            *** THIS IS THE ACTUAL FUNCTION IMPLEMENTED BY CRYPTOTECH "import_key" ***
             """;
+            
+        create identity_list imported keys doc="if non-NULL, list of actual keys imported"
+        
+        create identity_list changed_public_keys
+        doc="""
+            if non-NULL AND imported_keys is non-NULL: bitvector - corresponds to the first 
+            64 keys imported. If nth bit is set, import changed a key corresponding to the nth 
+            element in imported keys (i.e. key was in DB and was changed by import).
+            """;
+            
+        // exceptions
+
+        throws out_of_memory doc="out of memory";
+        
+        throws illegal_value 
+        doc="""
+            there is no key data to import, or imported keys was NULL and changed_public_keys 
+            was not.
+            """;    
     }
 
 
@@ -293,7 +332,7 @@ protocol session {
     {
         // parms
 
-        use hash fpr doc="key id or fingerprint of key";
+        use hash fpr doc="fingerprint of key";
 
         create string key_data 
         doc="""
@@ -308,6 +347,8 @@ protocol session {
         throws out_of_memory doc="out of memory";
 
         throws key_not_found doc="key not found";
+        
+        throws illegal_value doc="illegal parameter value";
     }
 
 
@@ -333,6 +374,8 @@ protocol session {
         throws key_not_found doc="key not found";
 
         throws cannot_export_key doc="cannot export secret key (i.e. it's on an HKS)";
+        
+        throws illegal_value doc="illegal parameter value";
     }
 
 
@@ -353,6 +396,14 @@ protocol session {
             column3 is description
             column4 is comment
             """;
+            
+        // exceptions
+
+        throws out_of_memory doc="out of memory";
+        
+        throws illegal_value doc="illegal parameter value";
+        
+        throws unknown_error;
     }
 
 
@@ -366,6 +417,14 @@ protocol session {
             column 1 is the ISO 639-1 language code
             column 2 is the name of the language
             """;
+            
+       // exceptions
+
+        throws out_of_memory doc="out of memory";
+        
+        throws illegal_value doc="illegal parameter value";
+        
+        throws unknown_error;
     }
 
 
@@ -378,6 +437,16 @@ protocol session {
         use int phrase_id doc="id of phrase in i18n";
 
         create string phrase doc="phrase as UTF-8 string";
+        
+        // exceptions
+
+        throws out_of_memory doc="out of memory";
+        
+        throws illegal_value doc="illegal parameter value";
+        
+        throws unknown_db_error:
+        
+        throws phrase_not_found;
     }
 
 
@@ -391,14 +460,13 @@ protocol session {
 
         // exceptions
 
-        throws any doc="string to the engine version string constant"; 
+        throws engine_version; 
     }
 
     method is_pEp_user
     doc="""
         returns true if the USER corresponding to this identity has been listed 
         in the *person* table as a pEp user.
-        This *does not check comm_type*.
         """
     {
         // parms
@@ -427,13 +495,17 @@ protocol session {
     {
         // exceptions
 
-        throws any doc="path to actual per user directory or NULL on failure";
+        throws char* doc="path to actual per user directory";
+        
+        throws NULL doc="on failure";
     }
 
     method per_machine_directory doc="returns the directory for pEp system db"
     {
         // exceptions
 
-        throws any doc="path to actual per user directory or NULL on failure";
+        throws char* doc="path to actual per machine directory";
+        
+        throws NULL doc="on failure";
     }
 }

api/keymanagement_api.yml2

@@ -49,13 +49,7 @@ protocol session {
             *input* (see caveats)
             """;
 
-        throws key_unsuitable
-        doc="""
-            if a default key was found for this identity, no
-            other acceptable keys were found; if this is returned,
-            the reason for rejecting the first default key found    
-            may be found in the comm_type
-            """;
+        throws any doc="any other value on error";
     }
 
 
@@ -86,6 +80,14 @@ protocol session {
             if you need to do this asynchronous, you need to return an identity
             with retrieve_next_identity() where identity.me is true.
             """;
+
+        // exceptions
+
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -123,6 +125,16 @@ protocol session {
             is not trusted, and 3) set this key as the user default if the current user
             default is not trusted.
             """;
+            
+        // exceptions
+
+        throws key_unsuitable;
+        
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -146,6 +158,16 @@ protocol session {
             it here makes it an eligible key for selection for encryption later. So use 
             this function on purpose with an understanding of what you're doing!
             """;
+            
+        // exceptions
+
+        throws key_unsuitable;
+        
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -166,6 +188,14 @@ protocol session {
             it will be removed as the default key for the identity and user (but is still
             available for key election, it is just not the cached default anymore).
             """;
+            
+        // exceptions
+        
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -176,6 +206,12 @@ protocol session {
         use hash fpr doc="fingerprint of key to test";
 
         return bool listed doc="flags if key is own";
+        
+        // exceptions
+        
+        throws illegal_value doc="illegal parameter values";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -189,6 +225,14 @@ protocol session {
             list of own identities. 
             The ownership of the copy of own_identities goes to the caller.
             """;
+        
+        // exceptions
+        
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -201,6 +245,14 @@ protocol session {
             list of fingerprints. This function does not return keys without 
             a private key part.
             """;
+            
+        // exceptions
+        
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -210,17 +262,28 @@ protocol session {
 
         lend identity me 
         doc="""
-            own identity this key is used for. The key has to be in the key ring already.
-            me->address, me->user_id and me->username must be set to valid data.
-            myself is called by set_own_key without key generation.
-            me->flags are ignored
-            me->address must not be an alias
-            me->fpr will be ignored and replaced by fpr, but caller MUST surrender ownership of the 
-            me->fpr reference, because it may be freed and replaced within the myself call. caller 
-            owns me->fpr memory again upon return.
+            own identity this key is used for. 
+            The key has to be in the key ring already identity->address must be set to valid 
+            data update_identity() is called by this function and will create a TOFU user_id + 
+            new entry if none is indicated and heuristic fails to match extant identity identity-
+            >fpr will NOT be updated with the set identity fpr; it is only in,out because 
+            update_identity() is called before setting it.
             """;
 
         use hash fpr doc="fingerprint of the key to mark as own key";
+        
+        // exceptions
+        
+        throws key_unsuitable;
+        
+        throws illegal_value 
+        doc="""
+            illegal parameter values, including if update_identity determines this is an own 
+            identity""";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 }
 

api/message_api.yml2

@@ -152,6 +152,12 @@ protocol session {
             on demand or no recipients with usable key, is left unencrypted,
             and key is attached to it 
             """;
+            
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -194,6 +200,16 @@ protocol session {
                 on demand or no recipients with usable key, is left unencrypted, 
                 and key is attached to it
                 """;
+                
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
+        throws any doc="any other value on error";
+        
+        throws unknown_error;
+        
+        throws any doc="any other value on error";         
     }
 
 
@@ -231,13 +247,19 @@ protocol session {
             flag key_reset_only 0x20;
         }
 
-        doc | (FIXME: The exceptions may not be correct or complete)
+        // exceptions
 
         throws key_not_found doc="at least one of the receipient keys could not be found";
 
         throws key_has_ambig_name doc="at least one of the receipient keys has an ambiguous name";
 
         throws get_key_failed doc="cannot retrieve key";
+        
+        throws cannot_find_identity;
+        
+        throws illegal_value;
+        
+        throws out_of_memory;
     }
 
 
@@ -248,9 +270,23 @@ protocol session {
         lend message src
         doc="""
             message to decrypt. 
-            The ownership of src remains with the caller - however, the contents 
-            might be modified (strings freed and allocated anew or set to empty,
+            The ownership of src remains with the caller - HOWEVER, the contents 
+            might be modified (strings freed and allocated anew or set to empty, 
             etc) intentionally; when this happens, decrypt_flag_src_modified is set.
+            
+            if src is unencrypted this function returns PEP_UNENCRYPTED and sets dst to NULL
+            if src->enc_format is PEP_enc_inline_EA on input then elevated attachments
+            will be expected
+            
+            decrypt_message RELIES on the fact that identity information provided in src 
+            for recips and sender is AS TAKEN FROM THE ORIGINAL PARSED MESSAGE. This means 
+            that if update_identity or myself is called on those identities by the caller 
+            before passing the message struct to decrypt_message, the caller will have to 
+            cache and restore those to their original state before sending them to this  
+            function. ADAPTERS AND APPLICATIONS PLEASE TAKE NOTE OF THIS. (Obviously, this 
+            doesn't include information like user_ids, but we very specifically need the 
+            incoming usernames preserved so that they can be handled by the internal 
+            algorithm appropriately)
             """;
 
         create message dst doc="pointer to new decrypted message or empty on failure";
@@ -271,30 +307,33 @@ protocol session {
         // flags
         
         flags {
+            flag decrypt_flag_untrusted_server 0x100 
+            doc="""
+                incoming flag. Used to signal that decrypt function should engage in behaviour
+                specified for when the server storing the source is untrusted.
+                """;
             flag decrypt_flag_own_private_key 0x1 
             doc="""
-                private key was imported for one of our addresses (NOT trusted
+                outgoing flag: private key was imported for one of our addresses (NOT trusted
                 or set to be used - handshake/trust is required for that)
                 """;
-            flag decrypt_flag_consume 0x2 doc='used by sync';
-            flag decrypt_flag_ignore 0x4 doc='used by sync';
             flag decrypt_flag_src_modified 0x8 
             doc="""
-                indicates that the src object has been modified. At the moment,
-                this is always as a direct result of the behaviour driven
-                by the input flags. This flag is the ONLY value that should be
-                relied upon to see if such changes have taken place.
+                outgoing flag: indicates that the modified_src field should contain a modified 
+                version of the source, at the moment always as a result of the input flags. 
                 """;
-            flag decrypt_flag_untrusted_server 0x100 
+            flag decrypt_flag_consume 0x2 
             doc="""
-                input flag. Used to signal that decrypt function should engage in behaviour
-                specified for when the server storing the source is untrusted.
+                used by sync to indicate this was a pEp internal message and should be consumed 
+                externally without showing it as a normal message to the user
                 """;
-            flag decrypt_flag_dont_trigger_sync 0x200;
+            flag decrypt_flag_ignore 0x4 doc='used by sync';
         }
 
         // exceptions
     
+        throws error doc="any error status";
+        
         throws decrypted doc="if message decrypted but not verified";
 
         throws cannot_reencrypt
@@ -308,18 +347,10 @@ protocol session {
             if src is unencrypted this function returns unencrypted and sets
             dst to empty.
             """;
-
-        throws any doc="all error status values allowed";
     }
 
 
-    method own_message_private_key_details
-    doc="""
-        details on own key in own message. Note: In order to obtain details about key 
-        to be possibly imported as a replacement of key currently used as own identity, 
-        application passes message that have been previously flagged by decrypt_message() 
-        as own message containing own key to this function.
-        """
+    method own_message_private_key_details doc="details on own key in own message."
     {
         // parms
 
@@ -329,11 +360,20 @@ protocol session {
             can check own signature.
             """;
 
-        create identity ident doc="identity containing uid, address and fpr of key";
+        create identity ident 
+        doc="""
+            identity containing uid, address and fpr of key. 
+            note: In order to obtain details about key to be possibly imported as a replacement 
+            of key currently used as own identity, application passes message that have been 
+            previously flagged by decrypt_message() as own message containing own key to this 
+            function.
+            """;
 
         // exceptions
 
-        throws any doc="error status";
+        throws illegal_value doc="illegal parameter values";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -343,15 +383,15 @@ protocol session {
 
         use message msg
         doc="""
-            message to get the rating for. From must point to a valid pEp_identity.
-            Dir must be dir_outgoing.
+            message to get the rating for. From must point to a valid pEp_identity
+            msg->dir must be PEP_dir_outgoing
             """;
 
         return rating msg_rating doc="rating for the message";
 
         // exceptions
 
-        throws any doc="error status";
+        throws illegal_value doc="illegal parameter values";
     }
 
 
@@ -362,14 +402,14 @@ protocol session {
         use message msg
         doc="""
             message to get the rating for. From must point to a valid pEp_identity.
-            Dir must be dir_outgoing.
+            msg->dir must be dir_outgoing.
             """;
 
         return rating msg_rating doc="rating preview for the message";
 
         // exceptions
 
-        throws any doc="error status";
+        throws illegal_value doc="illegal parameter values";
     }
 
 
@@ -383,7 +423,9 @@ protocol session {
 
         // exceptions
 
-        throws any doc="error status";
+        throws illegal_value doc="illegal parameter values";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -399,12 +441,14 @@ protocol session {
 
         create string words
         doc="""
-            string with all trustwords, separated 
+            pointer to string with all trustwords, separated 
             by a blank each. Empty if language is not supported or trustword 
             wordlist is damaged or unavailable. 
             The word pointer goes to the ownership of the caller. 
             The caller is responsible to free() it (on Windoze use pEp_free())
             """;
+            
+        create size_t wsize doc="length of full trustwords string";
 
         use bool full
         doc="""
@@ -416,6 +460,8 @@ protocol session {
         // exceptions
 
         throws out_of_memory doc="out of memory";
+        
+        throws illegal_value doc="illegal parameter values";
 
         throws trustword_not_found doc="at least one trustword not found";
     }
@@ -435,7 +481,7 @@ protocol session {
 
         create string words
         doc="""
-            string with all trustwords, separated by a blank each.
+            pointer to string with all trustwords, separated by a blank each.
             Empty if language is not supported or trustword  wordlist is damaged or unavailable.
             """;
 
@@ -448,11 +494,15 @@ protocol session {
 
         // exceptions
 
+        throws illegal_value doc="illegal parameter values";
+        
         throws out_of_memory doc="out of memory";
 
         throws trustword_not_found doc="at least one trustword not found";
 
-        throws like decrypt_message doc="error status of decrypt_message() if decryption fails";
+        throws cannot_find_identity doc="identity not found";
+        
+        throws error doc="status of decrypt_message() if decryption fails.";
     }
 
 
@@ -469,7 +519,7 @@ protocol session {
         create string words 
         doc="""
             pointer to string with all trustwords UTF-8 encoded, separated by a blank each. 
-            NULL if language is not supported or trustword wordlist is damaged or unavailable.
+            Empty if language is not supported or trustword wordlist is damaged or unavailable.
             The caller is responsible to free() it (on Windoze use pEp_free()).
             """;
 
@@ -484,6 +534,8 @@ protocol session {
         // exceptions
 
         throws out_of_memory doc="out of memory";
+        
+        throws illegal_value doc="illegal parameter values";
 
         throws trustword_not_found doc="at least one trustword not found";
     }
@@ -511,6 +563,8 @@ protocol session {
             """;
 
         throws out_of_memory doc="if not enough memory could be allocated";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -526,7 +580,13 @@ protocol session {
         
         // exceptions
 
+        throws illegal_value doc="illegal parameter values";
+        
+        throws out_of_memory doc="out of memory";
+        
         throws record_not_found doc="if no trust record for user_id and fpr can be found";
+        
+        throws any doc="any other value on error";
     }
 
 
@@ -538,7 +598,7 @@ protocol session {
 
         // exceptions
 
-        throws any doc="rating value for comm type ct";
+        throws rating doc="rating value for comm type ct";
     }
 }
 

build-mac/Subprojects/PEPSQLITE3/PEPSQLITE3.xcodeproj/project.pbxproj

@@ -229,7 +229,7 @@
 			);
 			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 \"${PROJECT_DIR}\"/../../../../sqlite/*.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libPEPSQLITE3_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${PROJECT_DIR}\"/../../../../sqlite/*.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${BUILT_PRODUCTS_DIR}/libPEPSQLITE3_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
 			showEnvVarsInLog = 0;
 		};
 		15A3268A26120757009D07EB /* Copy Artefacts & Headers to Custom Build Dir */ = {
@@ -248,7 +248,7 @@
 			);
 			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 \"${PROJECT_DIR}\"/../../../../sqlite/sqlite3.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libPEPSQLITE3_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp \"${PROJECT_DIR}\"/../../../../sqlite/sqlite3.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${BUILT_PRODUCTS_DIR}/libPEPSQLITE3_macOS.a\" ${CUSTOM_BUILD_DIR}\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -275,6 +275,96 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
+		1585F09F26A1DB0300B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */ = {
+			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 = NO;
+				SDKROOT = iphoneos;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = "";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug_BUILD_ALL_SUPPORTED_ARCHS;
+		};
+		1585F0A026A1DB0300B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */ = {
+			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_BUILD_ALL_SUPPORTED_ARCHS;
+		};
+		1585F0A126A1DB0300B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */ = {
+			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_BUILD_ALL_SUPPORTED_ARCHS;
+		};
 		15A3260E2611F646009D07EB /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -456,6 +546,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				15A3260E2611F646009D07EB /* Debug */,
+				1585F09F26A1DB0300B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */,
 				15A3260F2611F646009D07EB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -465,6 +556,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				15A3263A2612055F009D07EB /* Debug */,
+				1585F0A026A1DB0300B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */,
 				15A3263B2612055F009D07EB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -474,6 +566,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				15A3265A261205E7009D07EB /* Debug */,
+				1585F0A126A1DB0300B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */,
 				15A3265B261205E7009D07EB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;

build-mac/Subprojects/pEpASN1/pEpASN1.xcodeproj/project.pbxproj

@@ -881,7 +881,7 @@
 			);
 			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/* ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libpEpASN1_macOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${BUILT_PRODUCTS_DIR}\"/usr/local/include/* ${CUSTOM_INCLUDE_DIR}\ncp  \"${BUILT_PRODUCTS_DIR}/libpEpASN1_macOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
 		};
 		15A322D5260E065D009D07EB /* Copy Artefacts & Headers to Custom Build Dir */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -899,7 +899,7 @@
 			);
 			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 \"${PROJECT_DIR}\"/../../../asn.1/*.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${TARGET_BUILD_DIR}/libpEpASN1_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include\"\nmkdir -p ${CUSTOM_INCLUDE_DIR}\ncp -R \"${PROJECT_DIR}\"/../../../asn.1/*.h ${CUSTOM_INCLUDE_DIR}\ncp  \"${BUILT_PRODUCTS_DIR}/libpEpASN1_iOS.a\" ${CUSTOM_BUILD_DIR}\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -1053,6 +1053,94 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
+		1585F0A226A1DB1E00B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */ = {
+			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 = NO;
+				SDKROOT = iphoneos;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug_BUILD_ALL_SUPPORTED_ARCHS;
+		};
+		1585F0A326A1DB1E00B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = NQLYU6MGPN;
+				EXECUTABLE_PREFIX = lib;
+				MACOSX_DEPLOYMENT_TARGET = "${inherited}";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug_BUILD_ALL_SUPPORTED_ARCHS;
+		};
+		1585F0A426A1DB1E00B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */ = {
+			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_BUILD_ALL_SUPPORTED_ARCHS;
+		};
 		15A32025260E02AA009D07EB /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1230,6 +1318,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				15A32025260E02AA009D07EB /* Debug */,
+				1585F0A226A1DB1E00B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */,
 				15A32026260E02AA009D07EB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -1239,6 +1328,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				15A32055260E0330009D07EB /* Debug */,
+				1585F0A326A1DB1E00B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */,
 				15A32056260E0330009D07EB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -1248,6 +1338,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				15A32065260E0345009D07EB /* Debug */,
+				1585F0A426A1DB1E00B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */,
 				15A32066260E0345009D07EB /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;

build-mac/pEpEngine.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -34,19 +34,15 @@
 		1543DA4C2577F8BE0041EFB5 /* Sync_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8823C4B2DD008EF79C /* Sync_event.h */; };
 		1543DAA9257801880041EFB5 /* baseprotocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C414C1D510D8800C63EFF /* baseprotocol.c */; };
 		1543DAAD257801A90041EFB5 /* resource_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F6921C1F164A47009418F5 /* resource_id.c */; };
-		154917FD22B926700091B6D6 /* libnettle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917F922B9266F0091B6D6 /* libnettle.a */; };
-		154917FE22B926700091B6D6 /* libsequoia_openpgp_ffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917FA22B926700091B6D6 /* libsequoia_openpgp_ffi.a */; };
-		154917FF22B926700091B6D6 /* libhogweed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917FB22B926700091B6D6 /* libhogweed.a */; };
-		1549180022B926700091B6D6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917FC22B926700091B6D6 /* libgmp.a */; };
 		1549181222B92EA20091B6D6 /* libiconv.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1549180D22B92EA20091B6D6 /* libiconv.2.tbd */; };
-		154918AB22B940200091B6D6 /* fsm_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189222B9401D0091B6D6 /* fsm_common.h */; };
-		154918AC22B940200091B6D6 /* status_to_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189322B9401E0091B6D6 /* status_to_string.h */; };
-		154918B222B940200091B6D6 /* aux_mime_msg.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189922B9401E0091B6D6 /* aux_mime_msg.h */; };
-		154918BA22B940200091B6D6 /* resource_id.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A122B9401F0091B6D6 /* resource_id.h */; };
+		154918AB22B940200091B6D6 /* fsm_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189222B9401D0091B6D6 /* fsm_common.h */; platformFilter = ios; };
+		154918AC22B940200091B6D6 /* status_to_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189322B9401E0091B6D6 /* status_to_string.h */; platformFilter = ios; };
+		154918B222B940200091B6D6 /* aux_mime_msg.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189922B9401E0091B6D6 /* aux_mime_msg.h */; platformFilter = ios; };
+		154918BA22B940200091B6D6 /* resource_id.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A122B9401F0091B6D6 /* resource_id.h */; platformFilter = ios; };
 		154918BB22B940200091B6D6 /* aux_mime_msg.c in Sources */ = {isa = PBXBuildFile; fileRef = 154918A222B9401F0091B6D6 /* aux_mime_msg.c */; };
-		154918BC22B940200091B6D6 /* openpgp_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A322B9401F0091B6D6 /* openpgp_compat.h */; };
+		154918BC22B940200091B6D6 /* openpgp_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A322B9401F0091B6D6 /* openpgp_compat.h */; platformFilter = ios; };
 		154918BD22B940200091B6D6 /* growing_buf.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918A422B9401F0091B6D6 /* growing_buf.h */; };
-		154918C322B940200091B6D6 /* blacklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918AA22B940200091B6D6 /* blacklist.h */; };
+		154918C322B940200091B6D6 /* blacklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 154918AA22B940200091B6D6 /* blacklist.h */; platformFilter = ios; };
 		1552DB142577D4F100A92F71 /* pEpEngine_macOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 1552DB132577D4F100A92F71 /* pEpEngine_macOS.h */; };
 		1552DB162577D4F100A92F71 /* pEpEngine_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 1552DB152577D4F100A92F71 /* pEpEngine_macOS.m */; };
 		1552DC012577D67800A92F71 /* transport.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826751B455D0800EECAF0 /* transport.c */; };
@@ -99,35 +95,41 @@
 		1552DC892577D71800A92F71 /* status_to_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 1549189322B9401E0091B6D6 /* status_to_string.h */; };
 		1552DC8A2577D71800A92F71 /* distribution_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188ABF23C4BBDE008EF79C /* distribution_codec.h */; };
 		156AFEB82672089100AF0039 /* libetpan.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E351B8B630200FC617B /* libetpan.a */; };
+		1585EC1B269C33FB00B822E1 /* stringlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 64A8266E1B455D0800EECAF0 /* stringlist.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
+		1585EC1F269C351100B822E1 /* stringlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 64A8266E1B455D0800EECAF0 /* stringlist.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1585EF4426A08A9800B822E1 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EF4026A08A9800B822E1 /* libgmp.a */; };
+		1585EF4526A08A9800B822E1 /* libnettle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EF4126A08A9800B822E1 /* libnettle.a */; };
+		1585EF4626A08A9800B822E1 /* libhogweed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EF4226A08A9800B822E1 /* libhogweed.a */; };
+		1585EF4726A08A9800B822E1 /* libsequoia_openpgp_ffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585EF4326A08A9800B822E1 /* libsequoia_openpgp_ffi.a */; };
 		159EF42722B6D3E900149C0C /* pgp_sequoia.c in Sources */ = {isa = PBXBuildFile; fileRef = 159EF42422B6D3E900149C0C /* pgp_sequoia.c */; };
-		159EF42822B6D3E900149C0C /* pgp_sequoia.h in Headers */ = {isa = PBXBuildFile; fileRef = 159EF42522B6D3E900149C0C /* pgp_sequoia.h */; };
-		159EF42922B6D3E900149C0C /* pgp_sequoia_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 159EF42622B6D3E900149C0C /* pgp_sequoia_internal.h */; };
+		159EF42822B6D3E900149C0C /* pgp_sequoia.h in Headers */ = {isa = PBXBuildFile; fileRef = 159EF42522B6D3E900149C0C /* pgp_sequoia.h */; platformFilter = ios; };
+		159EF42922B6D3E900149C0C /* pgp_sequoia_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 159EF42622B6D3E900149C0C /* pgp_sequoia_internal.h */; platformFilter = ios; };
 		15A3233E260E0D2A009D07EB /* libpEpASN1_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A322F7260E0B75009D07EB /* libpEpASN1_iOS.a */; };
 		15A32429260E1873009D07EB /* libpEpASN1_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A322F5260E0B75009D07EB /* libpEpASN1_macOS.a */; };
 		15A326E326120AB0009D07EB /* libPEPSQLITE3_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A3266426120618009D07EB /* libPEPSQLITE3_iOS.a */; };
 		15A326E826120AB6009D07EB /* libPEPSQLITE3_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A3266626120618009D07EB /* libPEPSQLITE3_macOS.a */; };
-		430BCC482015EE800077E998 /* pEp_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 430BCC462015EE800077E998 /* pEp_string.h */; };
+		430BCC482015EE800077E998 /* pEp_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 430BCC462015EE800077E998 /* pEp_string.h */; platformFilter = ios; };
 		430BCC492015EE800077E998 /* pEp_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 430BCC472015EE800077E998 /* pEp_string.c */; };
 		430D258B1C9ED75A00B94535 /* blacklist.c in Sources */ = {isa = PBXBuildFile; fileRef = 430D258A1C9ED75A00B94535 /* blacklist.c */; };
 		43188A9323C4B2DE008EF79C /* sync_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8623C4B2DD008EF79C /* sync_codec.c */; };
-		43188A9423C4B2DE008EF79C /* Sync_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8723C4B2DD008EF79C /* Sync_impl.h */; };
-		43188A9523C4B2DE008EF79C /* Sync_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8823C4B2DD008EF79C /* Sync_event.h */; };
-		43188A9623C4B2DE008EF79C /* KeySync_fsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8923C4B2DD008EF79C /* KeySync_fsm.h */; };
+		43188A9423C4B2DE008EF79C /* Sync_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8723C4B2DD008EF79C /* Sync_impl.h */; platformFilter = ios; };
+		43188A9523C4B2DE008EF79C /* Sync_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8823C4B2DD008EF79C /* Sync_event.h */; platformFilter = ios; };
+		43188A9623C4B2DE008EF79C /* KeySync_fsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8923C4B2DD008EF79C /* KeySync_fsm.h */; platformFilter = ios; };
 		43188A9823C4B2DE008EF79C /* KeySync_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8B23C4B2DE008EF79C /* KeySync_fsm.c */; };
-		43188A9923C4B2DE008EF79C /* Sync_func.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8C23C4B2DE008EF79C /* Sync_func.h */; };
+		43188A9923C4B2DE008EF79C /* Sync_func.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A8C23C4B2DE008EF79C /* Sync_func.h */; platformFilter = ios; };
 		43188A9B23C4B2DE008EF79C /* Sync_func.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8E23C4B2DE008EF79C /* Sync_func.c */; };
 		43188A9C23C4B2DE008EF79C /* Sync_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A8F23C4B2DE008EF79C /* Sync_impl.c */; };
 		43188A9D23C4B2DE008EF79C /* Sync_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A9023C4B2DE008EF79C /* Sync_event.c */; };
-		43188A9E23C4B2DE008EF79C /* sync_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A9123C4B2DE008EF79C /* sync_codec.h */; };
+		43188A9E23C4B2DE008EF79C /* sync_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188A9123C4B2DE008EF79C /* sync_codec.h */; platformFilter = ios; };
 		43188A9F23C4B2DE008EF79C /* Sync_actions.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188A9223C4B2DE008EF79C /* Sync_actions.c */; };
 		43188AA823C4B4B3008EF79C /* keyreset_command.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188AA223C4B4B3008EF79C /* keyreset_command.c */; };
-		43188AA923C4B4B3008EF79C /* keyreset_command.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188AA723C4B4B3008EF79C /* keyreset_command.h */; };
+		43188AA923C4B4B3008EF79C /* keyreset_command.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188AA723C4B4B3008EF79C /* keyreset_command.h */; platformFilter = ios; };
 		43188AC023C4BBDE008EF79C /* distribution_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 43188ABE23C4BBDD008EF79C /* distribution_codec.c */; };
-		43188AC123C4BBDE008EF79C /* distribution_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188ABF23C4BBDE008EF79C /* distribution_codec.h */; };
-		431F04B722733A7E00CCE960 /* key_reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04B222733A7E00CCE960 /* key_reset.h */; };
-		438C43B52167752C00C7425B /* labeled_int_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43AF2167752C00C7425B /* labeled_int_list.h */; };
+		43188AC123C4BBDE008EF79C /* distribution_codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 43188ABF23C4BBDE008EF79C /* distribution_codec.h */; platformFilter = ios; };
+		431F04B722733A7E00CCE960 /* key_reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04B222733A7E00CCE960 /* key_reset.h */; platformFilter = ios; };
+		438C43B52167752C00C7425B /* labeled_int_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43AF2167752C00C7425B /* labeled_int_list.h */; platformFilter = ios; };
 		438C43B62167752C00C7425B /* labeled_int_list.c in Sources */ = {isa = PBXBuildFile; fileRef = 438C43B42167752C00C7425B /* labeled_int_list.c */; };
-		43C3778E246A8C0300962D22 /* internal_format.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C37788246A8C0300962D22 /* internal_format.h */; };
+		43C3778E246A8C0300962D22 /* internal_format.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C37788246A8C0300962D22 /* internal_format.h */; platformFilter = ios; };
 		43C3778F246A8C0300962D22 /* internal_format.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C3778D246A8C0300962D22 /* internal_format.c */; };
 		43F6921D1F164A47009418F5 /* resource_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F6921C1F164A47009418F5 /* resource_id.c */; };
 		43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C032166282C00AB4524 /* openpgp_compat.c */; };
@@ -137,9 +139,9 @@
 		6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E371B8B630200FC617B /* libetpan-ios.a */; };
 		644297C51BE11CE0002BC73B /* system.db in Resources */ = {isa = PBXBuildFile; fileRef = 64951A1B1BE0FCD800B10E71 /* system.db */; };
 		6467888C1CEB3D120001F54C /* map_asn1.c in Sources */ = {isa = PBXBuildFile; fileRef = 646788871CEB3D120001F54C /* map_asn1.c */; };
-		6467888D1CEB3D120001F54C /* map_asn1.h in Headers */ = {isa = PBXBuildFile; fileRef = 646788881CEB3D120001F54C /* map_asn1.h */; };
+		6467888D1CEB3D120001F54C /* map_asn1.h in Headers */ = {isa = PBXBuildFile; fileRef = 646788881CEB3D120001F54C /* map_asn1.h */; platformFilter = ios; };
 		646C414E1D510D8800C63EFF /* baseprotocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 646C414C1D510D8800C63EFF /* baseprotocol.c */; };
-		646C414F1D510D8800C63EFF /* baseprotocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C414D1D510D8800C63EFF /* baseprotocol.h */; };
+		646C414F1D510D8800C63EFF /* baseprotocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 646C414D1D510D8800C63EFF /* baseprotocol.h */; platformFilter = ios; };
 		64A826781B455D0800EECAF0 /* bloblist.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A8264C1B455D0800EECAF0 /* bloblist.c */; };
 		64A826791B455D0800EECAF0 /* cryptotech.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A8264E1B455D0800EECAF0 /* cryptotech.c */; };
 		64A8267A1B455D0800EECAF0 /* email.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826511B455D0800EECAF0 /* email.c */; };
@@ -156,7 +158,7 @@
 		64A826881B455D0800EECAF0 /* timestamp.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826711B455D0800EECAF0 /* timestamp.c */; };
 		64A826891B455D0800EECAF0 /* trans_auto.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826731B455D0800EECAF0 /* trans_auto.c */; };
 		64A8268A1B455D0800EECAF0 /* transport.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826751B455D0800EECAF0 /* transport.c */; };
-		64A8268C1B455D9D00EECAF0 /* pEpEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 64A826611B455D0800EECAF0 /* pEpEngine.h */; };
+		64A8268C1B455D9D00EECAF0 /* pEpEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 64A826611B455D0800EECAF0 /* pEpEngine.h */; platformFilter = ios; };
 		C46EBAED216E445F0042A6A3 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = C46EBAE7216E445F0042A6A3 /* base64.c */; };
 		C46EBAEE216E445F0042A6A3 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = C46EBAEC216E445F0042A6A3 /* base64.h */; };
 /* End PBXBuildFile section */
@@ -176,6 +178,20 @@
 			remoteGlobalIDString = C69AB10910546FE500F32FBD;
 			remoteInfo = "static libetpan";
 		};
+		1585EF6C26A08B2E00B822E1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1585EF5A26A08B2000B822E1 /* CommonPEPDependencies.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 1585EECA269EF0F100B822E1;
+			remoteInfo = build_sequoia_macOS;
+		};
+		1585EF6E26A08B3A00B822E1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1585EF5A26A08B2000B822E1 /* CommonPEPDependencies.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 1585EF0526A0479800B822E1;
+			remoteInfo = build_sequoia_iOS;
+		};
 		15A322F4260E0B75009D07EB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 15A3203B260E030B009D07EB /* pEpASN1.xcodeproj */;
@@ -253,13 +269,6 @@
 			remoteGlobalIDString = 644297BE1BE11C65002BC73B;
 			remoteInfo = pEpTrustWords;
 		};
-		64289E321B8B630200FC617B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
-			remoteInfo = libetpan;
-		};
 		64289E341B8B630200FC617B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */;
@@ -313,6 +322,11 @@
 		1552DB112577D4F100A92F71 /* libpEpEngine_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpEngine_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		1552DB132577D4F100A92F71 /* pEpEngine_macOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpEngine_macOS.h; sourceTree = "<group>"; };
 		1552DB152577D4F100A92F71 /* pEpEngine_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pEpEngine_macOS.m; sourceTree = "<group>"; };
+		1585EF4026A08A9800B822E1 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgmp.a; path = "../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libgmp.a"; sourceTree = "<group>"; };
+		1585EF4126A08A9800B822E1 /* libnettle.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnettle.a; path = "../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libnettle.a"; sourceTree = "<group>"; };
+		1585EF4226A08A9800B822E1 /* libhogweed.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhogweed.a; path = "../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libhogweed.a"; sourceTree = "<group>"; };
+		1585EF4326A08A9800B822E1 /* libsequoia_openpgp_ffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsequoia_openpgp_ffi.a; path = "../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libsequoia_openpgp_ffi.a"; sourceTree = "<group>"; };
+		1585EF5A26A08B2000B822E1 /* CommonPEPDependencies.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CommonPEPDependencies.xcodeproj; path = "../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/CommonPEPDependencies.xcodeproj"; sourceTree = "<group>"; };
 		159EF42422B6D3E900149C0C /* pgp_sequoia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pgp_sequoia.c; path = ../src/pgp_sequoia.c; sourceTree = "<group>"; };
 		159EF42522B6D3E900149C0C /* pgp_sequoia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pgp_sequoia.h; path = ../src/pgp_sequoia.h; sourceTree = "<group>"; };
 		159EF42622B6D3E900149C0C /* pgp_sequoia_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pgp_sequoia_internal.h; path = ../src/pgp_sequoia_internal.h; sourceTree = "<group>"; };
@@ -423,10 +437,10 @@
 				15A326E326120AB0009D07EB /* libPEPSQLITE3_iOS.a in Frameworks */,
 				15A3233E260E0D2A009D07EB /* libpEpASN1_iOS.a in Frameworks */,
 				6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */,
-				1549180022B926700091B6D6 /* libgmp.a in Frameworks */,
-				154917FF22B926700091B6D6 /* libhogweed.a in Frameworks */,
-				154917FE22B926700091B6D6 /* libsequoia_openpgp_ffi.a in Frameworks */,
-				154917FD22B926700091B6D6 /* libnettle.a in Frameworks */,
+				1585EF4426A08A9800B822E1 /* libgmp.a in Frameworks */,
+				1585EF4526A08A9800B822E1 /* libnettle.a in Frameworks */,
+				1585EF4626A08A9800B822E1 /* libhogweed.a in Frameworks */,
+				1585EF4726A08A9800B822E1 /* libsequoia_openpgp_ffi.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -436,6 +450,10 @@
 		154917EB22B926080091B6D6 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				1585EF4026A08A9800B822E1 /* libgmp.a */,
+				1585EF4226A08A9800B822E1 /* libhogweed.a */,
+				1585EF4126A08A9800B822E1 /* libnettle.a */,
+				1585EF4326A08A9800B822E1 /* libsequoia_openpgp_ffi.a */,
 				1508458825F101FB00D46DA6 /* libetpan.a */,
 				154917F422B926420091B6D6 /* sequoia4ios */,
 			);
@@ -462,6 +480,13 @@
 			path = pEpEngine_macOS;
 			sourceTree = "<group>";
 		};
+		1585EF5B26A08B2000B822E1 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		15A3203C260E030B009D07EB /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -501,7 +526,6 @@
 		64289E2B1B8B630200FC617B /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				64289E331B8B630200FC617B /* libetpan.framework */,
 				64289E351B8B630200FC617B /* libetpan.a */,
 				64289E371B8B630200FC617B /* libetpan-ios.a */,
 			);
@@ -519,6 +543,7 @@
 		64796A361B455AA5004B1C24 = {
 			isa = PBXGroup;
 			children = (
+				1585EF5A26A08B2000B822E1 /* CommonPEPDependencies.xcodeproj */,
 				15A3261C2611F6B5009D07EB /* PEPSQLITE3.xcodeproj */,
 				15A3203B260E030B009D07EB /* pEpASN1.xcodeproj */,
 				1549180D22B92EA20091B6D6 /* libiconv.2.tbd */,
@@ -640,6 +665,7 @@
 				1543DA462577F8BE0041EFB5 /* sync_codec.h in Headers */,
 				1552DC552577D6D700A92F71 /* pEp_string.h in Headers */,
 				1552DC192577D69300A92F71 /* pEpEngine.h in Headers */,
+				1585EC1F269C351100B822E1 /* stringlist.h in Headers */,
 				1543DA492577F8BE0041EFB5 /* KeySync_fsm.h in Headers */,
 				1552DB142577D4F100A92F71 /* pEpEngine_macOS.h in Headers */,
 				1552DC842577D71800A92F71 /* keyreset_command.h in Headers */,
@@ -680,6 +706,7 @@
 				431F04B722733A7E00CCE960 /* key_reset.h in Headers */,
 				64A8268C1B455D9D00EECAF0 /* pEpEngine.h in Headers */,
 				154918AC22B940200091B6D6 /* status_to_string.h in Headers */,
+				1585EC1B269C33FB00B822E1 /* stringlist.h in Headers */,
 				430BCC482015EE800077E998 /* pEp_string.h in Headers */,
 				159EF42922B6D3E900149C0C /* pgp_sequoia_internal.h in Headers */,
 				43188AA923C4B4B3008EF79C /* keyreset_command.h in Headers */,
@@ -703,6 +730,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				1585EF6D26A08B2E00B822E1 /* PBXTargetDependency */,
 				156AFE832670E6D800AF0039 /* PBXTargetDependency */,
 				15A3266826120623009D07EB /* PBXTargetDependency */,
 				15B21C3F25FB8E160097927A /* PBXTargetDependency */,
@@ -740,10 +768,12 @@
 				64796A3C1B455AA5004B1C24 /* Frameworks */,
 				64796A3D1B455AA5004B1C24 /* CopyFiles */,
 				64A8268B1B455D8D00EECAF0 /* Headers */,
+				1585EC74269C3A7000B822E1 /* Copy Artefacts to Custom Build Dir */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				1585EF6F26A08B3A00B822E1 /* PBXTargetDependency */,
 				15A3266026120618009D07EB /* PBXTargetDependency */,
 				15B21C3625FB8DD10097927A /* PBXTargetDependency */,
 				43D47AA1225CC82400E97C5B /* PBXTargetDependency */,
@@ -790,6 +820,10 @@
 			productRefGroup = 64796A401B455AA5004B1C24 /* Products */;
 			projectDirPath = "";
 			projectReferences = (
+				{
+					ProductGroup = 1585EF5B26A08B2000B822E1 /* Products */;
+					ProjectRef = 1585EF5A26A08B2000B822E1 /* CommonPEPDependencies.xcodeproj */;
+				},
 				{
 					ProductGroup = 64289E2B1B8B630200FC617B /* Products */;
 					ProjectRef = 64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */;
@@ -842,13 +876,6 @@
 			remoteRef = 15A3266526120618009D07EB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		64289E331B8B630200FC617B /* libetpan.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = libetpan.framework;
-			remoteRef = 64289E321B8B630200FC617B /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		64289E351B8B630200FC617B /* libetpan.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -893,7 +920,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nmkdir -p \"${CUSTOM_BUILD_DIR}\"\ncp -r \"${BUILD_DIR}/${CONFIGURATION}/libpEpEngine_macOS.a\" \"${CUSTOM_BUILD_DIR}/libpEpEngine.a\"\n\n# COPY HEADERS\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include/pEp\"\nmkdir -p \"${CUSTOM_INCLUDE_DIR}\"\n\n#pushd ${PROJECT_DIR}/../asn.1\n#    cp *h \"${CUSTOM_INCLUDE_DIR}\"\n#popd\n\npushd ${PROJECT_DIR}/../sync/generated\n    cp *h \"${CUSTOM_INCLUDE_DIR}\"\npopd\n\npushd ${PROJECT_DIR}/../src\n    cp *h \"${CUSTOM_INCLUDE_DIR}\"\npopd\n\n# Copy system.db also\ncp ${PROJECT_DIR}/../db/system.db \"${CUSTOM_BUILD_DIR}\"\n";
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nmkdir -p \"${CUSTOM_BUILD_DIR}\"\ncp -r \"${BUILT_PRODUCTS_DIR}/libpEpEngine_macOS.a\" \"${CUSTOM_BUILD_DIR}/libpEpEngine.a\"\n\n# COPY HEADERS\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include/pEp\"\nmkdir -p \"${CUSTOM_INCLUDE_DIR}\"\n\npushd ${PROJECT_DIR}/../sync/generated\n    cp *h \"${CUSTOM_INCLUDE_DIR}\"\npopd\n\npushd ${PROJECT_DIR}/../src\n    cp *h \"${CUSTOM_INCLUDE_DIR}\"\npopd\n\n# Copy system.db also\ncp ${PROJECT_DIR}/../db/system.db \"${CUSTOM_BUILD_DIR}\"\n";
 		};
 		150845EA25F13CF100D46DA6 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -914,6 +941,24 @@
 			shellPath = /bin/sh;
 			shellScript = "export LANG=en_US.UTF-8\n\necho \"***************************************\"\necho \"*** Generate files: ACTION: $ACTION ***\"\necho \"***************************************\"\n\ncd \"$SRCROOT/..\"\n\nbash -l -c \"gmake -C sync\"\nbash -l -c \"make -C asn.1 Sync.c Distribution.c\"\n";
 		};
+		1585EC74269C3A7000B822E1 /* Copy Artefacts to Custom Build Dir */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Artefacts to Custom Build Dir";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "CUSTOM_BUILD_DIR=\"${PROJECT_DIR}/build\"\nmkdir -p \"${CUSTOM_BUILD_DIR}\"\n\ncp -r \"${BUILT_PRODUCTS_DIR}/libpEpEngine.a\" \"${CUSTOM_BUILD_DIR}\"\n\n# COPY HEADERS\nCUSTOM_INCLUDE_DIR=\"${CUSTOM_BUILD_DIR}/include/pEp\"\nmkdir -p \"${CUSTOM_INCLUDE_DIR}\"\n\npushd ${PROJECT_DIR}/../sync/generated\n    cp *h \"${CUSTOM_INCLUDE_DIR}\"\npopd\n\npushd ${PROJECT_DIR}/../src\n    cp *h \"${CUSTOM_INCLUDE_DIR}\"\npopd\n\n# Copy system.db also\ncp ${PROJECT_DIR}/../db/system.db \"${CUSTOM_BUILD_DIR}\"\n";
+		};
 		644297C61BE11D00002BC73B /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1041,6 +1086,17 @@
 			name = "static libetpan";
 			targetProxy = 156AFE822670E6D800AF0039 /* PBXContainerItemProxy */;
 		};
+		1585EF6D26A08B2E00B822E1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = build_sequoia_macOS;
+			targetProxy = 1585EF6C26A08B2E00B822E1 /* PBXContainerItemProxy */;
+		};
+		1585EF6F26A08B3A00B822E1 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = build_sequoia_iOS;
+			platformFilter = ios;
+			targetProxy = 1585EF6E26A08B3A00B822E1 /* PBXContainerItemProxy */;
+		};
 		15A32305260E0C6F009D07EB /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = pEpASN1_macOS;
@@ -1049,11 +1105,13 @@
 		15A323EE260E167D009D07EB /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = pEpASN1_iOS;
+			platformFilter = ios;
 			targetProxy = 15A323ED260E167D009D07EB /* PBXContainerItemProxy */;
 		};
 		15A3266026120618009D07EB /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = PEPSQLITE3_iOS;
+			platformFilter = ios;
 			targetProxy = 15A3265F26120618009D07EB /* PBXContainerItemProxy */;
 		};
 		15A3266826120623009D07EB /* PBXTargetDependency */ = {
@@ -1063,6 +1121,7 @@
 		};
 		15B21C3625FB8DD10097927A /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
+			platformFilter = ios;
 			target = 150845DE25F13CE700D46DA6 /* generate_code */;
 			targetProxy = 15B21C3525FB8DD10097927A /* PBXContainerItemProxy */;
 		};
@@ -1073,12 +1132,14 @@
 		};
 		43D47AA1225CC82400E97C5B /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
+			platformFilter = ios;
 			target = 644297BE1BE11C65002BC73B /* pEpTrustWords */;
 			targetProxy = 43D47AA0225CC82400E97C5B /* PBXContainerItemProxy */;
 		};
 		64289E3F1B8B638800FC617B /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "libetpan ios";
+			platformFilter = ios;
 			targetProxy = 64289E3E1B8B638800FC617B /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -1122,17 +1183,13 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				HEADER_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/../../local/include",
-					"$(PROJECT_DIR)/Subprojects/pEpASN1/build/include",
-					"$(PROJECT_DIR)/Subprojects/PEPSQLITE3/build/include",
-				);
+				HEADER_SEARCH_PATHS = "${inherited}";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "-Objc";
-				OTHER_LIBTOOLFLAGS = "${PROJECT_DIR}/../../sequoia4macos/build/lib/libnettle.a ${PROJECT_DIR}/../../sequoia4macos/build/lib/libgmp.a ${PROJECT_DIR}/../../sequoia4macos/build/lib/libhogweed.a ${PROJECT_DIR}/../../sequoia4macos/build/lib/libsequoia_openpgp_ffi.a ${PROJECT_DIR}/../../local/lib/libiconv.a";
+				OTHER_LIBTOOLFLAGS = "${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libnettle.a ${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libgmp.a ${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libhogweed.a ${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libsequoia_openpgp_ffi.a";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
@@ -1154,21 +1211,160 @@
 				DEVELOPMENT_TEAM = NQLYU6MGPN;
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
+				HEADER_SEARCH_PATHS = "${inherited}";
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MTL_FAST_MATH = YES;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "-Objc";
+				OTHER_LIBTOOLFLAGS = "${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libnettle.a ${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libgmp.a ${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libhogweed.a ${PROJECT_DIR}/../../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/lib/libsequoia_openpgp_ffi.a";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		1585F06A26A1D80D00B822E1 /* Debug_BUILD_ALL_SUPPORTED_ARCHS */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD)";
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = 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_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 = NO;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;