diff options
| author | Kirill Marinushkin <k.marinushkin@gmail.com> | 2016-03-30 18:39:42 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-04-02 16:57:07 -0400 |
| commit | d3e6d6bcdfb725a57f94330367e7b752036c7a2c (patch) | |
| tree | aef603c5fd1aafeb8180c8b2e9e5f9e9b1a1fd2b /crypto/bio | |
| parent | fc9755ee0d9590510df48b5fbac7cea0b6792b1f (diff) | |
| download | openssl-d3e6d6bcdfb725a57f94330367e7b752036c7a2c.tar.gz | |
moved structure bio_buf_mem_st from headers to bss_mem.c
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bio_lcl.h | 6 | ||||
| -rw-r--r-- | crypto/bio/bss_mem.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h index ffd9e89ccd..7f3b22268a 100644 --- a/crypto/bio/bio_lcl.h +++ b/crypto/bio/bio_lcl.h @@ -76,12 +76,6 @@ union bio_addr_st { /* END BIO_ADDRINFO/BIO_ADDR stuff. */ -/* BIO_BUF_MEM */ -struct bio_buf_mem_st { - struct buf_mem_st *buf; /* allocated buffer */ - struct buf_mem_st *readp; /* read pointer */ -}; - #include "internal/cryptlib.h" #include <internal/bio.h> diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 02fa28d733..46bd0343d5 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -70,6 +70,7 @@ static int secmem_new(BIO *h); static int mem_free(BIO *data); static int mem_buf_free(BIO *data, int free_all); static int mem_buf_sync(BIO *h); + static const BIO_METHOD mem_method = { BIO_TYPE_MEM, "memory buffer", @@ -82,6 +83,7 @@ static const BIO_METHOD mem_method = { mem_free, NULL, }; + static const BIO_METHOD secmem_method = { BIO_TYPE_MEM, "secure memory buffer", @@ -95,6 +97,12 @@ static const BIO_METHOD secmem_method = { NULL, }; +/* BIO memory stores buffer and read pointer */ +typedef struct bio_buf_mem_st { + struct buf_mem_st *buf; /* allocated buffer */ + struct buf_mem_st *readp; /* read pointer */ +} BIO_BUF_MEM; + /* * bio->num is used to hold the value to return on 'empty', if it is 0, * should_retry is not set |