Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 717382
Collapse All | Expand All

(-)a/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
#	$OpenBSD: Makefile,v 1.7 2015/09/11 21:07:01 beck Exp $
1
#	$OpenBSD: Makefile,v 1.7 2015/09/11 21:07:01 beck Exp $
2
2
3
PROG=	nc
3
PROG=	nc
4
SRCS=	netcat.c atomicio.c socks.c
4
SRCS=	netcat.c atomicio.c socks.c compat/base64.c
5
5
6
PKG_CONFIG ?= pkg-config
6
PKG_CONFIG ?= pkg-config
7
LIBS=  `$(PKG_CONFIG) --libs libbsd` -lresolv
7
LIBS=  `$(PKG_CONFIG) --libs libbsd` -lresolv
(-)a/compat/base64.c (+308 lines)
Line 0 Link Here
1
/*	$OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $	*/
2
3
/*
4
 * Copyright (c) 1996 by Internet Software Consortium.
5
 *
6
 * Permission to use, copy, modify, and distribute this software for any
7
 * purpose with or without fee is hereby granted, provided that the above
8
 * copyright notice and this permission notice appear in all copies.
9
 *
10
 * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
11
 * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
12
 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
13
 * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
14
 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
15
 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
16
 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
17
 * SOFTWARE.
18
 */
19
20
/*
21
 * Portions Copyright (c) 1995 by International Business Machines, Inc.
22
 *
23
 * International Business Machines, Inc. (hereinafter called IBM) grants
24
 * permission under its copyrights to use, copy, modify, and distribute this
25
 * Software with or without fee, provided that the above copyright notice and
26
 * all paragraphs of this notice appear in all copies, and that the name of IBM
27
 * not be used in connection with the marketing of any product incorporating
28
 * the Software or modifications thereof, without specific, written prior
29
 * permission.
30
 *
31
 * To the extent it has a right to do so, IBM grants an immunity from suit
32
 * under its patents, if any, for the use, sale or manufacture of products to
33
 * the extent that such products are used for performing Domain Name System
34
 * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
35
 * granted for any product per se or for any other function of any product.
36
 *
37
 * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
38
 * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
39
 * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
40
 * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
41
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
42
 * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
43
 */
44
45
#include <sys/types.h>
46
#include <sys/socket.h>
47
#include <netinet/in.h>
48
#include <arpa/inet.h>
49
#include <arpa/nameser.h>
50
51
#include <ctype.h>
52
#include <resolv.h>
53
#include <stdio.h>
54
55
#include <stdlib.h>
56
#include <string.h>
57
58
static const char Base64[] =
59
	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
60
static const char Pad64 = '=';
61
62
/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
63
   The following encoding technique is taken from RFC 1521 by Borenstein
64
   and Freed.  It is reproduced here in a slightly edited form for
65
   convenience.
66
   A 65-character subset of US-ASCII is used, enabling 6 bits to be
67
   represented per printable character. (The extra 65th character, "=",
68
   is used to signify a special processing function.)
69
   The encoding process represents 24-bit groups of input bits as output
70
   strings of 4 encoded characters. Proceeding from left to right, a
71
   24-bit input group is formed by concatenating 3 8-bit input groups.
72
   These 24 bits are then treated as 4 concatenated 6-bit groups, each
73
   of which is translated into a single digit in the base64 alphabet.
74
   Each 6-bit group is used as an index into an array of 64 printable
75
   characters. The character referenced by the index is placed in the
76
   output string.
77
                         Table 1: The Base64 Alphabet
78
      Value Encoding  Value Encoding  Value Encoding  Value Encoding
79
          0 A            17 R            34 i            51 z
80
          1 B            18 S            35 j            52 0
81
          2 C            19 T            36 k            53 1
82
          3 D            20 U            37 l            54 2
83
          4 E            21 V            38 m            55 3
84
          5 F            22 W            39 n            56 4
85
          6 G            23 X            40 o            57 5
86
          7 H            24 Y            41 p            58 6
87
          8 I            25 Z            42 q            59 7
88
          9 J            26 a            43 r            60 8
89
         10 K            27 b            44 s            61 9
90
         11 L            28 c            45 t            62 +
91
         12 M            29 d            46 u            63 /
92
         13 N            30 e            47 v
93
         14 O            31 f            48 w         (pad) =
94
         15 P            32 g            49 x
95
         16 Q            33 h            50 y
96
   Special processing is performed if fewer than 24 bits are available
97
   at the end of the data being encoded.  A full encoding quantum is
98
   always completed at the end of a quantity.  When fewer than 24 input
99
   bits are available in an input group, zero bits are added (on the
100
   right) to form an integral number of 6-bit groups.  Padding at the
101
   end of the data is performed using the '=' character.
102
   Since all base64 input is an integral number of octets, only the
103
         -------------------------------------------------                       
104
   following cases can arise:
105
   
106
       (1) the final quantum of encoding input is an integral
107
           multiple of 24 bits; here, the final unit of encoded
108
	   output will be an integral multiple of 4 characters
109
	   with no "=" padding,
110
       (2) the final quantum of encoding input is exactly 8 bits;
111
           here, the final unit of encoded output will be two
112
	   characters followed by two "=" padding characters, or
113
       (3) the final quantum of encoding input is exactly 16 bits;
114
           here, the final unit of encoded output will be three
115
	   characters followed by one "=" padding character.
116
   */
117
118
int
119
b64_ntop(src, srclength, target, targsize)
120
	u_char const *src;
121
	size_t srclength;
122
	char *target;
123
	size_t targsize;
124
{
125
	size_t datalength = 0;
126
	u_char input[3];
127
	u_char output[4];
128
	int i;
129
130
	while (2 < srclength) {
131
		input[0] = *src++;
132
		input[1] = *src++;
133
		input[2] = *src++;
134
		srclength -= 3;
135
136
		output[0] = input[0] >> 2;
137
		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
138
		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
139
		output[3] = input[2] & 0x3f;
140
141
		if (datalength + 4 > targsize)
142
			return (-1);
143
		target[datalength++] = Base64[output[0]];
144
		target[datalength++] = Base64[output[1]];
145
		target[datalength++] = Base64[output[2]];
146
		target[datalength++] = Base64[output[3]];
147
	}
148
149
	/* Now we worry about padding. */
150
	if (0 != srclength) {
151
		/* Get what's left. */
152
		input[0] = input[1] = input[2] = '\0';
153
		for (i = 0; i < srclength; i++)
154
			input[i] = *src++;
155
156
		output[0] = input[0] >> 2;
157
		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
158
		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
159
160
		if (datalength + 4 > targsize)
161
			return (-1);
162
		target[datalength++] = Base64[output[0]];
163
		target[datalength++] = Base64[output[1]];
164
		if (srclength == 1)
165
			target[datalength++] = Pad64;
166
		else
167
			target[datalength++] = Base64[output[2]];
168
		target[datalength++] = Pad64;
169
	}
170
	if (datalength >= targsize)
171
		return (-1);
172
	target[datalength] = '\0';	/* Returned value doesn't count \0. */
173
	return (datalength);
174
}
175
176
/* skips all whitespace anywhere.
177
   converts characters, four at a time, starting at (or after)
178
   src from base - 64 numbers into three 8 bit bytes in the target area.
179
   it returns the number of data bytes stored at the target, or -1 on error.
180
 */
181
182
int
183
b64_pton(src, target, targsize)
184
	char const *src;
185
	u_char *target;
186
	size_t targsize;
187
{
188
	int tarindex, state, ch;
189
	u_char nextbyte;
190
	char *pos;
191
192
	state = 0;
193
	tarindex = 0;
194
195
	while ((ch = (unsigned char)*src++) != '\0') {
196
		if (isspace(ch))	/* Skip whitespace anywhere. */
197
			continue;
198
199
		if (ch == Pad64)
200
			break;
201
202
		pos = strchr(Base64, ch);
203
		if (pos == 0) 		/* A non-base64 character. */
204
			return (-1);
205
206
		switch (state) {
207
		case 0:
208
			if (target) {
209
				if (tarindex >= targsize)
210
					return (-1);
211
				target[tarindex] = (pos - Base64) << 2;
212
			}
213
			state = 1;
214
			break;
215
		case 1:
216
			if (target) {
217
				if (tarindex >= targsize)
218
					return (-1);
219
				target[tarindex]   |=  (pos - Base64) >> 4;
220
				nextbyte = ((pos - Base64) & 0x0f) << 4;
221
				if (tarindex + 1 < targsize)
222
					target[tarindex+1] = nextbyte;
223
				else if (nextbyte)
224
					return (-1);
225
			}
226
			tarindex++;
227
			state = 2;
228
			break;
229
		case 2:
230
			if (target) {
231
				if (tarindex >= targsize)
232
					return (-1);
233
				target[tarindex]   |=  (pos - Base64) >> 2;
234
				nextbyte = ((pos - Base64) & 0x03) << 6;
235
				if (tarindex + 1 < targsize)
236
					target[tarindex+1] = nextbyte;
237
				else if (nextbyte)
238
					return (-1);
239
			}
240
			tarindex++;
241
			state = 3;
242
			break;
243
		case 3:
244
			if (target) {
245
				if (tarindex >= targsize)
246
					return (-1);
247
				target[tarindex] |= (pos - Base64);
248
			}
249
			tarindex++;
250
			state = 0;
251
			break;
252
		}
253
	}
254
255
	/*
256
	 * We are done decoding Base-64 chars.  Let's see if we ended
257
	 * on a byte boundary, and/or with erroneous trailing characters.
258
	 */
259
260
	if (ch == Pad64) {			/* We got a pad char. */
261
		ch = (unsigned char)*src++;	/* Skip it, get next. */
262
		switch (state) {
263
		case 0:		/* Invalid = in first position */
264
		case 1:		/* Invalid = in second position */
265
			return (-1);
266
267
		case 2:		/* Valid, means one byte of info */
268
			/* Skip any number of spaces. */
269
			for (; ch != '\0'; ch = (unsigned char)*src++)
270
				if (!isspace(ch))
271
					break;
272
			/* Make sure there is another trailing = sign. */
273
			if (ch != Pad64)
274
				return (-1);
275
			ch = (unsigned char)*src++;		/* Skip the = */
276
			/* Fall through to "single trailing =" case. */
277
			/* FALLTHROUGH */
278
279
		case 3:		/* Valid, means two bytes of info */
280
			/*
281
			 * We know this char is an =.  Is there anything but
282
			 * whitespace after it?
283
			 */
284
			for (; ch != '\0'; ch = (unsigned char)*src++)
285
				if (!isspace(ch))
286
					return (-1);
287
288
			/*
289
			 * Now make sure for cases 2 and 3 that the "extra"
290
			 * bits that slopped past the last full byte were
291
			 * zeros.  If we don't check them, they become a
292
			 * subliminal channel.
293
			 */
294
			if (target && tarindex < targsize &&
295
			    target[tarindex] != 0)
296
				return (-1);
297
		}
298
	} else {
299
		/*
300
		 * We ended by seeing the end of the string.  Make sure we
301
		 * have no partial bytes lying around.
302
		 */
303
		if (state != 0)
304
			return (-1);
305
	}
306
307
	return (tarindex);
308
}
(-)a/compat/base64.h (+3 lines)
Line 0 Link Here
1
#include <sys/types.h>
2
int b64_ntop(u_char const* src, size_t srclength, char *target, size_t targsize);
3
int b64_pton(char const* src, u_char *target, size_t targsize);
(-)a/socks.c (-1 / +1 lines)
Lines 40-45 Link Here
40
#include <resolv.h>
40
#include <resolv.h>
41
#include <bsd/readpassphrase.h>
41
#include <bsd/readpassphrase.h>
42
#include "atomicio.h"
42
#include "atomicio.h"
43
#include "compat/base64.h"
43
44
44
#define SOCKS_PORT	"1080"
45
#define SOCKS_PORT	"1080"
45
#define HTTP_PROXY_PORT	"3128"
46
#define HTTP_PROXY_PORT	"3128"
46
- 

Return to bug 717382