X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=a20f7e133457c53a563f99c1be4a0742f4c3c69d;hp=8b4e315b311ec570716d0068ba03f1258680d248;hb=1951199b744b2104bf7fe60effe5dd0f455aee9c;hpb=4f1b1414371cc373f50ca79a888928635a3a3763

diff --git a/init.h b/init.h
index 8b4e315..a20f7e1 100644
--- a/init.h
+++ b/init.h
@@ -377,22 +377,6 @@ struct option_t MuttVars[] = {
    ** will be saved for later references.  Also see ``$$record'',
    ** and ``$fcc-hook''.
    */
-  {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, "yes" },
-  /*
-   ** .pp
-   ** This variable controls whether or not Madmutt may automatically enable
-   ** PGP encryption/signing for messages.  See also ``$$crypt_autoencrypt'',
-   ** ``$$crypt_replyencrypt'',
-   ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''.
-   */
-  {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, "yes" },
-  /*
-   ** .pp
-   ** This variable controls whether or not Madmutt may automatically enable
-   ** S/MIME encryption/signing for messages. See also ``$$crypt_autoencrypt'',
-   ** ``$$crypt_replyencrypt'',
-   ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''.
-   */
   {"date_format", DT_STR, R_BOTH, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"},
   /*
    ** .pp
@@ -1519,64 +1503,6 @@ struct option_t MuttVars[] = {
    ** when you are at the end of a message and invoke the \fInext-page\fP
    ** function.
    */
-  {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, "no" },
-  /*
-   ** .pp
-   ** Setting this variable will cause Madmutt to always attempt to
-   ** cryptographically sign outgoing messages.  This can be overridden
-   ** by use of the \fIpgp-menu\fP, when signing is not required or
-   ** encryption is requested as well. If ``$$smime_is_default'' is \fIset\fP,
-   ** then OpenSSL is used instead to create S/MIME messages and settings can
-   ** be overridden by use of the \fIsmime-menu\fP.
-   ** (Crypto only)
-   */
-  {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, "no" },
-  /*
-   ** .pp
-   ** Setting this variable will cause Madmutt to always attempt to PGP
-   ** encrypt outgoing messages.  This is probably only useful in
-   ** connection to the \fIsend-hook\fP command.  It can be overridden
-   ** by use of the \fIpgp-menu\fP, when encryption is not required or
-   ** signing is requested as well.  If ``$$smime_is_default'' is \fIset\fP,
-   ** then OpenSSL is used instead to create S/MIME messages and
-   ** settings can be overridden by use of the \fIsmime-menu\fP.
-   ** (Crypto only)
-   */
-  {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, automatically PGP or OpenSSL encrypt replies to messages which are
-   ** encrypted.
-   ** (Crypto only)
-   */
-  {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, "no" },
-  /*
-   ** .pp
-   ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages which are
-   ** signed.
-   ** .pp
-   ** \fBNote:\fP this does not work on messages that are encrypted \fBand\fP signed!
-   ** (Crypto only)
-   */
-  {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, "no" },
-  /*
-   ** .pp
-   ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages
-   ** which are encrypted. This makes sense in combination with
-   ** ``$$crypt_replyencrypt'', because it allows you to sign all
-   ** messages which are automatically encrypted.  This works around
-   ** the problem noted in ``$$crypt_replysign'', that Madmutt is not able
-   ** to find out whether an encrypted message is also signed.
-   ** (Crypto only)
-   */
-  {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" },
-  /*
-   ** .pp
-   ** If ``\fIyes\fP'', always attempt to verify PGP or S/MIME signatures.
-   ** If ``\fIask\fP'', ask whether or not to verify the signature.
-   ** If ``\fIno\fP'', never attempt to verify cryptographic signatures.
-   ** (Crypto only)
-   */
   {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, "no" },
   /*
    ** .pp
@@ -1741,16 +1667,13 @@ struct option_t MuttVars[] = {
   {"smtp_use_tls", DT_STR, R_NONE, UL &SmtpUseTLS, "" },
   /*
    ** .pp
-   ** Availability: SMTP (and SSL)
+   ** Availability: SMTP
    **
    ** .pp
    ** Defines wether to use STARTTLS. If this option is set to ``\fIrequired\fP''
    ** and the server does not support STARTTLS or there is an error in the
    ** TLS Handshake, the connection will fail. Setting this to ``\fIenabled\fP''
    ** will try to start TLS and continue without TLS in case of an error.
-   **
-   **.pp
-   ** Madmutt still needs to have SSL support enabled in order to use it.
    */
 #endif
   {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" },