git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DKIM: rework error logging to pass strings back to caller for logging. Bug 966
[exim.git]
/
src
/
src
/
pdkim
/
pdkim.h
diff --git
a/src/src/pdkim/pdkim.h
b/src/src/pdkim/pdkim.h
index 07ba5b5c4801b3888311e0d2d0c352717de9e809..8c477f744cbd3f49b6ba0a7b05af71c15d27ba0d 100644
(file)
--- a/
src/src/pdkim/pdkim.h
+++ b/
src/src/pdkim/pdkim.h
@@
-2,7
+2,7
@@
* PDKIM - a RFC4871 (DKIM) implementation
*
* Copyright (C) 2009 - 2012 Tom Kistner <tom@duncanthrax.net>
* PDKIM - a RFC4871 (DKIM) implementation
*
* Copyright (C) 2009 - 2012 Tom Kistner <tom@duncanthrax.net>
- * Copyright (c)
Jeremy Harris 2016
+ * Copyright (c)
2016 - 2017 Jeremy Harris
*
* http://duncanthrax.net/pdkim/
*
*
* http://duncanthrax.net/pdkim/
*
@@
-164,7
+164,7
@@
typedef struct pdkim_signature {
uschar *copiedheaders;
/* (b=) Raw signature data, along with its length in bytes */
uschar *copiedheaders;
/* (b=) Raw signature data, along with its length in bytes */
- blob sig
data
;
+ blob sig
hash
;
/* (bh=) Raw body hash data, along with its length in bytes */
blob bodyhash;
/* (bh=) Raw body hash data, along with its length in bytes */
blob bodyhash;
@@
-233,7
+233,7
@@
typedef struct pdkim_signature {
/* Properties below this point are used internally only ------------- */
/* Per-signature helper variables ----------------------------------- */
/* Properties below this point are used internally only ------------- */
/* Per-signature helper variables ----------------------------------- */
- hctx body_hash;
+ hctx body_hash
_ctx
;
unsigned long signed_body_bytes; /* How many body bytes we hashed */
pdkim_stringlist *headers; /* Raw headers included in the sig */
unsigned long signed_body_bytes; /* How many body bytes we hashed */
pdkim_stringlist *headers; /* Raw headers included in the sig */
@@
-250,9
+250,10
@@
typedef struct pdkim_ctx {
#define PDKIM_MODE_SIGN BIT(0) /* if unset, mode==verify */
#define PDKIM_DOT_TERM BIT(1) /* dot termination and unstuffing */
#define PDKIM_MODE_SIGN BIT(0) /* if unset, mode==verify */
#define PDKIM_DOT_TERM BIT(1) /* dot termination and unstuffing */
-#define PDKIM_SEEN_
LF
BIT(2)
-#define PDKIM_SEEN_
EOD
BIT(3)
+#define PDKIM_SEEN_
CR
BIT(2)
+#define PDKIM_SEEN_
LF
BIT(3)
#define PDKIM_PAST_HDRS BIT(4)
#define PDKIM_PAST_HDRS BIT(4)
+#define PDKIM_SEEN_EOD BIT(5)
unsigned flags;
/* One (signing) or several chained (verification) signatures */
unsigned flags;
/* One (signing) or several chained (verification) signatures */
@@
-285,7
+286,8
@@
extern "C" {
void pdkim_init (void);
DLLEXPORT
void pdkim_init (void);
DLLEXPORT
-pdkim_ctx *pdkim_init_sign (char *, char *, char *, int, BOOL);
+pdkim_ctx *pdkim_init_sign (char *, char *, char *, int,
+ BOOL, int(*)(char *, char *), const uschar **);
DLLEXPORT
pdkim_ctx *pdkim_init_verify (int(*)(char *, char *), BOOL);
DLLEXPORT
pdkim_ctx *pdkim_init_verify (int(*)(char *, char *), BOOL);
@@
-299,13
+301,13
@@
int pdkim_set_optional (pdkim_ctx *, char *, char *,int, int,
DLLEXPORT
int pdkim_feed (pdkim_ctx *, char *, int);
DLLEXPORT
DLLEXPORT
int pdkim_feed (pdkim_ctx *, char *, int);
DLLEXPORT
-int pdkim_feed_finish (pdkim_ctx *, pdkim_signature **);
+int pdkim_feed_finish (pdkim_ctx *, pdkim_signature **
, const uschar **
);
DLLEXPORT
void pdkim_free_ctx (pdkim_ctx *);
DLLEXPORT
void pdkim_free_ctx (pdkim_ctx *);
-const
char *
pdkim_errstr(int);
+const
uschar *
pdkim_errstr(int);
#ifdef __cplusplus
}
#ifdef __cplusplus
}