Update OpenSSL to v1.0.2n
This commit is contained in:
parent
4a3a5d5b0f
commit
1d3e86dd55
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -257,11 +257,13 @@ DH *DH_get_1024_160(void);
|
||||||
DH *DH_get_2048_224(void);
|
DH *DH_get_2048_224(void);
|
||||||
DH *DH_get_2048_256(void);
|
DH *DH_get_2048_256(void);
|
||||||
|
|
||||||
|
# ifndef OPENSSL_NO_CMS
|
||||||
/* RFC2631 KDF */
|
/* RFC2631 KDF */
|
||||||
int DH_KDF_X9_42(unsigned char *out, size_t outlen,
|
int DH_KDF_X9_42(unsigned char *out, size_t outlen,
|
||||||
const unsigned char *Z, size_t Zlen,
|
const unsigned char *Z, size_t Zlen,
|
||||||
ASN1_OBJECT *key_oid,
|
ASN1_OBJECT *key_oid,
|
||||||
const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
|
const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
|
||||||
|
# endif
|
||||||
|
|
||||||
# define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
|
# define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
|
||||||
EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
|
EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
|
||||||
|
|
|
@ -1363,6 +1363,98 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
|
||||||
const char *type,
|
const char *type,
|
||||||
const char *value));
|
const char *value));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pinit) (EVP_PKEY_CTX *ctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pcopy) (EVP_PKEY_CTX *dst,
|
||||||
|
EVP_PKEY_CTX *src));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth,
|
||||||
|
void (**pcleanup) (EVP_PKEY_CTX *ctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pparamgen) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_PKEY *pkey));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pkeygen) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_PKEY *pkey));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**psign_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**psign) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *sig, size_t *siglen,
|
||||||
|
const unsigned char *tbs,
|
||||||
|
size_t tbslen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pverify_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pverify) (EVP_PKEY_CTX *ctx,
|
||||||
|
const unsigned char *sig,
|
||||||
|
size_t siglen,
|
||||||
|
const unsigned char *tbs,
|
||||||
|
size_t tbslen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pverify_recover_init) (EVP_PKEY_CTX
|
||||||
|
*ctx),
|
||||||
|
int (**pverify_recover) (EVP_PKEY_CTX
|
||||||
|
*ctx,
|
||||||
|
unsigned char
|
||||||
|
*sig,
|
||||||
|
size_t *siglen,
|
||||||
|
const unsigned
|
||||||
|
char *tbs,
|
||||||
|
size_t tbslen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**psignctx_init) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_MD_CTX *mctx),
|
||||||
|
int (**psignctx) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *sig,
|
||||||
|
size_t *siglen,
|
||||||
|
EVP_MD_CTX *mctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_MD_CTX *mctx),
|
||||||
|
int (**pverifyctx) (EVP_PKEY_CTX *ctx,
|
||||||
|
const unsigned char *sig,
|
||||||
|
int siglen,
|
||||||
|
EVP_MD_CTX *mctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pencryptfn) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *out,
|
||||||
|
size_t *outlen,
|
||||||
|
const unsigned char *in,
|
||||||
|
size_t inlen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pdecrypt) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *out,
|
||||||
|
size_t *outlen,
|
||||||
|
const unsigned char *in,
|
||||||
|
size_t inlen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pderive_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pderive) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *key,
|
||||||
|
size_t *keylen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
|
||||||
|
void *p2),
|
||||||
|
int (**pctrl_str) (EVP_PKEY_CTX *ctx,
|
||||||
|
const char *type,
|
||||||
|
const char *value));
|
||||||
|
|
||||||
void EVP_add_alg_module(void);
|
void EVP_add_alg_module(void);
|
||||||
|
|
||||||
/* BEGIN ERROR CODES */
|
/* BEGIN ERROR CODES */
|
||||||
|
|
|
@ -30,11 +30,11 @@ extern "C" {
|
||||||
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
||||||
* major minor fix final patch/beta)
|
* major minor fix final patch/beta)
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_NUMBER 0x100020cfL
|
# define OPENSSL_VERSION_NUMBER 0x100020efL
|
||||||
# ifdef OPENSSL_FIPS
|
# ifdef OPENSSL_FIPS
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l-fips 25 May 2017"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n-fips 7 Dec 2017"
|
||||||
# else
|
# else
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l 25 May 2017"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n 7 Dec 2017"
|
||||||
# endif
|
# endif
|
||||||
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
||||||
|
|
||||||
|
|
|
@ -1727,7 +1727,7 @@ extern "C" {
|
||||||
# define SSL_ST_BEFORE 0x4000
|
# define SSL_ST_BEFORE 0x4000
|
||||||
# define SSL_ST_OK 0x03
|
# define SSL_ST_OK 0x03
|
||||||
# define SSL_ST_RENEGOTIATE (0x04|SSL_ST_INIT)
|
# define SSL_ST_RENEGOTIATE (0x04|SSL_ST_INIT)
|
||||||
# define SSL_ST_ERR 0x05
|
# define SSL_ST_ERR (0x05|SSL_ST_INIT)
|
||||||
|
|
||||||
# define SSL_CB_LOOP 0x01
|
# define SSL_CB_LOOP 0x01
|
||||||
# define SSL_CB_EXIT 0x02
|
# define SSL_CB_EXIT 0x02
|
||||||
|
|
|
@ -280,6 +280,8 @@
|
||||||
# define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf
|
# define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf
|
||||||
# undef EVP_PKEY_meth_set_verify_recover
|
# undef EVP_PKEY_meth_set_verify_recover
|
||||||
# define EVP_PKEY_meth_set_verify_recover EVP_PKEY_meth_set_vrfy_recover
|
# define EVP_PKEY_meth_set_verify_recover EVP_PKEY_meth_set_vrfy_recover
|
||||||
|
# undef EVP_PKEY_meth_get_verify_recover
|
||||||
|
# define EVP_PKEY_meth_get_verify_recover EVP_PKEY_meth_get_vrfy_recover
|
||||||
|
|
||||||
/* Hack some long EC names */
|
/* Hack some long EC names */
|
||||||
# undef EC_GROUP_set_point_conversion_form
|
# undef EC_GROUP_set_point_conversion_form
|
||||||
|
|
|
@ -317,7 +317,7 @@ int SSL_get_servername_type(const SSL *s);
|
||||||
*/
|
*/
|
||||||
int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
|
int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
|
||||||
const char *label, size_t llen,
|
const char *label, size_t llen,
|
||||||
const unsigned char *p, size_t plen,
|
const unsigned char *context, size_t contextlen,
|
||||||
int use_context);
|
int use_context);
|
||||||
|
|
||||||
int SSL_get_sigalgs(SSL *s, int idx,
|
int SSL_get_sigalgs(SSL *s, int idx,
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -257,11 +257,13 @@ DH *DH_get_1024_160(void);
|
||||||
DH *DH_get_2048_224(void);
|
DH *DH_get_2048_224(void);
|
||||||
DH *DH_get_2048_256(void);
|
DH *DH_get_2048_256(void);
|
||||||
|
|
||||||
|
# ifndef OPENSSL_NO_CMS
|
||||||
/* RFC2631 KDF */
|
/* RFC2631 KDF */
|
||||||
int DH_KDF_X9_42(unsigned char *out, size_t outlen,
|
int DH_KDF_X9_42(unsigned char *out, size_t outlen,
|
||||||
const unsigned char *Z, size_t Zlen,
|
const unsigned char *Z, size_t Zlen,
|
||||||
ASN1_OBJECT *key_oid,
|
ASN1_OBJECT *key_oid,
|
||||||
const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
|
const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);
|
||||||
|
# endif
|
||||||
|
|
||||||
# define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
|
# define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
|
||||||
EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
|
EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
|
||||||
|
|
|
@ -1363,6 +1363,98 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
|
||||||
const char *type,
|
const char *type,
|
||||||
const char *value));
|
const char *value));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_init(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pinit) (EVP_PKEY_CTX *ctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_copy(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pcopy) (EVP_PKEY_CTX *dst,
|
||||||
|
EVP_PKEY_CTX *src));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_cleanup(EVP_PKEY_METHOD *pmeth,
|
||||||
|
void (**pcleanup) (EVP_PKEY_CTX *ctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_paramgen(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pparamgen) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_PKEY *pkey));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_keygen(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pkeygen) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_PKEY *pkey));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**psign_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**psign) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *sig, size_t *siglen,
|
||||||
|
const unsigned char *tbs,
|
||||||
|
size_t tbslen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_verify(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pverify_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pverify) (EVP_PKEY_CTX *ctx,
|
||||||
|
const unsigned char *sig,
|
||||||
|
size_t siglen,
|
||||||
|
const unsigned char *tbs,
|
||||||
|
size_t tbslen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_verify_recover(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pverify_recover_init) (EVP_PKEY_CTX
|
||||||
|
*ctx),
|
||||||
|
int (**pverify_recover) (EVP_PKEY_CTX
|
||||||
|
*ctx,
|
||||||
|
unsigned char
|
||||||
|
*sig,
|
||||||
|
size_t *siglen,
|
||||||
|
const unsigned
|
||||||
|
char *tbs,
|
||||||
|
size_t tbslen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_signctx(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**psignctx_init) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_MD_CTX *mctx),
|
||||||
|
int (**psignctx) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *sig,
|
||||||
|
size_t *siglen,
|
||||||
|
EVP_MD_CTX *mctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_verifyctx(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pverifyctx_init) (EVP_PKEY_CTX *ctx,
|
||||||
|
EVP_MD_CTX *mctx),
|
||||||
|
int (**pverifyctx) (EVP_PKEY_CTX *ctx,
|
||||||
|
const unsigned char *sig,
|
||||||
|
int siglen,
|
||||||
|
EVP_MD_CTX *mctx));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_encrypt(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pencryptfn) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *out,
|
||||||
|
size_t *outlen,
|
||||||
|
const unsigned char *in,
|
||||||
|
size_t inlen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_decrypt(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pdecrypt) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *out,
|
||||||
|
size_t *outlen,
|
||||||
|
const unsigned char *in,
|
||||||
|
size_t inlen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_derive(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pderive_init) (EVP_PKEY_CTX *ctx),
|
||||||
|
int (**pderive) (EVP_PKEY_CTX *ctx,
|
||||||
|
unsigned char *key,
|
||||||
|
size_t *keylen));
|
||||||
|
|
||||||
|
void EVP_PKEY_meth_get_ctrl(EVP_PKEY_METHOD *pmeth,
|
||||||
|
int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
|
||||||
|
void *p2),
|
||||||
|
int (**pctrl_str) (EVP_PKEY_CTX *ctx,
|
||||||
|
const char *type,
|
||||||
|
const char *value));
|
||||||
|
|
||||||
void EVP_add_alg_module(void);
|
void EVP_add_alg_module(void);
|
||||||
|
|
||||||
/* BEGIN ERROR CODES */
|
/* BEGIN ERROR CODES */
|
||||||
|
|
|
@ -30,11 +30,11 @@ extern "C" {
|
||||||
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
||||||
* major minor fix final patch/beta)
|
* major minor fix final patch/beta)
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_NUMBER 0x100020cfL
|
# define OPENSSL_VERSION_NUMBER 0x100020efL
|
||||||
# ifdef OPENSSL_FIPS
|
# ifdef OPENSSL_FIPS
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l-fips 25 May 2017"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n-fips 7 Dec 2017"
|
||||||
# else
|
# else
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l 25 May 2017"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n 7 Dec 2017"
|
||||||
# endif
|
# endif
|
||||||
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
||||||
|
|
||||||
|
|
|
@ -1727,7 +1727,7 @@ extern "C" {
|
||||||
# define SSL_ST_BEFORE 0x4000
|
# define SSL_ST_BEFORE 0x4000
|
||||||
# define SSL_ST_OK 0x03
|
# define SSL_ST_OK 0x03
|
||||||
# define SSL_ST_RENEGOTIATE (0x04|SSL_ST_INIT)
|
# define SSL_ST_RENEGOTIATE (0x04|SSL_ST_INIT)
|
||||||
# define SSL_ST_ERR 0x05
|
# define SSL_ST_ERR (0x05|SSL_ST_INIT)
|
||||||
|
|
||||||
# define SSL_CB_LOOP 0x01
|
# define SSL_CB_LOOP 0x01
|
||||||
# define SSL_CB_EXIT 0x02
|
# define SSL_CB_EXIT 0x02
|
||||||
|
|
|
@ -280,6 +280,8 @@
|
||||||
# define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf
|
# define OPENSSL_add_all_algorithms_conf OPENSSL_add_all_algo_conf
|
||||||
# undef EVP_PKEY_meth_set_verify_recover
|
# undef EVP_PKEY_meth_set_verify_recover
|
||||||
# define EVP_PKEY_meth_set_verify_recover EVP_PKEY_meth_set_vrfy_recover
|
# define EVP_PKEY_meth_set_verify_recover EVP_PKEY_meth_set_vrfy_recover
|
||||||
|
# undef EVP_PKEY_meth_get_verify_recover
|
||||||
|
# define EVP_PKEY_meth_get_verify_recover EVP_PKEY_meth_get_vrfy_recover
|
||||||
|
|
||||||
/* Hack some long EC names */
|
/* Hack some long EC names */
|
||||||
# undef EC_GROUP_set_point_conversion_form
|
# undef EC_GROUP_set_point_conversion_form
|
||||||
|
|
|
@ -317,7 +317,7 @@ int SSL_get_servername_type(const SSL *s);
|
||||||
*/
|
*/
|
||||||
int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
|
int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
|
||||||
const char *label, size_t llen,
|
const char *label, size_t llen,
|
||||||
const unsigned char *p, size_t plen,
|
const unsigned char *context, size_t contextlen,
|
||||||
int use_context);
|
int use_context);
|
||||||
|
|
||||||
int SSL_get_sigalgs(SSL *s, int idx,
|
int SSL_get_sigalgs(SSL *s, int idx,
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue