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
tidying
[exim.git]
/
src
/
src
/
pdkim
/
pdkim.h
diff --git
a/src/src/pdkim/pdkim.h
b/src/src/pdkim/pdkim.h
index 59ac038881f47af47c9a7d9bd6d5d526a9ecf5e6..0c9d46d011d0b4baabe047aa330ca190203e73d6 100644
(file)
--- a/
src/src/pdkim/pdkim.h
+++ b/
src/src/pdkim/pdkim.h
@@
-48,8
+48,9
@@
#define PDKIM_ERR_RSA_SIGNING -102
#define PDKIM_ERR_LONG_LINE -103
#define PDKIM_ERR_BUFFER_TOO_SMALL -104
#define PDKIM_ERR_RSA_SIGNING -102
#define PDKIM_ERR_LONG_LINE -103
#define PDKIM_ERR_BUFFER_TOO_SMALL -104
-#define PDKIM_SIGN_PRIVKEY_WRAP -105
-#define PDKIM_SIGN_PRIVKEY_B64D -106
+#define PDKIM_ERR_EXCESS_SIGS -105
+#define PDKIM_SIGN_PRIVKEY_WRAP -106
+#define PDKIM_SIGN_PRIVKEY_B64D -107
/* -------------------------------------------------------------------------- */
/* Main/Extended verification status */
/* -------------------------------------------------------------------------- */
/* Main/Extended verification status */
@@
-73,9
+74,6
@@
/* Some parameter values */
#define PDKIM_QUERYMETHOD_DNS_TXT 0
/* Some parameter values */
#define PDKIM_QUERYMETHOD_DNS_TXT 0
-/*#define PDKIM_ALGO_RSA_SHA256 0 */
-/*#define PDKIM_ALGO_RSA_SHA1 1 */
-
#define PDKIM_CANON_SIMPLE 0
#define PDKIM_CANON_RELAXED 1
#define PDKIM_CANON_SIMPLE 0
#define PDKIM_CANON_RELAXED 1
@@
-141,7
+139,7
@@
typedef struct pdkim_signature {
/* (v=) The version, as an integer. Currently, always "1" */
int version;
/* (v=) The version, as an integer. Currently, always "1" */
int version;
- /* (a=) The signature algorithm.
Either PDKIM_ALGO_RSA_SHA256
*/
+ /* (a=) The signature algorithm. */
int keytype; /* pdkim_keytypes index */
int hashtype; /* pdkim_hashes index */
int keytype; /* pdkim_keytypes index */
int hashtype; /* pdkim_hashes index */
@@
-279,7
+277,7
@@
typedef struct pdkim_ctx {
pdkim_bodyhash *bodyhash;
/* Callback for dns/txt query method (verification only) */
pdkim_bodyhash *bodyhash;
/* Callback for dns/txt query method (verification only) */
- uschar * (*dns_txt_callback)(uschar *);
+ uschar * (*dns_txt_callback)(
const
uschar *);
/* Coder's little helpers */
gstring *cur_header;
/* Coder's little helpers */
gstring *cur_header;
@@
-312,7
+310,7
@@
extern "C" {
void pdkim_init (void);
void pdkim_init (void);
-void pdkim_init_context (pdkim_ctx *, BOOL, uschar * (*)(uschar *));
+void pdkim_init_context (pdkim_ctx *, BOOL, uschar * (*)(
const
uschar *));
DLLEXPORT
pdkim_signature *pdkim_init_sign (pdkim_ctx *,
DLLEXPORT
pdkim_signature *pdkim_init_sign (pdkim_ctx *,
@@
-320,7
+318,7
@@
pdkim_signature *pdkim_init_sign (pdkim_ctx *,
const uschar **);
DLLEXPORT
const uschar **);
DLLEXPORT
-pdkim_ctx *pdkim_init_verify (uschar * (*)(uschar *), BOOL);
+pdkim_ctx *pdkim_init_verify (uschar * (*)(
const
uschar *), BOOL);
DLLEXPORT
void pdkim_set_optional (pdkim_signature *, char *, char *,int, int,
DLLEXPORT
void pdkim_set_optional (pdkim_signature *, char *, char *,int, int,