[FFmpeg-devel] [PATCH 14/18] avformat/tls: remove unused fingerprint option

[Timo Rothenpieler <timo@rothenpieler.org>]

---
 libavformat/tls.h         | 5 +----
 libavformat/tls_openssl.c | 4 +---
 libavformat/whip.c        | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/libavformat/tls.h b/libavformat/tls.h
index 2f381acc04..9285228657 100644
--- a/libavformat/tls.h
+++ b/libavformat/tls.h
@@ -66,12 +66,10 @@ typedef struct TLSShared {
     int use_external_udp;
     URLContext *udp;
 
-    /* The fingerprint of certificate, used in SDP offer. */
-    char *fingerprint;
-
     /* The certificate and private key content used for DTLS handshake */
     char* cert_buf;
     char* key_buf;
+
     /**
      * The size of RTP packet, should generally be set to MTU.
      * 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 }, \
     {"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}, \
-    {"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}, \
     {"key_buf", "The optional private key buffer for DTLS", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}
 
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index d83fe602d5..2049eb021b 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -1013,8 +1013,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",
-        p->tls_shared.mtu, p->tls_shared.fingerprint);
+    av_log(p, AV_LOG_VERBOSE, "TLS: Setup ok, MTU=%d\n", p->tls_shared.mtu);
 
     ret = 0;
 fail:
@@ -1032,7 +1031,6 @@ static av_cold int dtls_close(URLContext *h)
     TLSContext *ctx = h->priv_data;
     SSL_free(ctx->ssl);
     SSL_CTX_free(ctx->ctx);
-    av_freep(&ctx->tls_shared.fingerprint);
     av_freep(&ctx->tls_shared.cert_buf);
     av_freep(&ctx->tls_shared.key_buf);
     EVP_PKEY_free(ctx->pkey);
diff --git a/libavformat/whip.c b/libavformat/whip.c
index 71c667cd31..602a4432bd 100644
--- a/libavformat/whip.c
+++ b/libavformat/whip.c
@@ -1297,7 +1297,6 @@ next_packet:
                     av_dict_set(&opts, "key_file", whip->key_file, 0);
                 } else
                     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, "listen", 1, 0);
                 /* If got the first binding response, start DTLS handshake. */
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".