From d200e5409230e35d6d3d2b9282e8f879767fb727 Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Tue, 19 Nov 2019 15:37:54 +0100 Subject: [PATCH 1/3] IOS-1663 Xcode: Update generated file list --- build-mac/generated-files-asn1.txt | 24 ++++++++++++++---------- build-mac/generated-files-sync.txt | 15 ++++++++++----- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/build-mac/generated-files-asn1.txt b/build-mac/generated-files-asn1.txt index cbc51639c..642550f9f 100644 --- a/build-mac/generated-files-asn1.txt +++ b/build-mac/generated-files-asn1.txt @@ -6,16 +6,20 @@ $(SRCROOT)/../asn.1/Beacon.c $(SRCROOT)/../asn.1/Beacon.h $(SRCROOT)/../asn.1/CommitAccept.c $(SRCROOT)/../asn.1/CommitAccept.h -$(SRCROOT)/../asn.1/CommitAcceptFirst.c -$(SRCROOT)/../asn.1/CommitAcceptFirst.h $(SRCROOT)/../asn.1/CommitAcceptForGroup.c $(SRCROOT)/../asn.1/CommitAcceptForGroup.h -$(SRCROOT)/../asn.1/CommitAcceptSecond.c -$(SRCROOT)/../asn.1/CommitAcceptSecond.h +$(SRCROOT)/../asn.1/CommitAcceptOfferer.c +$(SRCROOT)/../asn.1/CommitAcceptOfferer.h +$(SRCROOT)/../asn.1/CommitAcceptRequester.c +$(SRCROOT)/../asn.1/CommitAcceptRequester.h $(SRCROOT)/../asn.1/CommitReject.c $(SRCROOT)/../asn.1/CommitReject.h +$(SRCROOT)/../asn.1/GroupHandshake.c +$(SRCROOT)/../asn.1/GroupHandshake.h $(SRCROOT)/../asn.1/GroupKeys.c $(SRCROOT)/../asn.1/GroupKeys.h +$(SRCROOT)/../asn.1/GroupKeysAndClose.c +$(SRCROOT)/../asn.1/GroupKeysAndClose.h $(SRCROOT)/../asn.1/GroupTrustThisKey.c $(SRCROOT)/../asn.1/GroupTrustThisKey.h $(SRCROOT)/../asn.1/Hash.c @@ -40,14 +44,14 @@ $(SRCROOT)/../asn.1/NegotiationOpen.c $(SRCROOT)/../asn.1/NegotiationOpen.h $(SRCROOT)/../asn.1/NegotiationRequest.c $(SRCROOT)/../asn.1/NegotiationRequest.h +$(SRCROOT)/../asn.1/NegotiationRequestGrouped.c +$(SRCROOT)/../asn.1/NegotiationRequestGrouped.h $(SRCROOT)/../asn.1/OCTET_STRING.c $(SRCROOT)/../asn.1/OCTET_STRING.h -$(SRCROOT)/../asn.1/OwnKeys.c -$(SRCROOT)/../asn.1/OwnKeys.h -$(SRCROOT)/../asn.1/OwnKeysFirst.c -$(SRCROOT)/../asn.1/OwnKeysFirst.h -$(SRCROOT)/../asn.1/OwnKeysSecond.c -$(SRCROOT)/../asn.1/OwnKeysSecond.h +$(SRCROOT)/../asn.1/OwnKeysOfferer.c +$(SRCROOT)/../asn.1/OwnKeysOfferer.h +$(SRCROOT)/../asn.1/OwnKeysRequester.c +$(SRCROOT)/../asn.1/OwnKeysRequester.h $(SRCROOT)/../asn.1/PString.c $(SRCROOT)/../asn.1/PString.h $(SRCROOT)/../asn.1/PrintableString.c diff --git a/build-mac/generated-files-sync.txt b/build-mac/generated-files-sync.txt index b8fae00e4..4f991edc5 100644 --- a/build-mac/generated-files-sync.txt +++ b/build-mac/generated-files-sync.txt @@ -1,6 +1,11 @@ -$(SRCROOT)/../src/sync_codec.c -$(SRCROOT)/../src/sync_impl.c -$(SRCROOT)/../src/sync_actions.c -$(SRCROOT)/../src/Sync_func.c -$(SRCROOT)/../src/Sync_event.c $(SRCROOT)/../src/KeySync_fsm.c +$(SRCROOT)/../src/KeySync_fsm.h +$(SRCROOT)/../src/Sync_actions.c +$(SRCROOT)/../src/Sync_event.c +$(SRCROOT)/../src/Sync_event.h +$(SRCROOT)/../src/Sync_func.c +$(SRCROOT)/../src/Sync_func.h +$(SRCROOT)/../src/Sync_impl.c +$(SRCROOT)/../src/Sync_impl.h +$(SRCROOT)/../src/sync_codec.c +$(SRCROOT)/../src/sync_codec.h From 043d431770b579684036fe7de2b9717bd94e9435 Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Wed, 20 Nov 2019 16:01:56 +0100 Subject: [PATCH 2/3] doc update --- src/message_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/message_api.h b/src/message_api.h index 513eb8673..4f4a895ea 100644 --- a/src/message_api.h +++ b/src/message_api.h @@ -134,7 +134,7 @@ DYNAMIC_API PEP_STATUS encrypt_message_and_add_priv_key( // parameters: // session (in) session handle // target_id (in) self identity this message should be encrypted for -// src (in) message to encrypt +// src (inout) message to encrypt // extra (in) extra keys for encryption // dst (out) pointer to new encrypted message or NULL on failure // enc_format (in) encrypted format From 9201be05ca4304de9785c292fee4950d7f72c483 Mon Sep 17 00:00:00 2001 From: Volker Birk Date: Wed, 20 Nov 2019 16:03:44 +0100 Subject: [PATCH 3/3] or not to update, that is the question --- src/message_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/message_api.h b/src/message_api.h index 4f4a895ea..513eb8673 100644 --- a/src/message_api.h +++ b/src/message_api.h @@ -134,7 +134,7 @@ DYNAMIC_API PEP_STATUS encrypt_message_and_add_priv_key( // parameters: // session (in) session handle // target_id (in) self identity this message should be encrypted for -// src (inout) message to encrypt +// src (in) message to encrypt // extra (in) extra keys for encryption // dst (out) pointer to new encrypted message or NULL on failure // enc_format (in) encrypted format