Commit d3e6d6bc authored by Kirill Marinushkin's avatar Kirill Marinushkin Committed by Rich Salz
Browse files

moved structure bio_buf_mem_st from headers to bss_mem.c 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent fc9755ee

crypto/bio/bio_lcl.h

+0 −6
Original line number Diff line number Diff line
@@ -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>

crypto/bio/bss_mem.c

+8 −0
Original line number Diff line number Diff line
@@ -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

include/openssl/ossl_typ.h

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ typedef struct bn_recp_ctx_st BN_RECP_CTX; 
typedef struct bn_gencb_st BN_GENCB;



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_ctx_st EVP_CIPHER_CTX;