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 23E645020E for ; Wed, 9 Jul 2025 13:37:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A879268F71E; Wed, 9 Jul 2025 16:37:01 +0300 (EEST) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id DD54868F71C for ; Wed, 9 Jul 2025 16:37:00 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b3220c39cffso5442660a12.0 for ; Wed, 09 Jul 2025 06:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752068219; x=1752673019; 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=t3Bnok9YkpymIbW/cQqbFFSGjvsDeAS9Wz+Pk1LMpSk=; b=GttVmB+iUHLUmW64rA9VXOvnWbuvQWJxIUQT9RmT6tIekW48SwgBb92gGhOToqhtvK QHx2dSH7178tCuHOgAoXwnJP1JbGl+Hw3oI/Rpg0EdRyAPE0RhYRE3hRbE5Nug+rguV4 P1fotaIqMIkgq3LW4kjYpJnzenYbVs7IBANxH85Wr6ohdc4OjsfRlOvfHPNlNoH137UG r0sqjWYLkUe+XNxTv1Oh9GrHpKrSqwIVgOxuL+Fv0l+5imDVkMIBA7JE1PZUBY2MGpws eKHFrQo2G2zSRE6xSr3NL/rdu53+LfS3/xliEN9CTGdVWBseF44bVa7Ot5OYzycmC3fh Rofw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752068219; x=1752673019; 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=t3Bnok9YkpymIbW/cQqbFFSGjvsDeAS9Wz+Pk1LMpSk=; b=m/5FFrjc7OpfMUcIdbGKwW/X7yZW+lxYcEzVeJuUyzidEp0gyUuAjWX9JrUXiBLatd 79XrrrizyVEj0jSH5WURboZYRpliwiqVUz4e+w0S66DwMbxg+JFvay32Qmv2Th9hD80/ E7Oq2SwurqWhrnANWgwBI7o4Yipix/Jcw3bZBJe1VttmBPHzIHqQ1rHXG1dnM1lBNSTW O9KNmpyqE1Mc2y+D7O5Wcwvm80cLoMhL07NWCQEHPoJaLki6DtRla/C3gj+69ZdZqDPe RPTjW72xflkQY/EXZp3PdYQWSEcLoW+CD+8506oR2oljlojibF3Wg0i9ghCD97/8di9N iZMQ== X-Gm-Message-State: AOJu0YzB4sfRn62W7x3pwoFC+egAV+Wq9piUisgYNIAWQ9R19KXW6FWz fEOtguuJ3uZhKJYqTaUiOdkhNe5n4Xxi45X7hFLHONsh8nAhkToHTQxbpKgIQwkl X-Gm-Gg: ASbGncveMimwuP16LjSTG3CylKcnoVEFRK1yJwFtfB1TbI+FU7zkoCcz3Xul5cjYrvr dGB6rn6rpQ0lv0nJTdWfnyby5zzhhSEgzg2UAgAYD0zy/YWrQcybyw62lEp++PZ4oqqIRLhCGou tnel1rhAS8ljwJjmqFnOwf3IlvjfUw3LMh9LRrS7ctYpUH19A7GsRP5gKTFw+I94sRFkeENBRd5 nR4fvCkHNd6GuKv4Df505yZZufjAmKpZy5Jsc8Meo4xNikebl+lZNWfWnUxxi1DKd6BLa537mSc 3DTwhlDlWGr+p9CJZjNXE81iElkAiZObfQ815hVd5mGnnVxM4TVhovWLwhh4Sio4r5ke1fLVVoB X1qM2h54= X-Google-Smtp-Source: AGHT+IG6hyf/iJg6nREEPiCi49rc4f1L8Fh1tA0ndBL7HzFyMEEDPumiZtzQLM5UyB3mteqxGP6SLw== X-Received: by 2002:a05:6a20:244d:b0:215:dee4:4808 with SMTP id adf61e73a8af0-22cd64da965mr4205506637.18.1752068218727; Wed, 09 Jul 2025 06:36:58 -0700 (PDT) Received: from localhost.localdomain ([111.31.252.39]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74ce429b526sm14366340b3a.118.2025.07.09.06.36.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 09 Jul 2025 06:36:58 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Jul 2025 21:36:28 +0800 Message-ID: <20250709133635.22936-4-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250709133635.22936-1-jacklau1222@qq.com> References: <20250709133635.22936-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH 3/4] 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 ffd9cd51d2..a519c8c880 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -509,7 +509,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; @@ -727,7 +727,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. */ @@ -768,7 +768,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; } @@ -784,12 +784,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; } @@ -826,7 +826,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; @@ -837,7 +837,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; @@ -854,7 +854,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; @@ -906,12 +906,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".