diff options
-rw-r--r-- | src/event/server_events.c | 4 | ||||
-rw-r--r-- | src/pgp/gpg.c | 2 | ||||
-rw-r--r-- | src/pgp/gpg.h | 2 | ||||
-rw-r--r-- | tests/unittests/pgp/stub_gpg.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c index ee918bf1..0755aae5 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -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); diff --git a/src/pgp/gpg.c b/src/pgp/gpg.c index 81462f80..2b61b8c1 100644 --- a/src/pgp/gpg.c +++ b/src/pgp/gpg.c @@ -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); diff --git a/src/pgp/gpg.h b/src/pgp/gpg.h index 7b3a4433..3bdae37e 100644 --- a/src/pgp/gpg.h +++ b/src/pgp/gpg.h @@ -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 diff --git a/tests/unittests/pgp/stub_gpg.c b/tests/unittests/pgp/stub_gpg.c index 577f7d66..79ff8933 100644 --- a/tests/unittests/pgp/stub_gpg.c +++ b/tests/unittests/pgp/stub_gpg.c @@ -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; } |