summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorjsing <>2020-01-23 03:17:40 +0000
committerjsing <>2020-01-23 03:17:40 +0000
commit7e2f15593307fc374a9a0b62d562093d20e0f4aa (patch)
tree0ef2c65adc26f279aea716841857cfd27cc33036 /src/lib/libssl/ssl_locl.h
parentb70929d8816a98e03f2a44de9ee1c07edde90382 (diff)
downloadopenbsd-7e2f15593307fc374a9a0b62d562093d20e0f4aa.tar.gz
openbsd-7e2f15593307fc374a9a0b62d562093d20e0f4aa.tar.bz2
openbsd-7e2f15593307fc374a9a0b62d562093d20e0f4aa.zip
Switch back to a function pointer for ssl_pending.
This will allow the TLSv1.3 stack to provide its own implementation. Nuke a completely bogus comment from SSL_pending() whilst here. ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 1c60f10684..8649f651fa 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.252 2020/01/22 15:47:22 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.253 2020/01/23 03:17:40 jsing 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 *
@@ -391,8 +391,9 @@ typedef struct ssl_method_internal_st {
391 391
392 long (*ssl_get_message)(SSL *s, int st1, int stn, int mt, 392 long (*ssl_get_message)(SSL *s, int st1, int stn, int mt,
393 long max, int *ok); 393 long max, int *ok);
394 int (*ssl_read_bytes)(SSL *s, int type, unsigned char *buf, 394 int (*ssl_pending)(const SSL *s);
395 int len, int peek); 395 int (*ssl_read_bytes)(SSL *s, int type, unsigned char *buf, int len,
396 int peek);
396 int (*ssl_write_bytes)(SSL *s, int type, const void *buf_, int len); 397 int (*ssl_write_bytes)(SSL *s, int type, const void *buf_, int len);
397 398
398 const struct ssl_method_st *(*get_ssl_method)(int version); 399 const struct ssl_method_st *(*get_ssl_method)(int version);