generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved structure bio_buf_mem_st from headers to bss_mem.c

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Kirill Marinushkin 2016-03-30 18:39:42 +02:00 committed by Rich Salz
parent fc9755ee0d
commit d3e6d6bcdf
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/bio/bio_lcl.h
View File

@ -76,12 +76,6 @@ union bio_addr_st {
/* END BIO_ADDRINFO/BIO_ADDR stuff. */ /* 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/cryptlib.h"
#include <internal/bio.h> #include <internal/bio.h>

8
crypto/bio/bss_mem.c
View File

@ -70,6 +70,7 @@ static int secmem_new(BIO *h);
static int mem_free(BIO *data); static int mem_free(BIO *data);
static int mem_buf_free(BIO *data, int free_all); static int mem_buf_free(BIO *data, int free_all);
static int mem_buf_sync(BIO *h); static int mem_buf_sync(BIO *h);
static const BIO_METHOD mem_method = { static const BIO_METHOD mem_method = {
BIO_TYPE_MEM, BIO_TYPE_MEM,
"memory buffer", "memory buffer",
@ -82,6 +83,7 @@ static const BIO_METHOD mem_method = {
mem_free, mem_free,
NULL, NULL,
}; };
static const BIO_METHOD secmem_method = { static const BIO_METHOD secmem_method = {
BIO_TYPE_MEM, BIO_TYPE_MEM,
"secure memory buffer", "secure memory buffer",
@ -95,6 +97,12 @@ static const BIO_METHOD secmem_method = {
NULL, 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, * bio->num is used to hold the value to return on 'empty', if it is 0,
* should_retry is not set * should_retry is not set

1
include/openssl/ossl_typ.h
View File

@ -128,7 +128,6 @@ typedef struct bn_recp_ctx_st BN_RECP_CTX;
typedef struct bn_gencb_st BN_GENCB; typedef struct bn_gencb_st BN_GENCB;
typedef struct buf_mem_st BUF_MEM; typedef struct buf_mem_st BUF_MEM;
typedef struct bio_buf_mem_st BIO_BUF_MEM;
typedef struct evp_cipher_st EVP_CIPHER; typedef struct evp_cipher_st EVP_CIPHER;
typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;