Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
ca41ed3f
Commit
ca41ed3f
authored
Aug 30, 2014
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gnutls: don't break if ALPN extension is not available
At least, fedora 20 doesn't enable it.
parent
d5368889
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
modules/misc/gnutls.c
modules/misc/gnutls.c
+8
-0
No files found.
modules/misc/gnutls.c
View file @
ca41ed3f
...
...
@@ -198,6 +198,7 @@ static int gnutls_SessionOpen (vlc_tls_t *tls, int type,
goto
error
;
}
#ifdef GNUTLS_ALPN_MAND
if
(
alpn
!=
NULL
)
{
gnutls_datum_t
*
protv
=
NULL
;
...
...
@@ -222,6 +223,9 @@ static int gnutls_SessionOpen (vlc_tls_t *tls, int type,
val
=
gnutls_alpn_set_protocols
(
session
,
protv
,
protc
,
0
);
free
(
protv
);
}
#else
VLC_UNUSED
(
alpn
);
#endif
gnutls_transport_set_int
(
session
,
fd
);
...
...
@@ -275,6 +279,7 @@ static int gnutls_ContinueHandshake (vlc_tls_t *tls, char **restrict alp)
return
-
1
;
done:
#ifdef GNUTLS_ALPN_MAND
if
(
alp
!=
NULL
)
{
gnutls_datum_t
datum
;
...
...
@@ -292,6 +297,9 @@ done:
else
*
alp
=
NULL
;
}
#else
VLC_UNUSED
(
alp
);
#endif
return
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