Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
4fcf3290
Commit
4fcf3290
authored
Jun 14, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#19191 Repeated crashes on OpenBSD for ssl test cases
- Import patch from yaSSL
parent
15926709
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
6 deletions
+15
-6
extra/yassl/src/handshake.cpp
extra/yassl/src/handshake.cpp
+4
-4
extra/yassl/src/socket_wrapper.cpp
extra/yassl/src/socket_wrapper.cpp
+11
-2
No files found.
extra/yassl/src/handshake.cpp
View file @
4fcf3290
...
@@ -880,7 +880,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
...
@@ -880,7 +880,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
ssl
.
SetError
(
no_error
);
ssl
.
SetError
(
no_error
);
ssl
.
verfiyHandShakeComplete
();
ssl
.
verfiyHandShakeComplete
();
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
int
sent
=
0
;
int
sent
=
0
;
for
(;;)
{
for
(;;)
{
...
@@ -891,7 +891,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
...
@@ -891,7 +891,7 @@ int sendData(SSL& ssl, const void* buffer, int sz)
buildMessage
(
ssl
,
out
,
data
);
buildMessage
(
ssl
,
out
,
data
);
ssl
.
Send
(
out
.
get_buffer
(),
out
.
get_size
());
ssl
.
Send
(
out
.
get_buffer
(),
out
.
get_size
());
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
sent
+=
len
;
sent
+=
len
;
if
(
sent
==
sz
)
break
;
if
(
sent
==
sz
)
break
;
}
}
...
@@ -918,14 +918,14 @@ int receiveData(SSL& ssl, Data& data)
...
@@ -918,14 +918,14 @@ int receiveData(SSL& ssl, Data& data)
ssl
.
SetError
(
no_error
);
ssl
.
SetError
(
no_error
);
ssl
.
verfiyHandShakeComplete
();
ssl
.
verfiyHandShakeComplete
();
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
if
(
!
ssl
.
bufferedData
())
if
(
!
ssl
.
bufferedData
())
processReply
(
ssl
);
processReply
(
ssl
);
ssl
.
fillData
(
data
);
ssl
.
fillData
(
data
);
ssl
.
useLog
().
ShowData
(
data
.
get_length
());
ssl
.
useLog
().
ShowData
(
data
.
get_length
());
if
(
ssl
.
GetError
())
return
0
;
if
(
ssl
.
GetError
())
return
-
1
;
if
(
data
.
get_length
()
==
0
&&
ssl
.
getSocket
().
WouldBlock
())
{
if
(
data
.
get_length
()
==
0
&&
ssl
.
getSocket
().
WouldBlock
())
{
ssl
.
SetError
(
YasslError
(
SSL_ERROR_WANT_READ
));
ssl
.
SetError
(
YasslError
(
SSL_ERROR_WANT_READ
));
...
...
extra/yassl/src/socket_wrapper.cpp
View file @
4fcf3290
...
@@ -113,13 +113,22 @@ uint Socket::get_ready() const
...
@@ -113,13 +113,22 @@ uint Socket::get_ready() const
uint
Socket
::
send
(
const
byte
*
buf
,
unsigned
int
sz
,
int
flags
)
const
uint
Socket
::
send
(
const
byte
*
buf
,
unsigned
int
sz
,
int
flags
)
const
{
{
const
byte
*
pos
=
buf
;
const
byte
*
end
=
pos
+
sz
;
assert
(
socket_
!=
INVALID_SOCKET
);
assert
(
socket_
!=
INVALID_SOCKET
);
int
sent
=
::
send
(
socket_
,
reinterpret_cast
<
const
char
*>
(
buf
),
sz
,
flags
);
while
(
pos
!=
end
)
{
int
sent
=
::
send
(
socket_
,
reinterpret_cast
<
const
char
*>
(
pos
),
static_cast
<
int
>
(
end
-
pos
),
flags
);
if
(
sent
==
-
1
)
if
(
sent
==
-
1
)
return
0
;
return
0
;
return
sent
;
pos
+=
sent
;
}
return
sz
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment