make update
authorMatt Caswell <matt@openssl.org>
Thu, 19 Mar 2015 13:38:37 +0000 (13:38 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 19 Mar 2015 13:38:37 +0000 (13:38 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
crypto/bio/bio.h
crypto/bio/bio_err.c
crypto/stack/safestack.h

index 81f13c725cbfc1c41e9ed414e3bbed82fe2d1c61..be9cd0eff39b58eaf6afadb2a0c8eb7e9058016e 100644 (file)
@@ -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
index e8d3027c6a35b58c4068dfc2ae10725f1ac3abff..6dd6162fc93aa72dd36c403b6877f6ac2cf56b23 100644 (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_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"},
index 0af89525c5e89b196a2423d743f899b92e979e2b..519649b6ed0e0212558515c5695ad030a7af9785 100644 (file)
@@ -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