Make sure to NUL-terminate the string on end-of-file (and error)

[openssl.git] / crypto / bio / bio_err.c

diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index e31bf32aa43b3e67a98ab388f3664cb1079fdc68..5df17ff892fad4f456c2fd323bd8048e3ac5d3c9 100644 (file)
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -54,15 +54,17 @@
  */
 
 /* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
  */
 
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/bio.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ERR is defined */
 
 /* BEGIN ERROR CODES */
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
 static ERR_STRING_DATA BIO_str_functs[]=
        {
 {ERR_PACK(0,BIO_F_ACPT_STATE,0),       "ACPT_STATE"},
@@ -77,13 +79,22 @@ static ERR_STRING_DATA BIO_str_functs[]=
 {ERR_PACK(0,BIO_F_BIO_MAKE_PAIR,0),    "BIO_MAKE_PAIR"},
 {ERR_PACK(0,BIO_F_BIO_NEW,0),  "BIO_new"},
 {ERR_PACK(0,BIO_F_BIO_NEW_FILE,0),     "BIO_new_file"},
+{ERR_PACK(0,BIO_F_BIO_NEW_MEM_BUF,0),  "BIO_new_mem_buf"},
+{ERR_PACK(0,BIO_F_BIO_NREAD,0),        "BIO_nread"},
+{ERR_PACK(0,BIO_F_BIO_NREAD0,0),       "BIO_nread0"},
+{ERR_PACK(0,BIO_F_BIO_NWRITE,0),       "BIO_nwrite"},
+{ERR_PACK(0,BIO_F_BIO_NWRITE0,0),      "BIO_nwrite0"},
 {ERR_PACK(0,BIO_F_BIO_PUTS,0), "BIO_puts"},
 {ERR_PACK(0,BIO_F_BIO_READ,0), "BIO_read"},
 {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_FILE_READ,0),        "FILE_READ"},
+{ERR_PACK(0,BIO_F_LINEBUFFER_CTRL,0),  "LINEBUFFER_CTRL"},
+{ERR_PACK(0,BIO_F_MEM_READ,0), "MEM_READ"},
 {ERR_PACK(0,BIO_F_MEM_WRITE,0),        "MEM_WRITE"},
 {ERR_PACK(0,BIO_F_SSL_NEW,0),  "SSL_new"},
 {ERR_PACK(0,BIO_F_WSASTARTUP,0),       "WSASTARTUP"},
@@ -97,10 +108,12 @@ static ERR_STRING_DATA BIO_str_reasons[]=
 {BIO_R_BAD_HOSTNAME_LOOKUP               ,"bad hostname lookup"},
 {BIO_R_BROKEN_PIPE                       ,"broken pipe"},
 {BIO_R_CONNECT_ERROR                     ,"connect error"},
+{BIO_R_EOF_ON_MEMORY_BIO                 ,"EOF on memory BIO"},
 {BIO_R_ERROR_SETTING_NBIO                ,"error setting nbio"},
 {BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET,"error setting nbio on accepted socket"},
 {BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET,"error setting nbio on accept socket"},
 {BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET ,"gethostbyname addr is not af inet"},
+{BIO_R_INVALID_ARGUMENT                  ,"invalid argument"},
 {BIO_R_INVALID_IP_ADDRESS                ,"invalid ip address"},
 {BIO_R_IN_USE                            ,"in use"},
 {BIO_R_KEEPALIVE                         ,"keepalive"},
@@ -109,6 +122,7 @@ static ERR_STRING_DATA BIO_str_reasons[]=
 {BIO_R_NO_HOSTNAME_SPECIFIED             ,"no hostname specified"},
 {BIO_R_NO_PORT_DEFINED                   ,"no port defined"},
 {BIO_R_NO_PORT_SPECIFIED                 ,"no port specified"},
+{BIO_R_NO_SUCH_FILE                      ,"no such file"},
 {BIO_R_NULL_PARAMETER                    ,"null parameter"},
 {BIO_R_TAG_MISMATCH                      ,"tag mismatch"},
 {BIO_R_UNABLE_TO_BIND_SOCKET             ,"unable to bind socket"},
@@ -116,7 +130,8 @@ static ERR_STRING_DATA BIO_str_reasons[]=
 {BIO_R_UNABLE_TO_LISTEN_SOCKET           ,"unable to listen socket"},
 {BIO_R_UNINITIALIZED                     ,"uninitialized"},
 {BIO_R_UNSUPPORTED_METHOD                ,"unsupported method"},
-{BIO_R_WSASTARTUP                        ,"wsastartup"},
+{BIO_R_WRITE_TO_READ_ONLY_BIO            ,"write to read only BIO"},
+{BIO_R_WSASTARTUP                        ,"WSAStartup"},
 {0,NULL}
        };
 
@@ -129,7 +144,7 @@ void ERR_load_BIO_strings(void)
        if (init)
                {
                init=0;
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
                ERR_load_strings(ERR_LIB_BIO,BIO_str_functs);
                ERR_load_strings(ERR_LIB_BIO,BIO_str_reasons);
 #endif