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
Added bool_lax{} expansion operator, which uses Router condition logic to
[exim.git]
/
src
/
src
/
pdkim
/
pdkim.c
diff --git
a/src/src/pdkim/pdkim.c
b/src/src/pdkim/pdkim.c
index d2eaecc02908b3cc52730303a270eab9b6332a7b..fa5d88d599927fd11a41f78b90587c94ae804475 100644
(file)
--- a/
src/src/pdkim/pdkim.c
+++ b/
src/src/pdkim/pdkim.c
@@
-20,7
+20,7
@@
* 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.1
1 2009/11/23 12:34:51
nm4 Exp $ */
+/* $Cambridge: exim/src/src/pdkim/pdkim.c,v 1.1
4 2010/05/29 19:14:06
nm4 Exp $ */
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
@@
-211,6
+211,7
@@
pdkim_str *pdkim_strnew (char *cstr) {
p->allocated=(len+1);
p->len=len;
if (cstr) strcpy(p->str,cstr);
p->allocated=(len+1);
p->len=len;
if (cstr) strcpy(p->str,cstr);
+ else p->str[p->len] = '\0';
return p;
}
char *pdkim_strncat(pdkim_str *str, char *data, int len) {
return p;
}
char *pdkim_strncat(pdkim_str *str, char *data, int len) {
@@
-822,7
+823,7
@@
pdkim_pubkey *pdkim_parse_pubkey_record(pdkim_ctx *ctx, char *raw_record) {
pub->srvtype = strdup(cur_val->str);
break;
case 't':
pub->srvtype = strdup(cur_val->str);
break;
case 't':
- if (strchr(cur_val->str,'
t
') != NULL) pub->testing = 1;
+ if (strchr(cur_val->str,'
y
') != NULL) pub->testing = 1;
if (strchr(cur_val->str,'s') != NULL) pub->no_subdomaining = 1;
break;
default:
if (strchr(cur_val->str,'s') != NULL) pub->no_subdomaining = 1;
break;
default:
@@
-1494,7
+1495,7
@@
DLLEXPORT int pdkim_feed_finish(pdkim_ctx *ctx, pdkim_signature **return_signatu
if (rsa_pkcs1_sign( &rsa, RSA_PRIVATE,
((sig->algo == PDKIM_ALGO_RSA_SHA1)?
if (rsa_pkcs1_sign( &rsa, RSA_PRIVATE,
((sig->algo == PDKIM_ALGO_RSA_SHA1)?
-
RSA_SHA1:
RSA_SHA256),
+
SIG_RSA_SHA1:SIG_
RSA_SHA256),
0,
(unsigned char *)headerhash,
(unsigned char *)sig->sigdata ) != 0) {
0,
(unsigned char *)headerhash,
(unsigned char *)sig->sigdata ) != 0) {
@@
-1588,7
+1589,7
@@
DLLEXPORT int pdkim_feed_finish(pdkim_ctx *ctx, pdkim_signature **return_signatu
if (rsa_pkcs1_verify(&rsa,
RSA_PUBLIC,
((sig->algo == PDKIM_ALGO_RSA_SHA1)?
if (rsa_pkcs1_verify(&rsa,
RSA_PUBLIC,
((sig->algo == PDKIM_ALGO_RSA_SHA1)?
-
RSA_SHA1:
RSA_SHA256),
+
SIG_RSA_SHA1:SIG_
RSA_SHA256),
0,
(unsigned char *)headerhash,
(unsigned char *)sig->sigdata) != 0) {
0,
(unsigned char *)headerhash,
(unsigned char *)sig->sigdata) != 0) {