Update OpenSSL to v1.0.2k
This commit is contained in:
parent
c0e812a57a
commit
c297fced3d
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1370,6 +1370,7 @@ void EVP_add_alg_module(void);
|
||||||
* The following lines are auto generated by the script mkerr.pl. Any changes
|
* The following lines are auto generated by the script mkerr.pl. Any changes
|
||||||
* made after this point may be overwritten when the script is next run.
|
* made after this point may be overwritten when the script is next run.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void ERR_load_EVP_strings(void);
|
void ERR_load_EVP_strings(void);
|
||||||
|
|
||||||
/* Error codes for the EVP functions. */
|
/* Error codes for the EVP functions. */
|
||||||
|
@ -1489,6 +1490,7 @@ void ERR_load_EVP_strings(void);
|
||||||
# define EVP_R_INPUT_NOT_INITIALIZED 111
|
# define EVP_R_INPUT_NOT_INITIALIZED 111
|
||||||
# define EVP_R_INVALID_DIGEST 152
|
# define EVP_R_INVALID_DIGEST 152
|
||||||
# define EVP_R_INVALID_FIPS_MODE 168
|
# define EVP_R_INVALID_FIPS_MODE 168
|
||||||
|
# define EVP_R_INVALID_KEY 171
|
||||||
# define EVP_R_INVALID_KEY_LENGTH 130
|
# define EVP_R_INVALID_KEY_LENGTH 130
|
||||||
# define EVP_R_INVALID_OPERATION 148
|
# define EVP_R_INVALID_OPERATION 148
|
||||||
# define EVP_R_IV_TOO_LARGE 102
|
# define EVP_R_IV_TOO_LARGE 102
|
||||||
|
@ -1528,7 +1530,7 @@ void ERR_load_EVP_strings(void);
|
||||||
# define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
|
# define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
|
||||||
# define EVP_R_WRONG_PUBLIC_KEY_TYPE 110
|
# define EVP_R_WRONG_PUBLIC_KEY_TYPE 110
|
||||||
|
|
||||||
#ifdef __cplusplus
|
# ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -118,8 +118,8 @@ extern "C" {
|
||||||
|
|
||||||
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
|
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
|
||||||
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
||||||
#define ENGINESDIR "C:\\Users\\Andrew\\Desktop\\openssl-win32/lib/engines"
|
#define ENGINESDIR "C:\\Users\\Synergy\\Desktop\\openssl-w32/lib/engines"
|
||||||
#define OPENSSLDIR "C:\\Users\\Andrew\\Desktop\\openssl-win32/ssl"
|
#define OPENSSLDIR "C:\\Users\\Synergy\\Desktop\\openssl-w32/ssl"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -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 0x100020afL
|
# define OPENSSL_VERSION_NUMBER 0x100020bfL
|
||||||
# ifdef OPENSSL_FIPS
|
# ifdef OPENSSL_FIPS
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-fips 26 Sep 2016"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017"
|
||||||
# else
|
# else
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j 26 Sep 2016"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k 26 Jan 2017"
|
||||||
# endif
|
# endif
|
||||||
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
||||||
|
|
||||||
|
|
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.
|
@ -1370,6 +1370,7 @@ void EVP_add_alg_module(void);
|
||||||
* The following lines are auto generated by the script mkerr.pl. Any changes
|
* The following lines are auto generated by the script mkerr.pl. Any changes
|
||||||
* made after this point may be overwritten when the script is next run.
|
* made after this point may be overwritten when the script is next run.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void ERR_load_EVP_strings(void);
|
void ERR_load_EVP_strings(void);
|
||||||
|
|
||||||
/* Error codes for the EVP functions. */
|
/* Error codes for the EVP functions. */
|
||||||
|
@ -1489,6 +1490,7 @@ void ERR_load_EVP_strings(void);
|
||||||
# define EVP_R_INPUT_NOT_INITIALIZED 111
|
# define EVP_R_INPUT_NOT_INITIALIZED 111
|
||||||
# define EVP_R_INVALID_DIGEST 152
|
# define EVP_R_INVALID_DIGEST 152
|
||||||
# define EVP_R_INVALID_FIPS_MODE 168
|
# define EVP_R_INVALID_FIPS_MODE 168
|
||||||
|
# define EVP_R_INVALID_KEY 171
|
||||||
# define EVP_R_INVALID_KEY_LENGTH 130
|
# define EVP_R_INVALID_KEY_LENGTH 130
|
||||||
# define EVP_R_INVALID_OPERATION 148
|
# define EVP_R_INVALID_OPERATION 148
|
||||||
# define EVP_R_IV_TOO_LARGE 102
|
# define EVP_R_IV_TOO_LARGE 102
|
||||||
|
@ -1528,7 +1530,7 @@ void ERR_load_EVP_strings(void);
|
||||||
# define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
|
# define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
|
||||||
# define EVP_R_WRONG_PUBLIC_KEY_TYPE 110
|
# define EVP_R_WRONG_PUBLIC_KEY_TYPE 110
|
||||||
|
|
||||||
#ifdef __cplusplus
|
# ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -118,8 +118,8 @@ extern "C" {
|
||||||
|
|
||||||
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
|
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
|
||||||
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
||||||
#define ENGINESDIR "C:\\Users\\Andrew\\Desktop\\openssl-win64/lib/engines"
|
#define ENGINESDIR "C:\\Users\\Synergy\\Desktop\\openssl-w64/lib/engines"
|
||||||
#define OPENSSLDIR "C:\\Users\\Andrew\\Desktop\\openssl-win64/ssl"
|
#define OPENSSLDIR "C:\\Users\\Synergy\\Desktop\\openssl-w64/ssl"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -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 0x100020afL
|
# define OPENSSL_VERSION_NUMBER 0x100020bfL
|
||||||
# ifdef OPENSSL_FIPS
|
# ifdef OPENSSL_FIPS
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-fips 26 Sep 2016"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017"
|
||||||
# else
|
# else
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j 26 Sep 2016"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k 26 Jan 2017"
|
||||||
# endif
|
# endif
|
||||||
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
|
||||||
|
|
||||||
|
|
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