aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2015-08-24 00:18:23 +01:00
commit 6700f9afbb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/event/server_events.c
View File

@ -210,7 +210,7 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
if (enc_mode == PROF_ENC_OTR) {
win_println((ProfWin*)chatwin, 0, "PGP encrypted message received whilst in OTR session.");
} else { // PROF_ENC_NONE, PROF_ENC_PGP
char *decrypted = p_gpg_decrypt(barejid, enc_message);
char *decrypted = p_gpg_decrypt(enc_message);
if (decrypted) {
if (enc_mode == PROF_ENC_NONE) {
win_println((ProfWin*)chatwin, 0, "PGP encryption enabled.");
@ -263,7 +263,7 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
#ifndef HAVE_LIBOTR
#ifdef HAVE_LIBGPGME
if (enc_message) {
char *decrypted = p_gpg_decrypt(barejid, enc_message);
char *decrypted = p_gpg_decrypt(enc_message);
if (decrypted) {
ui_incoming_msg(chatwin, resource, decrypted, NULL, new_win);
chat_log_pgp_msg_in(barejid, decrypted);

2
src/pgp/gpg.c
View File

@ -493,7 +493,7 @@ p_gpg_encrypt(const char * const barejid, const char * const message)
}
char *
p_gpg_decrypt(const char * const barejid, const char * const cipher)
p_gpg_decrypt(const char * const cipher)
{
gpgme_ctx_t ctx;
gpgme_error_t error = gpgme_new(&ctx);

2
src/pgp/gpg.h
View File

@ -55,7 +55,7 @@ void p_gpg_free_key(ProfPGPKey *key);
char* p_gpg_sign(const char * const str, const char * const fp);
void p_gpg_verify(const char * const barejid, const char *const sign);
char* p_gpg_encrypt(const char * const barejid, const char * const message);
char* p_gpg_decrypt(const char * const barejid, const char * const cipher);
char* p_gpg_decrypt(const char * const cipher);
void p_gpg_free_decrypted(char *decrypted);
#endif

2
tests/unittests/pgp/stub_gpg.c
View File

@ -39,7 +39,7 @@ gboolean p_gpg_available(const char * const barejid)
{
return FALSE;
}
char * p_gpg_decrypt(const char * const barejid, const char * const cipher)
char * p_gpg_decrypt(const char * const cipher)
{
return NULL;
}