From: Matt Caswell <matt@openssl.org>
Date: Thu, 19 Mar 2015 13:38:37 +0000 (+0000)
Subject: make update
X-Git-Tag: OpenSSL_1_0_1m~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=686d82a7a22a37a1a9aefa8b4f36ca049921af0b;p=oweals%2Fopenssl.git

make update

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 81f13c725c..be9cd0eff3 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -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
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index e8d3027c6a..6dd6162fc9 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -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"},
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index 0af89525c5..519649b6ed 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -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