diff options
author | Eduardo Chappa <chappa@washington.edu> | 2021-04-17 23:22:48 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2021-04-17 23:22:48 -0600 |
commit | ec66afcc51369f994cf04960fc4828cb007176bd (patch) | |
tree | 2056be54d1b2ff06a02377c41594efe4c29274d3 /pith | |
parent | cd24f8efb57dd2b057ab6a216ff3789876c62420 (diff) | |
download | alpine-ec66afcc51369f994cf04960fc4828cb007176bd.tar.xz |
* Add new variable ssl-ciphers to list the ciphers that will be used when
negotiating a secure connection with a SSL server. Work in
collaboration with professor Martin Trusler.
Diffstat (limited to 'pith')
-rw-r--r-- | pith/conf.c | 9 | ||||
-rw-r--r-- | pith/conftype.h | 1 | ||||
-rw-r--r-- | pith/pine.hlp | 31 |
3 files changed, 40 insertions, 1 deletions
diff --git a/pith/conf.c b/pith/conf.c index e8904e4..8de5427 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -384,7 +384,9 @@ CONF_TXT_T cf_text_system_certs_file[] = "Sets the path for the system ssl file CONF_TXT_T cf_text_user_certs_path[] = "Sets the path for additional ssl certificates that the user trusts. Note\n#that this could be a list of paths, if the same\n# pinerc is used in different systems. Alpine always chooses the first one that\n# it finds. Value must be an absolute path."; -CONF_TXT_T cf_text_user_certs_file[] = "Sets the path for a file that contains certificates that a user trusts.\nNote that this could be a list of container files,\n# if the same pinerc is used in different systems. Alpine always chooses the,\n# first one that it finds. Value must be an absolute path."; +CONF_TXT_T cf_text_user_certs_file[] = "Sets the path for a file that contains certificates that a user trusts.\n#Note that this could be a list of container files,\n# if the same pinerc is used in different systems. Alpine always chooses the,\n# first one that it finds. Value must be an absolute path."; + +CONF_TXT_T cf_text_ciphers[] = "Colon separated list of ciphers that should be negotiated with the remote\n# ssl server upon connection."; #endif CONF_TXT_T cf_text_newmail_fifo_path[] = "Sets the filename for the newmail fifo (named pipe). Unix only."; @@ -678,6 +680,8 @@ static struct variable variables[] = { "User Certs Dir", cf_text_user_certs_file}, {"user-certs-file", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, "User Certs File", cf_text_user_certs_file}, +{"ssl-ciphers", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, + "SSL Ciphers", cf_text_ciphers}, #endif {"url-viewers", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, "URL-Viewers", cf_text_browser}, @@ -2439,6 +2443,7 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **)) set_current_val(&vars[V_SSLCAFILE], TRUE, TRUE); set_current_val(&vars[V_USERSSLCAPATH], TRUE, TRUE); set_current_val(&vars[V_USERSSLCAFILE], TRUE, TRUE); + set_current_val(&vars[V_SSLCIPHERS], TRUE, TRUE); #endif #if !defined(DOS) && !defined(OS2) && !defined(LEAVEOUTFIFO) set_current_val(&vars[V_FIFOPATH], TRUE, TRUE); @@ -8055,6 +8060,8 @@ config_help(int var, int feature) return(h_config_user_certs_path); case V_USERSSLCAFILE : return(h_config_user_certs_file); + case V_SSLCIPHERS : + return(h_config_ssl_ciphers); #endif #if !defined(DOS) && !defined(OS2) && !defined(LEAVEOUTFIFO) case V_FIFOPATH : diff --git a/pith/conftype.h b/pith/conftype.h index c563126..5f2dd50 100644 --- a/pith/conftype.h +++ b/pith/conftype.h @@ -129,6 +129,7 @@ typedef enum { V_PERSONAL_NAME = 0 , V_SSLCAFILE , V_USERSSLCAPATH , V_USERSSLCAFILE + , V_SSLCIPHERS #endif , V_BROWSER , V_HISTORY diff --git a/pith/pine.hlp b/pith/pine.hlp index 060a897..603c756 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -188,6 +188,9 @@ new additions to Alpine, please check it periodically. <P> New features include: <UL> +<LI> New configuration variable <!--#echo var="VAR_ssl-ciphers"--> that allows +users to list the ciphers that want to use when connecting to a SSL server. +Based on a collaboration with Professor Martin Trusler. <LI> New hidden feature <a href="h_config_delete_before_writing"><!--#echo var="FEAT_enable-delete-before-writing"--></a> to add support for terminals that need lines to be deleted before being written. Based on a collaboration with Professor Martin Trusler. @@ -22811,6 +22814,34 @@ User Certs File = /home/fred/.alpine-certs/certs.pem <P> <End of help on this topic> </BODY></HTML> +====== h_config_ssl_ciphers ====== +<HTML> +<HEAD> +<TITLE>OPTION: <!--#echo var="VAR_ssl-ciphers"--></TITLE> +</HEAD> +<BODY> +<H1>OPTION: <!--#echo var="VAR_ssl-ciphers"--></H1> + +(UNIX ALPINE ONLY) +This is a colon separated list of ciphers that your openssl or libressl +library supports and will use to negotiate a secure connection with a +remote SSL server. + +<P> +The list of ciphers supported by openssl can be obtained with the command +line command + +<P> +openssl ciphers + +<P> +Consult the manual page of the openssl ciphers command to see more +way to specify groups of ciphers, such as RSA, or other groups of +ciphers. + +<P> +<End of help on this topic> +</BODY></HTML> ====== h_config_set_att_ansi ====== <HTML><HEAD> <TITLE>OPTION: Set printer to attached ansi printer</TITLE> |