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

make update

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell
2015-03-19 13:38:37 +00:00
parent 8ca79fcbf4
commit 686d82a7a2
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/bio/bio.h
View File

@@ -829,6 +829,7 @@ void ERR_load_BIO_strings(void);
# define BIO_F_CONN_CTRL 127 # define BIO_F_CONN_CTRL 127
# define BIO_F_CONN_STATE 115 # define BIO_F_CONN_STATE 115
# define BIO_F_DGRAM_SCTP_READ 132 # define BIO_F_DGRAM_SCTP_READ 132
# define BIO_F_DGRAM_SCTP_WRITE 133
# define BIO_F_FILE_CTRL 116 # define BIO_F_FILE_CTRL 116
# define BIO_F_FILE_READ 130 # define BIO_F_FILE_READ 130
# define BIO_F_LINEBUFFER_CTRL 129 # define BIO_F_LINEBUFFER_CTRL 129

1
crypto/bio/bio_err.c
View File

@@ -96,6 +96,7 @@ static ERR_STRING_DATA BIO_str_functs[] = {
{ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"}, {ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"},
{ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"}, {ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"},
{ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "DGRAM_SCTP_READ"}, {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_CTRL), "FILE_CTRL"},
{ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"}, {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"},
{ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"}, {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"},

1
crypto/stack/safestack.h
View File

@@ -2530,7 +2530,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
# define lh_SSL_SESSION_stats_bio(lh,out) \ # define lh_SSL_SESSION_stats_bio(lh,out) \
LHM_lh_stats_bio(SSL_SESSION,lh,out) LHM_lh_stats_bio(SSL_SESSION,lh,out)
# define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh) # define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
/* End of util/mkstack.pl block, you may now edit :-) */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif