From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A68E24CD37 for ; Sun, 13 Jul 2025 07:10:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 378DB68DCB6; Sun, 13 Jul 2025 10:10:16 +0300 (EEST) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id AF87968DC6B for ; Sun, 13 Jul 2025 10:10:09 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b26f7d2c1f1so3742877a12.0 for ; Sun, 13 Jul 2025 00:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752390608; x=1752995408; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x5DBZuPfjjN+Y6jpEr3qf9lUlMoXKP3YFqE//4NPeQw=; b=jQxDtuonCmcjOga77c66NGxtsuNErnklI2AAQgic+LY9rMJ6SGPU3/+Yt8pQk62eqR LHGGWrjsel2YwTD//wULPX/0lB/l4LfF4odkJqqvHOszmL35RMKz7FaCX4AUyx7HsBqw B6SUpoR4/MlQIEcats/Dk54uCz3VxrRVdQr9ECMseoiQDJqmdJhddbCMFVhYfREQ2DUV Cb8a5m5Mz3wNH7p7FfWD2QJIJyx3yBm94RUyCrcucB0KEILNNjLLT2B21CuGxJs1KtLW 86gsf0pZnaKlwFRcjaQDDOi1EiUAOfmlX3HZ/2lVVZE/Fr2WOCgj/OQ+HqVvKj1EoR6K 9uPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752390608; x=1752995408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x5DBZuPfjjN+Y6jpEr3qf9lUlMoXKP3YFqE//4NPeQw=; b=K4b/EZrhGB0xK3boYwWWA775g4AGKg8Wdh0Y5jTol3vkLJluD6s08TlETK1DzZLKvj D7gGEme9ZP1eLlv2+gHJFgIl9tp3Scf/lt3OjNcnMaZfEWUeP8bHNOrkZ9bOhlZIsSJ5 KXSrXWgf36gqcmynj88Ig3bBiWk+f9dB8WVIuw6fmQ3zeAyhBJudZLtAuquzhLD8gpcN F9JZ2GY6byuU1EMMrrzp5o61eDMvaZLOYptiJTb8FCZUneY0WB1ywj+DFSGlKYbr/Fzl 6kgmAAlt4lzGoRkMHdhsfX8vRS2ZGqXa3iHfpNvpyNMzO17crZAuqNv+2UN+/IZ5tggG ADWw== X-Gm-Message-State: AOJu0Yz0HbgtCJWO2ao6x91EguPX+hjyxJBoiCsDcy2yKxFey1/XnMmj Z7RCApdHTw5I5uKfrhpyvQSDF6Vu2kpn4bCH25Bqggc2HgPbNOIq/70JEWRPEanu X-Gm-Gg: ASbGncvBd7aLwXHVE9l6bFrvfe8B8zAOqi8OaiGKMyKQCUGP2yUMOKISF/yIO4XTVID uAp1HPcbTXuj88Sk4M9D05L8gq5YmVF/wOFKSlSFaTvUX9DwoW43jrc8c5LNKZeC6DiRBLfwLmy G7oQLjZHE/NiIycry4a2slJJG7HhKjUfDo3OSj1wQVhPzGFhwhBpCrLrd0MZRZLOCuVxn/A6JZE XVSTK46FEFjldnWavXQB85IX11GslIbrndMcMavWEJcj/KcSr3PGJH2s98ipESnz8x54omtvXaY f5Mb/H3s3U5cAVTYEr5o7rVHfOxnlhW/j+CQsjzY/REc2FoXigu1IdaepQX8Y1vmBk6L2yX60rv 5fZR2KoolIE/wqarURjWyLI1EmtUUjBZOpCjzARoDSMW26X8VXfbUNQ== X-Google-Smtp-Source: AGHT+IGDBcSJGbfD1aiCqi1iRP7mrIDLDHfFKihqs6sdytTiS4yIBdVBe8thR22UsveP9kRJYoDiGw== X-Received: by 2002:a05:6a21:9993:b0:224:c067:66f8 with SMTP id adf61e73a8af0-2311fa0514cmr15413086637.37.1752390607726; Sun, 13 Jul 2025 00:10:07 -0700 (PDT) Received: from localhost.localdomain ([123.11.82.155]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74eb9e07facsm8595591b3a.68.2025.07.13.00.10.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 13 Jul 2025 00:10:07 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jul 2025 15:09:44 +0800 Message-ID: <20250713070950.10626-4-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250713070950.10626-1-jacklau1222@qq.com> References: <20250713070950.10626-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH v3 3/9] avformat/tls_openssl: remove all redundant "TLS: " in log with AVClass X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Jack Lau Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Jack Lau --- libavformat/tls_openssl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 25318d5fca..c824c5452b 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -508,7 +508,7 @@ int ff_dtls_export_materials(URLContext *h, char *dtls_srtp_materials, size_t ma ret = SSL_export_keying_material(c->ssl, dtls_srtp_materials, materials_sz, dst, strlen(dst), NULL, 0, 0); if (!ret) { - av_log(c, AV_LOG_ERROR, "TLS: Failed to export SRTP material, %s\n", openssl_get_error(c)); + av_log(c, AV_LOG_ERROR, "Failed to export SRTP material, %s\n", openssl_get_error(c)); return -1; } return 0; @@ -684,7 +684,7 @@ static int dtls_handshake(URLContext *h) goto end; } } else { - av_log(p, AV_LOG_TRACE, "TLS: Read %d bytes, r0=%d, r1=%d\n", r0, r0, r1); + av_log(p, AV_LOG_TRACE, "Read %d bytes, r0=%d, r1=%d\n", r0, r0, r1); } /* Check whether the DTLS is completed. */ @@ -725,7 +725,7 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h) return ret; } } else if (c->is_dtls){ - av_log(p, AV_LOG_ERROR, "TLS: Init cert failed, %s\n", openssl_get_error(p)); + av_log(p, AV_LOG_ERROR, "Init cert failed, %s\n", openssl_get_error(p)); ret = AVERROR(EINVAL); goto fail; } @@ -741,12 +741,12 @@ static av_cold int openssl_init_ca_key_cert(URLContext *h) } else if (c->key_buf) { p->pkey = pkey = pkey_from_pem_string(c->key_buf, 1); if (SSL_CTX_use_PrivateKey(p->ctx, pkey) != 1) { - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_use_PrivateKey failed, %s\n", openssl_get_error(p)); + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_use_PrivateKey failed, %s\n", openssl_get_error(p)); ret = AVERROR(EINVAL); return ret; } } else if (c->is_dtls) { - av_log(p, AV_LOG_ERROR, "TLS: Init pkey failed, %s\n", openssl_get_error(p)); + av_log(p, AV_LOG_ERROR, "Init pkey failed, %s\n", openssl_get_error(p)); ret = AVERROR(EINVAL); goto fail; } @@ -783,7 +783,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary ** /* For ECDSA, we could set the curves list. */ if (SSL_CTX_set1_curves_list(p->ctx, curves) != 1) { - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_set1_curves_list failed, curves=%s, %s\n", + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_set1_curves_list failed, curves=%s, %s\n", curves, openssl_get_error(p)); ret = AVERROR(EINVAL); return ret; @@ -794,7 +794,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary ** * ensuring maximum compatibility. */ if (SSL_CTX_set_cipher_list(p->ctx, ciphers) != 1) { - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_set_cipher_list failed, ciphers=%s, %s\n", + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_set_cipher_list failed, ciphers=%s, %s\n", ciphers, openssl_get_error(p)); ret = AVERROR(EINVAL); return ret; @@ -811,7 +811,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary ** SSL_CTX_set_read_ahead(p->ctx, 1); /* Setup the SRTP context */ if (SSL_CTX_set_tlsext_use_srtp(p->ctx, profiles)) { - av_log(p, AV_LOG_ERROR, "TLS: Init SSL_CTX_set_tlsext_use_srtp failed, profiles=%s, %s\n", + av_log(p, AV_LOG_ERROR, "Init SSL_CTX_set_tlsext_use_srtp failed, profiles=%s, %s\n", profiles, openssl_get_error(p)); ret = AVERROR(EINVAL); return ret; @@ -863,12 +863,12 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary ** ret = dtls_handshake(h); // Fatal SSL error, for example, no available suite when peer is DTLS 1.0 while we are DTLS 1.2. if (ret < 0) { - av_log(p, AV_LOG_ERROR, "TLS: Failed to drive SSL context, ret=%d\n", ret); + av_log(p, AV_LOG_ERROR, "Failed to drive SSL context, ret=%d\n", ret); return AVERROR(EIO); } } - av_log(p, AV_LOG_VERBOSE, "TLS: Setup ok, MTU=%d\n", p->tls_shared.mtu); + av_log(p, AV_LOG_VERBOSE, "Setup ok, MTU=%d\n", p->tls_shared.mtu); ret = 0; fail: -- 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".