aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkinichiro <kinichiro.inoguchi@gmail.com>2017-01-28 03:40:38 +0900
committerkinichiro <kinichiro.inoguchi@gmail.com>2017-01-28 03:40:38 +0900
commit58eb645fdba229c1b214a0ac14f7365df171b62f (patch)
tree062683488b56d8a9f62a2d5772aff39edebb4268
parentcb57534af8ce4cacd69a3edcd42bb8a6bcd0b40b (diff)
downloadportable-58eb645fdba229c1b214a0ac14f7365df171b62f.tar.gz
portable-58eb645fdba229c1b214a0ac14f7365df171b62f.tar.bz2
portable-58eb645fdba229c1b214a0ac14f7365df171b62f.zip
Copy libc compat files rather than adding into the repository
- remove the CP_LIBC files from repo - move tests/memmem.c to tests/compat/
Diffstat
-rw-r--r--apps/nc/compat/base64.c315
-rw-r--r--apps/nc/compat/strtonum.c65
-rw-r--r--crypto/compat/inet_pton.c212
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/Makefile.am2
-rwxr-xr-xupdate.sh6
6 files changed, 6 insertions, 596 deletions
diff --git a/apps/nc/compat/base64.c b/apps/nc/compat/base64.c
deleted file mode 100644
index e90696d..0000000
--- a/apps/nc/compat/base64.c
+++ /dev/null
@@ -1,315 +0,0 @@
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
58static const char Base64[] =
59 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
60static 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
67 A 65-character subset of US-ASCII is used, enabling 6 bits to be
68 represented per printable character. (The extra 65th character, "=",
69 is used to signify a special processing function.)
70
71 The encoding process represents 24-bit groups of input bits as output
72 strings of 4 encoded characters. Proceeding from left to right, a
73 24-bit input group is formed by concatenating 3 8-bit input groups.
74 These 24 bits are then treated as 4 concatenated 6-bit groups, each
75 of which is translated into a single digit in the base64 alphabet.
76
77 Each 6-bit group is used as an index into an array of 64 printable
78 characters. The character referenced by the index is placed in the
79 output string.
80
81 Table 1: The Base64 Alphabet
82
83 Value Encoding Value Encoding Value Encoding Value Encoding
84 0 A 17 R 34 i 51 z
85 1 B 18 S 35 j 52 0
86 2 C 19 T 36 k 53 1
87 3 D 20 U 37 l 54 2
88 4 E 21 V 38 m 55 3
89 5 F 22 W 39 n 56 4
90 6 G 23 X 40 o 57 5
91 7 H 24 Y 41 p 58 6
92 8 I 25 Z 42 q 59 7
93 9 J 26 a 43 r 60 8
94 10 K 27 b 44 s 61 9
95 11 L 28 c 45 t 62 +
96 12 M 29 d 46 u 63 /
97 13 N 30 e 47 v
98 14 O 31 f 48 w (pad) =
99 15 P 32 g 49 x
100 16 Q 33 h 50 y
101
102 Special processing is performed if fewer than 24 bits are available
103 at the end of the data being encoded. A full encoding quantum is
104 always completed at the end of a quantity. When fewer than 24 input
105 bits are available in an input group, zero bits are added (on the
106 right) to form an integral number of 6-bit groups. Padding at the
107 end of the data is performed using the '=' character.
108
109 Since all base64 input is an integral number of octets, only the
110 -------------------------------------------------
111 following cases can arise:
112
113 (1) the final quantum of encoding input is an integral
114 multiple of 24 bits; here, the final unit of encoded
115 output will be an integral multiple of 4 characters
116 with no "=" padding,
117 (2) the final quantum of encoding input is exactly 8 bits;
118 here, the final unit of encoded output will be two
119 characters followed by two "=" padding characters, or
120 (3) the final quantum of encoding input is exactly 16 bits;
121 here, the final unit of encoded output will be three
122 characters followed by one "=" padding character.
123 */
124
125int
126b64_ntop(src, srclength, target, targsize)
127 u_char const *src;
128 size_t srclength;
129 char *target;
130 size_t targsize;
131{
132 size_t datalength = 0;
133 u_char input[3];
134 u_char output[4];
135 int i;
136
137 while (2 < srclength) {
138 input[0] = *src++;
139 input[1] = *src++;
140 input[2] = *src++;
141 srclength -= 3;
142
143 output[0] = input[0] >> 2;
144 output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
145 output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
146 output[3] = input[2] & 0x3f;
147
148 if (datalength + 4 > targsize)
149 return (-1);
150 target[datalength++] = Base64[output[0]];
151 target[datalength++] = Base64[output[1]];
152 target[datalength++] = Base64[output[2]];
153 target[datalength++] = Base64[output[3]];
154 }
155
156 /* Now we worry about padding. */
157 if (0 != srclength) {
158 /* Get what's left. */
159 input[0] = input[1] = input[2] = '\0';
160 for (i = 0; i < srclength; i++)
161 input[i] = *src++;
162
163 output[0] = input[0] >> 2;
164 output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
165 output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
166
167 if (datalength + 4 > targsize)
168 return (-1);
169 target[datalength++] = Base64[output[0]];
170 target[datalength++] = Base64[output[1]];
171 if (srclength == 1)
172 target[datalength++] = Pad64;
173 else
174 target[datalength++] = Base64[output[2]];
175 target[datalength++] = Pad64;
176 }
177 if (datalength >= targsize)
178 return (-1);
179 target[datalength] = '\0'; /* Returned value doesn't count \0. */
180 return (datalength);
181}
182
183/* skips all whitespace anywhere.
184 converts characters, four at a time, starting at (or after)
185 src from base - 64 numbers into three 8 bit bytes in the target area.
186 it returns the number of data bytes stored at the target, or -1 on error.
187 */
188
189int
190b64_pton(src, target, targsize)
191 char const *src;
192 u_char *target;
193 size_t targsize;
194{
195 int tarindex, state, ch;
196 u_char nextbyte;
197 char *pos;
198
199 state = 0;
200 tarindex = 0;
201
202 while ((ch = (unsigned char)*src++) != '\0') {
203 if (isspace(ch)) /* Skip whitespace anywhere. */
204 continue;
205
206 if (ch == Pad64)
207 break;
208
209 pos = strchr(Base64, ch);
210 if (pos == 0) /* A non-base64 character. */
211 return (-1);
212
213 switch (state) {
214 case 0:
215 if (target) {
216 if (tarindex >= targsize)
217 return (-1);
218 target[tarindex] = (pos - Base64) << 2;
219 }
220 state = 1;
221 break;
222 case 1:
223 if (target) {
224 if (tarindex >= targsize)
225 return (-1);
226 target[tarindex] |= (pos - Base64) >> 4;
227 nextbyte = ((pos - Base64) & 0x0f) << 4;
228 if (tarindex + 1 < targsize)
229 target[tarindex+1] = nextbyte;
230 else if (nextbyte)
231 return (-1);
232 }
233 tarindex++;
234 state = 2;
235 break;
236 case 2:
237 if (target) {
238 if (tarindex >= targsize)
239 return (-1);
240 target[tarindex] |= (pos - Base64) >> 2;
241 nextbyte = ((pos - Base64) & 0x03) << 6;
242 if (tarindex + 1 < targsize)
243 target[tarindex+1] = nextbyte;
244 else if (nextbyte)
245 return (-1);
246 }
247 tarindex++;
248 state = 3;
249 break;
250 case 3:
251 if (target) {
252 if (tarindex >= targsize)
253 return (-1);
254 target[tarindex] |= (pos - Base64);
255 }
256 tarindex++;
257 state = 0;
258 break;
259 }
260 }
261
262 /*
263 * We are done decoding Base-64 chars. Let's see if we ended
264 * on a byte boundary, and/or with erroneous trailing characters.
265 */
266
267 if (ch == Pad64) { /* We got a pad char. */
268 ch = (unsigned char)*src++; /* Skip it, get next. */
269 switch (state) {
270 case 0: /* Invalid = in first position */
271 case 1: /* Invalid = in second position */
272 return (-1);
273
274 case 2: /* Valid, means one byte of info */
275 /* Skip any number of spaces. */
276 for (; ch != '\0'; ch = (unsigned char)*src++)
277 if (!isspace(ch))
278 break;
279 /* Make sure there is another trailing = sign. */
280 if (ch != Pad64)
281 return (-1);
282 ch = (unsigned char)*src++; /* Skip the = */
283 /* Fall through to "single trailing =" case. */
284 /* FALLTHROUGH */
285
286 case 3: /* Valid, means two bytes of info */
287 /*
288 * We know this char is an =. Is there anything but
289 * whitespace after it?
290 */
291 for (; ch != '\0'; ch = (unsigned char)*src++)
292 if (!isspace(ch))
293 return (-1);
294
295 /*
296 * Now make sure for cases 2 and 3 that the "extra"
297 * bits that slopped past the last full byte were
298 * zeros. If we don't check them, they become a
299 * subliminal channel.
300 */
301 if (target && tarindex < targsize &&
302 target[tarindex] != 0)
303 return (-1);
304 }
305 } else {
306 /*
307 * We ended by seeing the end of the string. Make sure we
308 * have no partial bytes lying around.
309 */
310 if (state != 0)
311 return (-1);
312 }
313
314 return (tarindex);
315}
diff --git a/apps/nc/compat/strtonum.c b/apps/nc/compat/strtonum.c
deleted file mode 100644
index 1aeee34..0000000
--- a/apps/nc/compat/strtonum.c
+++ /dev/null
@@ -1,65 +0,0 @@
1/* $OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $ */
2
3/*
4 * Copyright (c) 2004 Ted Unangst and Todd Miller
5 * All rights reserved.
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.
10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */
19
20#include <errno.h>
21#include <limits.h>
22#include <stdlib.h>
23
24#define INVALID 1
25#define TOOSMALL 2
26#define TOOLARGE 3
27
28long long
29strtonum(const char *numstr, long long minval, long long maxval,
30 const char **errstrp)
31{
32 long long ll = 0;
33 int error = 0;
34 char *ep;
35 struct errval {
36 const char *errstr;
37 int err;
38 } ev[4] = {
39 { NULL, 0 },
40 { "invalid", EINVAL },
41 { "too small", ERANGE },
42 { "too large", ERANGE },
43 };
44
45 ev[0].err = errno;
46 errno = 0;
47 if (minval > maxval) {
48 error = INVALID;
49 } else {
50 ll = strtoll(numstr, &ep, 10);
51 if (numstr == ep || *ep != '\0')
52 error = INVALID;
53 else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
54 error = TOOSMALL;
55 else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
56 error = TOOLARGE;
57 }
58 if (errstrp != NULL)
59 *errstrp = ev[error].errstr;
60 errno = ev[error].err;
61 if (error)
62 ll = 0;
63
64 return (ll);
65}
diff --git a/crypto/compat/inet_pton.c b/crypto/compat/inet_pton.c
deleted file mode 100644
index f8e299b..0000000
--- a/crypto/compat/inet_pton.c
+++ /dev/null
@@ -1,212 +0,0 @@
1/* $OpenBSD: inet_pton.c,v 1.9 2015/01/16 16:48:51 deraadt Exp $ */
2
3/* Copyright (c) 1996 by Internet Software Consortium.
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
10 * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
11 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
12 * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
13 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
14 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
15 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
16 * SOFTWARE.
17 */
18
19#include <sys/types.h>
20#include <sys/socket.h>
21#include <netinet/in.h>
22#include <arpa/inet.h>
23#include <arpa/nameser.h>
24#include <string.h>
25#include <errno.h>
26
27/*
28 * WARNING: Don't even consider trying to compile this on a system where
29 * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
30 */
31
32static int inet_pton4(const char *src, u_char *dst);
33static int inet_pton6(const char *src, u_char *dst);
34
35/* int
36 * inet_pton(af, src, dst)
37 * convert from presentation format (which usually means ASCII printable)
38 * to network format (which is usually some kind of binary format).
39 * return:
40 * 1 if the address was valid for the specified address family
41 * 0 if the address wasn't valid (`dst' is untouched in this case)
42 * -1 if some other error occurred (`dst' is untouched in this case, too)
43 * author:
44 * Paul Vixie, 1996.
45 */
46int
47inet_pton(int af, const char *src, void *dst)
48{
49 switch (af) {
50 case AF_INET:
51 return (inet_pton4(src, dst));
52 case AF_INET6:
53 return (inet_pton6(src, dst));
54 default:
55 errno = EAFNOSUPPORT;
56 return (-1);
57 }
58 /* NOTREACHED */
59}
60
61/* int
62 * inet_pton4(src, dst)
63 * like inet_aton() but without all the hexadecimal and shorthand.
64 * return:
65 * 1 if `src' is a valid dotted quad, else 0.
66 * notice:
67 * does not touch `dst' unless it's returning 1.
68 * author:
69 * Paul Vixie, 1996.
70 */
71static int
72inet_pton4(const char *src, u_char *dst)
73{
74 static const char digits[] = "0123456789";
75 int saw_digit, octets, ch;
76 u_char tmp[INADDRSZ], *tp;
77
78 saw_digit = 0;
79 octets = 0;
80 *(tp = tmp) = 0;
81 while ((ch = *src++) != '\0') {
82 const char *pch;
83
84 if ((pch = strchr(digits, ch)) != NULL) {
85 u_int new = *tp * 10 + (pch - digits);
86
87 if (new > 255)
88 return (0);
89 if (! saw_digit) {
90 if (++octets > 4)
91 return (0);
92 saw_digit = 1;
93 }
94 *tp = new;
95 } else if (ch == '.' && saw_digit) {
96 if (octets == 4)
97 return (0);
98 *++tp = 0;
99 saw_digit = 0;
100 } else
101 return (0);
102 }
103 if (octets < 4)
104 return (0);
105
106 memcpy(dst, tmp, INADDRSZ);
107 return (1);
108}
109
110/* int
111 * inet_pton6(src, dst)
112 * convert presentation level address to network order binary form.
113 * return:
114 * 1 if `src' is a valid [RFC1884 2.2] address, else 0.
115 * notice:
116 * does not touch `dst' unless it's returning 1.
117 * credit:
118 * inspired by Mark Andrews.
119 * author:
120 * Paul Vixie, 1996.
121 */
122static int
123inet_pton6(const char *src, u_char *dst)
124{
125 static const char xdigits_l[] = "0123456789abcdef",
126 xdigits_u[] = "0123456789ABCDEF";
127 u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
128 const char *xdigits, *curtok;
129 int ch, saw_xdigit, count_xdigit;
130 u_int val;
131
132 memset((tp = tmp), '\0', IN6ADDRSZ);
133 endp = tp + IN6ADDRSZ;
134 colonp = NULL;
135 /* Leading :: requires some special handling. */
136 if (*src == ':')
137 if (*++src != ':')
138 return (0);
139 curtok = src;
140 saw_xdigit = count_xdigit = 0;
141 val = 0;
142 while ((ch = *src++) != '\0') {
143 const char *pch;
144
145 if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
146 pch = strchr((xdigits = xdigits_u), ch);
147 if (pch != NULL) {
148 if (count_xdigit >= 4)
149 return (0);
150 val <<= 4;
151 val |= (pch - xdigits);
152 if (val > 0xffff)
153 return (0);
154 saw_xdigit = 1;
155 count_xdigit++;
156 continue;
157 }
158 if (ch == ':') {
159 curtok = src;
160 if (!saw_xdigit) {
161 if (colonp)
162 return (0);
163 colonp = tp;
164 continue;
165 } else if (*src == '\0') {
166 return (0);
167 }
168 if (tp + INT16SZ > endp)
169 return (0);
170 *tp++ = (u_char) (val >> 8) & 0xff;
171 *tp++ = (u_char) val & 0xff;
172 saw_xdigit = 0;
173 count_xdigit = 0;
174 val = 0;
175 continue;
176 }
177 if (ch == '.' && ((tp + INADDRSZ) <= endp) &&
178 inet_pton4(curtok, tp) > 0) {
179 tp += INADDRSZ;
180 saw_xdigit = 0;
181 count_xdigit = 0;
182 break; /* '\0' was seen by inet_pton4(). */
183 }
184 return (0);
185 }
186 if (saw_xdigit) {
187 if (tp + INT16SZ > endp)
188 return (0);
189 *tp++ = (u_char) (val >> 8) & 0xff;
190 *tp++ = (u_char) val & 0xff;
191 }
192 if (colonp != NULL) {
193 /*
194 * Since some memmove()'s erroneously fail to handle
195 * overlapping regions, we'll do the shift by hand.
196 */
197 const int n = tp - colonp;
198 int i;
199
200 if (tp == endp)
201 return (0);
202 for (i = 1; i <= n; i++) {
203 endp[- i] = colonp[n - i];
204 colonp[n - i] = 0;
205 }
206 tp = endp;
207 }
208 if (tp != endp)
209 return (0);
210 memcpy(dst, tmp, IN6ADDRSZ);
211 return (1);
212}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d7b73b9..91dc99a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -156,7 +156,7 @@ if(NOT CMAKE_HOST_WIN32)
156 if(HAVE_MEMMEM) 156 if(HAVE_MEMMEM)
157 add_executable(explicit_bzero explicit_bzero.c) 157 add_executable(explicit_bzero explicit_bzero.c)
158 else() 158 else()
159 add_executable(explicit_bzero explicit_bzero.c memmem.c) 159 add_executable(explicit_bzero explicit_bzero.c compat/memmem.c)
160 endif() 160 endif()
161 target_link_libraries(explicit_bzero ${TESTS_LIBS}) 161 target_link_libraries(explicit_bzero ${TESTS_LIBS})
162 add_test(explicit_bzero explicit_bzero) 162 add_test(explicit_bzero explicit_bzero)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cfa5043..7c61203 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -163,7 +163,7 @@ TESTS += explicit_bzero
163check_PROGRAMS += explicit_bzero 163check_PROGRAMS += explicit_bzero
164explicit_bzero_SOURCES = explicit_bzero.c 164explicit_bzero_SOURCES = explicit_bzero.c
165if !HAVE_MEMMEM 165if !HAVE_MEMMEM
166explicit_bzero_SOURCES += memmem.c 166explicit_bzero_SOURCES += compat/memmem.c
167endif 167endif
168endif 168endif
169endif 169endif
diff --git a/update.sh b/update.sh
index 19e8954..dbb9b60 100755
--- a/update.sh
+++ b/update.sh
@@ -76,8 +76,9 @@ for i in crypto/compat libtls-standalone/compat; do
76 for j in $libc_src/crypt/arc4random.c \ 76 for j in $libc_src/crypt/arc4random.c \
77 $libc_src/crypt/arc4random_uniform.c \ 77 $libc_src/crypt/arc4random_uniform.c \
78 $libc_src/crypt/chacha_private.h \ 78 $libc_src/crypt/chacha_private.h \
79 $libc_src/string/explicit_bzero.c \ 79 $libc_src/net/inet_pton.c \
80 $libc_src/stdlib/reallocarray.c \ 80 $libc_src/stdlib/reallocarray.c \
81 $libc_src/string/explicit_bzero.c \
81 $libc_src/string/strcasecmp.c \ 82 $libc_src/string/strcasecmp.c \
82 $libc_src/string/strlcpy.c \ 83 $libc_src/string/strlcpy.c \
83 $libc_src/string/strlcat.c \ 84 $libc_src/string/strlcat.c \
@@ -217,6 +218,7 @@ sed -e "s/compat\///" crypto/Makefile.am.arc4random > \
217echo "copying nc(1) source" 218echo "copying nc(1) source"
218$CP $bin_src/nc/nc.1 apps/nc 219$CP $bin_src/nc/nc.1 apps/nc
219rm -f apps/nc/*.c apps/nc/*.h 220rm -f apps/nc/*.c apps/nc/*.h
221$CP_LIBC $libc_src/net/base64.c apps/nc/compat
220$CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat 222$CP_LIBC $libc_src/stdlib/strtonum.c apps/nc/compat
221for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do 223for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do
222 if [ -e $bin_src/nc/$i ]; then 224 if [ -e $bin_src/nc/$i ]; then
@@ -269,7 +271,7 @@ $CP $libcrypto_regress/aead/aeadtests.txt tests
269# copy libc tests 271# copy libc tests
270$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c 272$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c
271$CP $libc_regress/explicit_bzero/explicit_bzero.c tests 273$CP $libc_regress/explicit_bzero/explicit_bzero.c tests
272$CP_LIBC $libc_src/string/memmem.c tests 274$CP_LIBC $libc_src/string/memmem.c tests/compat
273$CP $libc_regress/timingsafe/timingsafe.c tests 275$CP $libc_regress/timingsafe/timingsafe.c tests
274 276
275# copy libssl tests 277# copy libssl tests
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 22:10:47 +0000