diff options
| author | Daiyuu Nobori <daiyuu.git@softether.co.jp> | 2016-11-27 11:48:18 +0300 |
|---|---|---|
| committer | Daiyuu Nobori <daiyuu.git@softether.co.jp> | 2016-11-27 11:48:18 +0300 |
| commit | 712adc6d74df4129ac34b1c1bebc947a98469cee (patch) | |
| tree | 0b4005e33a8cfc94de71ea40398544e09f58d8c6 /src/Mayaqua/Network.h | |
| parent | cc8fff4d81b039ec9b37442cf54d2262146676b3 (diff) | |
| parent | 311ab9efaba485225c05b65437d0d1f5d685ef5f (diff) | |
resolved the conflict
Diffstat (limited to 'src/Mayaqua/Network.h')
| -rw-r--r-- | src/Mayaqua/Network.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h index bb4c69b7..ed69edf2 100644 --- a/src/Mayaqua/Network.h +++ b/src/Mayaqua/Network.h @@ -313,6 +313,7 @@ struct SOCK UINT Reverse_MyServerPort; // Self port number when using the reverse socket
UCHAR Ssl_Init_Async_SendAlert[2]; // Initial state of SSL send_alert
bool AcceptOnlyTls; // Accept only TLS (disable SSLv3)
+ UINT DisableSslVersions; // Bitmap of SSL Version to disable
bool RawIP_HeaderIncludeFlag;
#ifdef ENABLE_SSL_LOGGING
|