summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_internal.h
diff options
context:
space:
mode:
authordoug <>2014-12-17 17:51:33 +0000
committerdoug <>2014-12-17 17:51:33 +0000
commit8ee1a1e4a4c52092060a915a644f80202aba054a (patch)
tree6b23fc9e20f81f6dc09a6fb3d8bac2a4246a7ab9 /src/lib/libtls/tls_internal.h
parent1711181cf04802398af99b3d8ffff8829eb38455 (diff)
downloadopenbsd-8ee1a1e4a4c52092060a915a644f80202aba054a.tar.gz
openbsd-8ee1a1e4a4c52092060a915a644f80202aba054a.tar.bz2
openbsd-8ee1a1e4a4c52092060a915a644f80202aba054a.zip
Add size_t to int checks for SSL functions.
libtls accepts size_t for lengths but libssl accepts int. This verifies that the input does not exceed INT_MAX. It also avoids truncating size_t when comparing with int and adds printf-style attributes for tls_set_error(). with input from deraadt@ and tedu@ ok tedu@
Diffstat (limited to 'src/lib/libtls/tls_internal.h')
-rw-r--r--src/lib/libtls/tls_internal.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index bfd7146d7d..4b250574ef 100644
--- a/src/lib/libtls/tls_internal.h
+++ b/src/lib/libtls/tls_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_internal.h,v 1.4 2014/12/07 16:56:17 bcook Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.5 2014/12/17 17:51:33 doug Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -67,6 +67,8 @@ int tls_configure_keypair(struct tls *ctx);
67int tls_configure_server(struct tls *ctx); 67int tls_configure_server(struct tls *ctx);
68int tls_configure_ssl(struct tls *ctx); 68int tls_configure_ssl(struct tls *ctx);
69int tls_host_port(const char *hostport, char **host, char **port); 69int tls_host_port(const char *hostport, char **host, char **port);
70int tls_set_error(struct tls *ctx, char *fmt, ...); 70int tls_set_error(struct tls *ctx, char *fmt, ...)
71 __attribute__((__format__ (printf, 2, 3)))
72 __attribute__((__nonnull__ (2)));
71 73
72#endif /* HEADER_TLS_INTERNAL_H */ 74#endif /* HEADER_TLS_INTERNAL_H */