diff options
| author |   doug <doug@openbsd.org> | 2015-07-19 07:30:06 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-07-19 07:30:06 +0000 |
| commit | 414052902d85be23dd9bff033197979ef335a1ce (patch) | |
| tree | 20db7402482f6a90d60c68cb1a736ee2b993e6ae /lib/libssl/src/ssl/ssl_locl.h | |
| parent | Handle malloc(0) returning NULL (which can happen on some other (diff) | |
| download | wireguard-openbsd-414052902d85be23dd9bff033197979ef335a1ce.tar.xz wireguard-openbsd-414052902d85be23dd9bff033197979ef335a1ce.zip | |
Fix symbol collision with libtls.
Pointed out by guenther.
ok guenther@
Diffstat (limited to 'lib/libssl/src/ssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h index 1c78770dfa5..d05ef600e56 100644 --- a/lib/libssl/src/ssl/ssl_locl.h +++ b/lib/libssl/src/ssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.98 2015/07/19 06:31:32 doug Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.99 2015/07/19 07:30:06 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -757,8 +757,8 @@ int ssl23_accept(SSL *s); int ssl23_connect(SSL *s); int ssl23_read_bytes(SSL *s, int n); int ssl23_write_bytes(SSL *s); -int tls_accept(SSL *s); -int tls_connect(SSL *s); +int tls_any_accept(SSL *s); +int tls_any_connect(SSL *s); int tls1_new(SSL *s); void tls1_free(SSL *s); |