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
Remove obsolete $Cambridge$ CVS revision strings.
[exim.git]
/
src
/
src
/
pdkim
/
pdkim.c
diff --git
a/src/src/pdkim/pdkim.c
b/src/src/pdkim/pdkim.c
index fa5d88d599927fd11a41f78b90587c94ae804475..be159b3816a818be934c90b0c531a8089361a580 100644
(file)
--- a/
src/src/pdkim/pdkim.c
+++ b/
src/src/pdkim/pdkim.c
@@
-20,8
+20,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* $Cambridge: exim/src/src/pdkim/pdkim.c,v 1.14 2010/05/29 19:14:06 nm4 Exp $ */
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@
-65,32
+63,32
@@
struct pdkim_str {
/* -------------------------------------------------------------------------- */
/* A bunch of list constants */
/* -------------------------------------------------------------------------- */
/* A bunch of list constants */
-char *pdkim_querymethods[] = {
+c
onst c
har *pdkim_querymethods[] = {
"dns/txt",
NULL
};
"dns/txt",
NULL
};
-char *pdkim_algos[] = {
+c
onst c
har *pdkim_algos[] = {
"rsa-sha256",
"rsa-sha1",
NULL
};
"rsa-sha256",
"rsa-sha1",
NULL
};
-char *pdkim_canons[] = {
+c
onst c
har *pdkim_canons[] = {
"simple",
"relaxed",
NULL
};
"simple",
"relaxed",
NULL
};
-char *pdkim_hashes[] = {
+c
onst c
har *pdkim_hashes[] = {
"sha256",
"sha1",
NULL
};
"sha256",
"sha1",
NULL
};
-char *pdkim_keytypes[] = {
+c
onst c
har *pdkim_keytypes[] = {
"rsa",
NULL
};
typedef struct pdkim_combined_canon_entry {
"rsa",
NULL
};
typedef struct pdkim_combined_canon_entry {
- char *str;
+ c
onst c
har *str;
int canon_headers;
int canon_body;
} pdkim_combined_canon_entry;
int canon_headers;
int canon_body;
} pdkim_combined_canon_entry;
@@
-105,7
+103,7
@@
pdkim_combined_canon_entry pdkim_combined_canons[] = {
};
};
-char *pdkim_verify_status_str(int status) {
+c
onst c
har *pdkim_verify_status_str(int status) {
switch(status) {
case PDKIM_VERIFY_NONE: return "PDKIM_VERIFY_NONE";
case PDKIM_VERIFY_INVALID: return "PDKIM_VERIFY_INVALID";
switch(status) {
case PDKIM_VERIFY_NONE: return "PDKIM_VERIFY_NONE";
case PDKIM_VERIFY_INVALID: return "PDKIM_VERIFY_INVALID";
@@
-114,7
+112,7
@@
char *pdkim_verify_status_str(int status) {
default: return "PDKIM_VERIFY_UNKNOWN";
}
}
default: return "PDKIM_VERIFY_UNKNOWN";
}
}
-char *pdkim_verify_ext_status_str(int ext_status) {
+c
onst c
har *pdkim_verify_ext_status_str(int ext_status) {
switch(ext_status) {
case PDKIM_VERIFY_FAIL_BODY: return "PDKIM_VERIFY_FAIL_BODY";
case PDKIM_VERIFY_FAIL_MESSAGE: return "PDKIM_VERIFY_FAIL_MESSAGE";
switch(ext_status) {
case PDKIM_VERIFY_FAIL_BODY: return "PDKIM_VERIFY_FAIL_BODY";
case PDKIM_VERIFY_FAIL_MESSAGE: return "PDKIM_VERIFY_FAIL_MESSAGE";
@@
-129,12
+127,12
@@
char *pdkim_verify_ext_status_str(int ext_status) {
/* -------------------------------------------------------------------------- */
/* Print debugging functions */
#ifdef PDKIM_DEBUG
/* -------------------------------------------------------------------------- */
/* Print debugging functions */
#ifdef PDKIM_DEBUG
-void pdkim_quoteprint(FILE *stream, char *data, int len, int lf) {
+void pdkim_quoteprint(FILE *stream, c
onst c
har *data, int len, int lf) {
int i;
int i;
-
unsigned char *p = (
unsigned char *)data;
+
const unsigned char *p = (const
unsigned char *)data;
for (i=0;i<len;i++) {
for (i=0;i<len;i++) {
- int c = p[i];
+
const
int c = p[i];
switch (c) {
case ' ' : fprintf(stream,"{SP}"); break;
case '\t': fprintf(stream,"{TB}"); break;
switch (c) {
case ' ' : fprintf(stream,"{SP}"); break;
case '\t': fprintf(stream,"{TB}"); break;
@@
-153,12
+151,12
@@
void pdkim_quoteprint(FILE *stream, char *data, int len, int lf) {
if (lf)
fputc('\n',stream);
}
if (lf)
fputc('\n',stream);
}
-void pdkim_hexprint(FILE *stream, char *data, int len, int lf) {
+void pdkim_hexprint(FILE *stream, c
onst c
har *data, int len, int lf) {
int i;
int i;
-
unsigned char *p = (
unsigned char *)data;
+
const unsigned char *p = (const
unsigned char *)data;
for (i=0;i<len;i++) {
for (i=0;i<len;i++) {
- int c = p[i];
+
const
int c = p[i];
fprintf(stream,"%02x",c);
}
if (lf)
fprintf(stream,"%02x",c);
}
if (lf)
@@
-198,7
+196,7
@@
pdkim_stringlist *pdkim_prepend_stringlist(pdkim_stringlist *base, char *str) {
/* -------------------------------------------------------------------------- */
/* A small "growing string" implementation to escape malloc/realloc hell */
/* -------------------------------------------------------------------------- */
/* A small "growing string" implementation to escape malloc/realloc hell */
-pdkim_str *pdkim_strnew (char *cstr) {
+pdkim_str *pdkim_strnew (c
onst c
har *cstr) {
unsigned int len = cstr?strlen(cstr):0;
pdkim_str *p = malloc(sizeof(pdkim_str));
if (p == NULL) return NULL;
unsigned int len = cstr?strlen(cstr):0;
pdkim_str *p = malloc(sizeof(pdkim_str));
if (p == NULL) return NULL;
@@
-214,7
+212,7
@@
pdkim_str *pdkim_strnew (char *cstr) {
else p->str[p->len] = '\0';
return p;
}
else p->str[p->len] = '\0';
return p;
}
-char *pdkim_strncat(pdkim_str *str, char *data, int len) {
+char *pdkim_strncat(pdkim_str *str, c
onst c
har *data, int len) {
if ((str->allocated - str->len) < (len+1)) {
/* Extend the buffer */
int num_frags = ((len+1)/PDKIM_STR_ALLOC_FRAG)+1;
if ((str->allocated - str->len) < (len+1)) {
/* Extend the buffer */
int num_frags = ((len+1)/PDKIM_STR_ALLOC_FRAG)+1;
@@
-229,7
+227,7
@@
char *pdkim_strncat(pdkim_str *str, char *data, int len) {
str->str[str->len] = '\0';
return str->str;
}
str->str[str->len] = '\0';
return str->str;
}
-char *pdkim_strcat(pdkim_str *str, char *cstr) {
+char *pdkim_strcat(pdkim_str *str, c
onst c
har *cstr) {
return pdkim_strncat(str, cstr, strlen(cstr));
}
char *pdkim_numcat(pdkim_str *str, unsigned long num) {
return pdkim_strncat(str, cstr, strlen(cstr));
}
char *pdkim_numcat(pdkim_str *str, unsigned long num) {
@@
-328,9
+326,9
@@
DLLEXPORT void pdkim_free_ctx(pdkim_ctx *ctx) {
the passed colon-separated "list", starting at entry
"start". Returns the position of the header name in
the list. */
the passed colon-separated "list", starting at entry
"start". Returns the position of the header name in
the list. */
-int header_name_match(char *header,
- char *tick,
- int do_tick) {
+int header_name_match(c
onst c
har *header,
+ char
*tick,
+ int
do_tick) {
char *hname;
char *lcopy;
char *p;
char *hname;
char *lcopy;
char *p;
@@
-420,6
+418,7
@@
char *pdkim_relax_header (char *header, int crlf) {
p++;
q++;
}
p++;
q++;
}
+ if ((q>relaxed) && (*(q-1) == ' ')) q--; /* Squash eventual trailing SP */
*q = '\0';
if (crlf) strcat(relaxed,"\r\n");
return relaxed;
*q = '\0';
if (crlf) strcat(relaxed,"\r\n");
return relaxed;
@@
-864,7
+863,7
@@
pdkim_pubkey *pdkim_parse_pubkey_record(pdkim_ctx *ctx, char *raw_record) {
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
-int pdkim_update_bodyhash(pdkim_ctx *ctx, char *data, int len) {
+int pdkim_update_bodyhash(pdkim_ctx *ctx, c
onst c
har *data, int len) {
pdkim_signature *sig = ctx->sig;
/* Cache relaxed version of data */
char *relaxed_data = NULL;
pdkim_signature *sig = ctx->sig;
/* Cache relaxed version of data */
char *relaxed_data = NULL;
@@
-873,14
+872,14
@@
int pdkim_update_bodyhash(pdkim_ctx *ctx, char *data, int len) {
/* Traverse all signatures, updating their hashes. */
while (sig != NULL) {
/* Defaults to simple canon (no further treatment necessary) */
/* Traverse all signatures, updating their hashes. */
while (sig != NULL) {
/* Defaults to simple canon (no further treatment necessary) */
- char *canon_data = data;
- int canon_len = len;
+ c
onst c
har *canon_data = data;
+ int
canon_len = len;
if (sig->canon_body == PDKIM_CANON_RELAXED) {
/* Relax the line if not done already */
if (relaxed_data == NULL) {
int seen_wsp = 0;
if (sig->canon_body == PDKIM_CANON_RELAXED) {
/* Relax the line if not done already */
if (relaxed_data == NULL) {
int seen_wsp = 0;
- char *p = data;
+ c
onst c
har *p = data;
int q = 0;
relaxed_data = malloc(len+1);
if (relaxed_data == NULL) return PDKIM_ERR_OOM;
int q = 0;
relaxed_data = malloc(len+1);
if (relaxed_data == NULL) return PDKIM_ERR_OOM;
@@
-1481,7
+1480,7
@@
DLLEXPORT int pdkim_feed_finish(pdkim_ctx *ctx, pdkim_signature **return_signatu
if (ctx->mode == PDKIM_MODE_SIGN) {
rsa_context rsa;
if (ctx->mode == PDKIM_MODE_SIGN) {
rsa_context rsa;
- rsa_init(&rsa,RSA_PKCS_V15,0
,NULL,NULL
);
+ rsa_init(&rsa,RSA_PKCS_V15,0);
/* Perform private key operation */
if (rsa_parse_key(&rsa, (unsigned char *)sig->rsa_privkey,
/* Perform private key operation */
if (rsa_parse_key(&rsa, (unsigned char *)sig->rsa_privkey,
@@
-1520,7
+1519,7
@@
DLLEXPORT int pdkim_feed_finish(pdkim_ctx *ctx, pdkim_signature **return_signatu
rsa_context rsa;
char *dns_txt_name, *dns_txt_reply;
rsa_context rsa;
char *dns_txt_name, *dns_txt_reply;
- rsa_init(&rsa,RSA_PKCS_V15,0
,NULL,NULL
);
+ rsa_init(&rsa,RSA_PKCS_V15,0);
dns_txt_name = malloc(PDKIM_DNS_TXT_MAX_NAMELEN);
if (dns_txt_name == NULL) return PDKIM_ERR_OOM;
dns_txt_name = malloc(PDKIM_DNS_TXT_MAX_NAMELEN);
if (dns_txt_name == NULL) return PDKIM_ERR_OOM;