summaryrefslogtreecommitdiff
path: root/pith
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2019-09-06 21:36:38 -0600
committerEduardo Chappa <chappa@washington.edu>2019-09-06 21:36:38 -0600
commitf7b373f085992290c427392a28984c2ddc1553ba (patch)
tree60a9ccf460bff534b8f350a40b955986031a79d3 /pith
parenta7f1ee6fbe1aa46f7bcc0d40740e0b6c98a12692 (diff)
downloadalpine-f7b373f085992290c427392a28984c2ddc1553ba.tar.xz
* Fixes so that Alpine will build in the Windows operating system. This
update takes care of building with LibreSSL.
Diffstat (limited to 'pith')
-rw-r--r--pith/conf.c36
-rw-r--r--pith/conf.h1
-rw-r--r--pith/pine.hlp2
3 files changed, 1 insertions, 38 deletions
diff --git a/pith/conf.c b/pith/conf.c
index cea59de0..73a868b6 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -52,8 +52,6 @@ static char rcsid[] = "$Id: conf.c 1266 2009-07-14 18:39:12Z hubert@u.washington
#include "../pico/osdep/mswin.h"
#endif
-#include <openssl/ssl.h>
-
#define TO_BAIL_THRESHOLD 60
@@ -8450,37 +8448,3 @@ pcpine_general_help(titlebuf)
#endif /* _WINDOWS */
-typedef struct ssl_versions_s {
- char *name;
- int version;
-} SSL_VERSIONS_S;
-
-int
-pith_ssl_encryption_version(char *s)
-{
- SSL_VERSIONS_S ssl_versions[] = {
- {"no_min", 0},
- {"ssl3", SSL3_VERSION},
- {"tls1", TLS1_VERSION},
- {"tls1_1", TLS1_1_VERSION },
- {"tls1_2", TLS1_2_VERSION},
-#ifdef TLS1_3_VERSION
- {"tls1_3", TLS1_3_VERSION},
-#endif /* TLS1_3_VERSION */
- {"no_max", 0}, /* set this last in the list */
- { NULL, 0},
- };
- int i;
-
- if(s == NULL || *s == '\0')
- return -1;
-
- for(i = 0; ssl_versions[i].name != NULL; i++)
- if(strcmp(ssl_versions[i].name, s) == 0)
- break;
-
- if(strcmp(s, "no_max") == 0) i--;
-
- return ssl_versions[i].name != NULL ? ssl_versions[i].version : -1;
-}
-
diff --git a/pith/conf.h b/pith/conf.h
index a2e5a8a5..a7651145 100644
--- a/pith/conf.h
+++ b/pith/conf.h
@@ -914,7 +914,6 @@ char **get_supported_options(void);
unsigned reset_startup_rule(MAILSTREAM *);
void free_pinerc_lines(PINERC_LINE **);
void panic1(char *, char *);
-int pith_ssl_encryption_version(char *);
/* mandatory to implement prototypes */
int set_input_timeout(int);
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 5230d3e3..b39eed22 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 367 2019-09-01 20:03:34
+Alpine Commit 368 2019-09-06 21:36:18
============= h_news =================
<HTML>
<HEAD>