History

20100203-2050

forsyth committed 16 years ago

Commit 4b5b0581 parent 7f513a54 files · +477 −0Browse files

Unified · Split

4 files
  1. libsec/port/mkfile +1 −0
  2. libsec/port/sha2.c +281 −0
  3. libsec/port/sha256block.c +81 −0
  4. libsec/port/sha512block.c +114 −0
libsec/port/mkfile+1−0
@@ -6,6 +6,7 @@ CFILES = des.c desmodes.c desECB.c desCBC.c des3ECB.c des3CBC.c\ · 5 unmodified lines
66 aes.c blowfish.c \
77 idea.c \
88 hmac.c md5.c md5block.c md4.c sha1.c sha1block.c\
9+ sha2.c sha256block.c sha512block.c\
910 sha1pickle.c md5pickle.c\
1011 rc4.c\
1112 genrandom.c prng.c fastrand.c nfastrand.c\
libsec/port/sha2.c+281−0
@@ -0,0 +1,281 @@
1+#include "os.h"
2+#include <libsec.h>
3+
4+extern void _sha256block(SHA256state*, uchar*);
5+extern void _sha512block(SHA512state*, uchar*);
6+
7+u32int sha224h0[] = {
8+0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
9+0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4,
10+};
11+u32int sha256h0[] = {
12+0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
13+0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
14+};
15+
16+u64int sha384h0[] = {
17+0xcbbb9d5dc1059ed8ULL, 0x629a292a367cd507ULL, 0x9159015a3070dd17ULL, 0x152fecd8f70e5939ULL,
18+0x67332667ffc00b31ULL, 0x8eb44a8768581511ULL, 0xdb0c2e0d64f98fa7ULL, 0x47b5481dbefa4fa4ULL,
19+};
20+u64int sha512h0[] = {
21+0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
22+0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL, 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL,
23+};
24+
25+
26+static SHA256state *
27+sha256init(void)
28+{
29+ SHA256state *s;
30+
31+ s = malloc(sizeof(*s));
32+ if(s == nil)
33+ return nil;
34+ s->malloced = 1;
35+ s->seeded = 0;
36+ s->len = 0;
37+ s->blen = 0;
38+
39+ return s;
40+}
41+
42+static void
43+p32(u32int v, uchar *p)
44+{
45+ p[0] = v>>24;
46+ p[1] = v>>16;
47+ p[2] = v>>8;
48+ p[3] = v>>0;
49+}
50+
51+static void
52+p64(u64int v, uchar *p)
53+{
54+ p32(v>>32, p);
55+ p32(v, p+4);
56+}
57+
58+enum {
59+ HI = 0,
60+ LO = 1,
61+};
62+static void
63+p128(u64int v[2], uchar *p)
64+{
65+ p64(v[HI], p);
66+ p64(v[LO], p+8);
67+}
68+
69+static void
70+uvvadd(u64int v[2], int n)
71+{
72+ v[LO] += n;
73+ if(v[LO] < n) /* overflow */
74+ v[HI]++;
75+}
76+
77+static void
78+uvvmult8(u64int v[2])
79+{
80+ v[HI] = (v[HI]<<3) | (v[LO] >> (64-3));
81+ v[LO] <<= 3;
82+}
83+
84+
85+static void
86+_sha256(uchar *p, ulong len, SHA256state *s)
87+{
88+ u32int take;
89+
90+ /* complete possible partial block from last time */
91+ if(s->blen > 0 && s->blen+len >= SHA256bsize) {
92+ take = SHA256bsize-s->blen;
93+ memmove(s->buf+s->blen, p, take);
94+ p += take;
95+ len -= take;
96+ _sha256block(s, s->buf);
97+ s->len += SHA256bsize;
98+ s->blen = 0;
99+ memset(s->buf, 0, SHA256bsize);
100+ }
101+ /* whole blocks */
102+ while(len >= SHA256bsize) {
103+ _sha256block(s, p);
104+ s->len += SHA256bsize;
105+ p += SHA256bsize;
106+ len -= SHA256bsize;
107+ }
108+ /* keep possible leftover bytes */
109+ if(len > 0) {
110+ memmove(s->buf+s->blen, p, len);
111+ s->blen += len;
112+ }
113+}
114+
115+static void
116+sha256finish(SHA256state *s, uchar *digest, int smaller)
117+{
118+ int i;
119+ uchar end[SHA256bsize+8];
120+ u32int nzero, nb, nd;
121+
122+ nzero = (2*SHA256bsize - s->blen - 1 - 8) % SHA256bsize;
123+ end[0] = 0x80;
124+ memset(end+1, 0, nzero);
125+ nb = 8*(s->len+s->blen);
126+ p64(nb, end+1+nzero);
127+ _sha256(end, 1+nzero+8, s);
128+
129+ nd = SHA256dlen/4;
130+ if(smaller)
131+ nd = SHA224dlen/4;
132+ for(i = 0; i < nd; i++, digest += 4)
133+ p32(s->h32[i], digest);
134+}
135+
136+static SHA256state*
137+sha256x(uchar *p, ulong len, uchar *digest, SHA256state *s, int smaller)
138+{
139+ if(s == nil) {
140+ s = sha256init();
141+ if(s == nil)
142+ return nil;
143+ }
144+
145+ if(s->seeded == 0){
146+ memmove(s->h32, smaller? sha224h0: sha256h0, sizeof s->h32);
147+ s->seeded = 1;
148+ }
149+
150+ _sha256(p, len, s);
151+
152+ if(digest == 0)
153+ return s;
154+
155+ sha256finish(s, digest, smaller);
156+ if(s->malloced == 1)
157+ free(s);
158+ return nil;
159+}
160+
161+SHA256state*
162+sha224(uchar *p, ulong len, uchar *digest, SHA256state *s)
163+{
164+ return sha256x(p, len, digest, s, 1);
165+}
166+
167+SHA256state*
168+sha256(uchar *p, ulong len, uchar *digest, SHA256state *s)
169+{
170+ return sha256x(p, len, digest, s, 0);
171+}
172+
173+
174+static SHA512state *
175+sha512init(void)
176+{
177+ SHA512state *s;
178+
179+ s = malloc(sizeof(*s));
180+ if(s == nil)
181+ return nil;
182+ s->malloced = 1;
183+ s->seeded = 0;
184+ s->nb128[HI] = 0;
185+ s->nb128[LO] = 0;
186+ s->blen = 0;
187+
188+ return s;
189+}
190+
191+static void
192+_sha512(uchar *p, ulong len, SHA512state *s)
193+{
194+ u32int take;
195+
196+ /* complete possible partial block from last time */
197+ if(s->blen > 0 && s->blen+len >= SHA512bsize) {
198+ take = SHA512bsize-s->blen;
199+ memmove(s->buf+s->blen, p, take);
200+ p += take;
201+ len -= take;
202+ _sha512block(s, s->buf);
203+ uvvadd(s->nb128, SHA512bsize);
204+ s->blen = 0;
205+ memset(s->buf, 0, SHA512bsize);
206+ }
207+ /* whole blocks */
208+ while(len >= SHA512bsize) {
209+ _sha512block(s, p);
210+ uvvadd(s->nb128, SHA512bsize);
211+ p += SHA512bsize;
212+ len -= SHA512bsize;
213+ }
214+ /* keep possible leftover bytes */
215+ if(len > 0) {
216+ memmove(s->buf+s->blen, p, len);
217+ s->blen += len;
218+ }
219+}
220+
221+void
222+sha512finish(SHA512state *s, uchar *digest, int smaller)
223+{
224+ int i;
225+ uchar end[SHA512bsize+16];
226+ u32int nzero, n;
227+ u64int nb[2];
228+
229+ nzero = (2*SHA512bsize - s->blen - 1 - 16) % SHA512bsize;
230+ end[0] = 0x80;
231+ memset(end+1, 0, nzero);
232+ nb[0] = s->nb128[0];
233+ nb[1] = s->nb128[1];
234+ uvvadd(nb, s->blen);
235+ uvvmult8(nb);
236+ p128(nb, end+1+nzero);
237+ _sha512(end, 1+nzero+16, s);
238+
239+ n = SHA512dlen/8;
240+ if(smaller)
241+ n = SHA384dlen/8;
242+ for(i = 0; i < n; i++, digest += 8)
243+ p64(s->h64[i], digest);
244+}
245+
246+static SHA512state*
247+sha512x(uchar *p, ulong len, uchar *digest, SHA512state *s, int smaller)
248+{
249+ if(s == nil) {
250+ s = sha512init();
251+ if(s == nil)
252+ return nil;
253+ }
254+
255+ if(s->seeded == 0){
256+ memmove(s->h64, smaller? sha384h0: sha512h0, sizeof s->h64);
257+ s->seeded = 1;
258+ }
259+
260+ _sha512(p, len, s);
261+
262+ if(digest == 0)
263+ return s;
264+
265+ sha512finish(s, digest, smaller);
266+ if(s->malloced == 1)
267+ free(s);
268+ return nil;
269+}
270+
271+SHA512state*
272+sha384(uchar *p, ulong len, uchar *digest, SHA512state *s)
273+{
274+ return sha512x(p, len, digest, s, 1);
275+}
276+
277+SHA512state*
278+sha512(uchar *p, ulong len, uchar *digest, SHA512state *s)
279+{
280+ return sha512x(p, len, digest, s, 0);
281+}
libsec/port/sha256block.c+81−0
@@ -0,0 +1,81 @@
1+#include "os.h"
2+#include <libsec.h>
3+
4+enum {
5+ SHA256rounds = 64,
6+};
7+
8+u32int sha256const[] = {
9+0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
10+0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
11+0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
12+0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
13+0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
14+0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
15+0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
16+0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
17+};
18+
19+
20+#define CH(x,y,z) ((x&y) ^ (~x&z))
21+#define MAJ(x,y,z) ((x&y) ^ (x&z) ^ (y&z))
22+#define ROTR32(n, v) ((v>>n) | (v<<(32-n)))
23+#define ROTR64(n, v) ((v>>n) | (v<<(64-n)))
24+#define SHR(n, x) (x>>n)
25+
26+#define SIGMA0a(x) (ROTR32(2, x)^ROTR32(13, x)^ROTR32(22, x))
27+#define SIGMA1a(x) (ROTR32(6, x)^ROTR32(11, x)^ROTR32(25, x))
28+#define sigma0a(x) (ROTR32(7, x)^ROTR32(18, x)^SHR(3, x))
29+#define sigma1a(x) (ROTR32(17, x)^ROTR32(19, x)^SHR(10, x))
30+
31+/* for use in _sha*() */
32+#define A v[0]
33+#define B v[1]
34+#define C v[2]
35+#define D v[3]
36+#define E v[4]
37+#define F v[5]
38+#define G v[6]
39+#define H v[7]
40+
41+static u32int
42+g32(uchar *p)
43+{
44+ return p[0]<<24|p[1]<<16|p[2]<<8|p[3]<<0;
45+}
46+
47+void
48+_sha256block(SHA256state *s, uchar *buf)
49+{
50+ u32int w[2*SHA256bsize/4];
51+ int i, t;
52+ u32int t1, t2;
53+ u32int v[8];
54+
55+ for(t = 0; t < nelem(w)/2; t++) {
56+ if(t < 16) {
57+ w[t] = g32(buf);
58+ buf += 4;
59+ }
60+ }
61+
62+ memmove(v, s->h32, sizeof s->h32);
63+
64+ for(t = 0; t < SHA256rounds; t++) {
65+ if(t >= 16)
66+ w[t&31] = sigma1a(w[(t-2)&31]) + w[(t-7)&31] + sigma0a(w[(t-15)&31]) + w[(t-16)&31];
67+ t1 = H + SIGMA1a(E) + CH(E,F,G) + sha256const[t] + w[t&31];
68+ t2 = SIGMA0a(A) + MAJ(A,B,C);
69+ H = G;
70+ G = F;
71+ F = E;
72+ E = D+t1;
73+ D = C;
74+ C = B;
75+ B = A;
76+ A = t1+t2;
77+ }
78+
79+ for(i = 0; i < nelem(v); i++)
80+ s->h32[i] += v[i];
81+}
libsec/port/sha512block.c+114−0
@@ -0,0 +1,114 @@
1+#include "os.h"
2+#include <libsec.h>
3+
4+
5+enum {
6+ SHA512rounds = 80,
7+};
8+
9+u64int sha512const[] = {
10+0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
11+0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
12+0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
13+0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
14+0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
15+0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
16+0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
17+0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
18+0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
19+0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
20+0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
21+0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
22+0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
23+0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
24+0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
25+0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
26+0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
27+0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
28+0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
29+0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL,
30+};
31+
32+
33+static u32int
34+g32(uchar *p)
35+{
36+ return p[0]<<24|p[1]<<16|p[2]<<8|p[3]<<0;
37+}
38+
39+static u64int
40+g64(uchar *p)
41+{
42+ return ((u64int)g32(p)<<32)|g32(p+4);
43+}
44+
45+
46+#define CH(x,y,z) ((x&y) ^ (~x&z))
47+#define MAJ(x,y,z) ((x&y) ^ (x&z) ^ (y&z))
48+#define ROTR32(n, v) ((v>>n) | (v<<(32-n)))
49+#define ROTR64(n, v) ((v>>n) | (v<<(64-n)))
50+#define SHR(n, x) (x>>n)
51+
52+#define SIGMA0b(x) (ROTR64(28, x)^ROTR64(34, x)^ROTR64(39, x))
53+#define SIGMA1b(x) (ROTR64(14, x)^ROTR64(18, x)^ROTR64(41, x))
54+#define sigma0b(x) (ROTR64(1, x)^ROTR64(8, x)^SHR(7, x))
55+#define sigma1b(x) (ROTR64(19, x)^ROTR64(61, x)^SHR(6, x))
56+
57+#define A v[0]
58+#define B v[1]
59+#define C v[2]
60+#define D v[3]
61+#define E v[4]
62+#define F v[5]
63+#define G v[6]
64+#define H v[7]
65+
66+void
67+_sha512block(SHA512state *s, uchar *buf)
68+{
69+ u64int w[2*SHA512bsize/8];
70+ int i, t;
71+ u64int t1, t2, t3, v[8];
72+
73+ for(t = 0; t < nelem(w)/2; t++) {
74+ if(t < 16) {
75+ w[t] = g64(buf);
76+ buf += 8;
77+ }
78+ }
79+
80+ memmove(v, s->h64, sizeof s->h64);
81+
82+ for(t = 0; t < SHA512rounds; t++) {
83+ if(t >= 16) {
84+ /* w[t&31] = sigma1b(w[(t-2)&31]) + w[(t-7)&31] + sigma0b(w[(t-15)&31]) + w[(t-16)&31]; */
85+ t2 = w[(t-2)&31];
86+ t3 = w[(t-15)&31];
87+ /* w[t&31] = sigma1b(t2) + w[(t-7)&31] + sigma0b(t3) + w[(t-16)&31]; */
88+ t1 = sigma1b(t2);
89+ t1 += w[(t-7)&31];
90+ t1 += sigma0b(t3);
91+ t1 += w[(t-16)&31];
92+ w[t&31] = t1;
93+ }
94+ /* t1 = H + SIGMA1b(E) + CH(E,F,G) + sha512const[t] + w[t&31]; */
95+ t1 = H;
96+ t1 += SIGMA1b(E);
97+ t1 += CH(E, F, G);
98+ t1 += sha512const[t] + w[t&31];
99+ /* t2 = SIGMA0b(A) + MAJ(A,B,C); */
100+ t2 = SIGMA0b(A);
101+ t2 += MAJ(A, B, C);
102+ H = G;
103+ G = F;
104+ F = E;
105+ E = D+t1;
106+ D = C;
107+ C = B;
108+ B = A;
109+ A = t1+t2;
110+ }
111+
112+ for(i = 0; i < nelem(v); i++)
113+ s->h64[i] += v[i];
114+}