Old Mingw-w64 releases provided by supported distros seemingly don't have them,
so
check for them and disable the dtls protocol if unavailable.
Signed-off-by: James Almer <jamr...@gmail.com>
---
configure | 3 +++
libavformat/tls_schannel.c | 33 +++++++++++++++++++++++++++++++--
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 6df8fa4deb..0735527ed4 100755
--- a/configure
+++ b/configure
@@ -7271,6 +7271,9 @@ enabled schannel &&
schannel_extralibs="-lsecur32 -lncrypt -lcrypt32" ||
disable schannel
+enabled schannel && check_type "windows.h security.h schnlsp.h"
SecPkgContext_KeyingMaterialInfo "-DSECURITY_WIN32 -D_WIN32_WINNT=0x0A00" ||
+ disable dtls_protocol
+
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
enabled makeinfo \
&& [ 0$(makeinfo --version | grep "texinfo" | sed
's/.*texinfo[^0-9]*\([0-9]*\)\..*/\1/') -ge 5 ] \
diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c
index da6a284376..28641c5f13 100644
--- a/libavformat/tls_schannel.c
+++ b/libavformat/tls_schannel.c
@@ -20,6 +20,13 @@
/** Based on the CURL SChannel module */
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0A00
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0A00
+#endif
+
+#include "config_components.h"
+
#include "libavutil/mem.h"
#include "avformat.h"
#include "internal.h"
@@ -634,6 +641,7 @@ int ff_tls_set_external_socket(URLContext *h, URLContext
*sock)
int ff_dtls_export_materials(URLContext *h, char *dtls_srtp_materials, size_t
materials_sz)
{
+#if CONFIG_DTLS_PROTOCOL
TLSContext *c = h->priv_data;
SecPkgContext_KeyingMaterialInfo keying_info = { 0 };
@@ -672,6 +680,9 @@ int ff_dtls_export_materials(URLContext *h, char
*dtls_srtp_materials, size_t ma
}
return 0;
+#else
+ return AVERROR(ENOSYS);
+#endif
}
int ff_dtls_state(URLContext *h)
@@ -773,7 +784,11 @@ static int tls_shutdown_client(URLContext *h)
}
FreeContextBuffer(outbuf.pvBuffer);
}
- } while(sspi_ret == SEC_I_MESSAGE_FRAGMENT || sspi_ret ==
SEC_I_CONTINUE_NEEDED);
+ } while(
+#if CONFIG_DTLS_PROTOCOL
+ sspi_ret == SEC_I_MESSAGE_FRAGMENT ||
+#endif
+ sspi_ret == SEC_I_CONTINUE_NEEDED);
av_log(h, AV_LOG_DEBUG, "Close session result: 0x%lx\n", sspi_ret);
@@ -928,7 +943,11 @@ static int tls_handshake_loop(URLContext *h, int initial)
}
/* continue handshake */
- if (sspi_ret == SEC_I_CONTINUE_NEEDED || sspi_ret ==
SEC_I_MESSAGE_FRAGMENT || sspi_ret == SEC_E_OK) {
+ if (sspi_ret == SEC_I_CONTINUE_NEEDED ||
+#if CONFIG_DTLS_PROTOCOL
+ sspi_ret == SEC_I_MESSAGE_FRAGMENT ||
+#endif
+ sspi_ret == SEC_E_OK) {
for (i = 0; i < 3; i++) {
if (outbuf[i].BufferType == SECBUFFER_TOKEN &&
outbuf[i].cbBuffer > 0) {
ret = ffurl_write(uc, outbuf[i].pvBuffer,
outbuf[i].cbBuffer);
@@ -1080,6 +1099,7 @@ static int tls_handshake(URLContext *h)
if (ret < 0)
goto fail;
+#if CONFIG_DTLS_PROTOCOL
if (s->is_dtls && s->mtu > 0) {
ULONG mtu = s->mtu;
sspi_ret = SetContextAttributes(&c->ctxt_handle, SECPKG_ATTR_DTLS_MTU,
&mtu, sizeof(mtu));
@@ -1090,6 +1110,7 @@ static int tls_handshake(URLContext *h)
}
av_log(h, AV_LOG_VERBOSE, "Set DTLS MTU to %d\n", s->mtu);
}
+#endif
c->connected = 1;
s->state = DTLS_STATE_FINISHED;
@@ -1136,8 +1157,10 @@ static int tls_open(URLContext *h, const char *uri, int
flags, AVDictionary **op
schannel_cred.dwFlags = SCH_CRED_NO_SYSTEM_MAPPER |
SCH_CRED_MANUAL_CRED_VALIDATION;
+#if CONFIG_DTLS_PROTOCOL
if (s->is_dtls)
schannel_cred.grbitEnabledProtocols = SP_PROT_DTLS1_X_SERVER;
+#endif
} else {
if (s->verify)
schannel_cred.dwFlags = SCH_CRED_AUTO_CRED_VALIDATION |
@@ -1147,8 +1170,10 @@ static int tls_open(URLContext *h, const char *uri, int
flags, AVDictionary **op
SCH_CRED_IGNORE_NO_REVOCATION_CHECK |
SCH_CRED_IGNORE_REVOCATION_OFFLINE;
+#if CONFIG_DTLS_PROTOCOL
if (s->is_dtls)
schannel_cred.grbitEnabledProtocols = SP_PROT_DTLS1_X_CLIENT;
+#endif
}
/* Get credential handle */
@@ -1439,6 +1464,7 @@ static const AVOption options[] = {
{ NULL }
};
+#if CONFIG_TLS_PROTOCOL
static const AVClass tls_class = {
.class_name = "tls",
.item_name = av_default_item_name,
@@ -1458,7 +1484,9 @@ const URLProtocol ff_tls_protocol = {
.flags = URL_PROTOCOL_FLAG_NETWORK,
.priv_data_class = &tls_class,
};
+#endif
+#if CONFIG_DTLS_PROTOCOL
static const AVClass dtls_class = {
.class_name = "dtls",
.item_name = av_default_item_name,
@@ -1479,3 +1507,4 @@ const URLProtocol ff_dtls_protocol = {
.flags = URL_PROTOCOL_FLAG_NETWORK,
.priv_data_class = &dtls_class,
};
+#endif
--
2.50.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
