clerie/xmppc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix OpenPGP / Key Lookup / signers

Browse Source 
* Iterate list of UIDs for Key Lookup
 * Clean and set signers in context

Issue: #7 #8
This commit is contained in:
DebXWoody 2020-05-02 06:51:41 +02:00
parent 7bbd51ef5b
commit 24eab6f6e0
No known key found for this signature in database
GPG Key ID: C2DC916F35751C24
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mode/openpgp.c
View File

@ -184,6 +184,8 @@ char* _openpgp_gpg_signcrypt(xmppc_t *xmppc, char* recipient, char* message) {
strcat(xmpp_jid_me, jid); strcat(xmpp_jid_me, jid);
strcat(xmpp_jid_recipient,recipient); strcat(xmpp_jid_recipient,recipient);
gpgme_signers_clear(ctx);
// lookup own key // lookup own key
error = _openpgp_lookup_key(xmppc,xmpp_jid_me, &ctx, &recp[0]); error = _openpgp_lookup_key(xmppc,xmpp_jid_me, &ctx, &recp[0]);
if(error != 0) { if(error != 0) {
@ -191,6 +193,13 @@ char* _openpgp_gpg_signcrypt(xmppc_t *xmppc, char* recipient, char* message) {
return NULL; return NULL;
} }
error = gpgme_signers_add(ctx,recp[0]);
if(error != 0) {
logError(xmppc,"gpgme_signers_add %s. GpgME Error: %s\n", xmpp_jid_me, gpgme_strerror(error));
return NULL;
}
// lookup key of recipient // lookup key of recipient
error = _openpgp_lookup_key(xmppc,xmpp_jid_recipient, &ctx, &recp[1]); error = _openpgp_lookup_key(xmppc,xmpp_jid_recipient, &ctx, &recp[1]);
if(error != 0) { if(error != 0) {
@ -247,8 +256,15 @@ gpgme_error_t _openpgp_lookup_key(xmppc_t *xmppc,char* name, gpgme_ctx_t* ctx, g
gpgme_error_t error = gpgme_op_keylist_start (*ctx, NULL, 0); gpgme_error_t error = gpgme_op_keylist_start (*ctx, NULL, 0);
while (!error) { while (!error) {
error = gpgme_op_keylist_next (*ctx, key); error = gpgme_op_keylist_next (*ctx, key);
if(error == 0 && strcmp((*key)->uids->name, name) == 0) { if(!error) {
logDebug(xmppc, "Key found: %s ...\n", (*key)->uids->name); gpgme_user_id_t uids = (*key)->uids;
while (uids) {
if(strcmp(uids->name, name) == 0) {
logDebug(xmppc, "Key found: %s ...\n", uids->name);
return error;
}
uids=uids->next;
}
} else { } else {
gpgme_key_release((*key)); gpgme_key_release((*key));
} }