From: Pierre Habouzit Date: Mon, 2 Apr 2007 23:59:29 +0000 (+0200) Subject: drop lots of old fashionned crypt settings. X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=e4360f3016dc130069b68459ef3942a26347358c;p=apps%2Fmadmutt.git drop lots of old fashionned crypt settings. Signed-off-by: Pierre Habouzit --- diff --git a/globals.h b/globals.h index bfdda5b..a64a997 100644 --- a/globals.h +++ b/globals.h @@ -189,42 +189,12 @@ WHERE int CurrentMenu; WHERE string_list_t *UserHeader INITVAL (0); /*-- formerly in pgp.h --*/ -WHERE rx_t PgpGoodSign; WHERE char *PgpSignAs; -WHERE short PgpTimeout; WHERE char *PgpEntryFormat; -WHERE char *PgpClearSignCommand; -WHERE char *PgpDecodeCommand; -WHERE char *PgpVerifyCommand; -WHERE char *PgpDecryptCommand; -WHERE char *PgpSignCommand; -WHERE char *PgpEncryptSignCommand; -WHERE char *PgpEncryptOnlyCommand; -WHERE char *PgpImportCommand; -WHERE char *PgpExportCommand; -WHERE char *PgpVerifyKeyCommand; -WHERE char *PgpListSecringCommand; -WHERE char *PgpListPubringCommand; -WHERE char *PgpGetkeysCommand; /*-- formerly in smime.h --*/ WHERE char *SmimeDefaultKey; WHERE char *SmimeCryptAlg; -WHERE short SmimeTimeout; -WHERE char *SmimeCertificates; -WHERE char *SmimeKeys; -WHERE char *SmimeCALocation; -WHERE char *SmimeVerifyCommand; -WHERE char *SmimeVerifyOpaqueCommand; -WHERE char *SmimeDecryptCommand; -WHERE char *SmimeSignCommand; -WHERE char *SmimeSignOpaqueCommand; -WHERE char *SmimeEncryptCommand; -WHERE char *SmimeGetSignerCertCommand; -WHERE char *SmimePk7outCommand; -WHERE char *SmimeGetCertCommand; -WHERE char *SmimeImportCertCommand; -WHERE char *SmimeGetCertEmailCommand; #ifdef MAIN_C const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; diff --git a/init.h b/init.h index df18efe..b4bd6a2 100644 --- a/init.h +++ b/init.h @@ -1627,12 +1627,6 @@ struct option_t MuttVars[] = { ** you may \fIunset\fP this setting. ** (Crypto only) */ - {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, "no" }, - /* - ** .pp - ** If \fIset\fP, Madmutt will use a possibly-running gpg-agent process. - ** (PGP only) - */ {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" }, /* ** .pp @@ -1691,15 +1685,6 @@ struct option_t MuttVars[] = { ** .pp ** (PGP only) */ - {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, "" }, - /* - ** .pp - ** If you assign a text to this variable, then a PGP signature is only - ** considered verified if the output from $$pgp_verify_command contains - ** the text. Use this variable if the exit code from the command is 0 - ** even for bad signatures. - ** (PGP only) - */ {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" }, /* ** .pp @@ -1741,13 +1726,6 @@ struct option_t MuttVars[] = { ** keyid form to specify your key (e.g., ``\fT0x00112233\fP''). ** (PGP only) */ - {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" }, - /* - ** .pp - ** The number of seconds after which a cached passphrase will expire if - ** not used. Default: 300. - ** (PGP only) - */ {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, "address" }, /* ** .pp @@ -1776,119 +1754,6 @@ struct option_t MuttVars[] = { ** check the message for traditional pgp. */ /* XXX Default values! */ - {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" }, - /* - ** .pp - ** This format strings specifies a command which is used to decode - ** application/pgp attachments. - ** .pp - ** The PGP command formats have their own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .dl - ** .dt %p .dd Expands to PGPPASSFD=0 when a pass phrase is needed, to an empty - ** string otherwise. Note: This may be used with a %? construct. - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %a .dd The value of $$pgp_sign_as. - ** .dt %r .dd One or more key IDs. - ** .de - ** .pp - ** For examples on how to configure these formats for the various versions - ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (PGP only) - */ - {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, "" }, - /* - ** .pp - ** This command is invoked whenever Madmutt will need public key information. - ** \fT%r\fP is the only \fTprintf(3)\fP-like sequence used with this format. - ** (PGP only) - */ - {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify PGP signatures. - ** (PGP only) - */ - {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, "" }, - /* - ** .pp - ** This command is used to decrypt a PGP encrypted message. - ** (PGP only) - */ - {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, "" }, - /* - ** .pp - ** This format is used to create a old-style ``clearsigned'' PGP message. - ** .pp - ** Note that the use of this format is \fBstrongly\fP \fBdeprecated\fP. - ** (PGP only) - */ - {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, "" }, - /* - ** .pp - ** This command is used to create the detached PGP signature for a - ** multipart/signed PGP/MIME body part. - ** (PGP only) - */ - {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, "" }, - /* - ** .pp - ** This command is used to both sign and encrypt a body part. - ** (PGP only) - */ - {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, "" }, - /* - ** .pp - ** This command is used to encrypt a body part without signing it. - ** (PGP only) - */ - {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, "" }, - /* - ** .pp - ** This command is used to import a key from a message into - ** the user's public key ring. - ** (PGP only) - */ - {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, "" }, - /* - ** .pp - ** This command is used to export a public key from the user's - ** key ring. - ** (PGP only) - */ - {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, "" }, - /* - ** .pp - ** This command is used to verify key information from the key selection - ** menu. - ** (PGP only) - */ - {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, "" }, - /* - ** .pp - ** This command is used to list the secret key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ - {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, "" }, - /* - ** .pp - ** This command is used to list the public key ring's contents. The - ** output format must be analogous to the one used by - ** \fTgpg --list-keys --with-colons\fP. - ** .pp - ** This format is also generated by the \fTpgpring\fP utility which comes - ** with Madmutt. - ** (PGP only) - */ {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" }, /* ** .pp @@ -1898,13 +1763,6 @@ struct option_t MuttVars[] = { ** ``$$mime_forward_decode'' is \fIunset\fP. ** (PGP only) */ - {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, "300" }, - /* - ** .pp - ** The number of seconds after which a cached passphrase will expire if - ** not used. - ** (S/MIME only) - */ {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, "" }, /* ** .pp @@ -1915,131 +1773,6 @@ struct option_t MuttVars[] = { ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used. ** (S/MIME only) */ - {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, "" }, - /* - ** .pp - ** Since there is no pubring/secring as with PGP, Madmutt has to handle - ** storage ad retrieval of keys/certs by itself. This is very basic right now, - ** and stores keys and certificates in two different directories, both - ** named as the hash-value retrieved from OpenSSL. There is an index file - ** which contains mailbox-address keyid pair, and which can be manually - ** edited. This one points to the location of the private keys. - ** (S/MIME only) - */ - {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, "" }, - /* - ** .pp - ** This variable contains the name of either a directory, or a file which - ** contains trusted certificates for use with OpenSSL. - ** (S/MIME only) - */ - {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, "" }, - /* - ** .pp - ** Since there is no pubring/secring as with PGP, Madmutt has to handle - ** storage and retrieval of keys by itself. This is very basic right - ** now, and keys and certificates are stored in two different - ** directories, both named as the hash-value retrieved from - ** OpenSSL. There is an index file which contains mailbox-address - ** keyid pairs, and which can be manually edited. This one points to - ** the location of the certificates. - ** (S/MIME only) - */ - {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, "" }, - /* - ** .pp - ** This format string specifies a command which is used to decrypt - ** \fTapplication/x-pkcs7-mime\fP attachments. - ** .pp - ** The OpenSSL command formats have their own set of \fTprintf(3)\fP-like sequences - ** similar to PGP's: - ** .pp - ** .dl - ** .dt %f .dd Expands to the name of a file containing a message. - ** .dt %s .dd Expands to the name of a file containing the signature part - ** . of a multipart/signed attachment when verifying it. - ** .dt %k .dd The key-pair specified with $$smime_default_key - ** .dt %c .dd One or more certificate IDs. - ** .dt %a .dd The algorithm used for encryption. - ** .dt %C .dd CA location: Depending on whether $$smime_ca_location - ** . points to a directory or file, this expands to - ** . "-CApath $$smime_ca_location" or "-CAfile $$smime_ca_location". - ** .de - ** .pp - ** For examples on how to configure these formats, see the smime.rc in - ** the \fTsamples/\fP subdirectory which has been installed on your system - ** alongside the documentation. - ** (S/MIME only) - */ - {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type \fTmultipart/signed\fP. - ** (S/MIME only) - */ - {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to verify S/MIME signatures of type - ** \fTapplication/x-pkcs7-mime\fP. - ** (S/MIME only) - */ - {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTmultipart/signed\fP, which can be read by all mail clients. - ** (S/MIME only) - */ - {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, "" }, - /* - ** .pp - ** This command is used to created S/MIME signatures of type - ** \fTapplication/x-pkcs7-signature\fP, which can only be handled by mail - ** clients supporting the S/MIME extension. - ** (S/MIME only) - */ - {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, "" }, - /* - ** .pp - ** This command is used to create encrypted S/MIME messages. - ** (S/MIME only) - */ - {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, "" }, - /* - ** .pp - ** This command is used to extract PKCS7 structures of S/MIME signatures, - ** in order to extract the public X509 certificate(s). - ** (S/MIME only) - */ - {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, "" }, - /* - ** .pp - ** This command is used to extract X509 certificates from a PKCS7 structure. - ** (S/MIME only) - */ - {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, "" }, - /* - ** .pp - ** This command is used to extract only the signers X509 certificate from a S/MIME - ** signature, so that the certificate's owner may get compared to the - ** email's ``\fTFrom:\fP'' header field. - ** (S/MIME only) - */ - {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, "" }, - /* - ** .pp - ** This command is used to import a certificate via \fTsmime_keysng\fP. - ** (S/MIME only) - */ - {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, "" }, - /* - ** .pp - ** This command is used to extract the mail address(es) used for storing - ** X509 certificates, and for verification purposes (to check whether the - ** certificate was issued for the sender's mailbox). - ** (S/MIME only) - */ {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, "" }, /* ** .pp