virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/tls: remove unused fingerprint option

Browse Source
This commit is contained in:
Timo Rothenpieler
2025-07-01 17:23:42 +02:00
parent 043d3fef8a
commit 4a4a566d6e
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/tls.h
View File

@ -66,12 +66,10 @@ typedef struct TLSShared {
int use_external_udp; int use_external_udp;
URLContext *udp; URLContext *udp;
/* The fingerprint of certificate, used in SDP offer. */
char *fingerprint;
/* The certificate and private key content used for DTLS handshake */ /* The certificate and private key content used for DTLS handshake */
char* cert_buf; char* cert_buf;
char* key_buf; char* key_buf;
/** /**
* The size of RTP packet, should generally be set to MTU. * The size of RTP packet, should generally be set to MTU.
* Note that pion requires a smaller value, for example, 1200. * Note that pion requires a smaller value, for example, 1200.
@ -91,7 +89,6 @@ typedef struct TLSShared {
{"http_proxy", "Set proxy to tunnel through", offsetof(pstruct, options_field . http_proxy), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \ {"http_proxy", "Set proxy to tunnel through", offsetof(pstruct, options_field . http_proxy), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
{"use_external_udp", "Use external UDP from muxer or demuxer", offsetof(pstruct, options_field . use_external_udp), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 1, .flags = TLS_OPTFL }, \ {"use_external_udp", "Use external UDP from muxer or demuxer", offsetof(pstruct, options_field . use_external_udp), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 1, .flags = TLS_OPTFL }, \
{"mtu", "Maximum Transmission Unit", offsetof(pstruct, options_field . mtu), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = TLS_OPTFL}, \ {"mtu", "Maximum Transmission Unit", offsetof(pstruct, options_field . mtu), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = TLS_OPTFL}, \
{"fingerprint", "The optional fingerprint for DTLS", offsetof(pstruct, options_field . fingerprint), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \
{"cert_buf", "The optional certificate buffer for DTLS", offsetof(pstruct, options_field . cert_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \ {"cert_buf", "The optional certificate buffer for DTLS", offsetof(pstruct, options_field . cert_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \
{"key_buf", "The optional private key buffer for DTLS", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL} {"key_buf", "The optional private key buffer for DTLS", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}

4
libavformat/tls_openssl.c
View File

@ -1010,8 +1010,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary **
} }
} }
av_log(p, AV_LOG_VERBOSE, "TLS: Setup ok, MTU=%d, fingerprint %s\n", av_log(p, AV_LOG_VERBOSE, "TLS: Setup ok, MTU=%d\n", p->tls_shared.mtu);
p->tls_shared.mtu, p->tls_shared.fingerprint);
ret = 0; ret = 0;
fail: fail:
@ -1029,7 +1028,6 @@ static av_cold int dtls_close(URLContext *h)
TLSContext *ctx = h->priv_data; TLSContext *ctx = h->priv_data;
SSL_free(ctx->ssl); SSL_free(ctx->ssl);
SSL_CTX_free(ctx->ctx); SSL_CTX_free(ctx->ctx);
av_freep(&ctx->tls_shared.fingerprint);
av_freep(&ctx->tls_shared.cert_buf); av_freep(&ctx->tls_shared.cert_buf);
av_freep(&ctx->tls_shared.key_buf); av_freep(&ctx->tls_shared.key_buf);
EVP_PKEY_free(ctx->pkey); EVP_PKEY_free(ctx->pkey);

1
libavformat/whip.c
View File

@ -1297,7 +1297,6 @@ next_packet:
av_dict_set(&opts, "key_file", whip->key_file, 0); av_dict_set(&opts, "key_file", whip->key_file, 0);
} else } else
av_dict_set(&opts, "key_buf", whip->key_buf, 0); av_dict_set(&opts, "key_buf", whip->key_buf, 0);
av_dict_set(&opts, "fingerprint", whip->dtls_fingerprint, 0);
av_dict_set_int(&opts, "use_external_udp", 1, 0); av_dict_set_int(&opts, "use_external_udp", 1, 0);
av_dict_set_int(&opts, "listen", 1, 0); av_dict_set_int(&opts, "listen", 1, 0);
/* If got the first binding response, start DTLS handshake. */ /* If got the first binding response, start DTLS handshake. */