merged in default

doxygen_doc
commit ef8675eefc

@ -1,7 +1,7 @@
-- This file is under BSD License 2.0
-- Sync protocol for p≡p
-- Copyright (c) 2016, 2017 p≡p foundation
-- Copyright (c) 2016, 2010 p≡p foundation
-- Written by Volker Birk
@ -12,7 +12,7 @@ DEFINITIONS AUTOMATIC TAGS EXTENSIBILITY IMPLIED ::=
BEGIN
EXPORTS Identity, IdentityList, TID, Hash, Version;
EXPORTS Identity, IdentityList, TID, Hash, Version, Rating;
ISO639-1 ::= PrintableString(FROM ("a".."z")) (SIZE(2))
Hex ::= PrintableString(FROM ("A".."F") | FROM ("0".."9"))
@ -36,5 +36,31 @@ Version ::= SEQUENCE {
minor INTEGER (0..255) DEFAULT 2
}
Rating ::= ENUMERATED {
-- no color
cannot-decrypt (1),
have-no-key (2),
unencrypted (3),
unreliable (5),
b0rken (-2),
-- yellow
reliable (6),
-- green
trusted (7),
trusted-and-anonymized (8),
fully-anonymous (9),
-- red
mistrust (-1),
under-attack (-3)
}
END

@ -142,6 +142,10 @@
15B0381422B2B823002D664C /* asn_SEQUENCE_OF.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B037A922B2B822002D664C /* asn_SEQUENCE_OF.h */; };
15B75BE223FA9F9D00DAE976 /* SynchronizeGroupKeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 15B75BDC23FA9F9D00DAE976 /* SynchronizeGroupKeys.c */; };
15B75BE323FA9F9D00DAE976 /* SynchronizeGroupKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B75BE123FA9F9D00DAE976 /* SynchronizeGroupKeys.h */; };
15EB7B7B250794D9004C176D /* ReceiverRating.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EB7B73250794D8004C176D /* ReceiverRating.h */; };
15EB7B7C250794D9004C176D /* Rating.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EB7B78250794D8004C176D /* Rating.h */; };
15EB7B7D250794D9004C176D /* Rating.c in Sources */ = {isa = PBXBuildFile; fileRef = 15EB7B79250794D8004C176D /* Rating.c */; };
15EB7B7E250794D9004C176D /* ReceiverRating.c in Sources */ = {isa = PBXBuildFile; fileRef = 15EB7B7A250794D8004C176D /* ReceiverRating.c */; };
430BCC482015EE800077E998 /* pEp_string.h in Headers */ = {isa = PBXBuildFile; fileRef = 430BCC462015EE800077E998 /* pEp_string.h */; };
430BCC492015EE800077E998 /* pEp_string.c in Sources */ = {isa = PBXBuildFile; fileRef = 430BCC472015EE800077E998 /* pEp_string.c */; };
430D258B1C9ED75A00B94535 /* blacklist.c in Sources */ = {isa = PBXBuildFile; fileRef = 430D258A1C9ED75A00B94535 /* blacklist.c */; };
@ -396,6 +400,10 @@
15B037A922B2B822002D664C /* asn_SEQUENCE_OF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = asn_SEQUENCE_OF.h; path = ../asn.1/asn_SEQUENCE_OF.h; sourceTree = "<group>"; };
15B75BDC23FA9F9D00DAE976 /* SynchronizeGroupKeys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SynchronizeGroupKeys.c; path = ../asn.1/SynchronizeGroupKeys.c; sourceTree = "<group>"; };
15B75BE123FA9F9D00DAE976 /* SynchronizeGroupKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SynchronizeGroupKeys.h; path = ../asn.1/SynchronizeGroupKeys.h; sourceTree = "<group>"; };
15EB7B73250794D8004C176D /* ReceiverRating.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ReceiverRating.h; path = ../asn.1/ReceiverRating.h; sourceTree = "<group>"; };
15EB7B78250794D8004C176D /* Rating.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rating.h; path = ../asn.1/Rating.h; sourceTree = "<group>"; };
15EB7B79250794D8004C176D /* Rating.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Rating.c; path = ../asn.1/Rating.c; sourceTree = "<group>"; };
15EB7B7A250794D8004C176D /* ReceiverRating.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ReceiverRating.c; path = ../asn.1/ReceiverRating.c; sourceTree = "<group>"; };
430BCC462015EE800077E998 /* pEp_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pEp_string.h; path = ../src/pEp_string.h; sourceTree = "<group>"; };
430BCC472015EE800077E998 /* pEp_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pEp_string.c; path = ../src/pEp_string.c; sourceTree = "<group>"; };
430D258A1C9ED75A00B94535 /* blacklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blacklist.c; path = ../src/blacklist.c; sourceTree = "<group>"; };
@ -552,6 +560,10 @@
6406CE811CE382F400C14D77 /* asn.1 */ = {
isa = PBXGroup;
children = (
15EB7B79250794D8004C176D /* Rating.c */,
15EB7B78250794D8004C176D /* Rating.h */,
15EB7B7A250794D8004C176D /* ReceiverRating.c */,
15EB7B73250794D8004C176D /* ReceiverRating.h */,
15B75BDC23FA9F9D00DAE976 /* SynchronizeGroupKeys.c */,
15B75BE123FA9F9D00DAE976 /* SynchronizeGroupKeys.h */,
4378C79023D1AF1700D1AF3F /* ElectGroupKeyResetLeader.c */,
@ -828,7 +840,9 @@
15B0380F22B2B823002D664C /* Sync.h in Headers */,
43C3778E246A8C0300962D22 /* internal_format.h in Headers */,
15B0380422B2B822002D664C /* constr_SET_OF.h in Headers */,
15EB7B7C250794D9004C176D /* Rating.h in Headers */,
15B0381322B2B823002D664C /* asn_application.h in Headers */,
15EB7B7B250794D9004C176D /* ReceiverRating.h in Headers */,
15B0380322B2B822002D664C /* OwnKeysRequester.h in Headers */,
154918AB22B940200091B6D6 /* fsm_common.h in Headers */,
15147EF3237E9EA7003989FE /* GroupKeysAndClose.h in Headers */,
@ -1083,6 +1097,7 @@
15B037B522B2B822002D664C /* OCTET_STRING.c in Sources */,
64A826831B455D0800EECAF0 /* platform_unix.c in Sources */,
15B0380D22B2B822002D664C /* CommitReject.c in Sources */,
15EB7B7D250794D9004C176D /* Rating.c in Sources */,
15B0380B22B2B822002D664C /* NativeInteger.c in Sources */,
15147EF2237E9EA7003989FE /* GroupKeysAndClose.c in Sources */,
158FF95B23C49ED600CB1016 /* KeyReset.c in Sources */,
@ -1144,6 +1159,7 @@
430BCC492015EE800077E998 /* pEp_string.c in Sources */,
15B037EB22B2B822002D664C /* constr_SET_OF.c in Sources */,
15B037DD22B2B822002D664C /* Rollback.c in Sources */,
15EB7B7E250794D9004C176D /* ReceiverRating.c in Sources */,
158FF96123C49ED600CB1016 /* Distribution.c in Sources */,
43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */,
15B037F422B2B822002D664C /* ber_decoder.c in Sources */,

@ -85,137 +85,10 @@
<None Include="..\generate_code.cmd" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\asn.1\asn_codecs_prim.c" />
<ClCompile Include="..\..\asn.1\asn_SEQUENCE_OF.c" />
<ClCompile Include="..\..\asn.1\asn_SET_OF.c" />
<ClCompile Include="..\..\asn.1\Beacon.c" />
<ClCompile Include="..\..\asn.1\ber_decoder.c" />
<ClCompile Include="..\..\asn.1\ber_tlv_length.c" />
<ClCompile Include="..\..\asn.1\ber_tlv_tag.c" />
<ClCompile Include="..\..\asn.1\BIT_STRING.c" />
<ClCompile Include="..\..\asn.1\BOOLEAN.c" />
<ClCompile Include="..\..\asn.1\Command.c" />
<ClCompile Include="..\..\asn.1\Commands.c" />
<ClCompile Include="..\..\asn.1\CommitAccept.c" />
<ClCompile Include="..\..\asn.1\CommitAcceptForGroup.c" />
<ClCompile Include="..\..\asn.1\CommitAcceptOfferer.c" />
<ClCompile Include="..\..\asn.1\CommitAcceptRequester.c" />
<ClCompile Include="..\..\asn.1\CommitReject.c" />
<ClCompile Include="..\..\asn.1\constraints.c" />
<ClCompile Include="..\..\asn.1\constr_CHOICE.c" />
<ClCompile Include="..\..\asn.1\constr_SEQUENCE.c" />
<ClCompile Include="..\..\asn.1\constr_SEQUENCE_OF.c" />
<ClCompile Include="..\..\asn.1\constr_SET_OF.c" />
<ClCompile Include="..\..\asn.1\constr_TYPE.c" />
<ClCompile Include="..\..\asn.1\der_encoder.c" />
<ClCompile Include="..\..\asn.1\Distribution.c" />
<ClCompile Include="..\..\asn.1\ElectGroupKeyResetLeader.c" />
<ClCompile Include="..\..\asn.1\GroupHandshake.c" />
<ClCompile Include="..\..\asn.1\GroupKeysAndClose.c" />
<ClCompile Include="..\..\asn.1\GroupKeysForNewMember.c" />
<ClCompile Include="..\..\asn.1\GroupKeysUpdate.c" />
<ClCompile Include="..\..\asn.1\GroupTrustThisKey.c" />
<ClCompile Include="..\..\asn.1\Hash.c" />
<ClCompile Include="..\..\asn.1\Hex.c" />
<ClCompile Include="..\..\asn.1\Identity.c" />
<ClCompile Include="..\..\asn.1\IdentityList.c" />
<ClCompile Include="..\..\asn.1\InitUnledGroupKeyReset.c" />
<ClCompile Include="..\..\asn.1\INTEGER.c" />
<ClCompile Include="..\..\asn.1\ISO639-1.c" />
<ClCompile Include="..\..\asn.1\KeyReset.c" />
<ClCompile Include="..\..\asn.1\KeySync.c" />
<ClCompile Include="..\..\asn.1\NativeEnumerated.c" />
<ClCompile Include="..\..\asn.1\NativeInteger.c" />
<ClCompile Include="..\..\asn.1\NegotiationOpen.c" />
<ClCompile Include="..\..\asn.1\NegotiationRequest.c" />
<ClCompile Include="..\..\asn.1\NegotiationRequestGrouped.c" />
<ClCompile Include="..\..\asn.1\OCTET_STRING.c" />
<ClCompile Include="..\..\asn.1\OwnKeysOfferer.c" />
<ClCompile Include="..\..\asn.1\OwnKeysRequester.c" />
<ClCompile Include="..\..\asn.1\pdu_collection.c" />
<ClCompile Include="..\..\asn.1\per_decoder.c" />
<ClCompile Include="..\..\asn.1\per_encoder.c" />
<ClCompile Include="..\..\asn.1\per_opentype.c" />
<ClCompile Include="..\..\asn.1\per_support.c" />
<ClCompile Include="..\..\asn.1\PrintableString.c" />
<ClCompile Include="..\..\asn.1\PString.c" />
<ClCompile Include="..\..\asn.1\Rollback.c" />
<ClCompile Include="..\..\asn.1\Sync.c" />
<ClCompile Include="..\..\asn.1\SynchronizeGroupKeys.c" />
<ClCompile Include="..\..\asn.1\TID.c" />
<ClCompile Include="..\..\asn.1\UTF8String.c" />
<ClCompile Include="..\..\asn.1\Version.c" />
<ClCompile Include="..\..\asn.1\xer_decoder.c" />
<ClCompile Include="..\..\asn.1\xer_encoder.c" />
<ClCompile Include="..\..\asn.1\xer_support.c" />
<ClCompile Include="..\..\asn.1\*.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\asn.1\asn_application.h" />
<ClInclude Include="..\..\asn.1\asn_codecs.h" />
<ClInclude Include="..\..\asn.1\asn_codecs_prim.h" />
<ClInclude Include="..\..\asn.1\asn_internal.h" />
<ClInclude Include="..\..\asn.1\asn_SEQUENCE_OF.h" />
<ClInclude Include="..\..\asn.1\asn_SET_OF.h" />
<ClInclude Include="..\..\asn.1\asn_system.h" />
<ClInclude Include="..\..\asn.1\Beacon.h" />
<ClInclude Include="..\..\asn.1\ber_decoder.h" />
<ClInclude Include="..\..\asn.1\ber_tlv_length.h" />
<ClInclude Include="..\..\asn.1\ber_tlv_tag.h" />
<ClInclude Include="..\..\asn.1\BIT_STRING.h" />
<ClInclude Include="..\..\asn.1\BOOLEAN.h" />
<ClInclude Include="..\..\asn.1\Command.h" />
<ClInclude Include="..\..\asn.1\Commands.h" />
<ClInclude Include="..\..\asn.1\CommitAccept.h" />
<ClInclude Include="..\..\asn.1\CommitAcceptForGroup.h" />
<ClInclude Include="..\..\asn.1\CommitAcceptOfferer.h" />
<ClInclude Include="..\..\asn.1\CommitAcceptRequester.h" />
<ClInclude Include="..\..\asn.1\CommitReject.h" />
<ClInclude Include="..\..\asn.1\constraints.h" />
<ClInclude Include="..\..\asn.1\constr_CHOICE.h" />
<ClInclude Include="..\..\asn.1\constr_SEQUENCE.h" />
<ClInclude Include="..\..\asn.1\constr_SEQUENCE_OF.h" />
<ClInclude Include="..\..\asn.1\constr_SET_OF.h" />
<ClInclude Include="..\..\asn.1\constr_TYPE.h" />
<ClInclude Include="..\..\asn.1\der_encoder.h" />
<ClInclude Include="..\..\asn.1\Distribution.h" />
<ClInclude Include="..\..\asn.1\ElectGroupKeyResetLeader.h" />
<ClInclude Include="..\..\asn.1\GroupHandshake.h" />
<ClInclude Include="..\..\asn.1\GroupKeysAndClose.h" />
<ClInclude Include="..\..\asn.1\GroupKeysForNewMember.h" />
<ClInclude Include="..\..\asn.1\GroupKeysUpdate.h" />
<ClInclude Include="..\..\asn.1\GroupTrustThisKey.h" />
<ClInclude Include="..\..\asn.1\Hash.h" />
<ClInclude Include="..\..\asn.1\Hex.h" />
<ClInclude Include="..\..\asn.1\Identity.h" />
<ClInclude Include="..\..\asn.1\IdentityList.h" />
<ClInclude Include="..\..\asn.1\InitUnledGroupKeyReset.h" />
<ClInclude Include="..\..\asn.1\INTEGER.h" />
<ClInclude Include="..\..\asn.1\ISO639-1.h" />
<ClInclude Include="..\..\asn.1\KeyReset.h" />
<ClInclude Include="..\..\asn.1\KeySync.h" />
<ClInclude Include="..\..\asn.1\NativeEnumerated.h" />
<ClInclude Include="..\..\asn.1\NativeInteger.h" />
<ClInclude Include="..\..\asn.1\NegotiationOpen.h" />
<ClInclude Include="..\..\asn.1\NegotiationRequest.h" />
<ClInclude Include="..\..\asn.1\NegotiationRequestGrouped.h" />
<ClInclude Include="..\..\asn.1\OCTET_STRING.h" />
<ClInclude Include="..\..\asn.1\OwnKeysOfferer.h" />
<ClInclude Include="..\..\asn.1\OwnKeysRequester.h" />
<ClInclude Include="..\..\asn.1\per_decoder.h" />
<ClInclude Include="..\..\asn.1\per_encoder.h" />
<ClInclude Include="..\..\asn.1\per_opentype.h" />
<ClInclude Include="..\..\asn.1\per_support.h" />
<ClInclude Include="..\..\asn.1\PrintableString.h" />
<ClInclude Include="..\..\asn.1\PString.h" />
<ClInclude Include="..\..\asn.1\Rollback.h" />
<ClInclude Include="..\..\asn.1\Sync.h" />
<ClInclude Include="..\..\asn.1\SynchronizeGroupKeys.h" />
<ClInclude Include="..\..\asn.1\TID.h" />
<ClInclude Include="..\..\asn.1\UTF8String.h" />
<ClInclude Include="..\..\asn.1\Version.h" />
<ClInclude Include="..\..\asn.1\xer_decoder.h" />
<ClInclude Include="..\..\asn.1\xer_encoder.h" />
<ClInclude Include="..\..\asn.1\xer_support.h" />
<ClInclude Include="..\..\asn.1\*.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />

@ -94,7 +94,7 @@ PEP_STATUS base_prepare_message(
//
// caveat:
// payload may point to msg attachment, the ownership does not change
// if fpr != NULL the ownership goes to the caller
// the ownership of fpr goes to the caller
PEP_STATUS base_extract_message(
PEP_SESSION session,

@ -1381,6 +1381,17 @@ PEP_STATUS key_reset(
// Now it matters if we're talking about ourselves or a partner.
bool is_own_private = false;
if (is_me(session, tmp_ident)) {
// For now: We don't reset own revoked/mistrusted key. We're
// already done with this. @bug - check after key election removal
bool mistr = false;
bool revok = false;
status = is_mistrusted_key(session, fpr_copy, &mistr);
if (status != PEP_STATUS_OK || mistr)
goto pEp_free;
status = key_revoked(session, fpr_copy, &revok);
if (status != PEP_STATUS_OK || revok)
goto pEp_free;
bool own_key = false;
status = is_own_key(session, fpr_copy, &own_key);

@ -14,6 +14,7 @@
#include "resource_id.h"
#include "internal_format.h"
#include "keymanagement.h"
#include "sync_codec.h"
#include <assert.h>
#include <string.h>
@ -187,7 +188,88 @@ void replace_opt_field(message *msg,
}
}
static bool sync_message_attached(message *msg)
{
if (!(msg && msg->attachments))
return false;
for (bloblist_t *a = msg->attachments; a && a->value ; a = a->next) {
if (a->mime_type && strcasecmp(a->mime_type, "application/pEp.sync") == 0)
return true;
}
return false;
}
PEP_STATUS set_receiverRating(PEP_SESSION session, message *msg, PEP_rating rating)
{
if (!(session && msg && rating))
return PEP_ILLEGAL_VALUE;
if (!(msg->recv_by && msg->recv_by->fpr && msg->recv_by->fpr[0]))
return PEP_SYNC_NO_CHANNEL;
// don't add a second sync message
if (sync_message_attached(msg))
return PEP_STATUS_OK;
Sync_t *res = new_Sync_message(Sync_PR_keysync, KeySync_PR_receiverRating);
if (!res)
return PEP_OUT_OF_MEMORY;
res->choice.keysync.choice.receiverRating.rating = (Rating_t) rating;
char *payload;
size_t size;
PEP_STATUS status = encode_Sync_message(res, &payload, &size);
free_Sync_message(res);
if (status)
return status;
return base_decorate_message(session, msg, BASE_SYNC, payload, size, msg->recv_by->fpr);
}
PEP_STATUS get_receiverRating(PEP_SESSION session, message *msg, PEP_rating *rating)
{
if (!(session && msg && rating))
return PEP_ILLEGAL_VALUE;
*rating = PEP_rating_undefined;
size_t size;
const char *payload;
char *fpr;
PEP_STATUS status = base_extract_message(session, msg, BASE_SYNC, &size, &payload, &fpr);
if (status)
return status;
if (!fpr)
return PEP_SYNC_NO_CHANNEL;
bool own_key;
status = is_own_key(session, fpr, &own_key);
free(fpr);
if (status)
return status;
if (!own_key)
return PEP_SYNC_NO_CHANNEL;
Sync_t *res;
status = decode_Sync_message(payload, size, &res);
if (status)
return status;
if (!(res->present == Sync_PR_keysync && res->choice.keysync.present == KeySync_PR_receiverRating)) {
free_Sync_message(res);
return PEP_SYNC_NO_CHANNEL;
}
*rating = res->choice.keysync.choice.receiverRating.rating;
replace_opt_field(msg, "X-EncStatus", rating_to_string(*rating), true);
return PEP_STATUS_OK;
}
void decorate_message(
PEP_SESSION session,
message *msg,
PEP_rating rating,
stringlist_t *keylist,
@ -200,8 +282,10 @@ void decorate_message(
if (add_version)
replace_opt_field(msg, "X-pEp-Version", PEP_VERSION, clobber);
if (rating != PEP_rating_undefined)
if (rating != PEP_rating_undefined) {
replace_opt_field(msg, "X-EncStatus", rating_to_string(rating), clobber);
set_receiverRating(session, msg, rating);
}
if (keylist) {
char *_keylist = keylist_to_string(keylist);
@ -2195,7 +2279,7 @@ DYNAMIC_API PEP_STATUS encrypt_message(
attach_own_key(session, src);
added_key_to_real_src = true;
}
decorate_message(src, PEP_rating_undefined, NULL, true, true);
decorate_message(session, src, PEP_rating_undefined, NULL, true, true);
return PEP_UNENCRYPTED;
}
else {
@ -2267,7 +2351,7 @@ DYNAMIC_API PEP_STATUS encrypt_message(
}
if (msg) {
decorate_message(msg, PEP_rating_undefined, NULL, true, true);
decorate_message(session, msg, PEP_rating_undefined, NULL, true, true);
if (_src->id) {
msg->id = strdup(_src->id);
assert(msg->id);
@ -2639,7 +2723,7 @@ DYNAMIC_API PEP_STATUS encrypt_message_for_self(
if (msg->id == NULL)
goto enomem;
}
decorate_message(msg, PEP_rating_undefined, NULL, true, true);
decorate_message(session, msg, PEP_rating_undefined, NULL, true, true);
}
*dst = msg;
@ -3652,7 +3736,9 @@ PEP_STATUS check_for_own_revoked_key(
{
if (!session || !revoked_fpr_pairs)
return PEP_ILLEGAL_VALUE;
char* default_own_userid = NULL;
*revoked_fpr_pairs = NULL;
PEP_STATUS status = PEP_STATUS_OK;
@ -3674,17 +3760,45 @@ PEP_STATUS check_for_own_revoked_key(
&revoke_date);
bool own_key = false;
pEp_identity* placeholder_ident = NULL;
switch (status) {
case PEP_CANNOT_FIND_IDENTITY:
status = PEP_STATUS_OK;
continue;
case PEP_STATUS_OK:
status = is_own_key(session, recip_fpr, &own_key);
// Ok, we know it's a revoked key. Now see if it was "ours" by checking
// to see if we have an entry for it with our user id, since we already clearly
// know its replacement
status = get_default_own_userid(session, &default_own_userid);
if (status == PEP_STATUS_OK && !EMPTYSTR(default_own_userid)) {
placeholder_ident = new_identity(NULL, recip_fpr, default_own_userid, NULL);
if (!placeholder_ident)
status = PEP_OUT_OF_MEMORY;
else
status = get_trust(session, placeholder_ident);
if (status == PEP_STATUS_OK) {
stringlist_t* keylist = NULL;
status = find_private_keys(session, recip_fpr, &keylist);
if (status == PEP_STATUS_OK) {
if (keylist && !EMPTYSTR(keylist->value))
own_key = true;
}
free_stringlist(keylist);
}
}
else if (status == PEP_CANNOT_FIND_IDENTITY)
status = PEP_STATUS_OK;
free_identity(placeholder_ident);
if (status != PEP_STATUS_OK) {
free(replace_fpr);
free(default_own_userid);
return status;
}
@ -3706,6 +3820,7 @@ PEP_STATUS check_for_own_revoked_key(
pEp_free:
free_stringpair_list(_the_list);
free(default_own_userid);
return status;
}
@ -4031,8 +4146,15 @@ static PEP_STATUS _decrypt_message(
}
// Check for and deal with unencrypted messages
if (src->enc_format == PEP_enc_none) {
// if there is a valid receiverRating then return this rating else
// return unencrypted
*rating = PEP_rating_unencrypted;
PEP_rating _rating = PEP_rating_undefined;
status = get_receiverRating(session, src, &_rating);
if (status == PEP_STATUS_OK && _rating)
*rating = _rating;
else
*rating = PEP_rating_unencrypted;
// We remove these from the outermost source message
// if (keys_were_imported)
@ -4079,9 +4201,22 @@ static PEP_STATUS _decrypt_message(
return (status == PEP_STATUS_OK ? PEP_UNENCRYPTED : status);
}
// if there is an own identity defined via this message is coming in
// retrieve the details; in case there's no usuable own key make it
// functional
if (src->recv_by && !EMPTYSTR(src->recv_by->address)) {
status = myself(session, src->recv_by);
if (status) {
free_stringlist(_imported_key_list);
return status;
}
}
status = get_crypto_text(src, &ctext, &csize);
if (status != PEP_STATUS_OK)
if (status) {
free_stringlist(_imported_key_list);
return status;
}
/** Ok, we should be ready to decrypt. Try decrypt and verify first! **/
status = decrypt_and_verify(session, ctext, csize, dsig_text, dsig_size,
@ -4640,7 +4775,13 @@ static PEP_STATUS _decrypt_message(
dedup_stringlist(_keylist->next);
/* add pEp-related status flags to header */
decorate_message(msg, *rating, _keylist, false, false);
if (src->recv_by) {
free_identity(msg->recv_by);
msg->recv_by = identity_dup(src->recv_by);
if (!msg->recv_by)
goto enomem;
}
decorate_message(session, msg, *rating, _keylist, false, true);
// Maybe unnecessary
// if (keys_were_imported)
@ -5679,6 +5820,39 @@ enomem:
return PEP_OUT_OF_MEMORY;
}
static void remove_sync_message(message *msg)
{
if (!(msg && msg->attachments))
return;
bloblist_t *b = NULL;
for (bloblist_t *a = msg->attachments; a && a->value ; ) {
if (a->mime_type && (
strcasecmp(a->mime_type, "application/pEp.sync") == 0 ||
strcasecmp(a->mime_type, "application/pEp.sign") == 0
)
)
{
if (b) {
b->next = a->next;
a->next = NULL;
free_bloblist(a);
a = b->next;
}
else {
msg->attachments = a->next;
a->next = NULL;
free_bloblist(a);
a = msg->attachments;
}
}
else {
b = a;
a = a->next;
}
}
}
// CAN return PASSPHRASE errors
DYNAMIC_API PEP_STATUS re_evaluate_message_rating(
PEP_SESSION session,
@ -5757,9 +5931,12 @@ got_keylist:
status = amend_rating_according_to_sender_and_recipients(session, &_rating,
msg->from, _keylist);
if (status == PEP_STATUS_OK)
if (status == PEP_STATUS_OK) {
remove_sync_message(msg);
set_receiverRating(session, msg, _rating);
*rating = _rating;
}
pEp_error:
if (must_free_keylist)
free_stringlist(_keylist);

@ -492,7 +492,7 @@ DYNAMIC_API PEP_STATUS get_trustwords_for_fprs(
//
// parameters:
// session (in) session handle
// msg (in) message to get the rating for
// msg (inout) message to get the rating for
// x_keylist (in) decrypted message recipients keys fpr
// x_enc_status (in) original rating for the decrypted message
// rating (out) rating for the message

@ -5263,24 +5263,39 @@ PEP_STATUS is_own_key(PEP_SESSION session, const char* fpr, bool* own_key) {
return PEP_ILLEGAL_VALUE;
*own_key = false;
sqlite3_reset(session->own_key_is_listed);
sqlite3_bind_text(session->own_key_is_listed, 1, fpr, -1,
SQLITE_STATIC);
int result = sqlite3_step(session->own_key_is_listed);
switch (result) {
case SQLITE_ROW: {
*own_key = (sqlite3_column_int(session->own_key_is_listed, 0) != 0);
break;
}
default:
sqlite3_reset(session->own_key_is_listed);
return PEP_UNKNOWN_DB_ERROR;
}
sqlite3_reset(session->own_key_is_listed);
return PEP_STATUS_OK;
char* default_own_userid = NULL;
pEp_identity* placeholder_ident = NULL;
PEP_STATUS status = get_default_own_userid(session, &default_own_userid);
if (status == PEP_STATUS_OK && !EMPTYSTR(default_own_userid)) {
placeholder_ident = new_identity(NULL, fpr, default_own_userid, NULL);
if (!placeholder_ident)
status = PEP_OUT_OF_MEMORY;
else
status = get_trust(session, placeholder_ident);
if (status == PEP_STATUS_OK) {
if (placeholder_ident->comm_type == PEP_ct_pEp) {
stringlist_t* keylist = NULL;
status = find_private_keys(session, fpr, &keylist);
if (status == PEP_STATUS_OK) {
if (keylist && !EMPTYSTR(keylist->value))
*own_key = true;
}
free_stringlist(keylist);
}
}
}
if (status == PEP_CANNOT_FIND_IDENTITY)
status = PEP_STATUS_OK; // either no default own id yet, so no own keys yet
// or there was no own trust entry! False either way
free(default_own_userid);
free_identity(placeholder_ident);
return status;
}
DYNAMIC_API PEP_STATUS set_revoked(

@ -25,7 +25,7 @@ extern "C" {
#define PEP_ENGINE_VERSION_MAJOR 2
#define PEP_ENGINE_VERSION_MINOR 1
#define PEP_ENGINE_VERSION_PATCH 0
#define PEP_ENGINE_VERSION_RC 28
#define PEP_ENGINE_VERSION_RC 39
#define PEP_OWN_USERID "pEp_own_userId"

@ -294,6 +294,7 @@ PEP_STATUS encrypt_only(
);
void decorate_message(
PEP_SESSION session,
message *msg,
PEP_rating rating,
stringlist_t *keylist,

@ -296,7 +296,7 @@ template "field", mode=update_message {
const "state" > «yml:lcase(ancestor::protocol/@name)»_state.«yml:lcase(ancestor::fsm/@name)»
choose {
when "func:basicType()" // copyable
when "func:basicType() or @type='Rating'" // copyable
||
msg->choice.«yml:lcase(../../@name)».choice.«$message_name».«@name»
= session->«$state».«@name»;
@ -380,7 +380,7 @@ template "message", mode=update_state {
template "field", mode=update_state {
param "message_name";
choose {
when "func:basicType()" // copyable
when "func:basicType() or @type='Rating'" // copyable
||
session->«yml:lcase(../../../@name)»_state.«yml:lcase(../../@name)».«@name» = msg->choice.«yml:lcase(../../@name)»
.choice.«$message_name».«@name»;

@ -15,7 +15,7 @@ tstylesheet {
include ./functions.ysl2
function "pEp_imports"
| IMPORTS Version, Identity, IdentityList, TID, Hash FROM PEP;
| IMPORTS Version, Identity, IdentityList, TID, Hash, Rating FROM PEP;
function "header"
||

@ -585,7 +585,7 @@ tstylesheet {
goto the_end;
}
attach_own_key(session, _m);
decorate_message(_m, PEP_rating_undefined, NULL, true, true);
decorate_message(session, _m, PEP_rating_undefined, NULL, true, true);
m = _m;
break;
@ -1349,7 +1349,7 @@ tstylesheet {
case Init:
return "Init";
||
for "func:distinctName(state/event[not(@name='Init')])" {
for "func:distinctName(state/event[not(@name='Init')]|message)" {
|>> case «@name»:
|>>> return "«@name»";
}

@ -679,5 +679,14 @@ protocol Sync 1 {
message SynchronizeGroupKeys 21, ratelimit=60 {
}
// This could be part of TrustSync, but actually it does not matter.
// This message will not be sent by the Sync thread. It is used by
// decrypt_message() to mark a previously computed rating. It is only
// valid when signed with an own key.
message ReceiverRating 22, security=unencrypted {
field Rating rating;
}
}
}

@ -0,0 +1,222 @@
#include <stdlib.h>
#include <string>
#include <cstring>
#include "pEpEngine.h"
#include "test_util.h"
#include "TestConstants.h"
#include "Engine.h"
#include "key_reset.h"
#include <gtest/gtest.h>
namespace {
//The fixture for IsOwnKeyTest
class IsOwnKeyTest : public ::testing::Test {
public:
Engine* engine;
PEP_SESSION session;
protected:
// You can remove any or all of the following functions if its body
// is empty.
IsOwnKeyTest() {
// You can do set-up work for each test here.
test_suite_name = ::testing::UnitTest::GetInstance()->current_test_info()->GTEST_SUITE_SYM();
test_name = ::testing::UnitTest::GetInstance()->current_test_info()->name();
test_path = get_main_test_home_dir() + "/" + test_suite_name + "/" + test_name;
}
~IsOwnKeyTest() override {
// You can do clean-up work that doesn't throw exceptions here.
}
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void SetUp() override {
// Code here will be called immediately after the constructor (right
// before each test).
// Leave this empty if there are no files to copy to the home directory path
std::vector<std::pair<std::string, std::string>> init_files = std::vector<std::pair<std::string, std::string>>();
// Get a new test Engine.
engine = new Engine(test_path);
ASSERT_NE(engine, nullptr);
// Ok, let's initialize test directories etc.
engine->prep(NULL, NULL, NULL, init_files);
// Ok, try to start this bugger.
engine->start();
ASSERT_NE(engine->session, nullptr);
session = engine->session;
// Engine is up. Keep on truckin'
}
void TearDown() override {
// Code here will be called immediately after each test (right
// before the destructor).
engine->shut_down();
delete engine;
engine = NULL;
session = NULL;
}
private:
const char* test_suite_name;
const char* test_name;
string test_path;
// Objects declared here can be used by all tests in the IsOwnKeyTest suite.
};
} // namespace
/*
PEP_STATUS set_up_preset(PEP_SESSION session,
pEp_test_ident_preset preset_name,
bool set_ident,
bool set_pep,
bool trust,
bool set_own,
bool setup_private,
pEp_identity** ident) {
*/
TEST_F(IsOwnKeyTest, check_is_own_key_normal) {
pEp_identity* alice = NULL;
PEP_STATUS status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_OK;
bool is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_TRUE(is_own);
}
TEST_F(IsOwnKeyTest, check_is_own_key_OpenPGP) {
}
TEST_F(IsOwnKeyTest, check_is_own_key_external_revoked) {
pEp_identity* alice = NULL;
PEP_STATUS status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_OK;
bool is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_TRUE(is_own);
status = revoke_key(session, alice->fpr, "Because I wanna");
ASSERT_OK;
is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_TRUE(is_own); // Probably not wanted
}
TEST_F(IsOwnKeyTest, check_is_own_key_external_marked_revoked) {
pEp_identity* alice = NULL;
PEP_STATUS status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_OK;
bool is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_TRUE(is_own);
char* alicefpr = strdup(alice->fpr);
status = revoke_key(session, alice->fpr, "Because I wanna");
ASSERT_OK;
if (alice->fpr == NULL) {
alice->fpr = alicefpr;
}
alice->comm_type = PEP_ct_key_revoked;
status = set_identity(session, alice);
ASSERT_OK;
is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_FALSE(is_own);
}
TEST_F(IsOwnKeyTest, check_is_own_key_revoked_through_reset) { // Probably mistrusted case...
pEp_identity* alice = NULL;
PEP_STATUS status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_OK;
bool is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_TRUE(is_own);
status = key_reset_identity(session, alice, alice->fpr);
ASSERT_OK;
is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_FALSE(is_own);
}
TEST_F(IsOwnKeyTest, check_is_own_key_mistrusted) {
pEp_identity* alice = NULL;
PEP_STATUS status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_OK;
bool is_own = false;
status = is_own_key(session, alice->fpr, &is_own);
ASSERT_OK;
ASSERT_TRUE(is_own);
const char* alicefpr = strdup(alice->fpr);
status = key_mistrusted(session, alice);
ASSERT_OK;
is_own = false;
status = is_own_key(session, alicefpr, &is_own);
ASSERT_OK;
ASSERT_FALSE(is_own);
}
TEST_F(IsOwnKeyTest, check_is_own_key_expired) {
const char* testy_fpr = "D1AEA592B78BEF2BE8D93C78DD835B271075DA7E";
bool imported = slurp_and_import_key(session, "test_keys/testy_expired.pgp");
pEp_identity* testy = new_identity("testy@darthmama.org", testy_fpr, PEP_OWN_USERID, "Testy McExpiredson");
testy->comm_type = PEP_ct_key_expired_but_confirmed;
PEP_STATUS status = set_identity(session, testy);
ASSERT_OK;
bool is_own = false;
status = is_own_key(session, testy_fpr, &is_own);
ASSERT_OK;
ASSERT_FALSE(is_own);
}
TEST_F(IsOwnKeyTest, check_is_key_someone_elses_pubkey) {
pEp_identity* alice = NULL;
PEP_STATUS status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_OK;
// Dave == NOT OWN
pEp_identity* dave = NULL;
status = set_up_preset(session, DAVE, true, true, true, false, false, &dave);
// import the private part also
const char* dave_fpr = "E8AC9779A2D13A15D8D55C84B049F489BB5BCCF6";
bool is_own = false;
status = is_own_key(session, dave_fpr, &is_own);
ASSERT_OK;
ASSERT_FALSE(is_own);
}
TEST_F(IsOwnKeyTest, check_is_non_own_priv_key) {
pEp_identity* alice = NULL;
PEP_STATUS status = set_up_preset(session, ALICE, true, true, true, true, true, &alice);
ASSERT_OK;
// Dave == NOT OWN
pEp_identity* dave = NULL;
status = set_up_preset(session, DAVE, true, true, true, false, false, &dave);
// import the private part also
bool imported = slurp_and_import_key(session, "test_keys/priv/pep-test-dave-0xBB5BCCF6_priv.asc");
ASSERT_TRUE(imported);
const char* dave_fpr = "E8AC9779A2D13A15D8D55C84B049F489BB5BCCF6";
bool is_own = false;
status = is_own_key(session, dave_fpr, &is_own);
ASSERT_OK;
ASSERT_FALSE(is_own);
}

@ -1793,34 +1793,34 @@ TEST_F(KeyResetMessageTest, check_reset_ident_other_priv_no_fpr) {
}
TEST_F(KeyResetMessageTest, check_reset_ident_own_pub_fpr) {
send_setup(); // lazy
pEp_identity* alice = new_identity("pep.test.alice@pep-project.org", NULL, alice_user_id.c_str(), NULL);
PEP_STATUS status = read_file_and_import_key(session, "test_keys/pub/pep.test.alexander-0x26B54E4E_pub.asc");
// hacky
alice->fpr = strdup("3AD9F60FAEB22675DB873A1362D6981326B54E4E");
status = set_pgp_keypair(session, alice->fpr);
ASSERT_OK;
alice->comm_type = PEP_ct_OpenPGP;
status = set_trust(session, alice);
ASSERT_OK;
// Ok, let's reset it
status = key_reset_identity(session, alice, alice->fpr);
status = myself(session, alice);
ASSERT_OK;
ASSERT_TRUE(alice->me);
ASSERT_NOTNULL(alice->fpr);
ASSERT_STREQ(alice->fpr, alice_fpr);
ASSERT_EQ(alice->comm_type , PEP_ct_pEp);
free(alice->fpr);
alice->fpr = strdup("3AD9F60FAEB22675DB873A1362D6981326B54E4E");
status = get_trust(session, alice);
ASSERT_EQ(status , PEP_CANNOT_FIND_IDENTITY);
}
// TEST_F(KeyResetMessageTest, check_reset_ident_own_pub_fpr) {
// send_setup(); // lazy
// pEp_identity* alice = new_identity("pep.test.alice@pep-project.org", NULL, alice_user_id.c_str(), NULL);
// PEP_STATUS status = read_file_and_import_key(session, "test_keys/pub/pep.test.alexander-0x26B54E4E_pub.asc");
// // hacky
// alice->fpr = strdup("3AD9F60FAEB22675DB873A1362D6981326B54E4E");
// status = set_pgp_keypair(session, alice->fpr);
// ASSERT_EQ(status , PEP_STATUS_OK);
// alice->comm_type = PEP_ct_OpenPGP;
// status = set_trust(session, alice);
// ASSERT_EQ(status , PEP_STATUS_OK);
// // Ok, let's reset it
// status = key_reset_identity(session, alice, alice->fpr);
// status = myself(session, alice);
// ASSERT_EQ(status , PEP_STATUS_OK);
// ASSERT_TRUE(alice->me);
// ASSERT_NE(alice->fpr, nullptr);
// ASSERT_STREQ(alice->fpr, alice_fpr);
// ASSERT_EQ(alice->comm_type , PEP_ct_pEp);
// free(alice->fpr);
// alice->fpr = strdup("3AD9F60FAEB22675DB873A1362D6981326B54E4E");
// status = get_trust(session, alice);
// ASSERT_EQ(status , PEP_CANNOT_FIND_IDENTITY);
// }
TEST_F(KeyResetMessageTest, check_reset_ident_own_priv_fpr) {

@ -0,0 +1,154 @@
#include <stdlib.h>
#include <string>
#include <cstring>
#include "internal_format.h"
#include "test_util.h"
#include "TestConstants.h"
#include "Engine.h"
#include <gtest/gtest.h>
extern "C" {
PEP_STATUS set_receiverRating(PEP_SESSION session, message *msg, PEP_rating rating);
PEP_STATUS get_receiverRating(PEP_SESSION session, message *msg, PEP_rating *rating);
}
namespace {
//The fixture for ReceiverRatingTest
class ReceiverRatingTest : public ::testing::Test {
public:
Engine* engine;
PEP_SESSION session;
protected:
// You can remove any or all of the following functions if its body
// is empty.
ReceiverRatingTest() {
// You can do set-up work for each test here.
test_suite_name = ::testing::UnitTest::GetInstance()->current_test_info()->GTEST_SUITE_SYM();
test_name = ::testing::UnitTest::GetInstance()->current_test_info()->name();
test_path = get_main_test_home_dir() + "/" + test_suite_name + "/" + test_name;
}
~ReceiverRatingTest() override {
// You can do clean-up work that doesn't throw exceptions here.
}
// If the constructor and destructor are not enough for setting up
// and cleaning up each test, you can define the following methods:
void SetUp() override {
// Code here will be called immediately after the constructor (right
// before each test).
// Leave this empty if there are no files to copy to the home directory path
std::vector<std::pair<std::string, std::string>> init_files = std::vector<std::pair<std::string, std::string>>();
// Get a new test Engine.
engine = new Engine(test_path);
ASSERT_NE(engine, nullptr);
// Ok, let's initialize test directories etc.
engine->prep(NULL, NULL, NULL, init_files);
// Ok, try to start this bugger.
engine->start();
ASSERT_NE(engine->session, nullptr);
session = engine->session;
// Engine is up. Keep on truckin'
}
void TearDown() override {
// Code here will be called immediately after each test (right
// before the destructor).
engine->shut_down();
delete engine;
engine = NULL;
session = NULL;
}
private:
const char* test_suite_name;
const char* test_name;
string test_path;
// Objects declared here can be used by all tests in the ReceiverRatingTest suite.
};
} // namespace
TEST_F(ReceiverRatingTest, check_internal_format) {
// a message from me, Alice, to myself
const char* alice_fpr = "4ABE3AAF59AC32CFE4F86500A9411D176FF00E97";
PEP_STATUS status = read_file_and_import_key(session,
"test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc");
ASSERT_EQ(status , PEP_KEY_IMPORTED);
status = set_up_ident_from_scratch(session,
"test_keys/priv/pep-test-alice-0x6FF00E97_priv.asc",
"pep.test.alice@pep-project.org", alice_fpr,
PEP_OWN_USERID, "Alice in Wonderland", NULL, true
);
ASSERT_EQ(status , PEP_STATUS_OK);
message* msg = new_message(PEP_dir_outgoing);
pEp_identity* alice = new_identity("pep.test.alice@pep-project.org", NULL, PEP_OWN_USERID, NULL);
status = myself(session, alice);
ASSERT_EQ(status , PEP_STATUS_OK);
pEp_identity* alice2 = identity_dup(alice);
msg->to = new_identity_list(identity_dup(alice));
msg->from = identity_dup(alice);
msg->shortmsg = strdup("Yo Mama!");
msg->longmsg = strdup("Look at my hot new sender fpr field!");
// encrypt this message
message* enc_msg = NULL;
status = encrypt_message(session, msg, NULL, &enc_msg, PEP_enc_PEP, 0);
ASSERT_EQ(status , PEP_STATUS_OK);
// decrypt this message
message *dec_msg = NULL;
stringlist_t *keylist = NULL;
PEP_rating rating = PEP_rating_undefined;
PEP_decrypt_flags_t flags = 0;
enc_msg->recv_by = identity_dup(alice);
status = decrypt_message(session, enc_msg, &dec_msg, &keylist, &rating, &flags);
ASSERT_EQ(status, PEP_STATUS_OK);
ASSERT_STREQ(msg->shortmsg, dec_msg->shortmsg);
ASSERT_STREQ(msg->longmsg, dec_msg->longmsg);
ASSERT_EQ(rating, PEP_rating_trusted_and_anonymized);
bloblist_t *as = dec_msg->attachments;
ASSERT_STREQ(as->mime_type, "application/pEp.sync");
// test if receiver rating can be evaluated
free_stringlist(keylist);
message *dec_msg2 = NULL;
dec_msg->recv_by = identity_dup(alice);
status = decrypt_message(session, dec_msg, &dec_msg2, &keylist, &rating, &flags);
ASSERT_EQ(status, PEP_UNENCRYPTED);
ASSERT_EQ(rating, PEP_rating_trusted_and_anonymized);
// this must be repeatable
free_stringlist(keylist);
dec_msg->recv_by = identity_dup(alice);
status = decrypt_message(session, dec_msg, &dec_msg2, &keylist, &rating, &flags);
ASSERT_EQ(status, PEP_UNENCRYPTED);
ASSERT_EQ(rating, PEP_rating_trusted_and_anonymized);
free_stringlist(keylist);
free_identity(alice);
free_message(msg);
free_message(enc_msg);
free_message(dec_msg);
free_message(dec_msg2);
}

@ -20,38 +20,39 @@ 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
=DR2m
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
oxjLclwYcjrWkMcHKg7bmJh7Fg==
=Yst9
-----END PGP PRIVATE KEY BLOCK-----

@ -7,24 +7,25 @@ JxdtlWfbTOe+QImoYxUCrhomyOf5ramnOmWIIR7oAa8LxuWTC8nGaiSuvCSgPwo/
2dWyMyEGMkokfj3RhkLfGs3IKOXORQicKRYmsHO3p9YMduXRKDiRQ3H1FedIoaVn
xXYbQTtL897PjS6B+BSHquHzJZwrag/KE8+ZABEBAAG0P3BFcCBUZXN0IERhdmUg
KFRlc3QgRG8gTm90IFVzZSkgPHBlcC10ZXN0LWRhdmVAcGVwLXByb2plY3Qub3Jn
PokBPwQTAQgAKQUCWBxv8wIbAwUJBzW0AAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4B
AheAAAoJELBJ9Im7W8z29mUIAJQaPFLd3ydRIdBsgg6lP0ueXH383C4DNPM4cDMf
UNwyAqUjYzX09xVJHVMOPRcIfdrZLHZ5t2ro26wqWbHynEmIeBBTEf/wLMf4CFKV
fbm53zhbOzfFc5TB3hZVCU6pDowGh4POUapzYOkK17QNGfm/AjqEuntj0RNO4jIS
yihqSZH+QEYFv7ZTPZc9VbQ1YvTlXt6As0KW2c1uraObuDgmFJlUhED/l2yZfRqw
JVjvxXESjSHuLGSijDJlKZBcdsryy06KwzUNRUblbIR+xgNLnrsZWlb4EXQ9TBth
3mShJbIaCMxpOiuavFjtdYBEIxzEpb2QmB7Z9AVaXys9PC65AQ0EWBxv8wEIAMEW
cd7akENhm+qScRlyzJRamB7DJUK79ZtU0DoJuK9FFdjdFjTvIPkjtPREaaA0GwNj
SLkipff9yExk/QtjbQM0oaNBaDOqql9wT3MX9WLZxd1feeQ7UW2UZu9zqTuocDim
HsCTFDUCWkxrzR3COVN2F+8r3uMqbNrqayUeRpOvn+9Cs6nSGEG70GeaqZnYJyaO
bwKlWDW5acOnPDicCSKvpRHZY+SJF+n/KjKszmg/EMPk8j0sYXAZ7/mu8x3XuxfQ
tb8FeV874cavDGwEhyp9+QVJHNbl5Op7Q/69rSNnfpIq4B/vL/5yJ/TbVZ9kaeys
sKQMgA6nXuyP6pgEDW0AEQEAAYkBJQQYAQgADwUCWBxv8wIbDAUJBzW0AAAKCRCw
SfSJu1vM9ssECAChrPncgPlg7AIZk6TOev9UuqIubbZWn1GKM67RziylGfisGkE5
ZuONPXfbuHz/dS83UzIc7oHwmmPNKhiQFf0MMp3wxaO1V4w1sPPPkzNlLaorwzZw
wGvG5zvYx14o0cZtZVkwQxyJKNDvYLIS+ye7fCySmuY/Fa5juFmeotuOLt6Ch5QK
pMaAUOOSOAay82LP/Ne6nD7AQOIohG0HNvCl9Qfh+AAgezWUmTZ+5ZBKcQXukOQ+
MplFGRkPMX9bqTZw9Xpg+CccZNFsLfcTrCkuQrk6iyLuNMxox1FE/ceva2RcWEwM
9kdsFQwgtqRhZlmaRIiGydJ9ZPZ/BW+/sd1y
=3vo3
PokBUAQTAQgAOgIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAFiEE6KyXeaLR
OhXY1VyEsEn0ibtbzPYFAl9WW/UACgkQsEn0ibtbzPboEAgAqaiIO0RVcb+vsW42
v8HQffklt2jO0xGXdYOdSoRoaSZyvYq0/jFY+3BnO3awsW0rRaDJhgWDRCvwuOTl
3o4QhUeRmk48EBqNvDu9Ryz9GN3Yjpn5R4dSJLHC2bTthqvrmjMnicUuiAbysUOy
VlHZbl2V5N75FiD+w1EqFixisM/bnd13xHrvKDlA9mhtw8bPwoZKfKRIT+YRqVpM
7cIFceaVrxN8mfakJT8cqTzhFfHvqIal1A9ZOfDjQoB5OM1h3eLOUXv1sos/uNxl
Jn4P2s5X88OV1Ws7Q6E29DcIYYT/bOVV+RJcwnNd7y0x6URHXyxV9yI5Enn5ePhT
7Au6zrkBDQRYHG/zAQgAwRZx3tqQQ2Gb6pJxGXLMlFqYHsMlQrv1m1TQOgm4r0UV
2N0WNO8g+SO09ERpoDQbA2NIuSKl9/3ITGT9C2NtAzSho0FoM6qqX3BPcxf1YtnF
3V955DtRbZRm73OpO6hwOKYewJMUNQJaTGvNHcI5U3YX7yve4yps2uprJR5Gk6+f
70KzqdIYQbvQZ5qpmdgnJo5vAqVYNblpw6c8OJwJIq+lEdlj5IkX6f8qMqzOaD8Q
w+TyPSxhcBnv+a7zHde7F9C1vwV5Xzvhxq8MbASHKn35BUkc1uXk6ntD/r2tI2d+
kirgH+8v/nIn9NtVn2Rp7KywpAyADqde7I/qmAQNbQARAQABiQE2BBgBCAAgAhsM
FiEE6KyXeaLROhXY1VyEsEn0ibtbzPYFAl9WXAUACgkQsEn0ibtbzPabXAgAlJLX
w0Z1JEQ2Z5ph7eQY/ZAAXPQVBzhFvuHUhN+qEGZyY6WoyTr+OrucIyWti0+YOkzP
Qav/xHMaHkv1SzdwZWTZ9l1KN17PydGVvjcawakUff1nQ2/NCc2bbIKtX7cX3T1r
83Ovr8l2Nxp9Taip1t4Mtqmgyt63emCQ0+X8qqCxp+FAE/RdHjpyW718otlzE9PW
CpMy2LGHu1+PljKwrooPMrG2+dGfTCHbyuuCAPWO8vyopaXvx1B303IFpn+zKzAv
FCOx6uoSERl0KGXwcQ3dmbaIUDRPW+8v1ZmBXe09ouEk77hTiKVywr4hoxjLclwY
cjrWkMcHKg7bmJh7Fg==
=eIdH
-----END PGP PUBLIC KEY BLOCK-----

Loading…
Cancel
Save