pEp.foundation
/
pEpEngine
15
2
Fork 17
Code Issues 21 Pull Requests 1 Projects 2 Releases 52 Wiki Activity

ENGINE-209: compiling again

Browse Source
doc_update_sequoia
Krista Bennett 6 years ago
parent eaafe18955
commit 51a5b10a16
5 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File

27
src/keymanagement.c
Unescape Escape View File

@ -152,14 +152,15 @@ DYNAMIC_API PEP_STATUS update_identity(
if (revoked) {
// Do stuff
status = change_key_comm_type(session, fpr, PEP_ct_key_revoked);
status = change_key_comm_type(session, stored_identity->fpr, PEP_ct_key_revoked);
// What to do on failure? FIXME
status = remove_key_as_id_default(session, fpr);
status = remove_key_as_id_default(session, stored_identity->fpr);
}
else {
status = blacklist_is_listed(session, stored_identity->fpr, &dont_use_stored_fpr);
if (status != PEP_STATUS_OK)
dont_use_stored_fpr = true;
}
status = blacklist_is_listed(session, stored_identity->fpr, &dont_use_stored_fpr);
if (status != PEP_STATUS_OK)
dont_use_stored_fpr = true;
}
@ -1062,7 +1063,7 @@ PEP_STATUS contains_priv_key(PEP_SESSION session, const char *fpr,
return session->cryptotech[PEP_crypt_OpenPGP].contains_priv_key(session, fpr, has_private);
}
static PEP_STATUS change_key_comm_type(PEP_SESSION session,
PEP_STATUS change_key_comm_type(PEP_SESSION session,
const char* fpr,
PEP_comm_type comm_type) {
@ -1076,7 +1077,7 @@ static PEP_STATUS change_key_comm_type(PEP_SESSION session,
return status;
}
if (!user_id_list || !user_id_list->value())
if (!user_id_list || !user_id_list->value)
return PEP_KEY_NOT_FOUND;
stringlist_t* curr_id = user_id_list;
@ -1093,12 +1094,12 @@ static PEP_STATUS change_key_comm_type(PEP_SESSION session,
return PEP_STATUS_OK;
}
static PEP_STATUS remove_key_as_id_default(PEP_SESSIONS session,
PEP_STATUS remove_key_as_id_default(PEP_SESSION session,
const char* fpr)
{
identity_list* affected_ids = NULL;
PEP_STATUS status get_identities_by_fpr(session, fpr, &identity_list);
PEP_STATUS status = get_identities_by_fpr(session, fpr, &affected_ids);
if (status != PEP_STATUS_OK) {
free_identity_list(affected_ids);
@ -1112,9 +1113,9 @@ static PEP_STATUS remove_key_as_id_default(PEP_SESSIONS session,
status = PEP_STATUS_OK;
while (curr_identity) {
free(curr_identity->fpr);
curr_identity->fpr = (char*)calloc(1, sizeof(char)); // ""
status = set_identity(session, curr_identity);
free(curr_identity->ident->fpr);
curr_identity->ident->fpr = (char*)calloc(1, sizeof(char)); // ""
status = set_identity(session, curr_identity->ident);
if (status != PEP_STATUS_OK)
goto the_end;
curr_identity = curr_identity->next;

11
src/keymanagement.h
Unescape Escape View File

@ -245,13 +245,16 @@ DYNAMIC_API PEP_STATUS set_own_key(
// parameters:
// session(in) session to use
// fpr(in) fpr for which to change comm_type
static PEP_STATUS change_key_comm_type(
// comm_type(in) comm_type to change to
//
PEP_STATUS change_key_comm_type(
PEP_SESSION session,
const char* fpr
const char* fpr,
PEP_comm_type comm_type
);
static PEP_STATUS remove_key_as_id_default(
PEP_SESSIONS session,
PEP_STATUS remove_key_as_id_default(
PEP_SESSION session,
const char* fpr
);

15
src/pEpEngine.c
Unescape Escape View File

@ -1260,8 +1260,8 @@ DYNAMIC_API PEP_STATUS set_identity(
}
}
status = set_trust(session, identity->user_id, identity->fpr,
identity->comm_type)
// status = set_trust(session, identity->user_id, identity->fpr,
// identity->comm_type)
sqlite3_reset(session->set_trust);
sqlite3_bind_text(session->set_trust, 1, identity->user_id, -1,
SQLITE_STATIC);
@ -1284,7 +1284,7 @@ DYNAMIC_API PEP_STATUS set_identity(
}
PEP_STATUS get_identities_by_fpr(PEP_SESSION session,
char* fpr,
const char* fpr,
identity_list** id_list)
{
PEP_STATUS status = PEP_STATUS_OK;
@ -1293,7 +1293,7 @@ PEP_STATUS get_identities_by_fpr(PEP_SESSION session,
}
static PEP_STATUS set_trust(PEP_SESSION session,
PEP_STATUS set_trust(PEP_SESSION session,
const char* user_id,
const char* fpr,
PEP_comm_type comm_type)
@ -1307,7 +1307,7 @@ static PEP_STATUS set_trust(PEP_SESSION session,
sqlite3_bind_text(session->set_trust, 2, fpr, -1,
SQLITE_STATIC);
sqlite3_bind_int(session->set_trust, 3, comm_type);
result = sqlite3_step(session->set_trust);
int result = sqlite3_step(session->set_trust);
sqlite3_reset(session->set_trust);
if (result != SQLITE_DONE) {
return PEP_CANNOT_SET_TRUST;
@ -2029,7 +2029,7 @@ the_end:
return status;
}
static PEP_STATUS get_key_userids(
PEP_STATUS get_key_userids(
PEP_SESSION session,
const char* fpr,
stringlist_t** keylist
@ -2058,8 +2058,7 @@ static PEP_STATUS get_key_userids(
result = sqlite3_step(session->get_key_userids);
switch (result) {
case SQLITE_ROW:
userid = (const char *) sqlite3_column_text(session->get_key_userids,
0);
userid = (char *) sqlite3_column_text(session->get_key_userids, 0);
if (!userid)
return PEP_UNKNOWN_ERROR;

15
src/pEpEngine.h
Unescape Escape View File

@ -543,6 +543,11 @@ DYNAMIC_API PEP_STATUS get_identity(
pEp_identity **identity
);
PEP_STATUS get_identities_by_fpr(PEP_SESSION session,
const char* fpr,
identity_list** id_list);
// set_identity() - set identity information
//
// parameters:
@ -826,6 +831,10 @@ DYNAMIC_API void pEp_free(void *p);
DYNAMIC_API PEP_STATUS get_trust(PEP_SESSION session, pEp_identity *identity);
PEP_STATUS set_trust(PEP_SESSION session,
const char* user_id,
const char* fpr,
PEP_comm_type comm_type);
// least_trust() - get the least known trust level for a key in the database
//
@ -924,6 +933,12 @@ DYNAMIC_API PEP_STATUS key_revoked(
bool *revoked
);
PEP_STATUS get_key_userids(
PEP_SESSION session,
const char* fpr,
stringlist_t** keylist
);
// get_crashdump_log() - get the last log messages out
//

5
src/pEp_internal.h
Unescape Escape View File

@ -100,6 +100,7 @@ struct _pEpSession {
sqlite3_stmt *log;
sqlite3_stmt *trustword;
sqlite3_stmt *get_identity;
sqlite3_stmt *get_identities_by_fpr;
sqlite3_stmt *set_person;
sqlite3_stmt *set_device_group;
sqlite3_stmt *get_device_group;
@ -311,10 +312,6 @@ static inline int _same_fpr(
return comparison == 0;
}
static PEP_STATUS set_trust(PEP_SESSION session,
const char* user_id,
const char* fpr,
PEP_comm_type comm_type);
#ifdef DEBUG_ERRORSTACK
PEP_STATUS session_add_error(PEP_SESSION session, const char* file, unsigned line, PEP_STATUS status);

Write Preview
Loading…
Cancel
Save