From ee76be658c9d37e4be1cfb6fb1978b4afe3771bf Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Wed, 9 Oct 2002 23:11:22 +0000 Subject: [PATCH] * mml-sec.el (mml-signencrypt-style-alist): Defcustom. (mml-signencrypt-style): Mention the variable. --- lisp/ChangeLog | 5 +++++ lisp/mml-sec.el | 26 +++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc462a15c..81807b24d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-10-10 Simon Josefsson + + * mml-sec.el (mml-signencrypt-style-alist): Defcustom. + (mml-signencrypt-style): Mention the variable. + 2002-10-09 Simon Josefsson * mml1991.el (mml1991-pgg-sign): Bind pgg-default-user-id, not diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el index 924762421..858737ce2 100644 --- a/lisp/mml-sec.el +++ b/lisp/mml-sec.el @@ -46,15 +46,25 @@ (defvar mml-default-encrypt-method (caar mml-encrypt-alist) "Default encryption method.") -(defvar mml-signencrypt-style-alist +(defcustom mml-signencrypt-style-alist '(("smime" separate) ("pgp" separate) ("pgpmime" separate)) - "Alist specifying whether or not a single sign & encrypt -operation should be perfomed when requesting signencrypt. -Note that combined sign & encrypt is NOT supported by pgp v2! -Also note that you should access this with mml-signencrypt-style") - + "Alist specifying if `signencrypt' results in two separate operations or not. +The first entry indicates the MML security type, valid entries include +the strings \"smime\", \"pgp\", and \"pgpmime\". The second entry is +a symbol `separate' or `combined' where `separate' means that MML signs +and encrypt messages in a two step process, and `combined' means that MML +signs and encrypt the message in one step. +Note that the `combined' mode is NOT supported by all OpenPGP implementations, +in particular PGP version 2 does not support it!" + :type '(repeat (list (choice (const :tag "S/MIME" "smime") + (const :tag "PGP" "pgp") + (const :tag "PGP/MIME" "pgpmime") + (string :tag "User defined")) + (choice (const :tag "Separate" separate) + (const :tag "Combined" combined))))) + ;;; Configuration/helper functions (defun mml-signencrypt-style (method &optional style) @@ -66,7 +76,9 @@ For example, if you prefer to use combined sign & encrypt with smime, putting the following in your Gnus startup file will enable that behavior: -\(mml-set-signencrypt-style \"smime\" combined)" +\(mml-set-signencrypt-style \"smime\" combined) + +You can also customize or set `mml-signencrypt-style-alist' instead." (let ((style-item (assoc method mml-signencrypt-style-alist))) (if style-item (if (or (eq style 'separate) -- 2.25.1