1 files changed, 16 insertions, 12 deletions

diff --git a/src/Mayaqua/win32_inc/openssl/ssl.h b/src/Mayaqua/win32_inc/openssl/ssl.h
index d683199e..06b73094 100644
--- a/src/Mayaqua/win32_inc/openssl/ssl.h
+++ b/src/Mayaqua/win32_inc/openssl/ssl.h
@@ -338,7 +338,7 @@ extern "C" {
  * The following cipher list is used by default. It also is substituted when

  * an application-defined cipher list string starts with 'DEFAULT'.

  */

-# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"

+# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!LOW:!aNULL:!eNULL:!SSLv2"

 /*

  * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always

  * starts with a reasonable order, and all we have to do for DEFAULT is

@@ -625,7 +625,7 @@ struct ssl_session_st {
 # define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION        0x00040000L

 /* If set, always create a new key when using tmp_ecdh parameters */

 # define SSL_OP_SINGLE_ECDH_USE                          0x00080000L

-/* If set, always create a new key when using tmp_dh parameters */

+/* Does nothing: retained for compatibility */

 # define SSL_OP_SINGLE_DH_USE                            0x00100000L

 /* Does nothing: retained for compatibiity */

 # define SSL_OP_EPHEMERAL_RSA                            0x0

@@ -1727,6 +1727,7 @@ extern "C" {
 # define SSL_ST_BEFORE                   0x4000

 # define SSL_ST_OK                       0x03

 # define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)

+# define SSL_ST_ERR                      0x05

 

 # define SSL_CB_LOOP                     0x01

 # define SSL_CB_EXIT                     0x02

@@ -2091,7 +2092,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 # define SSL_CTX_set1_sigalgs_list(ctx, s) \

         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)

 # define SSL_set1_sigalgs(ctx, slist, slistlen) \

-        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS,clistlen,(int *)slist)

+        SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)slist)

 # define SSL_set1_sigalgs_list(ctx, s) \

         SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)

 # define SSL_CTX_set1_client_sigalgs(ctx, slist, slistlen) \

@@ -2344,7 +2345,7 @@ const char *SSL_get_version(const SSL *s);
 /* This sets the 'default' SSL version that SSL_new() will create */

 int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);

 

-# ifndef OPENSSL_NO_SSL2

+# ifndef OPENSSL_NO_SSL2_METHOD

 const SSL_METHOD *SSLv2_method(void); /* SSLv2 */

 const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */

 const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */

@@ -2531,7 +2532,6 @@ void SSL_set_tmp_ecdh_callback(SSL *ssl,
                                                 int keylength));

 # endif

 

-# ifndef OPENSSL_NO_COMP

 const COMP_METHOD *SSL_get_current_compression(SSL *s);

 const COMP_METHOD *SSL_get_current_expansion(SSL *s);

 const char *SSL_COMP_get_name(const COMP_METHOD *comp);

@@ -2540,13 +2540,6 @@ STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
                                                       *meths);

 void SSL_COMP_free_compression_methods(void);

 int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);

-# else

-const void *SSL_get_current_compression(SSL *s);

-const void *SSL_get_current_expansion(SSL *s);

-const char *SSL_COMP_get_name(const void *comp);

-void *SSL_COMP_get_compression_methods(void);

-int SSL_COMP_add_compression_method(int id, void *cm);

-# endif

 

 const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr);

 

@@ -2622,6 +2615,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_DTLS1_HEARTBEAT                            305

 # define SSL_F_DTLS1_OUTPUT_CERT_CHAIN                    255

 # define SSL_F_DTLS1_PREPROCESS_FRAGMENT                  288

+# define SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS             424

 # define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE           256

 # define SSL_F_DTLS1_PROCESS_RECORD                       257

 # define SSL_F_DTLS1_READ_BYTES                           258

@@ -2640,6 +2634,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_GET_CLIENT_MASTER_KEY                      107

 # define SSL_F_GET_SERVER_FINISHED                        108

 # define SSL_F_GET_SERVER_HELLO                           109

+# define SSL_F_GET_SERVER_STATIC_DH_KEY                   340

 # define SSL_F_GET_SERVER_VERIFY                          110

 # define SSL_F_I2D_SSL_SESSION                            111

 # define SSL_F_READ_N                                     112

@@ -2670,6 +2665,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_CHANGE_CIPHER_STATE                   129

 # define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM              130

 # define SSL_F_SSL3_CHECK_CLIENT_HELLO                    304

+# define SSL_F_SSL3_CHECK_FINISHED                        339

 # define SSL_F_SSL3_CLIENT_HELLO                          131

 # define SSL_F_SSL3_CONNECT                               132

 # define SSL_F_SSL3_CTRL                                  213

@@ -2678,6 +2674,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 292

 # define SSL_F_SSL3_ENC                                   134

 # define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238

+# define SSL_F_SSL3_GENERATE_MASTER_SECRET                388

 # define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135

 # define SSL_F_SSL3_GET_CERT_STATUS                       289

 # define SSL_F_SSL3_GET_CERT_VERIFY                       136

@@ -2784,6 +2781,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL_RSA_PUBLIC_ENCRYPT                     188

 # define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT                320

 # define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT                321

+# define SSL_F_SSL_SESSION_DUP                            348

 # define SSL_F_SSL_SESSION_NEW                            189

 # define SSL_F_SSL_SESSION_PRINT_FP                       190

 # define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                312

@@ -2842,8 +2840,11 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106

 # define SSL_R_BAD_DECOMPRESSION                          107

 # define SSL_R_BAD_DH_G_LENGTH                            108

+# define SSL_R_BAD_DH_G_VALUE                             375

 # define SSL_R_BAD_DH_PUB_KEY_LENGTH                      109

+# define SSL_R_BAD_DH_PUB_KEY_VALUE                       393

 # define SSL_R_BAD_DH_P_LENGTH                            110

+# define SSL_R_BAD_DH_P_VALUE                             395

 # define SSL_R_BAD_DIGEST_LENGTH                          111

 # define SSL_R_BAD_DSA_SIGNATURE                          112

 # define SSL_R_BAD_ECC_CERT                               304

@@ -2904,6 +2905,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_DATA_LENGTH_TOO_LONG                       146

 # define SSL_R_DECRYPTION_FAILED                          147

 # define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC        281

+# define SSL_R_DH_KEY_TOO_SMALL                           372

 # define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG            148

 # define SSL_R_DIGEST_CHECK_FAILED                        149

 # define SSL_R_DTLS_MESSAGE_TOO_BIG                       334

@@ -3047,6 +3049,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_SERVERHELLO_TLSEXT                         275

 # define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED           277

 # define SSL_R_SHORT_READ                                 219

+# define SSL_R_SHUTDOWN_WHILE_IN_INIT                     407

 # define SSL_R_SIGNATURE_ALGORITHMS_ERROR                 360

 # define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      220

 # define SSL_R_SRP_A_CALC                                 361

@@ -3104,6 +3107,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157

 # define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233

 # define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    234

+# define SSL_R_TOO_MANY_WARN_ALERTS                       409

 # define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER            235

 # define SSL_R_UNABLE_TO_DECODE_DH_CERTS                  236

 # define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS                313