summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorbcook <>2016-10-03 04:13:58 +0000
committerbcook <>2016-10-03 04:13:58 +0000
commita27f227083ddba33b521e7d37926d82e4103c5db (patch)
tree7f768020092497f6ffad05958bff1c1e162fe8cb /src/lib
parentbc32324675910bc8e8380d2aed74cb6a10b22d50 (diff)
downloadopenbsd-a27f227083ddba33b521e7d37926d82e4103c5db.tar.gz
openbsd-a27f227083ddba33b521e7d37926d82e4103c5db.tar.bz2
openbsd-a27f227083ddba33b521e7d37926d82e4103c5db.zip
use the same type for buf as the return type in tls_load_file
ok tedu@, noted by kinichiro
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libtls/tls_util.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libtls/tls_util.c b/src/lib/libtls/tls_util.c
index 919ea9a6ac..8cf3345caf 100644
--- a/src/lib/libtls/tls_util.c
+++ b/src/lib/libtls/tls_util.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_util.c,v 1.3 2015/09/09 19:49:07 jsing Exp $ */ 1/* $OpenBSD: tls_util.c,v 1.4 2016/10/03 04:13:58 bcook Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> 4 * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -105,7 +105,8 @@ tls_load_file(const char *name, size_t *len, char *password)
105 FILE *fp; 105 FILE *fp;
106 EVP_PKEY *key = NULL; 106 EVP_PKEY *key = NULL;
107 BIO *bio = NULL; 107 BIO *bio = NULL;
108 char *data, *buf = NULL; 108 char *data;
109 uint8_t *buf = NULL;
109 struct stat st; 110 struct stat st;
110 size_t size; 111 size_t size;
111 int fd = -1; 112 int fd = -1;