X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt-mod-pgp-classic.c;h=ae826635fdba1b178c7eeb476c756f14c2ff2916;hp=e6e3bc809e009213e48bfacdfa56965cb0244ef9;hb=55a238fef5db8ed7cc0c58654ba15df9638b25b4;hpb=f404a0ca916be07049af51a3022baaaaab94def6 diff --git a/crypt-mod-pgp-classic.c b/crypt-mod-pgp-classic.c index e6e3bc8..ae82663 100644 --- a/crypt-mod-pgp-classic.c +++ b/crypt-mod-pgp-classic.c @@ -1,19 +1,10 @@ -/* +/* + * Copyright notice from original mutt: * Copyright (C) 2004 g10 Code GmbH * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ /* @@ -37,36 +28,39 @@ static int crypt_mod_pgp_valid_passphrase (void) return pgp_valid_passphrase (); } -static int crypt_mod_pgp_decrypt_mime (FILE *a, FILE **b, BODY *c, BODY **d) +static int crypt_mod_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c, + BODY ** d) { return pgp_decrypt_mime (a, b, c, d); } -static void crypt_mod_pgp_application_handler (BODY *m, STATE *s) +static int crypt_mod_pgp_application_handler (BODY * m, STATE * s) { - pgp_application_pgp_handler (m, s); + return pgp_application_pgp_handler (m, s); } -static char *crypt_mod_pgp_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc) +static char *crypt_mod_pgp_findkeys (ADDRESS * to, ADDRESS * cc, + ADDRESS * bcc) { return pgp_findKeys (to, cc, bcc); } -static BODY *crypt_mod_pgp_sign_message (BODY *a) +static BODY *crypt_mod_pgp_sign_message (BODY * a) { return pgp_sign_message (a); } -static int crypt_mod_pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempf) +static int crypt_mod_pgp_verify_one (BODY * sigbdy, STATE * s, + const char *tempf) { return pgp_verify_one (sigbdy, s, tempf); } -static int crypt_mod_pgp_send_menu (HEADER *msg, int *redraw) +static int crypt_mod_pgp_send_menu (HEADER * msg, int *redraw) { return pgp_send_menu (msg, redraw); } -static BODY *crypt_mod_pgp_encrypt_message (BODY *a, char *keylist, int sign) +static BODY *crypt_mod_pgp_encrypt_message (BODY * a, char *keylist, int sign) { return pgp_encrypt_message (a, keylist, sign); } @@ -76,22 +70,24 @@ static BODY *crypt_mod_pgp_make_key_attachment (char *tempf) return pgp_make_key_attachment (tempf); } -static int crypt_mod_pgp_check_traditional (FILE *fp, BODY *b, int tagged_only) +static int crypt_mod_pgp_check_traditional (FILE * fp, BODY * b, + int tagged_only) { return pgp_check_traditional (fp, b, tagged_only); } -static BODY *crypt_mod_pgp_traditional_encryptsign (BODY *a, int flags, char *keylist) +static BODY *crypt_mod_pgp_traditional_encryptsign (BODY * a, int flags, + char *keylist) { return pgp_traditional_encryptsign (a, flags, keylist); } -static void crypt_mod_pgp_encrypted_handler (BODY *m, STATE *s) +static int crypt_mod_pgp_encrypted_handler (BODY * m, STATE * s) { - pgp_encrypted_handler (m, s); + return pgp_encrypted_handler (m, s); } -static void crypt_mod_pgp_invoke_getkeys (ADDRESS *addr) +static void crypt_mod_pgp_invoke_getkeys (ADDRESS * addr) { pgp_invoke_getkeys (addr); } @@ -101,36 +97,37 @@ static void crypt_mod_pgp_invoke_import (const char *fname) pgp_invoke_import (fname); } -static void crypt_mod_pgp_extract_keys_from_attachment_list (FILE *fp, int tag, BODY *top) +static void crypt_mod_pgp_extract_keys_from_attachment_list (FILE * fp, + int tag, + BODY * top) { pgp_extract_keys_from_attachment_list (fp, tag, top); } -struct crypt_module_specs crypt_mod_pgp_classic = - { APPLICATION_PGP, - { - NULL, /* init */ - crypt_mod_pgp_void_passphrase, - crypt_mod_pgp_valid_passphrase, - crypt_mod_pgp_decrypt_mime, - crypt_mod_pgp_application_handler, - crypt_mod_pgp_encrypted_handler, - crypt_mod_pgp_findkeys, - crypt_mod_pgp_sign_message, - crypt_mod_pgp_verify_one, - crypt_mod_pgp_send_menu, - - crypt_mod_pgp_encrypt_message, - crypt_mod_pgp_make_key_attachment, - crypt_mod_pgp_check_traditional, - crypt_mod_pgp_traditional_encryptsign, - crypt_mod_pgp_invoke_getkeys, - crypt_mod_pgp_invoke_import, - crypt_mod_pgp_extract_keys_from_attachment_list, - - NULL, /* smime_getkeys */ - NULL, /* smime_verify_sender */ - NULL, /* smime_build_smime_entity */ - NULL, /* smime_invoke_import */ - } - }; +struct crypt_module_specs crypt_mod_pgp_classic = { APPLICATION_PGP, + { + NULL, /* init */ + crypt_mod_pgp_void_passphrase, + crypt_mod_pgp_valid_passphrase, + crypt_mod_pgp_decrypt_mime, + crypt_mod_pgp_application_handler, + crypt_mod_pgp_encrypted_handler, + crypt_mod_pgp_findkeys, + crypt_mod_pgp_sign_message, + crypt_mod_pgp_verify_one, + crypt_mod_pgp_send_menu, + + crypt_mod_pgp_encrypt_message, + crypt_mod_pgp_make_key_attachment, + crypt_mod_pgp_check_traditional, + crypt_mod_pgp_traditional_encryptsign, + crypt_mod_pgp_invoke_getkeys, + crypt_mod_pgp_invoke_import, + crypt_mod_pgp_extract_keys_from_attachment_list, + + NULL, /* smime_getkeys */ + NULL, /* smime_verify_sender */ + NULL, /* smime_build_smime_entity */ + NULL, /* smime_invoke_import */ + } +};