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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
c8bbc6ab
Commit
c8bbc6ab
authored
Jan 11, 2008
by
serg/mysqldev@janus.mylan/production.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/data0/mysqldev/my/mysql-5.0-release
into mysql.com:/data0/mysqldev/users/serg/mysql-5.0-release
parents
fb8cceb0
1cb6ad3c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
extra/yassl/src/handshake.cpp
extra/yassl/src/handshake.cpp
+5
-0
extra/yassl/src/template_instnt.cpp
extra/yassl/src/template_instnt.cpp
+1
-0
extra/yassl/src/yassl_imp.cpp
extra/yassl/src/yassl_imp.cpp
+10
-1
No files found.
extra/yassl/src/handshake.cpp
View file @
c8bbc6ab
...
...
@@ -527,6 +527,11 @@ void ProcessOldClientHello(input_buffer& input, SSL& ssl)
input
.
read
(
len
,
sizeof
(
len
));
uint16
randomLen
;
ato16
(
len
,
randomLen
);
if
(
ch
.
suite_len_
>
MAX_SUITE_SZ
||
sessionLen
>
ID_LEN
||
randomLen
>
RAN_LEN
)
{
ssl
.
SetError
(
bad_input
);
return
;
}
int
j
=
0
;
for
(
uint16
i
=
0
;
i
<
ch
.
suite_len_
;
i
+=
3
)
{
...
...
extra/yassl/src/template_instnt.cpp
View file @
c8bbc6ab
...
...
@@ -101,6 +101,7 @@ template void ysArrayDelete<unsigned char>(unsigned char*);
template
void
ysArrayDelete
<
char
>(
char
*
);
template
int
min
<
int
>(
int
,
int
);
template
uint16
min
<
uint16
>(
uint16
,
uint16
);
template
unsigned
int
min
<
unsigned
int
>(
unsigned
int
,
unsigned
int
);
template
unsigned
long
min
<
unsigned
long
>(
unsigned
long
,
unsigned
long
);
}
...
...
extra/yassl/src/yassl_imp.cpp
View file @
c8bbc6ab
...
...
@@ -621,6 +621,10 @@ void HandShakeHeader::Process(input_buffer& input, SSL& ssl)
}
uint
len
=
c24to32
(
length_
);
if
(
len
>
input
.
get_remaining
())
{
ssl
.
SetError
(
bad_input
);
return
;
}
hashHandShake
(
ssl
,
input
,
len
);
hs
->
set_length
(
len
);
...
...
@@ -1391,10 +1395,15 @@ input_buffer& operator>>(input_buffer& input, ClientHello& hello)
// Suites
byte
tmp
[
2
];
uint16
len
;
tmp
[
0
]
=
input
[
AUTO
];
tmp
[
1
]
=
input
[
AUTO
];
ato16
(
tmp
,
hello
.
suite_len_
);
ato16
(
tmp
,
len
);
hello
.
suite_len_
=
min
(
len
,
static_cast
<
uint16
>
(
MAX_SUITE_SZ
));
input
.
read
(
hello
.
cipher_suites_
,
hello
.
suite_len_
);
if
(
len
>
hello
.
suite_len_
)
// ignore extra suites
input
.
set_current
(
input
.
get_current
()
+
len
-
hello
.
suite_len_
);
// Compression
hello
.
comp_len_
=
input
[
AUTO
];
...
...
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