diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 23:05:23 +0200 |
| commit | 0f7871ff824bcf064db3ab6bdfe26645ba6c8087 (patch) | |
| tree | 90d3d2b6112e083289c9cf68146852087814f6d3 /openssl/ssl/ssl_locl.h | |
| parent | 934184bfecd402aae891b8740d788b486aa7269f (diff) | |
| parent | 2a00e489122f6c4b525090dbdba2855a2ea2d519 (diff) | |
| download | vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.gz vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.tar.bz2 vcxsrv-0f7871ff824bcf064db3ab6bdfe26645ba6c8087.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/ssl/ssl_locl.h')
| -rw-r--r-- | openssl/ssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl/ssl/ssl_locl.h b/openssl/ssl/ssl_locl.h index 46ea18a07..79b85b9ed 100644 --- a/openssl/ssl/ssl_locl.h +++ b/openssl/ssl/ssl_locl.h @@ -370,10 +370,10 @@ # define SSL_AEAD 0x00000040L /* Bits for algorithm_ssl (protocol version) */ -# define SSL_SSLV2 0x00000001L -# define SSL_SSLV3 0x00000002L +# define SSL_SSLV2 0x00000001UL +# define SSL_SSLV3 0x00000002UL # define SSL_TLSV1 SSL_SSLV3/* for now */ -# define SSL_TLSV1_2 0x00000004L +# define SSL_TLSV1_2 0x00000004UL /* Bits for algorithm2 (handshake digests and other extra flags) */ |