Update BN and EC module

This commit is contained in:
Zhi Guan
2019-02-24 06:15:22 +01:00
parent fb47201b7e
commit bf4c6920d9
8 changed files with 5536 additions and 5432 deletions

View File

@@ -500,6 +500,8 @@ BIGNUM *BN_get_rfc3526_prime_8192(BIGNUM *bn);
int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);
DEFINE_STACK_OF(BIGNUM)
/* BEGIN ERROR CODES */
/*
* The following lines are auto generated by the script mkerr.pl. Any changes

View File

@@ -1365,6 +1365,8 @@ void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth,
# define EVP_PKEY_ECDH_KDF_NONE 1
# define EVP_PKEY_ECDH_KDF_X9_62 2
DEFINE_STACK_OF(EC_KEY)
STACK_OF(EC_KEY) *EC_KEY_split(EC_KEY *ec_key, int k, int n);
/* BEGIN ERROR CODES */
/*
@@ -1499,6 +1501,7 @@ int ERR_load_EC_strings(void);
# define EC_F_EC_KEY_SIMPLE_CHECK_KEY 216
# define EC_F_EC_KEY_SIMPLE_OCT2PRIV 217
# define EC_F_EC_KEY_SIMPLE_PRIV2OCT 218
# define EC_F_EC_KEY_SPLIT 284
# define EC_F_EC_POINTS_MAKE_AFFINE 219
# define EC_F_EC_POINT_ADD 220
# define EC_F_EC_POINT_CMP 221
@@ -1627,6 +1630,7 @@ int ERR_load_EC_strings(void);
# define EC_R_INVALID_SM2_ID 161
# define EC_R_INVALID_SM2_KAP_CHECKSUM_LENGTH 162
# define EC_R_INVALID_SM2_KAP_CHECKSUM_VALUE 163
# define EC_R_INVALID_SPLIT_PARAMETER 198
# define EC_R_INVALID_TRINOMIAL_BASIS 164
# define EC_R_INVALID_TYPE1CURVE 165
# define EC_R_INVALID_TYPE1_CURVE 166

View File

@@ -66,9 +66,6 @@ extern "C" {
typedef struct ECRS_SIG_st ECRS_SIG;
DECLARE_ASN1_FUNCTIONS(ECRS_SIG)
DEFINE_STACK_OF(BIGNUM)
DEFINE_STACK_OF(EC_KEY)
int ECRS_size(const EC_KEY *ec_key, int n);
ECRS_SIG *ECRS_do_sign(const EVP_MD *md, const unsigned char *dgst,

View File

@@ -41,9 +41,9 @@ extern "C" {
*/
# define OPENSSL_VERSION_NUMBER 0x1010004fL
# ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.0 - OpenSSL 1.1.0d-fips 17 Feb 2019"
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.0 - OpenSSL 1.1.0d-fips 24 Feb 2019"
# else
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.0 - OpenSSL 1.1.0d 17 Feb 2019"
# define OPENSSL_VERSION_TEXT "GmSSL 2.5.0 - OpenSSL 1.1.0d 24 Feb 2019"
# endif
/*-