summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedu <>2014-04-17 22:19:56 +0000
committertedu <>2014-04-17 22:19:56 +0000
commita48db82b1782d392cc541b89021499336fb5031f (patch)
tree5012a7047e7828c1d39e8bf93d06e92bf88869b1
parent21e85950d9b773f0cde74f89a623ff4b919126f6 (diff)
downloadopenbsd-a48db82b1782d392cc541b89021499336fb5031f.tar.gz
openbsd-a48db82b1782d392cc541b89021499336fb5031f.tar.bz2
openbsd-a48db82b1782d392cc541b89021499336fb5031f.zip
delete if 0 code
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/bio/b_sock.c28
-rw-r--r--src/lib/libcrypto/bio/bf_buff.c3
-rw-r--r--src/lib/libcrypto/bio/bf_lbuf.c21
-rw-r--r--src/lib/libcrypto/bio/bss_dgram.c39
-rw-r--r--src/lib/libssl/src/crypto/bio/b_sock.c28
-rw-r--r--src/lib/libssl/src/crypto/bio/bf_buff.c3
-rw-r--r--src/lib/libssl/src/crypto/bio/bf_lbuf.c21
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_dgram.c39
8 files changed, 28 insertions, 154 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 0972feeb58..43b27e0406 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -96,23 +96,7 @@ static int wsa_init_done = 0;
96#define WSAAPI 96#define WSAAPI
97#endif 97#endif
98 98
99#if 0
100static unsigned long BIO_ghbn_hits = 0L;
101static unsigned long BIO_ghbn_miss = 0L;
102
103#define GHBN_NUM 4
104static struct ghbn_cache_st {
105 char name[129];
106 struct hostent *ent;
107 unsigned long order;
108} ghbn_cache[GHBN_NUM];
109#endif
110
111static int get_ip(const char *str, unsigned char *ip); 99static int get_ip(const char *str, unsigned char *ip);
112#if 0
113static void ghbn_free(struct hostent *a);
114static struct hostent *ghbn_dup(struct hostent *a);
115#endif
116 100
117int 101int
118BIO_get_host_ip(const char *str, unsigned char *ip) 102BIO_get_host_ip(const char *str, unsigned char *ip)
@@ -200,10 +184,6 @@ BIO_get_port(const char *str, unsigned short *port_ptr)
200 *port_ptr = 21; 184 *port_ptr = 21;
201 else if (strcmp(str, "gopher") == 0) 185 else if (strcmp(str, "gopher") == 0)
202 *port_ptr = 70; 186 *port_ptr = 70;
203#if 0
204 else if (strcmp(str, "wais") == 0)
205 *port_ptr = 21;
206#endif
207 else { 187 else {
208 SYSerr(SYS_F_GETSERVBYNAME, errno); 188 SYSerr(SYS_F_GETSERVBYNAME, errno);
209 ERR_add_error_data(3, "service='", str, "'"); 189 ERR_add_error_data(3, "service='", str, "'");
@@ -220,10 +200,6 @@ BIO_sock_error(int sock)
220 int j, i; 200 int j, i;
221 int size; 201 int size;
222 202
223#if defined(OPENSSL_SYS_BEOS_R5)
224 return 0;
225#endif
226
227 size = sizeof(int); 203 size = sizeof(int);
228 /* Note: under Windows the third parameter is of type (char *) 204 /* Note: under Windows the third parameter is of type (char *)
229 * whereas under other systems it is (void *) if you don't have 205 * whereas under other systems it is (void *) if you don't have
@@ -260,13 +236,9 @@ BIO_socket_ioctl(int fd, long type, void *arg)
260{ 236{
261 int i; 237 int i;
262 238
263#ifdef __DJGPP__
264 i = ioctl(fd, type, (char *)arg);
265#else
266# define ARG arg 239# define ARG arg
267 240
268 i = ioctl(fd, type, ARG); 241 i = ioctl(fd, type, ARG);
269#endif /* __DJGPP__ */
270 if (i < 0) 242 if (i < 0)
271 SYSerr(SYS_F_IOCTLSOCKET, errno); 243 SYSerr(SYS_F_IOCTLSOCKET, errno);
272 return (i); 244 return (i);
diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c
index 7b76e895a4..9dfd90c7b4 100644
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ b/src/lib/libcrypto/bio/bf_buff.c
@@ -419,9 +419,6 @@ buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
419 r = BIO_write(b->next_bio, 419 r = BIO_write(b->next_bio,
420 &(ctx->obuf[ctx->obuf_off]), 420 &(ctx->obuf[ctx->obuf_off]),
421 ctx->obuf_len); 421 ctx->obuf_len);
422#if 0
423 fprintf(stderr, "FLUSH [%3d] %3d -> %3d\n", ctx->obuf_off, ctx->obuf_len, r);
424#endif
425 BIO_copy_next_retry(b); 422 BIO_copy_next_retry(b);
426 if (r <= 0) 423 if (r <= 0)
427 return ((long)r); 424 return ((long)r);
diff --git a/src/lib/libcrypto/bio/bf_lbuf.c b/src/lib/libcrypto/bio/bf_lbuf.c
index e233cbc92c..7ed26ccec7 100644
--- a/src/lib/libcrypto/bio/bf_lbuf.c
+++ b/src/lib/libcrypto/bio/bf_lbuf.c
@@ -205,24 +205,15 @@ linebuffer_write(BIO *b, const char *in, int inl)
205 } 205 }
206 } 206 }
207 207
208#if 0
209 BIO_write(b->next_bio, "<*<", 3);
210#endif
211 i = BIO_write(b->next_bio, ctx->obuf, ctx->obuf_len); 208 i = BIO_write(b->next_bio, ctx->obuf, ctx->obuf_len);
212 if (i <= 0) { 209 if (i <= 0) {
213 ctx->obuf_len = orig_olen; 210 ctx->obuf_len = orig_olen;
214 BIO_copy_next_retry(b); 211 BIO_copy_next_retry(b);
215#if 0
216 BIO_write(b->next_bio, ">*>", 3);
217#endif
218 if (i < 0) 212 if (i < 0)
219 return ((num > 0) ? num : i); 213 return ((num > 0) ? num : i);
220 if (i == 0) 214 if (i == 0)
221 return (num); 215 return (num);
222 } 216 }
223#if 0
224 BIO_write(b->next_bio, ">*>", 3);
225#endif
226 if (i < ctx->obuf_len) 217 if (i < ctx->obuf_len)
227 memmove(ctx->obuf, ctx->obuf + i, 218 memmove(ctx->obuf, ctx->obuf + i,
228 ctx->obuf_len - i); 219 ctx->obuf_len - i);
@@ -232,23 +223,14 @@ linebuffer_write(BIO *b, const char *in, int inl)
232 /* Now that the save buffer is emptied, let's write the input 223 /* Now that the save buffer is emptied, let's write the input
233 buffer if a NL was found and there is anything to write. */ 224 buffer if a NL was found and there is anything to write. */
234 if ((foundnl || p - in > ctx->obuf_size) && p - in > 0) { 225 if ((foundnl || p - in > ctx->obuf_size) && p - in > 0) {
235#if 0
236 BIO_write(b->next_bio, "<*<", 3);
237#endif
238 i = BIO_write(b->next_bio, in, p - in); 226 i = BIO_write(b->next_bio, in, p - in);
239 if (i <= 0) { 227 if (i <= 0) {
240 BIO_copy_next_retry(b); 228 BIO_copy_next_retry(b);
241#if 0
242 BIO_write(b->next_bio, ">*>", 3);
243#endif
244 if (i < 0) 229 if (i < 0)
245 return ((num > 0) ? num : i); 230 return ((num > 0) ? num : i);
246 if (i == 0) 231 if (i == 0)
247 return (num); 232 return (num);
248 } 233 }
249#if 0
250 BIO_write(b->next_bio, ">*>", 3);
251#endif
252 num += i; 234 num += i;
253 in += i; 235 in += i;
254 inl -= i; 236 inl -= i;
@@ -334,9 +316,6 @@ linebuffer_ctrl(BIO *b, int cmd, long num, void *ptr)
334 if (ctx->obuf_len > 0) { 316 if (ctx->obuf_len > 0) {
335 r = BIO_write(b->next_bio, 317 r = BIO_write(b->next_bio,
336 ctx->obuf, ctx->obuf_len); 318 ctx->obuf, ctx->obuf_len);
337#if 0
338 fprintf(stderr, "FLUSH %3d -> %3d\n", ctx->obuf_len, r);
339#endif
340 BIO_copy_next_retry(b); 319 BIO_copy_next_retry(b);
341 if (r <= 0) 320 if (r <= 0)
342 return ((long)r); 321 return ((long)r);
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index 50281b5650..c1e85a21c6 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -411,12 +411,10 @@ dgram_write(BIO *b, const char *in, int inl)
411 BIO_set_retry_write(b); 411 BIO_set_retry_write(b);
412 412
413 data->_errno = errno; 413 data->_errno = errno;
414 414 /*
415#if 0 /* higher layers are responsible for querying MTU, if necessary */ 415 * higher layers are responsible for querying MTU,
416 if (data->_errno == EMSGSIZE) 416 * if necessary
417 /* retrieve the new MTU */ 417 */
418 BIO_ctrl(b, BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
419#endif
420 } 418 }
421 } 419 }
422 return (ret); 420 return (ret);
@@ -486,28 +484,19 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
486 break; 484 break;
487 case BIO_CTRL_DGRAM_CONNECT: 485 case BIO_CTRL_DGRAM_CONNECT:
488 to = (struct sockaddr *)ptr; 486 to = (struct sockaddr *)ptr;
489#if 0 487 switch (to->sa_family) {
490 if (connect(b->num, to, sizeof(struct sockaddr)) < 0) { 488 case AF_INET:
491 perror("connect"); 489 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
492 ret = 0; 490 break;
493 } else {
494#endif
495 switch (to->sa_family) {
496 case AF_INET:
497 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
498 break;
499#if OPENSSL_USE_IPV6 491#if OPENSSL_USE_IPV6
500 case AF_INET6: 492 case AF_INET6:
501 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 493 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
502 break; 494 break;
503#endif 495#endif
504 default: 496 default:
505 memcpy(&data->peer, to, sizeof(data->peer.sa)); 497 memcpy(&data->peer, to, sizeof(data->peer.sa));
506 break; 498 break;
507 }
508#if 0
509 } 499 }
510#endif
511 break; 500 break;
512 /* (Linux)kernel sets DF bit on outgoing IP packets */ 501 /* (Linux)kernel sets DF bit on outgoing IP packets */
513 case BIO_CTRL_DGRAM_MTU_DISCOVER: 502 case BIO_CTRL_DGRAM_MTU_DISCOVER:
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index 0972feeb58..43b27e0406 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -96,23 +96,7 @@ static int wsa_init_done = 0;
96#define WSAAPI 96#define WSAAPI
97#endif 97#endif
98 98
99#if 0
100static unsigned long BIO_ghbn_hits = 0L;
101static unsigned long BIO_ghbn_miss = 0L;
102
103#define GHBN_NUM 4
104static struct ghbn_cache_st {
105 char name[129];
106 struct hostent *ent;
107 unsigned long order;
108} ghbn_cache[GHBN_NUM];
109#endif
110
111static int get_ip(const char *str, unsigned char *ip); 99static int get_ip(const char *str, unsigned char *ip);
112#if 0
113static void ghbn_free(struct hostent *a);
114static struct hostent *ghbn_dup(struct hostent *a);
115#endif
116 100
117int 101int
118BIO_get_host_ip(const char *str, unsigned char *ip) 102BIO_get_host_ip(const char *str, unsigned char *ip)
@@ -200,10 +184,6 @@ BIO_get_port(const char *str, unsigned short *port_ptr)
200 *port_ptr = 21; 184 *port_ptr = 21;
201 else if (strcmp(str, "gopher") == 0) 185 else if (strcmp(str, "gopher") == 0)
202 *port_ptr = 70; 186 *port_ptr = 70;
203#if 0
204 else if (strcmp(str, "wais") == 0)
205 *port_ptr = 21;
206#endif
207 else { 187 else {
208 SYSerr(SYS_F_GETSERVBYNAME, errno); 188 SYSerr(SYS_F_GETSERVBYNAME, errno);
209 ERR_add_error_data(3, "service='", str, "'"); 189 ERR_add_error_data(3, "service='", str, "'");
@@ -220,10 +200,6 @@ BIO_sock_error(int sock)
220 int j, i; 200 int j, i;
221 int size; 201 int size;
222 202
223#if defined(OPENSSL_SYS_BEOS_R5)
224 return 0;
225#endif
226
227 size = sizeof(int); 203 size = sizeof(int);
228 /* Note: under Windows the third parameter is of type (char *) 204 /* Note: under Windows the third parameter is of type (char *)
229 * whereas under other systems it is (void *) if you don't have 205 * whereas under other systems it is (void *) if you don't have
@@ -260,13 +236,9 @@ BIO_socket_ioctl(int fd, long type, void *arg)
260{ 236{
261 int i; 237 int i;
262 238
263#ifdef __DJGPP__
264 i = ioctl(fd, type, (char *)arg);
265#else
266# define ARG arg 239# define ARG arg
267 240
268 i = ioctl(fd, type, ARG); 241 i = ioctl(fd, type, ARG);
269#endif /* __DJGPP__ */
270 if (i < 0) 242 if (i < 0)
271 SYSerr(SYS_F_IOCTLSOCKET, errno); 243 SYSerr(SYS_F_IOCTLSOCKET, errno);
272 return (i); 244 return (i);
diff --git a/src/lib/libssl/src/crypto/bio/bf_buff.c b/src/lib/libssl/src/crypto/bio/bf_buff.c
index 7b76e895a4..9dfd90c7b4 100644
--- a/src/lib/libssl/src/crypto/bio/bf_buff.c
+++ b/src/lib/libssl/src/crypto/bio/bf_buff.c
@@ -419,9 +419,6 @@ buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
419 r = BIO_write(b->next_bio, 419 r = BIO_write(b->next_bio,
420 &(ctx->obuf[ctx->obuf_off]), 420 &(ctx->obuf[ctx->obuf_off]),
421 ctx->obuf_len); 421 ctx->obuf_len);
422#if 0
423 fprintf(stderr, "FLUSH [%3d] %3d -> %3d\n", ctx->obuf_off, ctx->obuf_len, r);
424#endif
425 BIO_copy_next_retry(b); 422 BIO_copy_next_retry(b);
426 if (r <= 0) 423 if (r <= 0)
427 return ((long)r); 424 return ((long)r);
diff --git a/src/lib/libssl/src/crypto/bio/bf_lbuf.c b/src/lib/libssl/src/crypto/bio/bf_lbuf.c
index e233cbc92c..7ed26ccec7 100644
--- a/src/lib/libssl/src/crypto/bio/bf_lbuf.c
+++ b/src/lib/libssl/src/crypto/bio/bf_lbuf.c
@@ -205,24 +205,15 @@ linebuffer_write(BIO *b, const char *in, int inl)
205 } 205 }
206 } 206 }
207 207
208#if 0
209 BIO_write(b->next_bio, "<*<", 3);
210#endif
211 i = BIO_write(b->next_bio, ctx->obuf, ctx->obuf_len); 208 i = BIO_write(b->next_bio, ctx->obuf, ctx->obuf_len);
212 if (i <= 0) { 209 if (i <= 0) {
213 ctx->obuf_len = orig_olen; 210 ctx->obuf_len = orig_olen;
214 BIO_copy_next_retry(b); 211 BIO_copy_next_retry(b);
215#if 0
216 BIO_write(b->next_bio, ">*>", 3);
217#endif
218 if (i < 0) 212 if (i < 0)
219 return ((num > 0) ? num : i); 213 return ((num > 0) ? num : i);
220 if (i == 0) 214 if (i == 0)
221 return (num); 215 return (num);
222 } 216 }
223#if 0
224 BIO_write(b->next_bio, ">*>", 3);
225#endif
226 if (i < ctx->obuf_len) 217 if (i < ctx->obuf_len)
227 memmove(ctx->obuf, ctx->obuf + i, 218 memmove(ctx->obuf, ctx->obuf + i,
228 ctx->obuf_len - i); 219 ctx->obuf_len - i);
@@ -232,23 +223,14 @@ linebuffer_write(BIO *b, const char *in, int inl)
232 /* Now that the save buffer is emptied, let's write the input 223 /* Now that the save buffer is emptied, let's write the input
233 buffer if a NL was found and there is anything to write. */ 224 buffer if a NL was found and there is anything to write. */
234 if ((foundnl || p - in > ctx->obuf_size) && p - in > 0) { 225 if ((foundnl || p - in > ctx->obuf_size) && p - in > 0) {
235#if 0
236 BIO_write(b->next_bio, "<*<", 3);
237#endif
238 i = BIO_write(b->next_bio, in, p - in); 226 i = BIO_write(b->next_bio, in, p - in);
239 if (i <= 0) { 227 if (i <= 0) {
240 BIO_copy_next_retry(b); 228 BIO_copy_next_retry(b);
241#if 0
242 BIO_write(b->next_bio, ">*>", 3);
243#endif
244 if (i < 0) 229 if (i < 0)
245 return ((num > 0) ? num : i); 230 return ((num > 0) ? num : i);
246 if (i == 0) 231 if (i == 0)
247 return (num); 232 return (num);
248 } 233 }
249#if 0
250 BIO_write(b->next_bio, ">*>", 3);
251#endif
252 num += i; 234 num += i;
253 in += i; 235 in += i;
254 inl -= i; 236 inl -= i;
@@ -334,9 +316,6 @@ linebuffer_ctrl(BIO *b, int cmd, long num, void *ptr)
334 if (ctx->obuf_len > 0) { 316 if (ctx->obuf_len > 0) {
335 r = BIO_write(b->next_bio, 317 r = BIO_write(b->next_bio,
336 ctx->obuf, ctx->obuf_len); 318 ctx->obuf, ctx->obuf_len);
337#if 0
338 fprintf(stderr, "FLUSH %3d -> %3d\n", ctx->obuf_len, r);
339#endif
340 BIO_copy_next_retry(b); 319 BIO_copy_next_retry(b);
341 if (r <= 0) 320 if (r <= 0)
342 return ((long)r); 321 return ((long)r);
diff --git a/src/lib/libssl/src/crypto/bio/bss_dgram.c b/src/lib/libssl/src/crypto/bio/bss_dgram.c
index 50281b5650..c1e85a21c6 100644
--- a/src/lib/libssl/src/crypto/bio/bss_dgram.c
+++ b/src/lib/libssl/src/crypto/bio/bss_dgram.c
@@ -411,12 +411,10 @@ dgram_write(BIO *b, const char *in, int inl)
411 BIO_set_retry_write(b); 411 BIO_set_retry_write(b);
412 412
413 data->_errno = errno; 413 data->_errno = errno;
414 414 /*
415#if 0 /* higher layers are responsible for querying MTU, if necessary */ 415 * higher layers are responsible for querying MTU,
416 if (data->_errno == EMSGSIZE) 416 * if necessary
417 /* retrieve the new MTU */ 417 */
418 BIO_ctrl(b, BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
419#endif
420 } 418 }
421 } 419 }
422 return (ret); 420 return (ret);
@@ -486,28 +484,19 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
486 break; 484 break;
487 case BIO_CTRL_DGRAM_CONNECT: 485 case BIO_CTRL_DGRAM_CONNECT:
488 to = (struct sockaddr *)ptr; 486 to = (struct sockaddr *)ptr;
489#if 0 487 switch (to->sa_family) {
490 if (connect(b->num, to, sizeof(struct sockaddr)) < 0) { 488 case AF_INET:
491 perror("connect"); 489 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
492 ret = 0; 490 break;
493 } else {
494#endif
495 switch (to->sa_family) {
496 case AF_INET:
497 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
498 break;
499#if OPENSSL_USE_IPV6 491#if OPENSSL_USE_IPV6
500 case AF_INET6: 492 case AF_INET6:
501 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 493 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
502 break; 494 break;
503#endif 495#endif
504 default: 496 default:
505 memcpy(&data->peer, to, sizeof(data->peer.sa)); 497 memcpy(&data->peer, to, sizeof(data->peer.sa));
506 break; 498 break;
507 }
508#if 0
509 } 499 }
510#endif
511 break; 500 break;
512 /* (Linux)kernel sets DF bit on outgoing IP packets */ 501 /* (Linux)kernel sets DF bit on outgoing IP packets */
513 case BIO_CTRL_DGRAM_MTU_DISCOVER: 502 case BIO_CTRL_DGRAM_MTU_DISCOVER:
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-12 23:09:14 +0000