bqv
/
weechat-xmpp
mirror of https://github.com/bqv/weechat-xmpp
1
0
Fork 0
Code Releases Activity

pgp: switch from rnp to gpgme

Browse Source
master
bqv 3 years ago
parent 30a7f9eeff
commit a0d1c104e4
No known key found for this signature in database
GPG Key ID: 9E2FF3BDEBDFC910
4 changed files with 162 additions and 249 deletions
Show Stats Download Patch File Download Diff File

6
README.org
Unescape Escape View File

@ -51,7 +51,6 @@
- libxml2 (dynamic, dependency) - libxml2 (dynamic, dependency)
- lmdb (dynamic, dependency) - lmdb (dynamic, dependency)
- libomemo-c (libsignal-protocol-c) (dynamic, dependency) - libomemo-c (libsignal-protocol-c) (dynamic, dependency)
- rnp (dynamic, dependency)
- gpgme (dynamic, dependency) - gpgme (dynamic, dependency)
- weechat (>= v3.0) - weechat (>= v3.0)
@ -158,14 +157,13 @@
* [ ] Delete bookmarks * [ ] Delete bookmarks
* [ ] Roster * [ ] Roster
* [ ] OTR (libotr) * [ ] OTR (libotr)
* [X] PGP (rnpgp) * [X] PGP (gpgme)
* [X] Use keyrings (e.g. exported from gnupg) * [X] Use keyrings (from gnupg)
* [X] Presence * [X] Presence
* [X] Decryption * [X] Decryption
* [X] Encryption * [X] Encryption
* [X] Custom set/clear key (/pgp) * [X] Custom set/clear key (/pgp)
* [ ] Save pgp key set per jid/muc * [ ] Save pgp key set per jid/muc
* [ ] GPGME
* [ ] Room Explorer (https://search.jabber.network/docs/api) * [ ] Room Explorer (https://search.jabber.network/docs/api)
** TODO [#C] Adhere to CCS (milestone v0.3) ** TODO [#C] Adhere to CCS (milestone v0.3)
** TODO [#D] Close all issues (milestone v1.0) ** TODO [#D] Close all issues (milestone v1.0)

2
makefile
Unescape Escape View File

@ -9,7 +9,6 @@ FIND=find
INCLUDES=-Ilibstrophe -Ideps -Ideps/fmt/include \ INCLUDES=-Ilibstrophe -Ideps -Ideps/fmt/include \
$(shell xml2-config --cflags) \ $(shell xml2-config --cflags) \
$(shell pkg-config --cflags gpgme) \ $(shell pkg-config --cflags gpgme) \
$(shell pkg-config --cflags librnp) \
$(shell pkg-config --cflags libsignal-protocol-c) $(shell pkg-config --cflags libsignal-protocol-c)
CFLAGS+=$(DBGCFLAGS) \ CFLAGS+=$(DBGCFLAGS) \
-fno-omit-frame-pointer -fPIC \ -fno-omit-frame-pointer -fPIC \
@ -36,7 +35,6 @@ LDLIBS=-lstrophe \
-lpthread \ -lpthread \
$(shell xml2-config --libs) \ $(shell xml2-config --libs) \
$(shell pkg-config --libs gpgme) \ $(shell pkg-config --libs gpgme) \
$(shell pkg-config --libs librnp) \
$(shell pkg-config --libs libsignal-protocol-c) \ $(shell pkg-config --libs libsignal-protocol-c) \
-lgcrypt \ -lgcrypt \
-llmdb -llmdb

389
pgp.cpp
Unescape Escape View File

@ -6,47 +6,61 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <rnp/rnp.h> #include <gpgme.h>
#include <weechat/weechat-plugin.h> #include <weechat/weechat-plugin.h>
#include "plugin.hh" #include "plugin.hh"
#include "pgp.hh" #include "pgp.hh"
#define RNP_SUCCESS 0 #define PGP_MESSAGE_HEADER "-----BEGIN PGP MESSAGE-----\r\n"
#define PGP_MESSAGE_FOOTER "\r\n-----END PGP MESSAGE-----"
#define PGP_MESSAGE_HEADER "-----BEGIN PGP MESSAGE-----\r\n\r\n" #define PGP_SIGNATURE_HEADER "-----BEGIN PGP SIGNATURE-----\r\n"
#define PGP_MESSAGE_FOOTER "\r\n-----END PGP MESSAGE-----\r\n" #define PGP_SIGNATURE_FOOTER "\r\n-----END PGP SIGNATURE-----"
#define PGP_SIGNATURE_HEADER "-----BEGIN PGP SIGNATURE-----\r\n\r\n"
#define PGP_SIGNATURE_FOOTER "\r\n-----END PGP SIGNATURE-----\r\n"
const char *PGP_ADVICE = "[PGP encrypted message (XEP-0027)]"; const char *PGP_ADVICE = "[PGP encrypted message (XEP-0027)]";
void pgp__init(struct t_pgp **pgp, const char *pub, const char *sec) void pgp__init(struct t_pgp **pgp, const char *pub, const char *sec)
{ {
struct t_pgp *new_pgp; struct t_pgp *new_pgp;
rnp_input_t keyring; gpgme_error_t err;
gpgme_data_t keydata;
gpgme_check_version(NULL);
new_pgp = (struct t_pgp*)calloc(1, sizeof(**pgp)); new_pgp = (struct t_pgp*)calloc(1, sizeof(**pgp));
if (rnp_ffi_create(&new_pgp->context, err = gpgme_new(&new_pgp->gpgme);
RNP_KEYSTORE_GPG, RNP_KEYSTORE_GPG) != RNP_SUCCESS) { if (err) {
return; return;
} }
gpgme_set_armor(new_pgp->gpgme, true);
if (rnp_input_from_path(&keyring, pub) == RNP_SUCCESS) { err = gpgme_data_new_from_file(&keydata, pub, true);
if (rnp_load_keys(new_pgp->context, RNP_KEYSTORE_GPG, if (err) {
keyring, RNP_LOAD_SAVE_PUBLIC_KEYS) == RNP_SUCCESS) { return;
rnp_input_destroy(keyring);
} }
err = gpgme_op_import(new_pgp->gpgme, keydata);
if (err) {
return;
} }
if (rnp_input_from_path(&keyring, sec) == RNP_SUCCESS) { gpgme_import_result_t impRes = gpgme_op_import_result(new_pgp->gpgme);
if (rnp_load_keys(new_pgp->context, RNP_KEYSTORE_GPG, weechat_printf(nullptr, "(gpg) imported %d keys", impRes->imported);
keyring, RNP_LOAD_SAVE_SECRET_KEYS) == RNP_SUCCESS) {
rnp_input_destroy(keyring); err = gpgme_data_new_from_file(&keydata, sec, true);
if (err) {
return;
} }
err = gpgme_op_import(new_pgp->gpgme, keydata);
if (err) {
return;
} }
impRes = gpgme_op_import_result(new_pgp->gpgme);
weechat_printf(nullptr, "(gpg) imported %d secret keys", impRes->imported);
*pgp = new_pgp; *pgp = new_pgp;
} }
@ -54,335 +68,236 @@ void pgp__free(struct t_pgp *pgp)
{ {
if (pgp) if (pgp)
{ {
if (pgp->context) if (pgp->gpgme)
free(pgp->context); gpgme_release(pgp->gpgme);
free(pgp); free(pgp);
} }
} }
char *pgp__encrypt(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *source, const char *target, const char *message) char *pgp__encrypt(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *source, const char *target, const char *message)
{ {
rnp_op_encrypt_t encrypt = NULL; std::string encrypted;
rnp_key_handle_t key = NULL; gpgme_key_t keys[3] = {NULL,NULL,NULL};
rnp_input_t keyfile = NULL;
rnp_input_t input = NULL;
rnp_output_t output = NULL;
char * result = NULL; char * result = NULL;
rnp_result_t ret; int ret;
gpgme_error_t err;
gpgme_data_t in, out;
/* create memory input and file output objects for the message and encrypted message */ /* Initialize input buffer. */
if ((ret = rnp_input_from_memory(&input, (uint8_t *)message, strlen(message), false)) != err = gpgme_data_new_from_mem(&in, message, strlen(message), false);
RNP_SUCCESS) { if (err) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to create input object: %s\n", weechat_prefix("error"), reason);
goto encrypt_finish; goto encrypt_finish;
} }
if ((ret = rnp_output_to_memory(&output, 0)) != RNP_SUCCESS) { /* Initialize output buffer. */
const char *reason = rnp_result_to_string(ret); err = gpgme_data_new(&out);
weechat_printf(buffer, "%spgp: failed to create output object: %s\n", weechat_prefix("error"), reason); if (err) {
goto encrypt_finish; goto encrypt_finish;
} }
/* create encryption operation */ /* Encrypt data. */
if ((ret = rnp_op_encrypt_create(&encrypt, pgp->context, input, output)) != RNP_SUCCESS) { err = gpgme_get_key(pgp->gpgme, target, &keys[0], false);
const char *reason = rnp_result_to_string(ret); if (err) {
weechat_printf(buffer, "%spgp: failed to create encrypt operation: %s\n", weechat_prefix("error"), reason);
goto encrypt_finish; goto encrypt_finish;
} }
err = gpgme_get_key(pgp->gpgme, source, &keys[1], false);
/* setup encryption parameters */ if (err) {
rnp_op_encrypt_set_armor(encrypt, true);
rnp_op_encrypt_set_file_name(encrypt, "message.txt");
rnp_op_encrypt_set_file_mtime(encrypt, time(NULL));
rnp_op_encrypt_set_compression(encrypt, "ZIP", 6);
rnp_op_encrypt_set_cipher(encrypt, RNP_ALGNAME_AES_256);
rnp_op_encrypt_set_aead(encrypt, "None");
/* locate recipient's key and add it to the operation context. */
if ((ret = rnp_locate_key(pgp->context, "keyid", target, &key)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to locate recipient key: %s\n", weechat_prefix("error"), reason);
goto encrypt_finish;
}
if ((ret = rnp_op_encrypt_add_recipient(encrypt, key)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to add recipient: %s\n", weechat_prefix("error"), reason);
goto encrypt_finish; goto encrypt_finish;
} }
rnp_key_handle_destroy(key); err = gpgme_op_encrypt(pgp->gpgme, keys, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);
key = NULL; if (err) {
/* locate carbon-copy key and add it to the operation context. */
if ((ret = rnp_locate_key(pgp->context, "keyid", source, &key)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to locate recipient key: %s\n", weechat_prefix("error"), reason);
goto encrypt_finish; goto encrypt_finish;
} }
if (gpgme_encrypt_result_t enc_result = gpgme_op_encrypt_result(pgp->gpgme);
if ((ret = rnp_op_encrypt_add_recipient(encrypt, key)) != RNP_SUCCESS) { enc_result->invalid_recipients)
const char *reason = rnp_result_to_string(ret); {
weechat_printf(buffer, "%spgp: failed to add recipient: %s\n", weechat_prefix("error"), reason);
goto encrypt_finish; goto encrypt_finish;
} }
rnp_key_handle_destroy(key); gpgme_data_seek(out, 0, SEEK_SET);
key = NULL; char data[512 + 1];
while ((ret = gpgme_data_read(out, data, 512)) > 0)
/* execute encryption operation */ {
if ((ret = rnp_op_encrypt_execute(encrypt)) != RNP_SUCCESS) { encrypted += std::string_view(data, ret);
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: encryption failed: %s\n", weechat_prefix("error"), reason);
goto encrypt_finish;
} }
uint8_t *buf; gpgme_data_release(in);
size_t buf_len; gpgme_data_release(out);
rnp_output_memory_get_buf(output, &buf, &buf_len, false); result = strndup(encrypted.data() + strlen(PGP_MESSAGE_HEADER),
result = strndup((char *)buf + strlen(PGP_MESSAGE_HEADER), encrypted.size() - strlen(PGP_MESSAGE_HEADER) - strlen(PGP_MESSAGE_FOOTER));
buf_len - strlen(PGP_MESSAGE_HEADER) - strlen(PGP_MESSAGE_FOOTER));
encrypt_finish: encrypt_finish:
rnp_op_encrypt_destroy(encrypt);
rnp_input_destroy(keyfile);
rnp_input_destroy(input);
rnp_output_destroy(output);
rnp_key_handle_destroy(key);
return result; return result;
} }
//"hQIMAzlgcSFDGLKEAQ//cGG3DFughC5xBF7xeXz1RdayOfhBAPfoZIq62MVuSnfS\nMfig65Zxz1LtAnnFq90TZY7hiHPBtVlYqg47AbSoYweMdpXsKgbUrd3NNf6k2nsZ\nUkChCtyGuHi8pTzclfle7gT0nNXJ1WcLCZ4ORZCrg3D5A+YTO9tdmE8GQsTT6TdV\nbbxF5yR4JF5SzFhuFL3ZoXPXrWylcwKXarYfoOTa6M2vSsCwApVIXQgJ/FI46sLT\nb0B/EVCjFvcvjkNr7+K7mQtth+x0a0pC4BtEhRvnIRAe/sdGp8NY+DP76clx4U+k\nIDG4H92F632pR6eEIoZttnBoaj0O4sTVAJCao5AoecR4w2FDqBWWtIyQp5vbo17/\nMtzungkk5vQP6Jhu36wa+JKpbHoxomVpHPZfAtIoyaY6pzQ0bUomIlSVpbZDvF68\nZKTlFd89Pm5x0JO5gsVYvf+N9Ed33d34n/0CFz5K5Tgu4Bk0v4LWEy3wtNsuQB4p\nkBSZJk7I2BakcRwP0zwld6rRHFIX1pb7zqThBPZGB9RkWPltiktUTibOII12tWhi\nksFpQJ8l1A8h9vM5kUXIeD6H2yP0CBUEIZF3Sf+jiSRZ/1/n3KoUrKEzkf/y4xgv\n1LA4pMjNLEr6J2fqGyYRFv4Bxv3PIvF17V5CwOtguxGRJHJXdIzm1BSHSqXxHezS\nYAFXMUb9fw3QX7Ed23KiyZjzd/LRsQBqMs9RsYyZB2PqF9x84lQYYbE8lErrryvK\nUEtmJKPw3Hvb7kgGox5vl5+KCg9q64EU9TgQpufYNShKtDz7Fsvc+ncgZoshDUeo\npw==\n=euIB" //"hQIMAzlgcSFDGLKEAQ//cGG3DFughC5xBF7xeXz1RdayOfhBAPfoZIq62MVuSnfS\nMfig65Zxz1LtAnnFq90TZY7hiHPBtVlYqg47AbSoYweMdpXsKgbUrd3NNf6k2nsZ\nUkChCtyGuHi8pTzclfle7gT0nNXJ1WcLCZ4ORZCrg3D5A+YTO9tdmE8GQsTT6TdV\nbbxF5yR4JF5SzFhuFL3ZoXPXrWylcwKXarYfoOTa6M2vSsCwApVIXQgJ/FI46sLT\nb0B/EVCjFvcvjkNr7+K7mQtth+x0a0pC4BtEhRvnIRAe/sdGp8NY+DP76clx4U+k\nIDG4H92F632pR6eEIoZttnBoaj0O4sTVAJCao5AoecR4w2FDqBWWtIyQp5vbo17/\nMtzungkk5vQP6Jhu36wa+JKpbHoxomVpHPZfAtIoyaY6pzQ0bUomIlSVpbZDvF68\nZKTlFd89Pm5x0JO5gsVYvf+N9Ed33d34n/0CFz5K5Tgu4Bk0v4LWEy3wtNsuQB4p\nkBSZJk7I2BakcRwP0zwld6rRHFIX1pb7zqThBPZGB9RkWPltiktUTibOII12tWhi\nksFpQJ8l1A8h9vM5kUXIeD6H2yP0CBUEIZF3Sf+jiSRZ/1/n3KoUrKEzkf/y4xgv\n1LA4pMjNLEr6J2fqGyYRFv4Bxv3PIvF17V5CwOtguxGRJHJXdIzm1BSHSqXxHezS\nYAFXMUb9fw3QX7Ed23KiyZjzd/LRsQBqMs9RsYyZB2PqF9x84lQYYbE8lErrryvK\nUEtmJKPw3Hvb7kgGox5vl5+KCg9q64EU9TgQpufYNShKtDz7Fsvc+ncgZoshDUeo\npw==\n=euIB"
char *pgp__decrypt(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *ciphertext) char *pgp__decrypt(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *ciphertext)
{ {
rnp_input_t input = NULL; std::string decrypted;
rnp_output_t output = NULL;
uint8_t * buf = NULL; uint8_t * buf = NULL;
size_t buf_len = 0; size_t buf_len = 0;
char * result = NULL; char * result = NULL;
rnp_result_t ret; int ret;
buf_len = strlen(PGP_MESSAGE_HEADER) + strlen(ciphertext) + strlen(PGP_MESSAGE_FOOTER) + 1; buf_len = strlen(PGP_MESSAGE_HEADER) + strlen(ciphertext) + strlen(PGP_MESSAGE_FOOTER) + 1;
buf = (uint8_t*)malloc(sizeof(char) * buf_len); buf = (uint8_t*)malloc(sizeof(char) * buf_len);
buf_len = snprintf((char *)buf, buf_len, PGP_MESSAGE_HEADER "%s" PGP_MESSAGE_FOOTER, ciphertext); buf_len = snprintf((char *)buf, buf_len, PGP_MESSAGE_HEADER "%s" PGP_MESSAGE_FOOTER, ciphertext);
/* create file input and memory output objects for the encrypted message and decrypted gpgme_error_t err;
* message */ gpgme_data_t in, out;
if ((ret = rnp_input_from_memory(&input, buf, buf_len, false)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret); /* Initialize input buffer. */
weechat_printf(buffer, "%spgp: failed to create input object: %s\n", weechat_prefix("error"), reason); err = gpgme_data_new_from_mem(&in, (char *)buf, buf_len, false);
if (err) {
goto decrypt_finish; goto decrypt_finish;
} }
if ((ret = rnp_output_to_memory(&output, 0)) != RNP_SUCCESS) { /* Initialize output buffer. */
const char *reason = rnp_result_to_string(ret); err = gpgme_data_new(&out);
weechat_printf(buffer, "%spgp: failed to create output object: %s\n", weechat_prefix("error"), reason); if (err) {
goto decrypt_finish; goto decrypt_finish;
} }
if ((ret = rnp_decrypt(pgp->context, input, output)) != RNP_SUCCESS) { /* Decrypt data. */
const char *reason = rnp_result_to_string(ret); err = gpgme_op_decrypt(pgp->gpgme, in, out);
weechat_printf(buffer, "%spgp: public-key decryption failed: %s\n", weechat_prefix("error"), reason); if (err) {
goto decrypt_finish; goto decrypt_finish;
} }
free(buf); if (gpgme_decrypt_result_t dec_result = gpgme_op_decrypt_result(pgp->gpgme);
dec_result->unsupported_algorithm)
/* get the decrypted message from the output structure */ {
if (rnp_output_memory_get_buf(output, &buf, &buf_len, false) != RNP_SUCCESS) {
goto decrypt_finish; goto decrypt_finish;
} }
gpgme_data_seek(out, 0, SEEK_SET);
char data[512 + 1];
while ((ret = gpgme_data_read(out, data, 512)) > 0)
{
decrypted += std::string_view(data, ret);
}
result = strndup((const char *)buf, (int)buf_len); gpgme_data_release(in);
gpgme_data_release(out);
result = strndup(decrypted.data(), decrypted.size());
decrypt_finish: decrypt_finish:
rnp_input_destroy(input);
rnp_output_destroy(output);
return result; return result;
} }
char *pgp__verify(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *certificate) char *pgp__verify(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *certificate)
{ {
rnp_op_verify_t verify = NULL;
rnp_input_t input = NULL;
rnp_input_t signature = NULL;
uint8_t * buf = NULL; uint8_t * buf = NULL;
size_t buf_len = 0; size_t buf_len = 0;
size_t sigcount = 0; size_t sigcount = 0;
char * result = NULL; char * result = NULL;
rnp_result_t ret; int ret;
buf_len = strlen(PGP_SIGNATURE_HEADER) + strlen(certificate) + strlen(PGP_SIGNATURE_FOOTER) + 1; buf_len = strlen(PGP_SIGNATURE_HEADER) + strlen(certificate) + strlen(PGP_SIGNATURE_FOOTER) + 1;
buf = (uint8_t*)malloc(sizeof(char) * buf_len); buf = (uint8_t*)malloc(sizeof(char) * buf_len);
buf_len = snprintf((char *)buf, buf_len, PGP_SIGNATURE_HEADER "%s" PGP_SIGNATURE_FOOTER, certificate); buf_len = snprintf((char *)buf, buf_len, PGP_SIGNATURE_HEADER "%s" PGP_SIGNATURE_FOOTER, certificate);
/* create file input memory objects for the signed message and verified message */ gpgme_verify_result_t vrf_result;
if ((ret = rnp_input_from_memory(&input, buf, buf_len, false)) != RNP_SUCCESS) { gpgme_error_t err;
const char *reason = rnp_result_to_string(ret); gpgme_data_t in, out;
weechat_printf(buffer, "%spgp: failed to create input object: %s\n", weechat_prefix("error"), reason);
goto verify_finish;
}
if ((ret = rnp_input_from_memory(&signature, buf, buf_len, false)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to create input object: %s\n", weechat_prefix("error"), reason);
goto verify_finish;
}
if ((ret = rnp_op_verify_detached_create(&verify, pgp->context, input, signature)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to create verification context: %s\n", weechat_prefix("error"), reason);
goto verify_finish;
}
//if ((
ret = rnp_op_verify_execute(verify)
;
// ) != RNP_ERROR_SIGNATURE_INVALID)
// if (ret != RNP_ERROR_SIGNATURE_INVALID) {
// const char *reason = rnp_result_to_string(ret);
// weechat_printf(buffer, "%spgp: failed to execute verification operation: %s\n", weechat_prefix("error"), reason);
// goto verify_finish;
// }
/* now check signatures and get some info about them */
if ((ret = rnp_op_verify_get_signature_count(verify, &sigcount)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to get signature count: %s\n", weechat_prefix("error"), reason);
goto verify_finish;
}
for (size_t i = 0; i < sigcount; i++) { /* Initialize input buffer. */
rnp_op_verify_signature_t sig = NULL; err = gpgme_data_new_from_mem(&in, (char *)buf, buf_len, false);
rnp_key_handle_t key = NULL; if (err) {
rnp_signature_handle_t signature = NULL;
char * keyid = NULL;
if ((ret = rnp_op_verify_get_signature_at(verify, i, &sig)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to get signature %d: %s\n", weechat_prefix("error"), (int)i, reason);
goto verify_finish; goto verify_finish;
} }
if ((ret = rnp_op_verify_signature_get_key(sig, &key)) == RNP_SUCCESS) { /* Initialize output buffer. */
if ((ret = rnp_key_get_keyid(key, &keyid)) != RNP_SUCCESS) { err = gpgme_data_new(&out);
const char *reason = rnp_result_to_string(ret); if (err) {
weechat_printf(buffer, "%spgp: failed to get key id %d: %s\n", weechat_prefix("error"), (int)i, reason);
rnp_key_handle_destroy(key);
goto verify_finish; goto verify_finish;
} }
if ((ret = rnp_key_get_signature_at(key, 0, &signature)) == RNP_SUCCESS) { /* Verify data. */
if ((ret = rnp_signature_get_keyid(signature, &keyid)) != RNP_SUCCESS) { err = gpgme_op_verify(pgp->gpgme, in, out, nullptr);
const char *reason = rnp_result_to_string(ret); if (err) {
weechat_printf(buffer, "%spgp: failed to get key id: %s\n", weechat_prefix("error"), reason);
rnp_key_handle_destroy(key);
goto verify_finish; goto verify_finish;
} }
rnp_signature_handle_destroy(signature); if (vrf_result = gpgme_op_verify_result(pgp->gpgme);
} !(vrf_result->signatures->summary & GPGME_SIGSUM_VALID))
} else { {
if ((ret = rnp_op_verify_signature_get_handle(sig, &signature)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to get signature's %d handle: %s\n", weechat_prefix("error"), (int)i, reason);
goto verify_finish;
}
if ((ret = rnp_signature_get_keyid(signature, &keyid)) != RNP_SUCCESS) {
const char *reason = rnp_result_to_string(ret);
weechat_printf(buffer, "%spgp: failed to get key id: %s\n", weechat_prefix("error"), reason);
rnp_key_handle_destroy(key);
goto verify_finish; goto verify_finish;
} }
}
result = strdup(keyid); result = strdup(vrf_result->signatures->fpr);
rnp_buffer_destroy(keyid);
rnp_key_handle_destroy(key);
break;
}
verify_finish: verify_finish:
rnp_op_verify_destroy(verify);
rnp_input_destroy(input);
rnp_input_destroy(signature);
return result; return result;
} }
char *pgp__sign(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *source, const char *message) char *pgp__sign(struct t_gui_buffer *buffer, struct t_pgp *pgp, const char *source, const char *message)
{ {
rnp_input_t keyfile = NULL; std::string signature;
rnp_input_t input = NULL;
rnp_output_t output = NULL;
rnp_op_sign_t sign = NULL;
rnp_key_handle_t key = NULL;
uint8_t * buf = NULL; uint8_t * buf = NULL;
size_t buf_len = 0; size_t buf_len = 0;
char * result = NULL; char * result = NULL;
int ret;
/* create file input and memory output objects for the encrypted message and decrypted gpgme_error_t err;
* message */ gpgme_data_t in, out;
if (rnp_input_from_memory(&input, (uint8_t *)message, strlen(message), false) != gpgme_key_t key;
RNP_SUCCESS) {
weechat_printf(buffer, "%spgp: failed to create input object\n", weechat_prefix("error"));
goto sign_finish;
}
if (rnp_output_to_memory(&output, 0) != RNP_SUCCESS) { /* Initialize input buffer. */
weechat_printf(buffer, "%spgp: failed to create output object\n", weechat_prefix("error")); err = gpgme_data_new_from_mem(&in, (char *)message, strlen(message), false);
if (err) {
goto sign_finish; goto sign_finish;
} }
/* initialize and configure sign operation */ /* Initialize output buffer. */
if (rnp_op_sign_detached_create(&sign, pgp->context, input, output) != RNP_SUCCESS) { err = gpgme_data_new(&out);
weechat_printf(buffer, "%spgp: failed to create sign operation\n", weechat_prefix("error")); if (err) {
goto sign_finish; goto sign_finish;
} }
/* armor, file name, compression */ /* Include signature within key. */
rnp_op_sign_set_armor(sign, true); {
rnp_op_sign_set_file_name(sign, "message.txt"); gpgme_keylist_mode_t kmode = gpgme_get_keylist_mode(pgp->gpgme);
rnp_op_sign_set_file_mtime(sign, time(NULL)); kmode |= GPGME_KEYLIST_MODE_SIGS;
rnp_op_sign_set_compression(sign, "ZIP", 6); err = gpgme_set_keylist_mode(pgp->gpgme, kmode);
/* signatures creation time - by default will be set to the current time as well */ }
rnp_op_sign_set_creation_time(sign, time(NULL)); if (err) {
/* signatures expiration time - by default will be 0, i.e. never expire */
rnp_op_sign_set_expiration_time(sign, 365 * 24 * 60 * 60);
/* set hash algorithm - should be compatible for all signatures */
rnp_op_sign_set_hash(sign, RNP_ALGNAME_SHA256);
/* now add signatures. First locate the signing key, then add and setup signature */
if (rnp_locate_key(pgp->context, "keyid", source, &key) != RNP_SUCCESS) {
weechat_printf(buffer, "%spgp: failed to locate signing key: %s\n", weechat_prefix("error"), source);
goto sign_finish; goto sign_finish;
} }
if (rnp_op_sign_add_signature(sign, key, NULL) != RNP_SUCCESS) { err = gpgme_get_key(pgp->gpgme, source, &key, false);
weechat_printf(buffer, "%spgp: failed to add signature for key: %s\n", weechat_prefix("error"), source); if (err) {
weechat_printf(nullptr, "(gpg) get key fail for %s", source);
goto sign_finish; goto sign_finish;
} }
err = gpgme_signers_add(pgp->gpgme, key);
rnp_key_handle_destroy(key); if (err) {
key = NULL; weechat_printf(nullptr, "(gpg) add key fail for %s", source);
/* finally do signing */
if (rnp_op_sign_execute(sign) != RNP_SUCCESS) {
weechat_printf(buffer, "%spgp: failed to sign with key: %s\n", weechat_prefix("error"), source);
goto sign_finish; goto sign_finish;
} }
/* get the signature from the output structure */ /* Sign data. */
if (rnp_output_memory_get_buf(output, &buf, &buf_len, false) != RNP_SUCCESS) { err = gpgme_op_sign(pgp->gpgme, in, out, GPGME_SIG_MODE_DETACH);
if (err) {
weechat_printf(nullptr, "(gpg) sign fail for %s", source);
goto sign_finish; goto sign_finish;
} }
if (gpgme_sign_result_t sgn_result = gpgme_op_sign_result(pgp->gpgme);
!sgn_result->signatures)
{
weechat_printf(nullptr, "(gpg) signature fail for %s", source);
}
gpgme_data_seek(out, 0, SEEK_SET);
char data[512 + 1];
while ((ret = gpgme_data_read(out, data, 512)) > 0)
{
signature += std::string_view(data, ret);
}
gpgme_data_release(in);
gpgme_data_release(out);
result = strndup((char *)buf + strlen(PGP_SIGNATURE_HEADER), result = strndup(signature.data() + strlen(PGP_SIGNATURE_HEADER),
buf_len - strlen(PGP_SIGNATURE_HEADER) - strlen(PGP_SIGNATURE_FOOTER)); signature.size() - strlen(PGP_SIGNATURE_HEADER) - strlen(PGP_SIGNATURE_FOOTER));
sign_finish: sign_finish:
rnp_input_destroy(keyfile);
rnp_key_handle_destroy(key);
rnp_op_sign_destroy(sign);
rnp_input_destroy(input);
rnp_output_destroy(output);
return result; return result;
} }

4
pgp.hh
Unescape Escape View File

@ -4,11 +4,13 @@
#pragma once #pragma once
#include <string>
extern const char *PGP_ADVICE; extern const char *PGP_ADVICE;
struct t_pgp struct t_pgp
{ {
struct rnp_ffi_st *context; struct gpgme_context *gpgme;
const char *keyid; const char *keyid;
}; };

Write Preview
Loading…
Cancel
Save