diff options
author | jsing <> | 2015-03-31 12:21:27 +0000 |
---|---|---|
committer | jsing <> | 2015-03-31 12:21:27 +0000 |
commit | b5828f12ff689b9c1b62264b27b32dcbd97de33f (patch) | |
tree | d79f85860400a651427592168da3935f38b4ff73 /src/lib/libtls/tls_internal.h | |
parent | 9f9909654ade9ba11a37c45f75c146ac91419bca (diff) | |
download | openbsd-b5828f12ff689b9c1b62264b27b32dcbd97de33f.tar.gz openbsd-b5828f12ff689b9c1b62264b27b32dcbd97de33f.tar.bz2 openbsd-b5828f12ff689b9c1b62264b27b32dcbd97de33f.zip |
Store errors that occur during a tls_accept_socket() call on the context
for the server, rather than on the context for the connection. This makes
more sense than the current behaviour does.
Issue reported by Tim van der Molen.
Diffstat (limited to '')
-rw-r--r-- | src/lib/libtls/tls_internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h index d1ba48ea1a..ba37e136e6 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.11 2015/02/22 14:50:41 jsing Exp $ */ | 1 | /* $OpenBSD: tls_internal.h,v 1.12 2015/03/31 12:21:27 jsing 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> |
@@ -77,6 +77,7 @@ int tls_host_port(const char *hostport, char **host, char **port); | |||
77 | int tls_set_error(struct tls *ctx, char *fmt, ...) | 77 | int tls_set_error(struct tls *ctx, char *fmt, ...) |
78 | __attribute__((__format__ (printf, 2, 3))) | 78 | __attribute__((__format__ (printf, 2, 3))) |
79 | __attribute__((__nonnull__ (2))); | 79 | __attribute__((__nonnull__ (2))); |
80 | int tls_ssl_error(struct tls *ctx, int ssl_ret, const char *prefix); | 80 | int tls_ssl_error(struct tls *ctx, SSL *ssl_conn, int ssl_ret, |
81 | const char *prefix); | ||
81 | 82 | ||
82 | #endif /* HEADER_TLS_INTERNAL_H */ | 83 | #endif /* HEADER_TLS_INTERNAL_H */ |