summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2016-09-04 13:17:08 +0000
committerjsing <>2016-09-04 13:17:08 +0000
commit71cf0e2d9bd1fd282d8b7b8c5840f6ccdf3fdceb (patch)
tree3f5618be446266245a2a4ee3f25b275c2e2f3a51 /src
parent2ff6cad82ed0174e0ce2c12b3a0a4b6c469b4a05 (diff)
downloadopenbsd-71cf0e2d9bd1fd282d8b7b8c5840f6ccdf3fdceb.tar.gz
openbsd-71cf0e2d9bd1fd282d8b7b8c5840f6ccdf3fdceb.tar.bz2
openbsd-71cf0e2d9bd1fd282d8b7b8c5840f6ccdf3fdceb.zip
Sort headers and use the installed tls.h, rather than the local one.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libtls/tls_bio_cb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libtls/tls_bio_cb.c b/src/lib/libtls/tls_bio_cb.c
index cee37a86d8..e689cf1117 100644
--- a/src/lib/libtls/tls_bio_cb.c
+++ b/src/lib/libtls/tls_bio_cb.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_bio_cb.c,v 1.2 2016/09/04 12:54:33 jsing Exp $ */ 1/* $OpenBSD: tls_bio_cb.c,v 1.3 2016/09/04 13:17:08 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2016 Tobias Pape <tobias@netshed.de> 3 * Copyright (c) 2016 Tobias Pape <tobias@netshed.de>
4 * 4 *
@@ -15,15 +15,15 @@
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */ 16 */
17 17
18#include <fcntl.h>
18#include <stdlib.h> 19#include <stdlib.h>
19#include <unistd.h> 20#include <unistd.h>
20#include <fcntl.h>
21
22#include "tls.h"
23#include "tls_internal.h"
24 21
25#include <openssl/bio.h> 22#include <openssl/bio.h>
26 23
24#include <tls.h>
25#include "tls_internal.h"
26
27static int write_cb(BIO *b, const char *buf, int num); 27static int write_cb(BIO *b, const char *buf, int num);
28static int read_cb(BIO *b, char *buf, int size); 28static int read_cb(BIO *b, char *buf, int size);
29static int puts_cb(BIO *b, const char *str); 29static int puts_cb(BIO *b, const char *str);