make update

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 8842a1182cd65682b855c9f7d186464ec62036fc..bc08401eebf017de576d34abab04b78cde78d7e8 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -624,6 +624,7 @@ int BIO_printf(BIO *bio, ...);
 #define BIO_F_BIO_SOCK_INIT                             112
 #define BIO_F_BIO_WRITE                                         113
 #define BIO_F_BUFFER_CTRL                               114
+#define BIO_F_CONN_CTRL                                         127
 #define BIO_F_CONN_STATE                                115
 #define BIO_F_FILE_CTRL                                         116
 #define BIO_F_MEM_WRITE                                         117

diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index 136c348af7e3600ad89756bdb62b1654a32703d6..b5f07de5a055c9bca9be5d2026e176f63735d066 100644 (file)
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -87,6 +87,7 @@ static ERR_STRING_DATA BIO_str_functs[]=
 {ERR_PACK(0,BIO_F_BIO_SOCK_INIT,0),    "BIO_sock_init"},
 {ERR_PACK(0,BIO_F_BIO_WRITE,0),        "BIO_write"},
 {ERR_PACK(0,BIO_F_BUFFER_CTRL,0),      "BUFFER_CTRL"},
+{ERR_PACK(0,BIO_F_CONN_CTRL,0),        "CONN_CTRL"},
 {ERR_PACK(0,BIO_F_CONN_STATE,0),       "CONN_STATE"},
 {ERR_PACK(0,BIO_F_FILE_CTRL,0),        "FILE_CTRL"},
 {ERR_PACK(0,BIO_F_MEM_WRITE,0),        "MEM_WRITE"},

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 6f2454cecee8db7644c9565a3fdc09dc0f20f407..990d1a1fe56f98e111f7681a835e98ab9475c795 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1258,6 +1258,7 @@ int SSL_COMP_add_compression_method(int id,char *cm);
 #define SSL_F_SSL_CLEAR                                         164
 #define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD           165
 #define SSL_F_SSL_CREATE_CIPHER_LIST                    166
+#define SSL_F_SSL_CTRL                                  232
 #define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                         168
 #define SSL_F_SSL_CTX_NEW                               169
 #define SSL_F_SSL_CTX_SET_PURPOSE                       226

diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index b8bfa03b6bc9a83999edd34328fa842b6ee0470d..c722544dd4bf3406c3a1f92d064466f663144e44 100644 (file)
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -140,6 +140,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_PACK(0,SSL_F_SSL_CLEAR,0),        "SSL_clear"},
 {ERR_PACK(0,SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,0),  "SSL_COMP_add_compression_method"},
 {ERR_PACK(0,SSL_F_SSL_CREATE_CIPHER_LIST,0),   "SSL_CREATE_CIPHER_LIST"},
+{ERR_PACK(0,SSL_F_SSL_CTRL,0), "SSL_ctrl"},
 {ERR_PACK(0,SSL_F_SSL_CTX_CHECK_PRIVATE_KEY,0),        "SSL_CTX_check_private_key"},
 {ERR_PACK(0,SSL_F_SSL_CTX_NEW,0),      "SSL_CTX_new"},
 {ERR_PACK(0,SSL_F_SSL_CTX_SET_PURPOSE,0),      "SSL_CTX_set_purpose"},