summaryrefslogtreecommitdiff
path: root/alpine
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2020-07-17 01:43:23 -0600
committerEduardo Chappa <chappa@washington.edu>2020-07-17 01:43:23 -0600
commit50f4fdaa40ab3195377f22243c3ba4287389d207 (patch)
tree343bbe912224e2a82c12b4008de6b1d37b5028fb /alpine
parent15dc39d5ae81117836fc0513e37fe3b89608c8aa (diff)
downloadalpine-50f4fdaa40ab3195377f22243c3ba4287389d207.tar.xz
* Experimental: Attempt to implement the Encryption Range in Windows. It works
in Windows 10, and it should work in Windows 8.1. It needs testing in Windows 7 and Windows Vista.
Diffstat (limited to 'alpine')
-rw-r--r--alpine/alpine.c3
-rw-r--r--alpine/confscroll.c4
2 files changed, 1 insertions, 6 deletions
diff --git a/alpine/alpine.c b/alpine/alpine.c
index 55bd581..a2585af 100644
--- a/alpine/alpine.c
+++ b/alpine/alpine.c
@@ -662,7 +662,6 @@ main(int argc, char **argv)
}
}
-#ifdef DF_ENCRYPTION_RANGE
if(ps_global->VAR_ENCRYPTION_RANGE
&& ps_global->VAR_ENCRYPTION_RANGE[0]){
char *min_s, *max_s, *s;
@@ -725,7 +724,7 @@ main(int argc, char **argv)
mail_parameters(NULL, SET_ENCRYPTION_RANGE_MAX, (void *) &max_v);
}
}
-#endif /* DF_ENCRYPTION_RANGE */
+
/*
* setup alternative authentication driver preference for IMAP opens
diff --git a/alpine/confscroll.c b/alpine/confscroll.c
index c8760eb..67b1570 100644
--- a/alpine/confscroll.c
+++ b/alpine/confscroll.c
@@ -343,9 +343,7 @@ exclude_config_var(struct pine *ps, struct variable *var, int allow_hard_to_conf
case V_GLOB_ADDRBOOK :
case V_DISABLE_DRIVERS :
case V_DISABLE_AUTHS :
-#ifdef DF_ENCRYPTION_RANGE
case V_ENCRYPTION_RANGE :
-#endif
case V_REMOTE_ABOOK_METADATA :
case V_REMOTE_ABOOK_HISTORY :
case V_REMOTE_ABOOK_VALIDITY :
@@ -5780,9 +5778,7 @@ fix_side_effects(struct pine *ps, struct variable *var, int revert)
var == &ps->vars[V_NEWS_SPEC] ||
var == &ps->vars[V_DISABLE_DRIVERS] ||
var == &ps->vars[V_DISABLE_AUTHS] ||
-#ifdef DF_ENCRYPTION_RANGE
var == &ps->vars[V_ENCRYPTION_RANGE] ||
-#endif
#if !defined(_WINDOWS) || defined(ENABLE_WINDOWS_UNIXSSL_CERTS)
var == &ps->vars[V_SSLCAPATH] ||
var == &ps->vars[V_SSLCAFILE] ||