Blame

Date:
Message:
Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.
Actions:
History | Blob | Raw File
  1 6e527fbc 2005-02-13 devnull #include <u.h>

  2 6e527fbc 2005-02-13 devnull #include <libc.h>

  3 6e527fbc 2005-02-13 devnull #include <mp.h>

  4 6e527fbc 2005-02-13 devnull #include <libsec.h>

  5 6e527fbc 2005-02-13 devnull #include "SConn.h"

  6 6e527fbc 2005-02-13 devnull 

  7 6e527fbc 2005-02-13 devnull extern int verbose;

  8 6e527fbc 2005-02-13 devnull 

  9 6e527fbc 2005-02-13 devnull typedef struct ConnState {

 10 6e527fbc 2005-02-13 devnull 	uchar secret[SHA1dlen];

 11 6e527fbc 2005-02-13 devnull 	ulong seqno;

 12 6e527fbc 2005-02-13 devnull 	RC4state rc4;

 13 6e527fbc 2005-02-13 devnull } ConnState;

 14 6e527fbc 2005-02-13 devnull 

 15 6e527fbc 2005-02-13 devnull typedef struct SS{

 16 cbeb0b26 2006-04-01 devnull 	int fd;		/* file descriptor for read/write of encrypted data */

 17 cbeb0b26 2006-04-01 devnull 	int alg;	/* if nonzero, "alg sha rc4_128" */

 18 6e527fbc 2005-02-13 devnull 	ConnState in, out;

 19 6e527fbc 2005-02-13 devnull } SS;

 20 6e527fbc 2005-02-13 devnull 

 21 6e527fbc 2005-02-13 devnull static int

 22 6e527fbc 2005-02-13 devnull SC_secret(SConn *conn, uchar *sigma, int direction)

 23 6e527fbc 2005-02-13 devnull {

 24 6e527fbc 2005-02-13 devnull 	SS *ss = (SS*)(conn->chan);

 25 6e527fbc 2005-02-13 devnull 	int nsigma = conn->secretlen;

 26 6e527fbc 2005-02-13 devnull 

 27 6e527fbc 2005-02-13 devnull 	if(direction != 0){

 28 6e527fbc 2005-02-13 devnull 		hmac_sha1(sigma, nsigma, (uchar*)"one", 3, ss->out.secret, nil);

 29 6e527fbc 2005-02-13 devnull 		hmac_sha1(sigma, nsigma, (uchar*)"two", 3, ss->in.secret, nil);

 30 6e527fbc 2005-02-13 devnull 	}else{

 31 6e527fbc 2005-02-13 devnull 		hmac_sha1(sigma, nsigma, (uchar*)"two", 3, ss->out.secret, nil);

 32 6e527fbc 2005-02-13 devnull 		hmac_sha1(sigma, nsigma, (uchar*)"one", 3, ss->in.secret, nil);

 33 6e527fbc 2005-02-13 devnull 	}

 34 cbeb0b26 2006-04-01 devnull 	setupRC4state(&ss->in.rc4, ss->in.secret, 16); /* restrict to 128 bits */

 35 6e527fbc 2005-02-13 devnull 	setupRC4state(&ss->out.rc4, ss->out.secret, 16);

 36 6e527fbc 2005-02-13 devnull 	ss->alg = 1;

 37 6e527fbc 2005-02-13 devnull 	return 0;

 38 6e527fbc 2005-02-13 devnull }

 39 6e527fbc 2005-02-13 devnull 

 40 6e527fbc 2005-02-13 devnull static void

 41 6e527fbc 2005-02-13 devnull hash(uchar secret[SHA1dlen], uchar *data, int len, int seqno, uchar d[SHA1dlen])

 42 6e527fbc 2005-02-13 devnull {

 43 6e527fbc 2005-02-13 devnull 	DigestState sha;

 44 6e527fbc 2005-02-13 devnull 	uchar seq[4];

 45 6e527fbc 2005-02-13 devnull 

 46 6e527fbc 2005-02-13 devnull 	seq[0] = seqno>>24;

 47 6e527fbc 2005-02-13 devnull 	seq[1] = seqno>>16;

 48 6e527fbc 2005-02-13 devnull 	seq[2] = seqno>>8;

 49 6e527fbc 2005-02-13 devnull 	seq[3] = seqno;

 50 6e527fbc 2005-02-13 devnull 	memset(&sha, 0, sizeof sha);

 51 6e527fbc 2005-02-13 devnull 	sha1(secret, SHA1dlen, nil, &sha);

 52 6e527fbc 2005-02-13 devnull 	sha1(data, len, nil, &sha);

 53 6e527fbc 2005-02-13 devnull 	sha1(seq, 4, d, &sha);

 54 6e527fbc 2005-02-13 devnull }

 55 6e527fbc 2005-02-13 devnull 

 56 6e527fbc 2005-02-13 devnull static int

 57 6e527fbc 2005-02-13 devnull verify(uchar secret[SHA1dlen], uchar *data, int len, int seqno, uchar d[SHA1dlen])

 58 6e527fbc 2005-02-13 devnull {

 59 6e527fbc 2005-02-13 devnull 	DigestState sha;

 60 6e527fbc 2005-02-13 devnull 	uchar seq[4];

 61 6e527fbc 2005-02-13 devnull 	uchar digest[SHA1dlen];

 62 6e527fbc 2005-02-13 devnull 

 63 6e527fbc 2005-02-13 devnull 	seq[0] = seqno>>24;

 64 6e527fbc 2005-02-13 devnull 	seq[1] = seqno>>16;

 65 6e527fbc 2005-02-13 devnull 	seq[2] = seqno>>8;

 66 6e527fbc 2005-02-13 devnull 	seq[3] = seqno;

 67 6e527fbc 2005-02-13 devnull 	memset(&sha, 0, sizeof sha);

 68 6e527fbc 2005-02-13 devnull 	sha1(secret, SHA1dlen, nil, &sha);

 69 6e527fbc 2005-02-13 devnull 	sha1(data, len, nil, &sha);

 70 6e527fbc 2005-02-13 devnull 	sha1(seq, 4, digest, &sha);

 71 6e527fbc 2005-02-13 devnull 	return memcmp(d, digest, SHA1dlen);

 72 6e527fbc 2005-02-13 devnull }

 73 6e527fbc 2005-02-13 devnull 

 74 6e527fbc 2005-02-13 devnull static int

 75 6e527fbc 2005-02-13 devnull SC_read(SConn *conn, uchar *buf, int n)

 76 6e527fbc 2005-02-13 devnull {

 77 6e527fbc 2005-02-13 devnull 	SS *ss = (SS*)(conn->chan);

 78 6e527fbc 2005-02-13 devnull 	uchar count[2], digest[SHA1dlen];

 79 6e527fbc 2005-02-13 devnull 	int len, nr;

 80 6e527fbc 2005-02-13 devnull 

 81 6e527fbc 2005-02-13 devnull 	if(read(ss->fd, count, 2) != 2 || (count[0]&0x80) == 0){

 82 6e527fbc 2005-02-13 devnull 		snprint((char*)buf,n,"!SC_read invalid count");

 83 6e527fbc 2005-02-13 devnull 		return -1;

 84 6e527fbc 2005-02-13 devnull 	}

 85 cbeb0b26 2006-04-01 devnull 	len = (count[0]&0x7f)<<8 | count[1];	/* SSL-style count; no pad */

 86 6e527fbc 2005-02-13 devnull 	if(ss->alg){

 87 6e527fbc 2005-02-13 devnull 		len -= SHA1dlen;

 88 6e527fbc 2005-02-13 devnull 		if(len <= 0 || readn(ss->fd, digest, SHA1dlen) != SHA1dlen){

 89 6e527fbc 2005-02-13 devnull 			snprint((char*)buf,n,"!SC_read missing sha1");

 90 6e527fbc 2005-02-13 devnull 			return -1;

 91 6e527fbc 2005-02-13 devnull 		}

 92 6e527fbc 2005-02-13 devnull 		if(len > n || readn(ss->fd, buf, len) != len){

 93 6e527fbc 2005-02-13 devnull 			snprint((char*)buf,n,"!SC_read missing data");

 94 6e527fbc 2005-02-13 devnull 			return -1;

 95 6e527fbc 2005-02-13 devnull 		}

 96 6e527fbc 2005-02-13 devnull 		rc4(&ss->in.rc4, digest, SHA1dlen);

 97 6e527fbc 2005-02-13 devnull 		rc4(&ss->in.rc4, buf, len);

 98 6e527fbc 2005-02-13 devnull 		if(verify(ss->in.secret, buf, len, ss->in.seqno, digest) != 0){

 99 6e527fbc 2005-02-13 devnull 			snprint((char*)buf,n,"!SC_read integrity check failed");

100 6e527fbc 2005-02-13 devnull 			return -1;

101 6e527fbc 2005-02-13 devnull 		}

102 6e527fbc 2005-02-13 devnull 	}else{

103 6e527fbc 2005-02-13 devnull 		if(len <= 0 || len > n){

104 6e527fbc 2005-02-13 devnull 			snprint((char*)buf,n,"!SC_read implausible record length");

105 6e527fbc 2005-02-13 devnull 			return -1;

106 6e527fbc 2005-02-13 devnull 		}

107 6e527fbc 2005-02-13 devnull 		if( (nr = readn(ss->fd, buf, len)) != len){

108 6e527fbc 2005-02-13 devnull 			snprint((char*)buf,n,"!SC_read expected %d bytes, but got %d", len, nr);

109 6e527fbc 2005-02-13 devnull 			return -1;

110 6e527fbc 2005-02-13 devnull 		}

111 6e527fbc 2005-02-13 devnull 	}

112 6e527fbc 2005-02-13 devnull 	ss->in.seqno++;

113 6e527fbc 2005-02-13 devnull 	return len;

114 6e527fbc 2005-02-13 devnull }

115 6e527fbc 2005-02-13 devnull 

116 6e527fbc 2005-02-13 devnull static int

117 6e527fbc 2005-02-13 devnull SC_write(SConn *conn, uchar *buf, int n)

118 6e527fbc 2005-02-13 devnull {

119 6e527fbc 2005-02-13 devnull 	SS *ss = (SS*)(conn->chan);

120 6e527fbc 2005-02-13 devnull 	uchar count[2], digest[SHA1dlen], enc[Maxmsg+1];

121 6e527fbc 2005-02-13 devnull 	int len;

122 6e527fbc 2005-02-13 devnull 

123 6e527fbc 2005-02-13 devnull 	if(n <= 0 || n > Maxmsg+1){

124 6e527fbc 2005-02-13 devnull 		werrstr("!SC_write invalid n %d", n);

125 6e527fbc 2005-02-13 devnull 		return -1;

126 6e527fbc 2005-02-13 devnull 	}

127 6e527fbc 2005-02-13 devnull 	len = n;

128 6e527fbc 2005-02-13 devnull 	if(ss->alg)

129 6e527fbc 2005-02-13 devnull 		len += SHA1dlen;

130 6e527fbc 2005-02-13 devnull 	count[0] = 0x80 | len>>8;

131 6e527fbc 2005-02-13 devnull 	count[1] = len;

132 6e527fbc 2005-02-13 devnull 	if(write(ss->fd, count, 2) != 2){

133 6e527fbc 2005-02-13 devnull 		werrstr("!SC_write invalid count");

134 6e527fbc 2005-02-13 devnull 		return -1;

135 6e527fbc 2005-02-13 devnull 	}

136 6e527fbc 2005-02-13 devnull 	if(ss->alg){

137 6e527fbc 2005-02-13 devnull 		hash(ss->out.secret, buf, n, ss->out.seqno, digest);

138 6e527fbc 2005-02-13 devnull 		rc4(&ss->out.rc4, digest, SHA1dlen);

139 6e527fbc 2005-02-13 devnull 		memcpy(enc, buf, n);

140 6e527fbc 2005-02-13 devnull 		rc4(&ss->out.rc4, enc, n);

141 6e527fbc 2005-02-13 devnull 		if(write(ss->fd, digest, SHA1dlen) != SHA1dlen ||

142 6e527fbc 2005-02-13 devnull 				write(ss->fd, enc, n) != n){

143 6e527fbc 2005-02-13 devnull 			werrstr("!SC_write error on send");

144 6e527fbc 2005-02-13 devnull 			return -1;

145 6e527fbc 2005-02-13 devnull 		}

146 6e527fbc 2005-02-13 devnull 	}else{

147 6e527fbc 2005-02-13 devnull 		if(write(ss->fd, buf, n) != n){

148 6e527fbc 2005-02-13 devnull 			werrstr("!SC_write error on send");

149 6e527fbc 2005-02-13 devnull 			return -1;

150 6e527fbc 2005-02-13 devnull 		}

151 6e527fbc 2005-02-13 devnull 	}

152 6e527fbc 2005-02-13 devnull 	ss->out.seqno++;

153 6e527fbc 2005-02-13 devnull 	return n;

154 6e527fbc 2005-02-13 devnull }

155 6e527fbc 2005-02-13 devnull 

156 6e527fbc 2005-02-13 devnull static void

157 6e527fbc 2005-02-13 devnull SC_free(SConn *conn)

158 6e527fbc 2005-02-13 devnull {

159 6e527fbc 2005-02-13 devnull 	SS *ss = (SS*)(conn->chan);

160 6e527fbc 2005-02-13 devnull 

161 6e527fbc 2005-02-13 devnull 	close(ss->fd);

162 6e527fbc 2005-02-13 devnull 	free(ss);

163 6e527fbc 2005-02-13 devnull 	free(conn);

164 6e527fbc 2005-02-13 devnull }

165 6e527fbc 2005-02-13 devnull 

166 6e527fbc 2005-02-13 devnull SConn*

167 6e527fbc 2005-02-13 devnull newSConn(int fd)

168 6e527fbc 2005-02-13 devnull {

169 6e527fbc 2005-02-13 devnull 	SS *ss;

170 6e527fbc 2005-02-13 devnull 	SConn *conn;

171 6e527fbc 2005-02-13 devnull 

172 6e527fbc 2005-02-13 devnull 	if(fd < 0)

173 6e527fbc 2005-02-13 devnull 		return nil;

174 6e527fbc 2005-02-13 devnull 	ss = (SS*)emalloc(sizeof(*ss));

175 6e527fbc 2005-02-13 devnull 	conn = (SConn*)emalloc(sizeof(*conn));

176 6e527fbc 2005-02-13 devnull 	ss->fd  = fd;

177 6e527fbc 2005-02-13 devnull 	ss->alg = 0;

178 6e527fbc 2005-02-13 devnull 	conn->chan = (void*)ss;

179 6e527fbc 2005-02-13 devnull 	conn->secretlen = SHA1dlen;

180 6e527fbc 2005-02-13 devnull 	conn->free = SC_free;

181 6e527fbc 2005-02-13 devnull 	conn->secret = SC_secret;

182 6e527fbc 2005-02-13 devnull 	conn->read = SC_read;

183 6e527fbc 2005-02-13 devnull 	conn->write = SC_write;

184 6e527fbc 2005-02-13 devnull 	return conn;

185 6e527fbc 2005-02-13 devnull }

186 6e527fbc 2005-02-13 devnull 

187 6e527fbc 2005-02-13 devnull void

188 6e527fbc 2005-02-13 devnull writerr(SConn *conn, char *s)

189 6e527fbc 2005-02-13 devnull {

190 6e527fbc 2005-02-13 devnull 	char buf[Maxmsg];

191 6e527fbc 2005-02-13 devnull 

192 6e527fbc 2005-02-13 devnull 	snprint(buf, Maxmsg, "!%s", s);

193 6e527fbc 2005-02-13 devnull 	conn->write(conn, (uchar*)buf, strlen(buf));

194 6e527fbc 2005-02-13 devnull }

195 6e527fbc 2005-02-13 devnull 

196 6e527fbc 2005-02-13 devnull int

197 6e527fbc 2005-02-13 devnull readstr(SConn *conn, char *s)

198 6e527fbc 2005-02-13 devnull {

199 6e527fbc 2005-02-13 devnull 	int n;

200 6e527fbc 2005-02-13 devnull 

201 6e527fbc 2005-02-13 devnull 	n = conn->read(conn, (uchar*)s, Maxmsg);

202 6e527fbc 2005-02-13 devnull 	if(n >= 0){

203 6e527fbc 2005-02-13 devnull 		s[n] = 0;

204 6e527fbc 2005-02-13 devnull 		if(s[0] == '!'){

205 6e527fbc 2005-02-13 devnull 			memmove(s, s+1, n);

206 6e527fbc 2005-02-13 devnull 			n = -1;

207 6e527fbc 2005-02-13 devnull 		}

208 6e527fbc 2005-02-13 devnull 	}else{

209 6e527fbc 2005-02-13 devnull 		strcpy(s, "read error");

210 6e527fbc 2005-02-13 devnull 	}

211 6e527fbc 2005-02-13 devnull 	return n;

212 6e527fbc 2005-02-13 devnull }

213 6e527fbc 2005-02-13 devnull