summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2000-02-23 23:38:59 +0000
committerRichard Levitte <levitte@openssl.org>2000-02-23 23:38:59 +0000
commite6a58767c58b1f30b43b9bc3236c64ea18e437df (patch)
treea5d2ead9db78309e4076005940bb2d2d56666258
parent9ae2ad23e6692362b943f728568b36b837a0a294 (diff)
make update
-rw-r--r--crypto/bio/bio.h1
-rw-r--r--crypto/bio/bio_err.c1
-rw-r--r--ssl/ssl.h1
-rw-r--r--ssl/ssl_err.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 8842a1182c..bc08401eeb 100644
--- 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 136c348af7..b5f07de5a0 100644
--- 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 6f2454cece..990d1a1fe5 100644
--- 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 b8bfa03b6b..c722544dd4 100644
--- 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"},