Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
videolan
vlc-gpu
Commits
8650df15
Commit
8650df15
authored
Jun 15, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SRTP: fix parser
parent
60e93de0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
libs/srtp/srtp.c
libs/srtp/srtp.c
+5
-5
No files found.
libs/srtp/srtp.c
View file @
8650df15
...
...
@@ -392,10 +392,10 @@ static ssize_t hexstring (const char *in, uint8_t *out, size_t outlen)
for
(
size_t
i
=
0
;
i
<
inlen
;
i
+=
2
)
{
int
a
=
hexdigit
(
in
[
2
*
i
]),
b
=
hexdigit
(
in
[
2
*
i
+
1
]);
int
a
=
hexdigit
(
in
[
i
]),
b
=
hexdigit
(
in
[
i
+
1
]);
if
((
a
==
-
1
)
||
(
b
==
-
1
))
return
EINVAL
;
out
[
i
]
=
(
a
<<
4
)
|
b
;
return
-
1
;
out
[
i
/
2
]
=
(
a
<<
4
)
|
b
;
}
return
inlen
/
2
;
}
...
...
@@ -410,14 +410,14 @@ static ssize_t hexstring (const char *in, uint8_t *out, size_t outlen)
int
srtp_setkeystring
(
srtp_session_t
*
s
,
const
char
*
key
,
const
char
*
salt
)
{
uint8_t
bkey
[
32
];
/* TODO/NOTE: hard-coded for AES */
uint8_t
bkey
[
16
];
/* TODO/NOTE: hard-coded for AES */
uint8_t
bsalt
[
14
];
/* TODO/NOTE: hard-coded for the PRF-AES-CM */
ssize_t
bkeylen
=
hexstring
(
key
,
bkey
,
sizeof
(
bkey
));
ssize_t
bsaltlen
=
hexstring
(
salt
,
bsalt
,
sizeof
(
bsalt
));
if
((
bkeylen
==
-
1
)
||
(
bsaltlen
==
-
1
))
return
EINVAL
;
return
srtp_
derive
(
s
,
bkey
,
bkeylen
,
bsalt
,
bsaltlen
)
?
EINVAL
:
0
;
return
srtp_
setkey
(
s
,
bkey
,
bkeylen
,
bsalt
,
bsaltlen
)
?
EINVAL
:
0
;
}
/**
...
...
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