avformat/tls_schannel: add check for Windows 10 only types and defines

Old Mingw-w64 releases provided by some distros seemingly don't have them, so check for them and disable the dtls protocol if unavailable.

James Almer committed 1 year ago

Commit 307983b1 parent 053a1132 files · +35 −2Browse files

Unified · Split

2 files

configure +4 −0
libavformat/tls_schannel.c +31 −2

configure+4−0

     kCVImageBufferTransferFunction_ITU_R_2020
     kCVImageBufferTransferFunction_SMPTE_ST_428_1
     kVTQPModulationLevel_Default
+    SecPkgContext_KeyingMaterialInfo
     socklen_t
     struct_addrinfo
     struct_group_source_req
 test_code cc "windows.h d3d12video.h" "D3D12_FEATURE_VIDEO feature = D3D12_FEATURE_VIDEO_ENCODER_CODEC" && \
 test_code cc "windows.h d3d12video.h" "D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS req" && enable d3d12_encoder_feature
 check_type "windows.h" "DPI_AWARENESS_CONTEXT" -D_WIN32_WINNT=0x0A00
+check_type "windows.h security.h schnlsp.h" SecPkgContext_KeyingMaterialInfo -DSECURITY_WIN32
 check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
 check_func_headers mfapi.h MFCreateAlignedMemoryBuffer -lmfplat
     schannel_extralibs="-lsecur32 -lncrypt -lcrypt32" ||
         disable schannel
+enabled schannel && check_cc dtls_protocol "windows.h security.h schnlsp.h" "int i = SP_PROT_DTLS1_X_CLIENT;" -DSECURITY_WIN32
 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 ] \

libavformat/tls_schannel.c+31−2

 /** Based on the CURL SChannel module */
+#include "config.h"
+#include "config_components.h"
 #include "libavutil/mem.h"
 #include "avformat.h"
 #include "internal.h"
 int ff_dtls_export_materials(URLContext *h, char *dtls_srtp_materials, size_t materials_sz)
 {
+#if HAVE_SECPKGCONTEXT_KEYINGMATERIALINFO
     TLSContext *c = h->priv_data;
     SecPkgContext_KeyingMaterialInfo keying_info = { 0 };
     }
     return 0;
+#else
+    return AVERROR(ENOSYS);
+#endif
 }
 int ff_dtls_state(URLContext *h)
                 }
                 FreeContextBuffer(outbuf.pvBuffer);
             }
-        } while(sspi_ret == SEC_I_MESSAGE_FRAGMENT || sspi_ret == SEC_I_CONTINUE_NEEDED);
+        } while(
+#ifdef SEC_I_MESSAGE_FRAGMENT
+                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);
         }
         /* 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 ||
+#ifdef SEC_I_MESSAGE_FRAGMENT
+            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);
             goto fail;
         }
+#ifdef SEC_I_MESSAGE_FRAGMENT
         if (sspi_ret == SEC_I_MESSAGE_FRAGMENT) {
             av_log(h, AV_LOG_TRACE, "Writing fragmented output message part\n");
             read_data = 0;
             continue;
         }
+#endif
         if (inbuf[1].BufferType == SECBUFFER_EXTRA && inbuf[1].cbBuffer > 0) {
             if (c->enc_buf_offset > inbuf[1].cbBuffer) {
     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));
         }
         av_log(h, AV_LOG_VERBOSE, "Set DTLS MTU to %d\n", s->mtu);
     }
+#endif
     c->connected = 1;
     s->state = DTLS_STATE_FINISHED;
         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 |
                                     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 */
     return ret;
 }
+#if CONFIG_DTLS_PROTOCOL
 static int dtls_open(URLContext *h, const char *uri, int flags, AVDictionary **options)
 {
     TLSContext *c = h->priv_data;
     return tls_open(h, uri, flags, options);
 }
+#endif
 static int tls_read(URLContext *h, uint8_t *buf, int len)
 {
     { NULL }
 };
+#if CONFIG_TLS_PROTOCOL
 static const AVClass tls_class = {
     .class_name = "tls",
     .item_name  = av_default_item_name,
     .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,
     .flags          = URL_PROTOCOL_FLAG_NETWORK,
     .priv_data_class = &dtls_class,
 };
+#endif

avformat/tls_schannel: add check for Windows 10 only types and defines

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code