diff options
Diffstat (limited to 'src/usr.bin/nc/netcat.c')
| -rw-r--r-- | src/usr.bin/nc/netcat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index df0aed9e38..9e2b7e9eb7 100644 --- a/src/usr.bin/nc/netcat.c +++ b/src/usr.bin/nc/netcat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: netcat.c,v 1.140 2015/10/23 05:27:17 beck Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.141 2015/11/01 01:05:31 deraadt Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> | 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> |
| 4 | * Copyright (c) 2015 Bob Beck. All rights reserved. | 4 | * Copyright (c) 2015 Bob Beck. All rights reserved. |
| @@ -676,7 +676,6 @@ unix_bind(char *path, int flags) | |||
| 676 | 676 | ||
| 677 | void | 677 | void |
| 678 | tls_setup_client(struct tls *tls_ctx, int s, char *host) | 678 | tls_setup_client(struct tls *tls_ctx, int s, char *host) |
| 679 | |||
| 680 | { | 679 | { |
| 681 | int i; | 680 | int i; |
| 682 | 681 | ||
| @@ -696,6 +695,7 @@ tls_setup_client(struct tls *tls_ctx, int s, char *host) | |||
| 696 | strcmp(tls_expecthash, tls_peer_cert_hash(tls_ctx)) != 0) | 695 | strcmp(tls_expecthash, tls_peer_cert_hash(tls_ctx)) != 0) |
| 697 | errx(1, "peer certificate is not %s", tls_expecthash); | 696 | errx(1, "peer certificate is not %s", tls_expecthash); |
| 698 | } | 697 | } |
| 698 | |||
| 699 | struct tls * | 699 | struct tls * |
| 700 | tls_setup_server(struct tls *tls_ctx, int connfd, char *host) | 700 | tls_setup_server(struct tls *tls_ctx, int connfd, char *host) |
| 701 | { | 701 | { |
| @@ -735,6 +735,7 @@ tls_setup_server(struct tls *tls_ctx, int connfd, char *host) | |||
| 735 | } | 735 | } |
| 736 | return NULL; | 736 | return NULL; |
| 737 | } | 737 | } |
| 738 | |||
| 738 | /* | 739 | /* |
| 739 | * unix_connect() | 740 | * unix_connect() |
| 740 | * Returns a socket connected to a local unix socket. Returns -1 on failure. | 741 | * Returns a socket connected to a local unix socket. Returns -1 on failure. |
| @@ -1161,7 +1162,6 @@ drainbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls) | |||
| 1161 | return n; | 1162 | return n; |
| 1162 | } | 1163 | } |
| 1163 | 1164 | ||
| 1164 | |||
| 1165 | ssize_t | 1165 | ssize_t |
| 1166 | fillbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls) | 1166 | fillbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls) |
| 1167 | { | 1167 | { |
