pEp.foundation
/
pEpEngine
14
2
Fork 17
Code Issues 27 Pull Requests 1 Projects 2 Releases 62 Wiki Activity

Reworked logic in update_identity, when identity->fpr is provided

doc_update_sequoia
Edouard Tisserant 2016-03-02 13:11:13 +01:00
parent c7c3c8b679
commit ec50919ebd
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/keymanagement.c
View File

@ -74,24 +74,21 @@ DYNAMIC_API PEP_STATUS update_identity(
}
}
else /* !EMPTYSTR(identity->fpr) */ {
if (_comm_type_key != PEP_ct_unknown) {
if (strcmp(identity->fpr, stored_identity->fpr) == 0) {
if (_comm_type_key < PEP_ct_unconfirmed_encryption) {
identity->comm_type = _comm_type_key;
}
else if (identity->comm_type == PEP_ct_unknown) {
if (strcmp(identity->fpr, stored_identity->fpr) == 0) {
identity->comm_type = stored_identity->comm_type;
}
else {
status = get_trust(session, identity);
assert(status != PEP_OUT_OF_MEMORY);
if (status == PEP_OUT_OF_MEMORY)
return PEP_OUT_OF_MEMORY;
}else{
identity->comm_type = stored_identity->comm_type;
if (identity->comm_type == PEP_ct_unknown) {
identity->comm_type = _comm_type_key;
}
}
}else{
status = get_trust(session, identity);
assert(status != PEP_OUT_OF_MEMORY);
if (status == PEP_OUT_OF_MEMORY)
return PEP_OUT_OF_MEMORY;
}
else
identity->comm_type = PEP_ct_unknown;
}
if (identity->lang[0] == 0) {
@ -395,7 +392,7 @@ DYNAMIC_API PEP_STATUS trust_personal_key(
if (ident->comm_type > PEP_ct_strong_but_unconfirmed) {
ident->comm_type |= PEP_ct_confirmed;
status = update_identity(session, ident);
status = set_identity(session, ident);
}
else {
// MISSING: S/MIME has to be handled depending on trusted CAs