This commit is contained in:
Zhi Guan
2017-02-15 00:32:40 +08:00
parent 83321f9755
commit 91ee73a880
15 changed files with 711 additions and 35 deletions

View File

@@ -60,6 +60,7 @@ static ERR_STRING_DATA ERR_str_libraries[] = {
{ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines"},
{ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines"},
{ERR_PACK(ERR_LIB_KDF2, 0, 0), "KDF2 routines"},
{ERR_PACK(ERR_LIB_FFX, 0, 0), "FFX routines"},
{0, NULL},
};
@@ -105,6 +106,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = {
{ERR_R_ENGINE_LIB, "ENGINE lib"},
{ERR_R_ECDSA_LIB, "ECDSA lib"},
{ERR_R_KDF2_LIB, "KDF2 lib"},
{ERR_R_FFX_LIB, "FFX lib"},
{ERR_R_NESTED_ASN1_ERROR, "nested asn1 error"},
{ERR_R_MISSING_ASN1_EOS, "missing asn1 eos"},

View File

@@ -40,6 +40,7 @@
#include <openssl/async.h>
#include <openssl/kdf.h>
#include <openssl/kdf2.h>
#include <openssl/ffx.h>
int err_load_crypto_strings_int(void)
{
@@ -105,6 +106,9 @@ int err_load_crypto_strings_int(void)
# ifndef OPENSSL_NO_KDF2
ERR_load_KDF2_strings() == 0 ||
# endif
# ifndef OPENSSL_NO_FFX
ERR_load_FFX_strings() == 0 ||
# endif
#endif
ERR_load_KDF_strings() == 0)
return 0;

View File

@@ -36,6 +36,7 @@ L CT include/openssl/ct.h crypto/ct/ct_err.c
L ASYNC include/openssl/async.h crypto/async/async_err.c
L KDF include/openssl/kdf.h crypto/kdf/kdf_err.c
L KDF2 include/openssl/kdf2.h crypto/kdf2/kdf2_err.c
L FFX include/openssl/ffx.h crypto/ffx/ffx_err.c
# additional header files to be scanned for function names
L NONE crypto/x509/x509_vfy.h NONE