Commit 686d82a7 authored by Matt Caswell's avatar Matt Caswell
Browse files

make update 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 8ca79fcb

crypto/bio/bio.h

+1 −0
Original line number Diff line number Diff line
@@ -829,6 +829,7 @@ void ERR_load_BIO_strings(void); 
# define BIO_F_CONN_CTRL                                  127

# define BIO_F_CONN_STATE                                 115

# define BIO_F_DGRAM_SCTP_READ                            132

# define BIO_F_DGRAM_SCTP_WRITE                           133

# define BIO_F_FILE_CTRL                                  116

# define BIO_F_FILE_READ                                  130

# define BIO_F_LINEBUFFER_CTRL                            129

crypto/bio/bio_err.c

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static ERR_STRING_DATA BIO_str_functs[] = { 
    {ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"},

    {ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "DGRAM_SCTP_READ"},

    {ERR_FUNC(BIO_F_DGRAM_SCTP_WRITE), "DGRAM_SCTP_WRITE"},

    {ERR_FUNC(BIO_F_FILE_CTRL), "FILE_CTRL"},

    {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"},

    {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"},

crypto/stack/safestack.h

+0 −1
Original line number Diff line number Diff line
@@ -2530,7 +2530,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) 
# define lh_SSL_SESSION_stats_bio(lh,out) \

  LHM_lh_stats_bio(SSL_SESSION,lh,out)

# define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)

/* End of util/mkstack.pl block, you may now edit :-) */

#ifdef  __cplusplus

}

#endif