From f06080cb3da93e99755edb5f19e7ccc132aeba36 Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Thu, 26 Apr 2018 12:06:17 -0400 Subject: Add missing error code when alloc-return-null Reviewed-by: Bernd Edlinger Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6085) --- include/openssl/bioerr.h | 4 ++++ include/openssl/bnerr.h | 2 ++ include/openssl/ecerr.h | 1 + include/openssl/objectserr.h | 1 + include/openssl/pkcs12err.h | 4 ++++ include/openssl/x509v3err.h | 1 + 6 files changed, 13 insertions(+) (limited to 'include/openssl') diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h index de70388..f119a59 100644 --- a/include/openssl/bioerr.h +++ b/include/openssl/bioerr.h @@ -24,10 +24,12 @@ int ERR_load_BIO_strings(void); # define BIO_F_ADDR_STRINGS 134 # define BIO_F_BIO_ACCEPT 101 # define BIO_F_BIO_ACCEPT_EX 137 +# define BIO_F_BIO_ACCEPT_NEW 152 # define BIO_F_BIO_ADDR_NEW 144 # define BIO_F_BIO_BIND 147 # define BIO_F_BIO_CALLBACK_CTRL 131 # define BIO_F_BIO_CONNECT 138 +# define BIO_F_BIO_CONNECT_NEW 153 # define BIO_F_BIO_CTRL 103 # define BIO_F_BIO_GETS 104 # define BIO_F_BIO_GET_HOST_IP 106 @@ -70,6 +72,8 @@ int ERR_load_BIO_strings(void); # define BIO_F_LINEBUFFER_CTRL 129 # define BIO_F_LINEBUFFER_NEW 151 # define BIO_F_MEM_WRITE 117 +# define BIO_F_NBIOF_NEW 154 +# define BIO_F_SLG_WRITE 155 # define BIO_F_SSL_NEW 118 /* diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h index 297b8c5..8a022cc 100644 --- a/include/openssl/bnerr.h +++ b/include/openssl/bnerr.h @@ -57,11 +57,13 @@ int ERR_load_BN_strings(void); # define BN_F_BN_MOD_INVERSE_NO_BRANCH 139 # define BN_F_BN_MOD_LSHIFT_QUICK 119 # define BN_F_BN_MOD_SQRT 121 +# define BN_F_BN_MONT_CTX_NEW 149 # define BN_F_BN_MPI2BN 112 # define BN_F_BN_NEW 113 # define BN_F_BN_POOL_GET 147 # define BN_F_BN_RAND 114 # define BN_F_BN_RAND_RANGE 122 +# define BN_F_BN_RECP_CTX_NEW 150 # define BN_F_BN_RSHIFT 146 # define BN_F_BN_SET_WORDS 144 # define BN_F_BN_STACK_PUSH 148 diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h index 202088d..320c651 100644 --- a/include/openssl/ecerr.h +++ b/include/openssl/ecerr.h @@ -114,6 +114,7 @@ int ERR_load_EC_strings(void); # define EC_F_EC_GROUP_SET_CURVE_GF2M 176 # define EC_F_EC_GROUP_SET_CURVE_GFP 109 # define EC_F_EC_GROUP_SET_GENERATOR 111 +# define EC_F_EC_GROUP_SET_SEED 286 # define EC_F_EC_KEY_CHECK_KEY 177 # define EC_F_EC_KEY_COPY 178 # define EC_F_EC_KEY_GENERATE_KEY 179 diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h index e965791..02308df 100644 --- a/include/openssl/objectserr.h +++ b/include/openssl/objectserr.h @@ -27,6 +27,7 @@ int ERR_load_OBJ_strings(void); # define OBJ_F_OBJ_NID2LN 102 # define OBJ_F_OBJ_NID2OBJ 103 # define OBJ_F_OBJ_NID2SN 104 +# define OBJ_F_OBJ_TXT2OBJ 108 /* * OBJ reason codes. diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h index ba82043..c7184ff 100644 --- a/include/openssl/pkcs12err.h +++ b/include/openssl/pkcs12err.h @@ -19,6 +19,10 @@ int ERR_load_PKCS12_strings(void); /* * PKCS12 function codes. */ +# define PKCS12_F_OPENSSL_ASC2UNI 121 +# define PKCS12_F_OPENSSL_UNI2ASC 124 +# define PKCS12_F_OPENSSL_UNI2UTF8 127 +# define PKCS12_F_OPENSSL_UTF82UNI 129 # define PKCS12_F_PKCS12_CREATE 105 # define PKCS12_F_PKCS12_GEN_MAC 107 # define PKCS12_F_PKCS12_INIT 109 diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h index f961339..6b3df12 100644 --- a/include/openssl/x509v3err.h +++ b/include/openssl/x509v3err.h @@ -54,6 +54,7 @@ int ERR_load_X509V3_strings(void); # define X509V3_F_SXNET_ADD_ID_ULONG 127 # define X509V3_F_SXNET_GET_ID_ASC 128 # define X509V3_F_SXNET_GET_ID_ULONG 129 +# define X509V3_F_TREE_INIT 172 # define X509V3_F_V2I_ASIDENTIFIERS 163 # define X509V3_F_V2I_ASN1_BIT_STRING 101 # define X509V3_F_V2I_AUTHORITY_INFO_ACCESS 139 -- cgit v1.1