Provide DKIM_EXPL_ codes for use in MFL

* doc/functions.texi: Document changes
* mflib/status.mf: Define DKIM_EXPL_ constants
* src/dkim.c (dkim_explanation_str): Change the wording of
DKIM_EXPL_BAD_BASE64 error string.
* src/dkim.h: Define DKIM_EXPL_ using _MFL_DKIM_EXPL_ ones

2 files changed, 19 insertions, 20 deletions

diff --git a/src/dkim.c b/src/dkim.c
index c6ebd27c..6aba9792 100644
--- a/src/dkim.c
+++ b/src/dkim.c
@@ -1535,7 +1535,7 @@ char const *dkim_explanation_str[] = {
 	[DKIM_EXPL_KEY_SYNTAX] = "key syntax error",
 	[DKIM_EXPL_KEY_REVOKED] = "key revoked",
 	[DKIM_EXPL_BAD_BODY] = "body hash did not verify",
-	[DKIM_EXPL_BAD_BASE64] = "can't decode base64",
+	[DKIM_EXPL_BAD_BASE64] = "can't decode b= tag",
 	[DKIM_EXPL_BAD_SIG] = "signature did not verify",
 };
 
diff --git a/src/dkim.h b/src/dkim.h
index 21c412de..a77a9987 100644
--- a/src/dkim.h
+++ b/src/dkim.h
@@ -80,24 +80,24 @@ int dkim_header_list_match(char const *h_list, char const *h);
 
 /* Explanatory error codes */
 enum {
-	DKIM_EXPL_OK,
-	DKIM_EXPL_NO_SIG,
-	DKIM_EXPL_INTERNAL_ERROR,
-	DKIM_EXPL_SIG_SYNTAX,
-	DKIM_EXPL_SIG_MISS,	
-	DKIM_EXPL_DOMAIN_MISMATCH,
-	DKIM_EXPL_BAD_VERSION,
-	DKIM_EXPL_BAD_ALGORITHM,
-	DKIM_EXPL_BAD_QUERY,
-	DKIM_EXPL_FROM,
-	DKIM_EXPL_EXPIRED,
-	DKIM_EXPL_DNS_UNAVAIL,
-	DKIM_EXPL_DNS_NOTFOUND,
-	DKIM_EXPL_KEY_SYNTAX,
-	DKIM_EXPL_KEY_REVOKED,
-	DKIM_EXPL_BAD_BODY,
-	DKIM_EXPL_BAD_BASE64,
-	DKIM_EXPL_BAD_SIG,
+	DKIM_EXPL_OK                  = _MFL_DKIM_EXPL_OK,
+	DKIM_EXPL_NO_SIG	      = _MFL_DKIM_EXPL_NO_SIG,
+	DKIM_EXPL_INTERNAL_ERROR      = _MFL_DKIM_EXPL_INTERNAL_ERROR,
+	DKIM_EXPL_SIG_SYNTAX	      = _MFL_DKIM_EXPL_SIG_SYNTAX,
+	DKIM_EXPL_SIG_MISS	      = _MFL_DKIM_EXPL_SIG_MISS,
+	DKIM_EXPL_DOMAIN_MISMATCH     = _MFL_DKIM_EXPL_DOMAIN_MISMATCH,
+	DKIM_EXPL_BAD_VERSION	      = _MFL_DKIM_EXPL_BAD_VERSION,
+	DKIM_EXPL_BAD_ALGORITHM	      = _MFL_DKIM_EXPL_BAD_ALGORITHM,
+	DKIM_EXPL_BAD_QUERY	      = _MFL_DKIM_EXPL_BAD_QUERY,
+	DKIM_EXPL_FROM		      = _MFL_DKIM_EXPL_FROM,
+	DKIM_EXPL_EXPIRED	      = _MFL_DKIM_EXPL_EXPIRED,
+	DKIM_EXPL_DNS_UNAVAIL	      = _MFL_DKIM_EXPL_DNS_UNAVAIL,
+	DKIM_EXPL_DNS_NOTFOUND	      = _MFL_DKIM_EXPL_DNS_NOTFOUND,
+	DKIM_EXPL_KEY_SYNTAX	      = _MFL_DKIM_EXPL_KEY_SYNTAX,
+	DKIM_EXPL_KEY_REVOKED	      = _MFL_DKIM_EXPL_KEY_REVOKED,
+	DKIM_EXPL_BAD_BODY	      = _MFL_DKIM_EXPL_BAD_BODY,
+	DKIM_EXPL_BAD_BASE64	      = _MFL_DKIM_EXPL_BAD_BASE64,
+	DKIM_EXPL_BAD_SIG             = _MFL_DKIM_EXPL_BAD_SIG,
 };
 
 /* Verification error codes */
@@ -111,4 +111,3 @@ int mfd_dkim_verify(mu_message_t msg, char **sigstr);
 
 extern char const *dkim_explanation_str[];
 extern int dkim_result_trans[];
-