diff options
author | doug <> | 2015-07-19 07:30:06 +0000 |
---|---|---|
committer | doug <> | 2015-07-19 07:30:06 +0000 |
commit | 11e1a704b0141f0bc09002ae44c62941ba74c537 (patch) | |
tree | 7abb60146170f61e7ffb17add50d04eecb4269ac /src/lib/libssl/ssl_locl.h | |
parent | 915e1bd09b87e5d7402cab53ddc89bd039968fd4 (diff) | |
download | openbsd-11e1a704b0141f0bc09002ae44c62941ba74c537.tar.gz openbsd-11e1a704b0141f0bc09002ae44c62941ba74c537.tar.bz2 openbsd-11e1a704b0141f0bc09002ae44c62941ba74c537.zip |
Fix symbol collision with libtls.
Pointed out by guenther.
ok guenther@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 1c78770dfa..d05ef600e5 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.98 2015/07/19 06:31:32 doug Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.99 2015/07/19 07:30:06 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -757,8 +757,8 @@ int ssl23_accept(SSL *s); | |||
757 | int ssl23_connect(SSL *s); | 757 | int ssl23_connect(SSL *s); |
758 | int ssl23_read_bytes(SSL *s, int n); | 758 | int ssl23_read_bytes(SSL *s, int n); |
759 | int ssl23_write_bytes(SSL *s); | 759 | int ssl23_write_bytes(SSL *s); |
760 | int tls_accept(SSL *s); | 760 | int tls_any_accept(SSL *s); |
761 | int tls_connect(SSL *s); | 761 | int tls_any_connect(SSL *s); |
762 | 762 | ||
763 | int tls1_new(SSL *s); | 763 | int tls1_new(SSL *s); |
764 | void tls1_free(SSL *s); | 764 | void tls1_free(SSL *s); |