diff options
author | msvensson@neptunus.(none) <> | 2007-01-29 16:54:40 +0100 |
---|---|---|
committer | msvensson@neptunus.(none) <> | 2007-01-29 16:54:40 +0100 |
commit | 751d00c47eff2f61e42a43ff55f09d840da1b8bc (patch) | |
tree | b6a5e8e8caed2b74a28ec61b821d2450a1af4fa6 /extra/yassl/src/handshake.cpp | |
parent | 645de0c5d7525b0481197e4f0a6f67f0f2c2785f (diff) | |
download | mariadb-git-751d00c47eff2f61e42a43ff55f09d840da1b8bc.tar.gz |
Import latest version of yaSSL
- Replace SawTooth copyright header with MySQL's
- Bug#19209 Test 'rpl_openssl' hangs on Windows
- Spurious "2013 Connection to server lost" errors fixed
yaSSL doesn't close socket anymore, that is left to the application
Diffstat (limited to 'extra/yassl/src/handshake.cpp')
-rw-r--r-- | extra/yassl/src/handshake.cpp | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/extra/yassl/src/handshake.cpp b/extra/yassl/src/handshake.cpp index c03d72ff2ef..0cd0dfe9c7c 100644 --- a/extra/yassl/src/handshake.cpp +++ b/extra/yassl/src/handshake.cpp @@ -1,27 +1,20 @@ -/* handshake.cpp - * - * Copyright (C) 2003 Sawtooth Consulting Ltd. - * - * This file is part of yaSSL. - * - * yaSSL is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * There are special exceptions to the terms and conditions of the GPL as it - * is applied to yaSSL. View the full text of the exception in the file - * FLOSS-EXCEPTIONS in the directory of this software distribution. - * - * yaSSL is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* + Copyright (C) 2000-2007 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301 USA. +*/ /* The handshake source implements functions for creating and reading @@ -979,7 +972,7 @@ int receiveData(SSL& ssl, Data& data, bool peek) ssl.verfiyHandShakeComplete(); if (ssl.GetError()) return -1; - if (!ssl.bufferedData()) + if (!ssl.HasData()) processReply(ssl); if (peek) |