1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp
--- libdkim.orig/src/libdkimtest.cpp 2009-03-13 16:17:45.000000000 -0500
+++ libdkim/src/libdkimtest.cpp 2009-03-13 16:26:02.000000000 -0500
@@ -55,8 +55,23 @@
return 0;
}
+void usage()
+{
-
+ printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@yourdomain.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n");
+ printf( "-b<standard> allman , ietf or both\n");
+ printf( "-c<canonicalization> r for relaxed [DEFAULT], s - simple, t relaxed/simple, u - simple/relaxed\n");
+ printf( "-d<domain> the domain tag, if not provided it will be determined from the sender/from header\n");
+ printf( "-l include body length tag\n");
+ printf( "-h this help\n");
+ printf( "-i<identity> the identity, if not provided it will not be included\n");
+ printf( "-s sign the message\n");
+ printf( "-t include a timestamp tag\n");
+ printf( "-v verify the message\n");
+ printf( "-x<expire_time> the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t if set to - then it will not be included");
+ printf( "-z<hash> 1 for sha1, 2 for sha256, 3 for both\n");
+ printf( "-y<selector> the selector tag DEFAULT=MDaemon\n");
+}
int main(int argc, char* argv[])
{
int n;
@@ -77,7 +92,7 @@
time(&t);
opts.nCanon = DKIM_SIGN_RELAXED;
- opts.nIncludeBodyLengthTag = 1;
+ opts.nIncludeBodyLengthTag = 0;
opts.nIncludeQueryMethod = 0;
opts.nIncludeTimeStamp = 0;
opts.expireTime = t + 604800; // expires in 1 week
@@ -92,6 +107,11 @@
int nArgParseState = 0;
bool bSign = true;
+ if(argc<2){
+ usage();
+ exit(1);
+ }
+
for( n = 1; n < argc; n++ )
{
if( argv[n][0] == '-' && strlen(argv[n]) > 1 )
@@ -121,14 +141,16 @@
}
break;
-
+ case 'd':
+ strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1);
+ break;
case 'l': // body length tag
opts.nIncludeBodyLengthTag = 1;
break;
case 'h':
- printf( "usage: \n" );
+ usage();
return 0;
case 'i': // identity
@@ -138,7 +160,7 @@
}
else
{
- strcpy( opts.szIdentity, argv[n] + 2 );
+ strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 );
}
break;
@@ -169,6 +191,9 @@
}
break;
+ case 'y':
+ strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1);
+ break;
case 'z': // sign w/ sha1, sha256 or both
opts.nHash = atoi( &argv[n][2] );
|
GitWeb