Update pre9
This commit is contained in:
@@ -78,7 +78,6 @@ DEFINE_LHASH_OF(MEM);
|
||||
void OPENSSL_cpuid_setup(void);
|
||||
extern unsigned int OPENSSL_ia32cap_P[];
|
||||
void OPENSSL_showfatal(const char *fmta, ...);
|
||||
extern int OPENSSL_NONPIC_relocated;
|
||||
void crypto_cleanup_all_ex_data_int(void);
|
||||
int openssl_init_fork_handlers(void);
|
||||
|
||||
|
||||
+69
-18
@@ -107,25 +107,76 @@ void *BN_GENCB_get_arg(BN_GENCB *cb);
|
||||
* on the size of the number */
|
||||
|
||||
/*
|
||||
* number of Miller-Rabin iterations for an error rate of less than 2^-80 for
|
||||
* random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook of
|
||||
* Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996];
|
||||
* original paper: Damgaard, Landrock, Pomerance: Average case error
|
||||
* estimates for the strong probable prime test. -- Math. Comp. 61 (1993)
|
||||
* 177-194)
|
||||
* BN_prime_checks_for_size() returns the number of Miller-Rabin iterations
|
||||
* that will be done for checking that a random number is probably prime. The
|
||||
* error rate for accepting a composite number as prime depends on the size of
|
||||
* the prime |b|. The error rates used are for calculating an RSA key with 2 primes,
|
||||
* and so the level is what you would expect for a key of double the size of the
|
||||
* prime.
|
||||
*
|
||||
* This table is generated using the algorithm of FIPS PUB 186-4
|
||||
* Digital Signature Standard (DSS), section F.1, page 117.
|
||||
* (https://dx.doi.org/10.6028/NIST.FIPS.186-4)
|
||||
*
|
||||
* The following magma script was used to generate the output:
|
||||
* securitybits:=125;
|
||||
* k:=1024;
|
||||
* for t:=1 to 65 do
|
||||
* for M:=3 to Floor(2*Sqrt(k-1)-1) do
|
||||
* S:=0;
|
||||
* // Sum over m
|
||||
* for m:=3 to M do
|
||||
* s:=0;
|
||||
* // Sum over j
|
||||
* for j:=2 to m do
|
||||
* s+:=(RealField(32)!2)^-(j+(k-1)/j);
|
||||
* end for;
|
||||
* S+:=2^(m-(m-1)*t)*s;
|
||||
* end for;
|
||||
* A:=2^(k-2-M*t);
|
||||
* B:=8*(Pi(RealField(32))^2-6)/3*2^(k-2)*S;
|
||||
* pkt:=2.00743*Log(2)*k*2^-k*(A+B);
|
||||
* seclevel:=Floor(-Log(2,pkt));
|
||||
* if seclevel ge securitybits then
|
||||
* printf "k: %5o, security: %o bits (t: %o, M: %o)\n",k,seclevel,t,M;
|
||||
* break;
|
||||
* end if;
|
||||
* end for;
|
||||
* if seclevel ge securitybits then break; end if;
|
||||
* end for;
|
||||
*
|
||||
* It can be run online at:
|
||||
* http://magma.maths.usyd.edu.au/calc
|
||||
*
|
||||
* And will output:
|
||||
* k: 1024, security: 129 bits (t: 6, M: 23)
|
||||
*
|
||||
* k is the number of bits of the prime, securitybits is the level we want to
|
||||
* reach.
|
||||
*
|
||||
* prime length | RSA key size | # MR tests | security level
|
||||
* -------------+--------------|------------+---------------
|
||||
* (b) >= 6394 | >= 12788 | 3 | 256 bit
|
||||
* (b) >= 3747 | >= 7494 | 3 | 192 bit
|
||||
* (b) >= 1345 | >= 2690 | 4 | 128 bit
|
||||
* (b) >= 1080 | >= 2160 | 5 | 128 bit
|
||||
* (b) >= 852 | >= 1704 | 5 | 112 bit
|
||||
* (b) >= 476 | >= 952 | 5 | 80 bit
|
||||
* (b) >= 400 | >= 800 | 6 | 80 bit
|
||||
* (b) >= 347 | >= 694 | 7 | 80 bit
|
||||
* (b) >= 308 | >= 616 | 8 | 80 bit
|
||||
* (b) >= 55 | >= 110 | 27 | 64 bit
|
||||
* (b) >= 6 | >= 12 | 34 | 64 bit
|
||||
*/
|
||||
# define BN_prime_checks_for_size(b) ((b) >= 1300 ? 2 : \
|
||||
(b) >= 850 ? 3 : \
|
||||
(b) >= 650 ? 4 : \
|
||||
(b) >= 550 ? 5 : \
|
||||
(b) >= 450 ? 6 : \
|
||||
(b) >= 400 ? 7 : \
|
||||
(b) >= 350 ? 8 : \
|
||||
(b) >= 300 ? 9 : \
|
||||
(b) >= 250 ? 12 : \
|
||||
(b) >= 200 ? 15 : \
|
||||
(b) >= 150 ? 18 : \
|
||||
/* b >= 100 */ 27)
|
||||
|
||||
# define BN_prime_checks_for_size(b) ((b) >= 3747 ? 3 : \
|
||||
(b) >= 1345 ? 4 : \
|
||||
(b) >= 476 ? 5 : \
|
||||
(b) >= 400 ? 6 : \
|
||||
(b) >= 347 ? 7 : \
|
||||
(b) >= 308 ? 8 : \
|
||||
(b) >= 55 ? 27 : \
|
||||
/* b >= 6 */ 34)
|
||||
|
||||
# define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
|
||||
|
||||
|
||||
@@ -141,10 +141,12 @@ int DSAparams_print_fp(FILE *fp, const DSA *x);
|
||||
int DSA_print_fp(FILE *bp, const DSA *x, int off);
|
||||
# endif
|
||||
|
||||
# define DSS_prime_checks 50
|
||||
# define DSS_prime_checks 64
|
||||
/*
|
||||
* Primality test according to FIPS PUB 186[-1], Appendix 2.1: 50 rounds of
|
||||
* Rabin-Miller
|
||||
* Primality test according to FIPS PUB 186-4, Appendix C.3. Since we only
|
||||
* have one value here we set the number of checks to 64 which is the 128 bit
|
||||
* security level that is the highest level and valid for creating a 3072 bit
|
||||
* DSA key.
|
||||
*/
|
||||
# define DSA_is_prime(n, callback, cb_arg) \
|
||||
BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
|
||||
|
||||
@@ -216,6 +216,8 @@ extern "C" {
|
||||
# define OSSL_SSIZE_MAX SSIZE_MAX
|
||||
# elif defined(_POSIX_SSIZE_MAX)
|
||||
# define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX
|
||||
# else
|
||||
# define OSSL_SSIZE_MAX ((ssize_t)(SIZE_MAX>>1))
|
||||
# endif
|
||||
# endif
|
||||
|
||||
|
||||
+134
-47
@@ -223,50 +223,84 @@ unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x);
|
||||
size_t EC_GROUP_get_seed_len(const EC_GROUP *);
|
||||
size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
|
||||
|
||||
/** Sets the parameter of a ec over GFp defined by y^2 = x^3 + a*x + b
|
||||
/** Sets the parameters of a ec curve defined by y^2 = x^3 + a*x + b (for GFp)
|
||||
* or y^2 + x*y = x^3 + a*x^2 + b (for GF2m)
|
||||
* \param group EC_GROUP object
|
||||
* \param p BIGNUM with the prime number
|
||||
* \param p BIGNUM with the prime number (GFp) or the polynomial
|
||||
* defining the underlying field (GF2m)
|
||||
* \param a BIGNUM with parameter a of the equation
|
||||
* \param b BIGNUM with parameter b of the equation
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
|
||||
const BIGNUM *b, BN_CTX *ctx);
|
||||
int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
|
||||
const BIGNUM *b, BN_CTX *ctx);
|
||||
|
||||
/** Gets the parameter of the ec over GFp defined by y^2 = x^3 + a*x + b
|
||||
/** Gets the parameters of the ec curve defined by y^2 = x^3 + a*x + b (for GFp)
|
||||
* or y^2 + x*y = x^3 + a*x^2 + b (for GF2m)
|
||||
* \param group EC_GROUP object
|
||||
* \param p BIGNUM for the prime number
|
||||
* \param p BIGNUM with the prime number (GFp) or the polynomial
|
||||
* defining the underlying field (GF2m)
|
||||
* \param a BIGNUM for parameter a of the equation
|
||||
* \param b BIGNUM for parameter b of the equation
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
|
||||
BIGNUM *b, BN_CTX *ctx);
|
||||
int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
|
||||
BN_CTX *ctx);
|
||||
|
||||
/** Sets the parameters of an ec curve. Synonym for EC_GROUP_set_curve
|
||||
* \param group EC_GROUP object
|
||||
* \param p BIGNUM with the prime number (GFp) or the polynomial
|
||||
* defining the underlying field (GF2m)
|
||||
* \param a BIGNUM with parameter a of the equation
|
||||
* \param b BIGNUM with parameter b of the equation
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
DEPRECATEDIN_1_2_0(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p,
|
||||
const BIGNUM *a, const BIGNUM *b,
|
||||
BN_CTX *ctx))
|
||||
|
||||
/** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
|
||||
* \param group EC_GROUP object
|
||||
* \param p BIGNUM with the prime number (GFp) or the polynomial
|
||||
* defining the underlying field (GF2m)
|
||||
* \param a BIGNUM for parameter a of the equation
|
||||
* \param b BIGNUM for parameter b of the equation
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
DEPRECATEDIN_1_2_0(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p,
|
||||
BIGNUM *a, BIGNUM *b,
|
||||
BN_CTX *ctx))
|
||||
|
||||
# ifndef OPENSSL_NO_EC2M
|
||||
/** Sets the parameter of a ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
|
||||
/** Sets the parameter of an ec curve. Synonym for EC_GROUP_set_curve
|
||||
* \param group EC_GROUP object
|
||||
* \param p BIGNUM with the polynomial defining the underlying field
|
||||
* \param p BIGNUM with the prime number (GFp) or the polynomial
|
||||
* defining the underlying field (GF2m)
|
||||
* \param a BIGNUM with parameter a of the equation
|
||||
* \param b BIGNUM with parameter b of the equation
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
|
||||
const BIGNUM *b, BN_CTX *ctx);
|
||||
DEPRECATEDIN_1_2_0(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p,
|
||||
const BIGNUM *a, const BIGNUM *b,
|
||||
BN_CTX *ctx))
|
||||
|
||||
/** Gets the parameter of the ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
|
||||
/** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
|
||||
* \param group EC_GROUP object
|
||||
* \param p BIGNUM for the polynomial defining the underlying field
|
||||
* \param p BIGNUM with the prime number (GFp) or the polynomial
|
||||
* defining the underlying field (GF2m)
|
||||
* \param a BIGNUM for parameter a of the equation
|
||||
* \param b BIGNUM for parameter b of the equation
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
|
||||
BIGNUM *b, BN_CTX *ctx);
|
||||
DEPRECATEDIN_1_2_0(int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p,
|
||||
BIGNUM *a, BIGNUM *b,
|
||||
BN_CTX *ctx))
|
||||
# endif
|
||||
/** Returns the number of bits needed to represent a field element
|
||||
* \param group EC_GROUP object
|
||||
@@ -459,7 +493,7 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
|
||||
BIGNUM *y, BIGNUM *z,
|
||||
BN_CTX *ctx);
|
||||
|
||||
/** Sets the affine coordinates of a EC_POINT over GFp
|
||||
/** Sets the affine coordinates of an EC_POINT
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM with the x-coordinate
|
||||
@@ -467,23 +501,65 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
|
||||
const BIGNUM *x, const BIGNUM *y,
|
||||
int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *p,
|
||||
const BIGNUM *x, const BIGNUM *y,
|
||||
BN_CTX *ctx);
|
||||
|
||||
/** Gets the affine coordinates of an EC_POINT.
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM for the x-coordinate
|
||||
* \param y BIGNUM for the y-coordinate
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p,
|
||||
BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
|
||||
|
||||
/** Sets the affine coordinates of an EC_POINT. A synonym of
|
||||
* EC_POINT_set_affine_coordinates
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM with the x-coordinate
|
||||
* \param y BIGNUM with the y-coordinate
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
DEPRECATEDIN_1_2_0(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
|
||||
EC_POINT *p,
|
||||
const BIGNUM *x,
|
||||
const BIGNUM *y,
|
||||
BN_CTX *ctx))
|
||||
|
||||
/** Gets the affine coordinates of an EC_POINT. A synonym of
|
||||
* EC_POINT_get_affine_coordinates
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM for the x-coordinate
|
||||
* \param y BIGNUM for the y-coordinate
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
DEPRECATEDIN_1_2_0(int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
|
||||
const EC_POINT *p,
|
||||
BIGNUM *x,
|
||||
BIGNUM *y,
|
||||
BN_CTX *ctx))
|
||||
|
||||
/** Sets the x9.62 compressed coordinates of a EC_POINT
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM with x-coordinate
|
||||
* \param y_bit integer with the y-Bit (either 0 or 1)
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p,
|
||||
const BIGNUM *x, int y_bit,
|
||||
BN_CTX *ctx);
|
||||
|
||||
/** Gets the affine coordinates of a EC_POINT over GFp
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM for the x-coordinate
|
||||
* \param y BIGNUM for the y-coordinate
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
|
||||
const EC_POINT *p, BIGNUM *x,
|
||||
BIGNUM *y, BN_CTX *ctx);
|
||||
|
||||
/** Sets the x9.62 compressed coordinates of a EC_POINT over GFp
|
||||
/** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of
|
||||
* EC_POINT_set_compressed_coordinates
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM with x-coordinate
|
||||
@@ -491,11 +567,14 @@ int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
|
||||
EC_POINT *p, const BIGNUM *x,
|
||||
int y_bit, BN_CTX *ctx);
|
||||
DEPRECATEDIN_1_2_0(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
|
||||
EC_POINT *p,
|
||||
const BIGNUM *x,
|
||||
int y_bit,
|
||||
BN_CTX *ctx))
|
||||
# ifndef OPENSSL_NO_EC2M
|
||||
/** Sets the affine coordinates of a EC_POINT over GF2m
|
||||
/** Sets the affine coordinates of an EC_POINT. A synonym of
|
||||
* EC_POINT_set_affine_coordinates
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM with the x-coordinate
|
||||
@@ -503,11 +582,14 @@ int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
|
||||
const BIGNUM *x, const BIGNUM *y,
|
||||
BN_CTX *ctx);
|
||||
DEPRECATEDIN_1_2_0(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
|
||||
EC_POINT *p,
|
||||
const BIGNUM *x,
|
||||
const BIGNUM *y,
|
||||
BN_CTX *ctx))
|
||||
|
||||
/** Gets the affine coordinates of a EC_POINT over GF2m
|
||||
/** Gets the affine coordinates of an EC_POINT. A synonym of
|
||||
* EC_POINT_get_affine_coordinates
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM for the x-coordinate
|
||||
@@ -515,11 +597,14 @@ int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
|
||||
const EC_POINT *p, BIGNUM *x,
|
||||
BIGNUM *y, BN_CTX *ctx);
|
||||
DEPRECATEDIN_1_2_0(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
|
||||
const EC_POINT *p,
|
||||
BIGNUM *x,
|
||||
BIGNUM *y,
|
||||
BN_CTX *ctx))
|
||||
|
||||
/** Sets the x9.62 compressed coordinates of a EC_POINT over GF2m
|
||||
/** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of
|
||||
* EC_POINT_set_compressed_coordinates
|
||||
* \param group underlying EC_GROUP object
|
||||
* \param p EC_POINT object
|
||||
* \param x BIGNUM with x-coordinate
|
||||
@@ -527,9 +612,11 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
|
||||
* \param ctx BN_CTX object (optional)
|
||||
* \return 1 on success and 0 if an error occurred
|
||||
*/
|
||||
int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
|
||||
EC_POINT *p, const BIGNUM *x,
|
||||
int y_bit, BN_CTX *ctx);
|
||||
DEPRECATEDIN_1_2_0(int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
|
||||
EC_POINT *p,
|
||||
const BIGNUM *x,
|
||||
int y_bit,
|
||||
BN_CTX *ctx))
|
||||
# endif
|
||||
/** Encodes a EC_POINT object to a octet string
|
||||
* \param group underlying EC_GROUP object
|
||||
|
||||
@@ -103,6 +103,7 @@ int ERR_load_EC_strings(void);
|
||||
# define EC_F_EC_GROUP_CHECK 170
|
||||
# define EC_F_EC_GROUP_CHECK_DISCRIMINANT 171
|
||||
# define EC_F_EC_GROUP_COPY 106
|
||||
# define EC_F_EC_GROUP_GET_CURVE 291
|
||||
# define EC_F_EC_GROUP_GET_CURVE_GF2M 172
|
||||
# define EC_F_EC_GROUP_GET_CURVE_GFP 130
|
||||
# define EC_F_EC_GROUP_GET_DEGREE 173
|
||||
@@ -115,6 +116,7 @@ int ERR_load_EC_strings(void);
|
||||
# define EC_F_EC_GROUP_NEW_FROM_DATA 175
|
||||
# define EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS 263
|
||||
# define EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS 264
|
||||
# define EC_F_EC_GROUP_SET_CURVE 292
|
||||
# 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
|
||||
@@ -142,6 +144,7 @@ int ERR_load_EC_strings(void);
|
||||
# define EC_F_EC_POINT_CMP 113
|
||||
# define EC_F_EC_POINT_COPY 114
|
||||
# define EC_F_EC_POINT_DBL 115
|
||||
# define EC_F_EC_POINT_GET_AFFINE_COORDINATES 293
|
||||
# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M 183
|
||||
# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP 116
|
||||
# define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP 117
|
||||
@@ -153,8 +156,10 @@ int ERR_load_EC_strings(void);
|
||||
# define EC_F_EC_POINT_OCT2POINT 122
|
||||
# define EC_F_EC_POINT_POINT2BUF 281
|
||||
# define EC_F_EC_POINT_POINT2OCT 123
|
||||
# define EC_F_EC_POINT_SET_AFFINE_COORDINATES 294
|
||||
# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M 185
|
||||
# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP 124
|
||||
# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES 295
|
||||
# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M 186
|
||||
# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP 125
|
||||
# define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP 126
|
||||
|
||||
@@ -1195,6 +1195,14 @@
|
||||
#define NID_hmacWithSHA512 801
|
||||
#define OBJ_hmacWithSHA512 OBJ_rsadsi,2L,11L
|
||||
|
||||
#define LN_hmacWithSHA512_224 "hmacWithSHA512-224"
|
||||
#define NID_hmacWithSHA512_224 1193
|
||||
#define OBJ_hmacWithSHA512_224 OBJ_rsadsi,2L,12L
|
||||
|
||||
#define LN_hmacWithSHA512_256 "hmacWithSHA512-256"
|
||||
#define NID_hmacWithSHA512_256 1194
|
||||
#define OBJ_hmacWithSHA512_256 OBJ_rsadsi,2L,13L
|
||||
|
||||
#define SN_rc2_cbc "RC2-CBC"
|
||||
#define LN_rc2_cbc "rc2-cbc"
|
||||
#define NID_rc2_cbc 37
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#include <openssl/opensslv.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@@ -97,7 +99,13 @@ extern "C" {
|
||||
# define OPENSSL_API_COMPAT OPENSSL_MIN_API
|
||||
#endif
|
||||
|
||||
#if OPENSSL_API_COMPAT < 0x10200000L
|
||||
/*
|
||||
* Do not deprecate things to be deprecated in version 1.2.0 before the
|
||||
* OpenSSL version number matches.
|
||||
*/
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10200000L
|
||||
# define DEPRECATEDIN_1_2_0(f) f;
|
||||
#elif OPENSSL_API_COMPAT < 0x10200000L
|
||||
# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f)
|
||||
#else
|
||||
# define DEPRECATEDIN_1_2_0(f)
|
||||
|
||||
@@ -1058,9 +1058,9 @@ typedef enum {
|
||||
/* Is the SSL_connection established? */
|
||||
# define SSL_in_connect_init(a) (SSL_in_init(a) && !SSL_is_server(a))
|
||||
# define SSL_in_accept_init(a) (SSL_in_init(a) && SSL_is_server(a))
|
||||
int SSL_in_init(SSL *s);
|
||||
int SSL_in_before(SSL *s);
|
||||
int SSL_is_init_finished(SSL *s);
|
||||
int SSL_in_init(const SSL *s);
|
||||
int SSL_in_before(const SSL *s);
|
||||
int SSL_is_init_finished(const SSL *s);
|
||||
|
||||
/*
|
||||
* The following 3 states are kept in ssl->rlayer.rstate when reads fail, you
|
||||
|
||||
@@ -471,6 +471,7 @@ int ERR_load_SSL_strings(void);
|
||||
# define SSL_R_BAD_HRR_VERSION 263
|
||||
# define SSL_R_BAD_KEY_SHARE 108
|
||||
# define SSL_R_BAD_KEY_UPDATE 122
|
||||
# define SSL_R_BAD_LEGACY_VERSION 292
|
||||
# define SSL_R_BAD_LENGTH 271
|
||||
# define SSL_R_BAD_PACKET 240
|
||||
# define SSL_R_BAD_PACKET_LENGTH 115
|
||||
@@ -696,6 +697,8 @@ int ERR_load_SSL_strings(void);
|
||||
# define SSL_R_SSL_SESSION_ID_TOO_LONG 408
|
||||
# define SSL_R_SSL_SESSION_VERSION_MISMATCH 210
|
||||
# define SSL_R_STILL_IN_INIT 121
|
||||
# define SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED 1116
|
||||
# define SSL_R_TLSV13_ALERT_MISSING_EXTENSION 1109
|
||||
# define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049
|
||||
# define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050
|
||||
# define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED 1021
|
||||
|
||||
@@ -72,7 +72,6 @@ extern "C" {
|
||||
# define TLS1_AD_USER_CANCELLED 90
|
||||
# define TLS1_AD_NO_RENEGOTIATION 100
|
||||
/* TLSv1.3 alerts */
|
||||
# define TLS13_AD_END_OF_EARLY_DATA 1
|
||||
# define TLS13_AD_MISSING_EXTENSION 109 /* fatal */
|
||||
# define TLS13_AD_CERTIFICATE_REQUIRED 116 /* fatal */
|
||||
/* codes 110-114 are from RFC3546 */
|
||||
|
||||
Reference in New Issue
Block a user