Merge remote-tracking branch 'origin/fastpath' into topic/robin/master-test

* origin/fastpath:
  make version_ok return true for TLSv12
This commit is contained in:
Robin Sommer 2012-07-23 15:46:04 -07:00
commit b6991d405b
2 changed files with 3 additions and 1 deletions

View file

@ -93,6 +93,7 @@ function version_ok(vers : uint16) : bool
case SSLv30:
case TLSv10:
case TLSv11:
case TLSv12:
return true;
default:

View file

@ -22,5 +22,6 @@ enum SSLVersions {
SSLv20 = 0x0002,
SSLv30 = 0x0300,
TLSv10 = 0x0301,
TLSv11 = 0x0302
TLSv11 = 0x0302,
TLSv12 = 0x0303
};