summaryrefslogtreecommitdiffstats
path: root/include/internal
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-09-05 17:26:58 +0100
committerMatt Caswell <matt@openssl.org>2016-10-28 09:48:54 +0100
commitd07aee2c7a33e77d97d8e13811af3637e3849cb2 (patch)
tree1c3452687dbd734f4e739713f29fbf770f5524dd /include/internal
parent229bd12487f8576fc088dc4f641950ac33c62033 (diff)
Create BIO_read_ex() which handles size_t arguments
Also extend BIO_METHOD to be able to supply an implementation for the new BIO_read function. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include/internal')
-rw-r--r--include/internal/bio.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/internal/bio.h b/include/internal/bio.h
index 3b6a6ac4d2..f840bcd32c 100644
--- a/include/internal/bio.h
+++ b/include/internal/bio.h
@@ -13,7 +13,8 @@ struct bio_method_st {
int type;
const char *name;
int (*bwrite) (BIO *, const char *, int);
- int (*bread) (BIO *, char *, int);
+ int (*bread) (BIO *, char *, size_t, size_t *);
+ int (*bread_old) (BIO *, char *, int);
int (*bputs) (BIO *, const char *);
int (*bgets) (BIO *, char *, int);
long (*ctrl) (BIO *, int, long, void *);
@@ -24,3 +25,7 @@ struct bio_method_st {
void bio_free_ex_data(BIO *bio);
void bio_cleanup(void);
+
+
+/* Old style to new style BIO_METHOD conversion functions */
+int bread_conv(BIO *bio, char *out, size_t outl, size_t *read);