add gmapi

This commit is contained in:
Zhi Guan
2017-02-15 15:53:30 +08:00
parent 065259f710
commit c04b2060af
18 changed files with 2919 additions and 3 deletions

View File

@@ -64,6 +64,7 @@ static ERR_STRING_DATA ERR_str_libraries[] = {
{ERR_PACK(ERR_LIB_PAILLIER, 0, 0), "PAILLIER routines"},
{ERR_PACK(ERR_LIB_CPK, 0, 0), "CPK routines"},
{ERR_PACK(ERR_LIB_OTP, 0, 0), "OTP routines"},
{ERR_PACK(ERR_LIB_GMAPI, 0, 0), "GMAPI routines"},
{0, NULL},
};
@@ -113,6 +114,7 @@ static ERR_STRING_DATA ERR_str_reasons[] = {
{ERR_R_PAILLIER_LIB, "PAILLIER lib"},
{ERR_R_CPK_LIB, "CPK lib"},
{ERR_R_OTP_LIB, "OTP lib"},
{ERR_R_GMAPI_LIB, "GMAPI lib"},
{ERR_R_NESTED_ASN1_ERROR, "nested asn1 error"},
{ERR_R_MISSING_ASN1_EOS, "missing asn1 eos"},

View File

@@ -43,6 +43,8 @@
#include <openssl/ffx.h>
#include <openssl/paillier.h>
#include <openssl/cpk.h>
#include <openssl/otp.h>
#include <openssl/gmapi.h>
int err_load_crypto_strings_int(void)
{
@@ -120,6 +122,9 @@ int err_load_crypto_strings_int(void)
# ifndef OPENSSL_NO_OTP
ERR_load_OTP_strings() == 0 ||
# endif
# ifndef OPENSSL_NO_GMAPI
ERR_load_GMAPI_strings() == 0 ||
# endif
#endif
ERR_load_KDF_strings() == 0)
return 0;

View File

@@ -40,6 +40,7 @@ L FFX include/openssl/ffx.h crypto/ffx/ffx_err.c
L PAILLIER include/openssl/paillier.h crypto/paillier/pai_err.c
L CPK include/openssl/cpk.h crypto/cpk/cpk_err.c
L OTP include/openssl/otp.h crypto/otp/otp_err.c
L GMAPI include/openssl/gmapi.h crypto/gmapi/gmapi_err.c
# additional header files to be scanned for function names
L NONE crypto/x509/x509_vfy.h NONE