diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
| commit | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (patch) | |
| tree | 6b4b6de1185b25f8e6071b3204fcb69762bdc0ac /openssl/ssl/ssl.h | |
| parent | 40bdd8b27f5c730b8d0c9a189e89fb51a5400611 (diff) | |
| parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
| download | vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.gz vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.bz2 vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/ssl/ssl.h')
| -rw-r--r-- | openssl/ssl/ssl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl/ssl/ssl.h b/openssl/ssl/ssl.h index e4c3f6501..8f922eea7 100644 --- a/openssl/ssl/ssl.h +++ b/openssl/ssl/ssl.h @@ -1882,6 +1882,7 @@ void ERR_load_SSL_strings(void); #define SSL_F_SSL3_CALLBACK_CTRL 233 #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_CLIENT_HELLO 131 #define SSL_F_SSL3_CONNECT 132 #define SSL_F_SSL3_CTRL 213 @@ -2139,6 +2140,7 @@ void ERR_load_SSL_strings(void); #define SSL_R_MISSING_TMP_RSA_KEY 172 #define SSL_R_MISSING_TMP_RSA_PKEY 173 #define SSL_R_MISSING_VERIFY_MESSAGE 174 +#define SSL_R_MULTIPLE_SGC_RESTARTS 346 #define SSL_R_NON_SSLV2_INITIAL_PACKET 175 #define SSL_R_NO_CERTIFICATES_RETURNED 176 #define SSL_R_NO_CERTIFICATE_ASSIGNED 177 |