diff options
author | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
commit | 8cd093f61168a373d919c68e0ce4e04949fa4eb6 (patch) | |
tree | d1bc1dd33da84a22d6ab30aa9f7efb79b592ffda /openssl/crypto/err | |
parent | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (diff) | |
parent | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff) | |
download | vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.gz vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.bz2 vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/err')
-rw-r--r-- | openssl/crypto/err/openssl.ec | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openssl/crypto/err/openssl.ec b/openssl/crypto/err/openssl.ec index e0554b434..bafbc35d3 100644 --- a/openssl/crypto/err/openssl.ec +++ b/openssl/crypto/err/openssl.ec @@ -71,6 +71,7 @@ R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060 R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION 1070 R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071 R SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 +R SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK 1086 R SSL_R_TLSV1_ALERT_USER_CANCELLED 1090 R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 R SSL_R_TLSV1_UNSUPPORTED_EXTENSION 1110 |