-
Notifications
You must be signed in to change notification settings - Fork 11
/
djbdns-1.05-dnssec.patch
1749 lines (1682 loc) · 58.9 KB
/
djbdns-1.05-dnssec.patch
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
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
(C) 2012 Peter Conrad <conrad@quisquis.de>
This patch is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff -rNU3 djbdns-1.05.tds-base/axfrdns.c djbdns-1.05.tinydnssec/axfrdns.c
--- djbdns-1.05.tds-base/axfrdns.c 2012-12-06 22:45:38.000000000 +0100
+++ djbdns-1.05.tinydnssec/axfrdns.c 2012-12-06 22:39:13.000000000 +0100
@@ -23,6 +23,7 @@
#include "response.h"
#include "ip6.h"
#include "clientloc.h"
+#include "edns0.h"
extern int respond(char *,char *,char *);
@@ -346,6 +347,9 @@
if (byte_diff(qclass,2,DNS_C_IN) && byte_diff(qclass,2,DNS_C_ANY))
strerr_die2x(111,FATAL,"bogus query: bad class");
+ pos = check_edns0(header, buf, len, pos);
+ if (!pos) die_truncated();
+
qlog(ip,port,header,zone,qtype," ");
if (byte_equal(qtype,2,DNS_T_AXFR)) {
diff -rNU3 djbdns-1.05.tds-base/base32hex.c djbdns-1.05.tinydnssec/base32hex.c
--- djbdns-1.05.tds-base/base32hex.c 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05.tinydnssec/base32hex.c 2012-12-06 22:39:13.000000000 +0100
@@ -0,0 +1,79 @@
+/* (C) 2012 Peter Conrad <conrad@quisquis.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "base32hex.h"
+
+#define to_32hex(c) ((c) < 10 ? (c) + '0' : (c) + 'a' - 10)
+
+/* out must point to a buffer of at least (len * 8 / 5) + 1 bytes.
+ * Encoded string is *not* padded.
+ * See RFC-4648. This implementation produces lowercase hex characters.
+ * Returns length of encoded string.
+ */
+unsigned int base32hex(char *out, uint8_t *in, unsigned int len) {
+int buf = 0, bits = 0;
+char *x = out;
+
+ while (len-- > 0) {
+ buf <<= 8;
+ buf |= *in++;
+ bits += 8;
+ while (bits >= 5) {
+ char c = (buf >> (bits - 5)) & 0x1f;
+ *x++ = to_32hex(c);
+ bits -= 5;
+ }
+ }
+ if (bits > 0) {
+ char c = (buf << (5 - bits)) & 0x1f;
+ *x++ = to_32hex(c);
+ }
+ return x - out;
+}
+
+#ifdef TEST
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void test(char *in, char *expected, int explen) {
+char buf[255];
+int r;
+
+ if ((r = base32hex(buf, in, strlen(in))) != explen) {
+ printf("Failed: b32h('%s') yields %d chars (expected %d)\n",
+ in, r, explen);
+ exit(1);
+ }
+ if (strncmp(buf, expected, r)) {
+ buf[r] = 0;
+ printf("Failed: b32h('%s') = '%s' (expected %s)\n",
+ in, buf, expected);
+ exit(1);
+ }
+}
+
+int main(int argc, char **argv) {
+ test("", "", 0);
+ test("f", "co", 2);
+ test("fo", "cpng", 4);
+ test("foo", "cpnmu", 5);
+ test("foob", "cpnmuog", 7);
+ test("fooba", "cpnmuoj1", 8);
+ test("foobar", "cpnmuoj1e8", 10);
+ printf("Success!\n");
+}
+
+#endif
diff -rNU3 djbdns-1.05.tds-base/base32hex.h djbdns-1.05.tinydnssec/base32hex.h
--- djbdns-1.05.tds-base/base32hex.h 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05.tinydnssec/base32hex.h 2012-12-06 22:39:13.000000000 +0100
@@ -0,0 +1,23 @@
+/* (C) 2012 Peter Conrad <conrad@quisquis.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BASE32_HEX_H
+#define _BASE32_HEX_H
+
+#include <stdint.h>
+
+extern unsigned int base32hex(char *out, uint8_t *in, unsigned int len);
+
+#endif
diff -rNU3 djbdns-1.05.tds-base/dns.h djbdns-1.05.tinydnssec/dns.h
--- djbdns-1.05.tds-base/dns.h 2012-12-06 22:45:38.000000000 +0100
+++ djbdns-1.05.tinydnssec/dns.h 2012-12-06 22:39:13.000000000 +0100
@@ -20,8 +20,17 @@
#define DNS_T_SIG "\0\30"
#define DNS_T_KEY "\0\31"
#define DNS_T_AAAA "\0\34"
+#define DNS_T_OPT "\0\51"
+#define DNS_T_DS "\0\53"
+#define DNS_T_RRSIG "\0\56"
+#define DNS_T_DNSKEY "\0\60"
+#define DNS_T_NSEC3 "\0\62"
+#define DNS_T_NSEC3PARAM "\0\63"
#define DNS_T_AXFR "\0\374"
#define DNS_T_ANY "\0\377"
+/* Pseudo-RRs for DNSSEC */
+#define DNS_T_HASHREF "\377\1"
+#define DNS_T_HASHLIST "\377\2"
struct dns_transmit {
char *query; /* 0, or dynamically allocated */
diff -rNU3 djbdns-1.05.tds-base/edns0.c djbdns-1.05.tinydnssec/edns0.c
--- djbdns-1.05.tds-base/edns0.c 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05.tinydnssec/edns0.c 2012-12-06 22:39:13.000000000 +0100
@@ -0,0 +1,45 @@
+/* (C) 2012 Peter Conrad <conrad@quisquis.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dns.h"
+#include "edns0.h"
+#include "response.h"
+#include "uint16.h"
+
+unsigned int check_edns0(const char header[12], const char *buf, const int len, unsigned int pos)
+{
+char opt_class[2];
+char opt_ttl[4];
+
+ max_response_len = 512;
+ do_dnssec = 0;
+ if (!header[6] && !header[7] && !header[8] && !header[9]
+ && !header[10] && header[11] == 1) {
+ char nametype[3];
+ uint16 size, min_len;
+ pos = dns_packet_copy(buf,len,pos,nametype,3); if (!pos) return pos;
+ if (nametype[0] || nametype[1] || nametype[2] != DNS_T_OPT[1]) return pos;
+ pos = dns_packet_copy(buf,len,pos,opt_class,2); if (!pos) return pos;
+ pos = dns_packet_copy(buf,len,pos,opt_ttl,4); if (!pos) return pos;
+ if (opt_ttl[0]) return pos; // unsupported RCODE in query
+ if (opt_ttl[1]) return pos; // unsupported version
+ do_dnssec = opt_ttl[2] & 0x80;
+ uint16_unpack_big(opt_class, &size);
+ min_len = do_dnssec ? 1220 : 512;
+ max_response_len = size > 4000 ? 4000 : size;
+ if (max_response_len < min_len) { max_response_len = min_len; }
+ }
+ return pos;
+}
diff -rNU3 djbdns-1.05.tds-base/edns0.h djbdns-1.05.tinydnssec/edns0.h
--- djbdns-1.05.tds-base/edns0.h 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05.tinydnssec/edns0.h 2012-12-06 22:39:13.000000000 +0100
@@ -0,0 +1,22 @@
+/* (C) 2012 Peter Conrad <conrad@quisquis.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _EDNS0_H
+
+#define _EDNS0_H
+
+extern unsigned int check_edns0(const char *, const char *, const int, unsigned int);
+
+#endif
diff -rNU3 djbdns-1.05.tds-base/Makefile djbdns-1.05.tinydnssec/Makefile
--- djbdns-1.05.tds-base/Makefile 2012-12-06 22:45:45.000000000 +0100
+++ djbdns-1.05.tinydnssec/Makefile 2012-12-07 11:07:23.000000000 +0100
@@ -53,10 +53,10 @@
axfrdns: \
load axfrdns.o iopause.o droproot.o tdlookup.o response.o qlog.o \
prot.o timeoutread.o timeoutwrite.o clientloc.o dns.a libtai.a alloc.a env.a \
-cdb.a buffer.a unix.a byte.a
+cdb.a buffer.a unix.a byte.a sha1.o base32hex.o edns0.o
./load axfrdns iopause.o droproot.o tdlookup.o response.o \
qlog.o prot.o timeoutread.o timeoutwrite.o clientloc.o dns.a libtai.a \
- alloc.a env.a cdb.a buffer.a unix.a byte.a
+ alloc.a env.a cdb.a buffer.a unix.a byte.a sha1.o base32hex.o edns0.o
axfrdns-conf: \
load axfrdns-conf.o generic-conf.o auto_home.o buffer.a unix.a byte.a
@@ -76,6 +76,10 @@
response.h uint32.h clientloc.h
./compile axfrdns.c
+base32hex.o: \
+compile base32hex.c base32hex.h
+ ./compile base32hex.c
+
buffer.a: \
makelib buffer.o buffer_1.o buffer_2.o buffer_copy.o buffer_get.o \
buffer_put.o strerr_die.o strerr_sys.o
@@ -454,10 +458,11 @@
dnsq: \
load dnsq.o iopause.o printrecord.o printpacket.o parsetype.o dns.a \
-env.a libtai.a buffer.a alloc.a unix.a byte.a socket.lib
+env.a libtai.a buffer.a alloc.a unix.a byte.a socket.lib printtype.o \
+base32hex.o
./load dnsq iopause.o printrecord.o printpacket.o \
parsetype.o dns.a env.a libtai.a buffer.a alloc.a unix.a \
- byte.a `cat socket.lib`
+ byte.a `cat socket.lib` printtype.o base32hex.o
dnsq.o: \
compile dnsq.c uint16.h strerr.h buffer.h scan.h str.h byte.h error.h \
@@ -467,10 +472,11 @@
dnsqr: \
load dnsqr.o iopause.o printrecord.o printpacket.o parsetype.o dns.a \
-env.a libtai.a buffer.a alloc.a unix.a byte.a socket.lib
+env.a libtai.a buffer.a alloc.a unix.a byte.a socket.lib printtype.o \
+base32hex.o
./load dnsqr iopause.o printrecord.o printpacket.o \
parsetype.o dns.a env.a libtai.a buffer.a alloc.a unix.a \
- byte.a `cat socket.lib`
+ byte.a `cat socket.lib` printtype.o base32hex.o
dnsqr.o: \
compile dnsqr.c uint16.h strerr.h buffer.h scan.h str.h byte.h \
@@ -480,10 +486,10 @@
dnstrace: \
load dnstrace.o dd.o iopause.o printrecord.o parsetype.o dns.a env.a \
-libtai.a alloc.a buffer.a unix.a byte.a socket.lib
+libtai.a alloc.a buffer.a unix.a byte.a socket.lib printtype.o base32hex.o
./load dnstrace dd.o iopause.o printrecord.o parsetype.o \
dns.a env.a libtai.a alloc.a buffer.a unix.a byte.a `cat \
- socket.lib`
+ socket.lib` printtype.o base32hex.o
dnstrace.o: \
compile dnstrace.c uint16.h uint32.h fmt.h str.h byte.h ip4.h \
@@ -514,6 +520,10 @@
compile droproot.c env.h scan.h prot.h strerr.h
./compile droproot.c
+edns0.o: \
+compile edns0.c edns0.h uint16.h dns.h response.h iopause.h taia.h uint64.h
+ ./compile edns0.c
+
env.a: \
makelib env.o
./makelib env.a env.o
@@ -689,10 +699,10 @@
pickdns: \
load pickdns.o server.o iopause.o response.o droproot.o qlog.o prot.o dns.a \
-env.a libtai.a cdb.a alloc.a buffer.a unix.a byte.a socket.lib
+env.a libtai.a cdb.a alloc.a buffer.a unix.a byte.a socket.lib edns0.o
./load pickdns server.o iopause.o response.o droproot.o qlog.o \
prot.o dns.a env.a libtai.a cdb.a alloc.a buffer.a unix.a \
- byte.a `cat socket.lib`
+ byte.a `cat socket.lib` edns0.o
pickdns-conf: \
load pickdns-conf.o generic-conf.o auto_home.o buffer.a unix.a byte.a
@@ -725,15 +735,19 @@
printpacket.o: \
compile printpacket.c uint16.h uint32.h error.h byte.h dns.h \
stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h taia.h \
-printrecord.h stralloc.h printpacket.h stralloc.h
+printrecord.h stralloc.h printpacket.h stralloc.h printtype.h
./compile printpacket.c
printrecord.o: \
compile printrecord.c uint16.h uint32.h error.h byte.h dns.h \
stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h taia.h \
-printrecord.h stralloc.h
+printrecord.h stralloc.h printtype.h
./compile printrecord.c
+printtype.o: \
+compile printtype.c printtype.h dns.h stralloc.h byte.h uint16.h iopause.h taia.h uint64.h
+ ./compile printtype.c
+
prog: \
dnscache-conf dnscache walldns-conf walldns rbldns-conf rbldns \
rbldns-data pickdns-conf pickdns pickdns-data tinydns-conf tinydns \
@@ -767,10 +781,10 @@
rbldns: \
load rbldns.o server.o iopause.o response.o dd.o droproot.o qlog.o prot.o dns.a \
-env.a libtai.a cdb.a alloc.a buffer.a unix.a byte.a socket.lib
+env.a libtai.a cdb.a alloc.a buffer.a unix.a byte.a socket.lib edns0.o
./load rbldns server.o iopause.o response.o dd.o droproot.o qlog.o \
prot.o dns.a env.a libtai.a cdb.a alloc.a buffer.a unix.a \
- byte.a `cat socket.lib`
+ byte.a `cat socket.lib` edns0.o
rbldns-conf: \
load rbldns-conf.o generic-conf.o auto_home.o buffer.a unix.a byte.a
@@ -840,7 +854,7 @@
compile server.c byte.h case.h env.h buffer.h strerr.h ip4.h uint16.h \
ndelay.h socket.h uint16.h droproot.h qlog.h uint16.h response.h \
uint32.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h \
-taia.h iopause.h alloc.h str.h
+taia.h iopause.h alloc.h str.h edns0.h
./compile server.c
setup: \
@@ -931,6 +945,10 @@
cp /dev/null haven2i.h
./choose cL tryn2i haven2i.h1 haven2i.h2 socket > haven2i.h
+sha1.o: \
+compile sha1.c sha1.h
+ ./compile sha1.c
+
str_chr.o: \
compile str_chr.c str.h
./compile str_chr.c
@@ -1072,7 +1090,7 @@
tdlookup.o: \
compile tdlookup.c uint16.h open.h tai.h uint64.h cdb.h uint32.h \
byte.h case.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h \
-taia.h seek.h response.h uint32.h ip6.h clientloc.h
+taia.h seek.h response.h uint32.h ip6.h clientloc.h sha1.h base32hex.h
./compile tdlookup.c
timeoutread.o: \
@@ -1088,10 +1106,10 @@
tinydns: \
load tinydns.o server.o iopause.o droproot.o tdlookup.o response.o qlog.o \
prot.o clientloc.o dns.a libtai.a env.a cdb.a alloc.a buffer.a unix.a byte.a \
-socket.lib
+socket.lib sha1.o base32hex.o edns0.o
./load tinydns server.o iopause.o droproot.o tdlookup.o response.o \
qlog.o prot.o clientloc.o dns.a libtai.a env.a cdb.a alloc.a buffer.a \
- unix.a byte.a `cat socket.lib`
+ unix.a byte.a `cat socket.lib` sha1.o base32hex.o edns0.o
tinydns-conf: \
load tinydns-conf.o generic-conf.o auto_home.o buffer.a unix.a byte.a
@@ -1126,11 +1144,12 @@
./compile tinydns-edit.c
tinydns-get: \
-load tinydns-get.o tdlookup.o response.o printpacket.o printrecord.o \
-parsetype.o clientloc.o dns.a libtai.a cdb.a buffer.a alloc.a unix.a byte.a
+load tinydns-get.o tdlookup.o sha1.o response.o printpacket.o printrecord.o \
+parsetype.o clientloc.o dns.a libtai.a cdb.a buffer.a alloc.a unix.a byte.a \
+base32hex.o printtype.o
./load tinydns-get tdlookup.o response.o printpacket.o \
printrecord.o parsetype.o clientloc.o dns.a libtai.a cdb.a buffer.a \
- alloc.a unix.a byte.a
+ alloc.a unix.a byte.a sha1.o base32hex.o printtype.o
tinydns-get.o: \
compile tinydns-get.c str.h byte.h scan.h exit.h stralloc.h \
@@ -1198,10 +1217,10 @@
walldns: \
load walldns.o server.o iopause.o response.o droproot.o qlog.o prot.o dd.o \
-dns.a env.a cdb.a alloc.a buffer.a unix.a byte.a socket.lib
+dns.a env.a cdb.a alloc.a buffer.a unix.a byte.a socket.lib edns0.o
./load walldns server.o iopause.o response.o droproot.o qlog.o \
prot.o dd.o dns.a libtai.a env.a cdb.a alloc.a buffer.a unix.a \
- byte.a `cat socket.lib`
+ byte.a `cat socket.lib` edns0.o
walldns-conf: \
load walldns-conf.o generic-conf.o auto_home.o buffer.a unix.a byte.a
@@ -1227,4 +1246,4 @@
./choose c trysa6 sockaddr_in6.h1 sockaddr_in6.h2 > sockaddr_in6.h
clean:
- rm -f `cat TARGETS`
+ rm -f `cat TARGETS` data data.cdb test/[ot]*
diff -rNU3 djbdns-1.05.tds-base/parsetype.c djbdns-1.05.tinydnssec/parsetype.c
--- djbdns-1.05.tds-base/parsetype.c 2001-02-11 22:11:45.000000000 +0100
+++ djbdns-1.05.tinydnssec/parsetype.c 2012-12-06 22:39:13.000000000 +0100
@@ -24,6 +24,8 @@
else if (case_equals(s,"key")) byte_copy(type,2,DNS_T_KEY);
else if (case_equals(s,"aaaa")) byte_copy(type,2,DNS_T_AAAA);
else if (case_equals(s,"axfr")) byte_copy(type,2,DNS_T_AXFR);
+ else if (case_equals(s,"dnskey")) byte_copy(type,2,DNS_T_DNSKEY);
+ else if (case_equals(s,"ds")) byte_copy(type,2,DNS_T_DS);
else
return 0;
diff -rNU3 djbdns-1.05.tds-base/printpacket.c djbdns-1.05.tinydnssec/printpacket.c
--- djbdns-1.05.tds-base/printpacket.c 2001-02-11 22:11:45.000000000 +0100
+++ djbdns-1.05.tinydnssec/printpacket.c 2012-12-06 22:39:13.000000000 +0100
@@ -5,6 +5,7 @@
#include "dns.h"
#include "printrecord.h"
#include "printpacket.h"
+#include "printtype.h"
static char *d;
@@ -67,8 +68,7 @@
X("weird class")
}
else {
- uint16_unpack_big(data,&type);
- NUM(type)
+ if (!printtype(out,data)) return 0;
X(" ")
if (!dns_domain_todot_cat(out,d)) return 0;
}
diff -rNU3 djbdns-1.05.tds-base/printrecord.c djbdns-1.05.tinydnssec/printrecord.c
--- djbdns-1.05.tds-base/printrecord.c 2012-12-06 22:45:38.000000000 +0100
+++ djbdns-1.05.tinydnssec/printrecord.c 2012-12-06 22:39:13.000000000 +0100
@@ -5,9 +5,25 @@
#include "dns.h"
#include "printrecord.h"
#include "ip6.h"
+#include "base32hex.h"
+#include "printtype.h"
static char *d;
+static const char *HEX = "0123456789ABCDEF";
+
+static int hexout(stralloc *out,const char *buf,unsigned int len,unsigned int pos,unsigned int n) {
+ unsigned char c;
+ int i;
+
+ for (i = 0; i < n; i++) {
+ pos = dns_packet_copy(buf,len,pos,&c,1); if (!pos) return 0;
+ if (!stralloc_catb(out,&HEX[(c>>4)&0xf],1)) return 0;
+ if (!stralloc_catb(out,&HEX[c&0xf],1)) return 0;
+ }
+ return pos;
+}
+
unsigned int printrecord_cat(stralloc *out,const char *buf,unsigned int len,unsigned int pos,const char *q,const char qtype[2])
{
const char *x;
@@ -18,6 +34,7 @@
unsigned int newpos;
int i;
unsigned char ch;
+ int rawlen;
pos = dns_packet_getname(buf,len,pos,&d); if (!pos) return 0;
pos = dns_packet_copy(buf,len,pos,misc,10); if (!pos) return 0;
@@ -33,15 +50,20 @@
if (!dns_domain_todot_cat(out,d)) return 0;
if (!stralloc_cats(out," ")) return 0;
- uint32_unpack_big(misc + 4,&u32);
- if (!stralloc_catulong0(out,u32,0)) return 0;
+ if (byte_diff(misc,2,DNS_T_OPT)) {
+ uint32_unpack_big(misc + 4,&u32);
+ if (!stralloc_catulong0(out,u32,0)) return 0;
- if (byte_diff(misc + 2,2,DNS_C_IN)) {
- if (!stralloc_cats(out," weird class\n")) return 0;
- return newpos;
+ if (byte_diff(misc + 2,2,DNS_C_IN)) {
+ if (!stralloc_cats(out," weird class\n")) return 0;
+ return newpos;
+ }
+ } else {
+ if (!stralloc_cats(out,"0")) return 0;
}
x = 0;
+ rawlen = 0;
if (byte_equal(misc,2,DNS_T_NS)) x = " NS ";
if (byte_equal(misc,2,DNS_T_PTR)) x = " PTR ";
if (byte_equal(misc,2,DNS_T_CNAME)) x = " CNAME ";
@@ -92,12 +114,111 @@
stringlen=ip6_fmt(ip6str,misc);
if (!stralloc_catb(out,ip6str,stringlen)) return 0;
}
+ else if (byte_equal(misc,2,DNS_T_DNSKEY)) {
+ pos = dns_packet_copy(buf,len,pos,misc,4); if (!pos) return 0;
+ if (!stralloc_cats(out," DNSKEY ")) return 0;
+ uint16_unpack_big(misc,&u16);
+ if (!stralloc_catulong0(out,u16,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[2],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[3],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ rawlen = datalen - 4;
+ }
+ else if (byte_equal(misc,2,DNS_T_DS)) {
+ pos = dns_packet_copy(buf,len,pos,misc,4); if (!pos) return 0;
+ if (!stralloc_cats(out," DS ")) return 0;
+ uint16_unpack_big(misc,&u16);
+ if (!stralloc_catulong0(out,u16,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[2],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[3],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ pos = hexout(out,buf,len,pos,datalen - 4); if (!pos) return 0;
+ }
+ else if (byte_equal(misc,2,DNS_T_RRSIG)) {
+ pos = dns_packet_copy(buf,len,pos,misc,18); if (!pos) return 0;
+ if (!stralloc_cats(out," RRSIG ")) return 0;
+ if (!printtype(out,misc)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[2],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[3],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ uint32_unpack_big(misc + 4,&u32);
+ if (!stralloc_catulong0(out,u32,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ uint32_unpack_big(misc + 8,&u32);
+ if (!stralloc_catulong0(out,u32,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ uint32_unpack_big(misc + 12,&u32);
+ if (!stralloc_catulong0(out,u32,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ uint16_unpack_big(misc + 16,&u16);
+ if (!stralloc_catulong0(out,u16,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ rawlen = dns_packet_getname(buf,len,pos,&d); if (!pos) return 0;
+ rawlen = datalen - 18 - (rawlen - pos);
+ pos += datalen - 18 - rawlen;
+ if (!dns_domain_todot_cat(out,d)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ }
+ else if (byte_equal(misc,2,DNS_T_NSEC3)) {
+ char nextHash[255];
+ char nextOwner[255*8/5];
+ int j;
+ pos = dns_packet_copy(buf,len,pos,misc,5); if (!pos) return 0;
+ if (!stralloc_cats(out," NSEC3 ")) return 0;
+ if (!stralloc_catulong0(out,misc[0],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[1],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ uint16_unpack_big(misc+2,&u16);
+ if (!stralloc_catulong0(out,u16,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!misc[4])
+ if (!stralloc_cats(out,"-")) return 0;
+ pos = hexout(out,buf,len,pos,misc[4]); if (!pos) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ pos = dns_packet_copy(buf,len,pos,misc,1); if (!pos) return 0;
+ pos = dns_packet_copy(buf,len,pos,nextHash,misc[0]); if (!pos) return 0;
+ i = base32hex(nextOwner, nextHash, misc[0]);
+ if (!stralloc_catb(out,nextOwner,i)) return 0;
+ while (pos < newpos) {
+ pos = dns_packet_copy(buf,len,pos,misc,2); if (!pos) return 0;
+ pos = dns_packet_copy(buf,len,pos,nextHash,misc[1]); if (!pos) return 0;
+ j = 8 * misc[1];
+ for (i = 0; i < j; i++) {
+ if (nextHash[i/8] & (1 << (7 - (i%8)))) {
+ misc[1] = i;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!printtype(out,misc)) return 0;
+ }
+ }
+ }
+ }
+ else if (byte_equal(misc,2,DNS_T_OPT)) {
+ if (!stralloc_cats(out," OPT ")) return 0;
+ uint16_unpack_big(misc+2, &u16);
+ if (!stralloc_catulong0(out,u16,0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[4],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!stralloc_catulong0(out,misc[5],0)) return 0;
+ if (!stralloc_cats(out," ")) return 0;
+ if (!hexout(out,misc,8,6,2)) return 0;
+ rawlen = datalen;
+ }
else {
if (!stralloc_cats(out," ")) return 0;
uint16_unpack_big(misc,&u16);
if (!stralloc_catulong0(out,u16,0)) return 0;
if (!stralloc_cats(out," ")) return 0;
- while (datalen--) {
+ rawlen = datalen;
+ }
+ while (rawlen--) {
pos = dns_packet_copy(buf,len,pos,misc,1); if (!pos) return 0;
if ((misc[0] >= 33) && (misc[0] <= 126) && (misc[0] != '\\')) {
if (!stralloc_catb(out,misc,1)) return 0;
@@ -111,7 +232,6 @@
if (!stralloc_catb(out,misc,4)) return 0;
}
}
- }
if (!stralloc_cats(out,"\n")) return 0;
if (pos != newpos) { errno = error_proto; return 0; }
diff -rNU3 djbdns-1.05.tds-base/printtype.c djbdns-1.05.tinydnssec/printtype.c
--- djbdns-1.05.tds-base/printtype.c 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05.tinydnssec/printtype.c 2012-12-06 22:39:13.000000000 +0100
@@ -0,0 +1,47 @@
+/* (C) 2012 Peter Conrad <conrad@quisquis.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "byte.h"
+#include "dns.h"
+#include "uint16.h"
+#include "printtype.h"
+
+int printtype(stralloc *out, const char type[2]) {
+uint16 u16;
+
+ if (byte_equal(type,2,DNS_T_A)) return stralloc_cats(out,"A");
+ if (byte_equal(type,2,DNS_T_NS)) return stralloc_cats(out,"NS");
+ if (byte_equal(type,2,DNS_T_CNAME)) return stralloc_cats(out,"CNAME");
+ if (byte_equal(type,2,DNS_T_SOA)) return stralloc_cats(out,"SOA");
+ if (byte_equal(type,2,DNS_T_PTR)) return stralloc_cats(out,"PTR");
+ if (byte_equal(type,2,DNS_T_HINFO)) return stralloc_cats(out,"HINFO");
+ if (byte_equal(type,2,DNS_T_MX)) return stralloc_cats(out,"MX");
+ if (byte_equal(type,2,DNS_T_TXT)) return stralloc_cats(out,"TXT");
+ if (byte_equal(type,2,DNS_T_RP)) return stralloc_cats(out,"RP");
+ if (byte_equal(type,2,DNS_T_SIG)) return stralloc_cats(out,"SIG");
+ if (byte_equal(type,2,DNS_T_KEY)) return stralloc_cats(out,"KEY");
+ if (byte_equal(type,2,DNS_T_AAAA)) return stralloc_cats(out,"AAAA");
+ if (byte_equal(type,2,DNS_T_OPT)) return stralloc_cats(out,"OPT");
+ if (byte_equal(type,2,DNS_T_DS)) return stralloc_cats(out,"DS");
+ if (byte_equal(type,2,DNS_T_RRSIG)) return stralloc_cats(out,"RRSIG");
+ if (byte_equal(type,2,DNS_T_DNSKEY)) return stralloc_cats(out,"DNSKEY");
+ if (byte_equal(type,2,DNS_T_NSEC3)) return stralloc_cats(out,"NSEC3");
+ if (byte_equal(type,2,DNS_T_NSEC3PARAM)) return stralloc_cats(out,"NSEC3PARAM");
+ if (byte_equal(type,2,DNS_T_AXFR)) return stralloc_cats(out,"AXFR");
+ if (byte_equal(type,2,DNS_T_ANY)) return stralloc_cats(out,"*");
+
+ uint16_unpack_big(type,&u16);
+ return stralloc_catulong0(out,u16,0);
+}
diff -rNU3 djbdns-1.05.tds-base/printtype.h djbdns-1.05.tinydnssec/printtype.h
--- djbdns-1.05.tds-base/printtype.h 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05.tinydnssec/printtype.h 2012-12-06 22:39:13.000000000 +0100
@@ -0,0 +1,23 @@
+/* (C) 2012 Peter Conrad <conrad@quisquis.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _PRINTTYPE_H
+#define _PRINTTYPE_H
+
+#include "stralloc.h"
+
+extern int printtype(stralloc *, const char *);
+
+#endif
diff -rNU3 djbdns-1.05.tds-base/response.c djbdns-1.05.tinydnssec/response.c
--- djbdns-1.05.tds-base/response.c 2001-02-11 22:11:45.000000000 +0100
+++ djbdns-1.05.tinydnssec/response.c 2012-12-06 22:39:13.000000000 +0100
@@ -5,6 +5,8 @@
char response[65535];
unsigned int response_len = 0; /* <= 65535 */
+unsigned int max_response_len = 0; /* <= 65535 */
+unsigned int do_dnssec = 0;
static unsigned int tctarget;
#define NAMES 100
diff -rNU3 djbdns-1.05.tds-base/response.h djbdns-1.05.tinydnssec/response.h
--- djbdns-1.05.tds-base/response.h 2001-02-11 22:11:45.000000000 +0100
+++ djbdns-1.05.tinydnssec/response.h 2012-12-06 22:39:13.000000000 +0100
@@ -5,6 +5,8 @@
extern char response[];
extern unsigned int response_len;
+extern unsigned int max_response_len;
+extern unsigned int do_dnssec;
extern int response_query(const char *,const char *,const char *);
extern void response_nxdomain(void);
diff -rNU3 djbdns-1.05.tds-base/server.c djbdns-1.05.tinydnssec/server.c
--- djbdns-1.05.tds-base/server.c 2012-12-06 22:45:38.000000000 +0100
+++ djbdns-1.05.tinydnssec/server.c 2012-12-06 22:39:13.000000000 +0100
@@ -1,3 +1,4 @@
+#include "edns0.h"
#include "byte.h"
#include "case.h"
#include "env.h"
@@ -63,6 +64,9 @@
if (header[2] & 126) goto NOTIMP;
if (byte_equal(qtype,2,DNS_T_AXFR)) goto NOTIMP;
+ pos = check_edns0(header, buf, len, pos);
+ if (!pos) goto NOQ;
+
case_lowerb(q,dns_domain_length(q));
if (!respond(q,qtype,ip)) {
qlog(ip,port,header,q,qtype," - ");
@@ -168,7 +172,7 @@
len = socket_recv6(udp53[i],buf,sizeof buf,ip,&port,&ifid);
if (len < 0) continue;
if (!doit()) continue;
- if (response_len > 512) response_tc();
+ if (response_len > max_response_len) response_tc();
socket_send6(udp53[i],response,response_len,ip,port,ifid);
/* may block for buffer space; if it fails, too bad */
}
diff -rNU3 djbdns-1.05.tds-base/sha1.c djbdns-1.05.tinydnssec/sha1.c
--- djbdns-1.05.tds-base/sha1.c 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05.tinydnssec/sha1.c 2012-12-06 22:39:13.000000000 +0100
@@ -0,0 +1,385 @@
+/*
+SHA-1 in C
+By Steve Reid <sreid@sea-to-sky.net>
+100% Public Domain
+
+-----------------
+Modified 7/98
+By James H. Brown <jbrown@burgoyne.com>
+Still 100% Public Domain
+
+Corrected a problem which generated improper hash values on 16 bit machines
+Routine SHA1Update changed from
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
+len)
+to
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
+long len)
+
+The 'len' parameter was declared an int which works fine on 32 bit machines.
+However, on 16 bit machines an int is too small for the shifts being done
+against
+it. This caused the hash function to generate incorrect values if len was
+greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
+
+Since the file IO in main() reads 16K at a time, any file 8K or larger would
+be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+"a"s).
+
+I also changed the declaration of variables i & j in SHA1Update to
+unsigned long from unsigned int for the same reason.
+
+These changes should make no difference to any 32 bit implementations since
+an
+int and a long are the same size in those environments.
+
+--
+I also corrected a few compiler warnings generated by Borland C.
+1. Added #include <process.h> for exit() prototype
+2. Removed unused variable 'j' in SHA1Final
+3. Changed exit(0) to return(0) at end of main.
+
+ALL changes I made can be located by searching for comments containing 'JHB'
+-----------------
+Modified 8/98
+By Steve Reid <sreid@sea-to-sky.net>
+Still 100% public domain
+
+1- Removed #include <process.h> and used return() instead of exit()
+2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
+3- Changed email address from steve@edmweb.com to sreid@sea-to-sky.net
+
+-----------------
+Modified 4/01
+By Saul Kravitz <Saul.Kravitz@celera.com>
+Still 100% PD
+Modified to run on Compaq Alpha hardware.
+
+-----------------
+Modified 07/2002
+By Ralph Giles <giles@ghostscript.com>
+Still 100% public domain
+modified for use with stdint types, autoconf
+code cleanup, removed attribution comments
+switched SHA1Final() argument order for consistency
+use SHA1_ prefix for public api
+move public api to sha1.h
+
+-----------------
+Modified 08/2012
+By Peter Conrad <conrad@quisquis.de>
+Still 100% public domain
+
+Taken from http://svn.ghostscript.com/jbig2dec/trunk/ for inclusion in tinydns
+Added/removed some includes
+Replaced WORDS_BIGENDIAN with BYTE_ORDER == BIG_ENDIAN check
+Test succeeds on x86_64
+*/
+
+/*
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+ A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+ 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+ 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define SHA1HANDSOFF */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <endian.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "sha1.h"
+
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+/* FIXME: can we do this in an endian-proof way? */
+#if BYTE_ORDER == BIG_ENDIAN
+#define blk0(i) block->l[i]
+#else
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+ |(rol(block->l[i],8)&0x00FF00FF))
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+ ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+#ifdef VERBOSE /* SAK */
+void SHAPrintContext(SHA1_CTX *context, char *msg){
+ printf("%s (%d,%d) %x %x %x %x %x\n",
+ msg,
+ context->count[0], context->count[1],
+ context->state[0],
+ context->state[1],
+ context->state[2],
+ context->state[3],
+ context->state[4]);
+}
+#endif /* VERBOSE */
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+{
+ uint32_t a, b, c, d, e;
+ typedef union {
+ uint8_t c[64];
+ uint32_t l[16];
+ } CHAR64LONG16;
+ CHAR64LONG16* block;
+
+#ifdef SHA1HANDSOFF
+ static uint8_t workspace[64];
+ block = (CHAR64LONG16*)workspace;
+ memcpy(block, buffer, 64);
+#else
+ block = (CHAR64LONG16*)buffer;
+#endif
+
+ /* Copy context->state[] to working vars */
+ a = state[0];
+ b = state[1];
+ c = state[2];
+ d = state[3];
+ e = state[4];
+
+ /* 4 rounds of 20 operations each. Loop unrolled. */
+ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+ R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+ R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+ R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+ R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+ R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+ R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+ R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+ R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+ R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+ R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+ R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+ R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+ R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+ R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+ R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+ R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+ R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+ R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+ R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+
+ /* Add the working vars back into context.state[] */
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+ state[4] += e;
+
+ /* Wipe variables */
+ a = b = c = d = e = 0;
+}
+
+
+/* SHA1Init - Initialize new context */
+void SHA1_Init(SHA1_CTX* context)
+{
+ /* SHA1 initialization constants */
+ context->state[0] = 0x67452301;
+ context->state[1] = 0xEFCDAB89;
+ context->state[2] = 0x98BADCFE;
+ context->state[3] = 0x10325476;
+ context->state[4] = 0xC3D2E1F0;