summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2020-02-29 14:37:17 -0700
committerEduardo Chappa <chappa@washington.edu>2020-02-29 14:37:17 -0700
commitd7838fd7545719029474fea04a51332a542e978a (patch)
tree813bd12e6b221e51288687c1c34092ce3615ede9
parent6288c67a92b37eba8f74305e5bb9d076a0c53e4b (diff)
downloadalpine-d7838fd7545719029474fea04a51332a542e978a.tar.xz
* Add #include "../pith/options.h" to pith/smkeys.c and remove the
double definition of pith_smime_enter_password.
-rw-r--r--pith/pine.hlp2
-rw-r--r--pith/smkeys.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 9c13d808..fdb24c3f 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 410 2020-02-20 17:16:52
+Alpine Commit 411 2020-02-29 14:37:03
============= h_news =================
<HTML>
<HEAD>
diff --git a/pith/smkeys.c b/pith/smkeys.c
index c929a139..f65553ce 100644
--- a/pith/smkeys.c
+++ b/pith/smkeys.c
@@ -34,6 +34,7 @@ static char rcsid[] = "$Id: smkeys.c 1266 2009-07-14 18:39:12Z hubert@u.washingt
#include "../pith/util.h"
#include "../pith/mailindx.h"
#include "../pith/readfile.h"
+#include "../pith/options.h"
#include "smkeys.h"
#ifdef APPLEKEYCHAIN
@@ -50,8 +51,6 @@ static int mem_add_extra_cacerts(char *contents, X509_LOOKUP *lookup);
int compare_certs_by_name(const void *data1, const void *data2);
int password_policy_check(char *);
-int (*pith_smime_enter_password)(char *, char *, size_t);
-
/* test if password passes a predetermined policy.
* return value: 0 - does not pass; 1 - it passes
*/