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 D175950306 for ; Fri, 11 Jul 2025 13:22:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9B1B068FFA9; Fri, 11 Jul 2025 16:21:47 +0300 (EEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 392CE68FF68 for ; Fri, 11 Jul 2025 16:21:40 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-74931666cbcso1704179b3a.0 for ; Fri, 11 Jul 2025 06:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752240098; x=1752844898; 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=TkriCWoJEoAESNFrE+5m8R6wscFZeAOlGRTdfaqIrV6xL+Cn+AcN0gKgH23BfzT+wY 0Z/zvH091XhQbwFzS9X9ks6WiDOcGUT3lROUKZAsDFIe3+Yjpv4jUqlrfaQNEJds6vnF yKcw5J3pG257h5oLOBWHKyQemOZ1NEPMlsgOlXVDoxu6IQhMvWdBl9mpngISGwRC4r6W +19dOZD/ksxEPQTjgK85uQk+R36l0bteAPKHbbwfQPRh00WLoWyY0OUxl8VIXT5piX8j kVMmKcpmNiAgdCoXHIS7D+yVrjnLNmKNqzMzqS+MhU0pzo//+py3mja8R7Pn+1UxFFki Sg+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752240098; x=1752844898; 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=wf8Qp9VSeiejj0eXER4nRt7JRjP5vC+0/m5I32cQHQtJi+3DZbuRA3rLZvxrEMQR22 Gpglj3P8rvJOUm7Yb71sxRSQDEGYWUoxyIg8lRxPTyBie3hIo8p4ad+BVdy9MRbCiRvX qPj7QN3xLdq5+IovA23ftUhlcIFzS/w15vHWuFENMNaFWANkCmE+V3eCkspijtWeX19h XFfZv1bE5+XXv3WK47uNzKqqDyVh6FhxlKCcLYcLmsQHUnxag2MN4idjaLK7N5QaMoLx /MJS75Uq3XRRjgCjxrLpGsRIAB2HjqRsXT47EtJz76JKXZ32mycOBndi/zyhIjlaGwPJ wGVA== X-Gm-Message-State: AOJu0YyyjDNA4vIG1q7OU9S7XJbnH+V5Nkt4fVz7iliBEKVmfo3YT3ah SeJ0t0o5OqpAWZ4P70qq++I9iw5aLY8ERVC7n5heg8ufNcz4qEkbHwLw+Worbs0GtrQ= X-Gm-Gg: ASbGncsX/XZARytZVFqkqel0hlq9NHd6W6snrdxbAD62RLbwVffnCls1uRdNGpQXqTa aUOwp3U8IvD83mr1gczsUjTtBzFhd8zt/2NaVROKB+Uu4n4VHk+pDHG5oqIEgzQKjXxqRTtXCLv LdV5RcNQeVk4CRg0dOWCPTg4P6X/SJTucXeNcyCsjS3g5K5UCf9FPo4linT8QgR7js2FIio8AZI n2nYV1uFK4A9LxA1gHhWdbuECpeg29mmQvKk3NyLcs27G1lRIpsdly+LQBUvfW+ns1YI+5HMgNJ WbnZW63y7nG3tN3YPlsZKsejMFTTRQow7bGhv95V2xvT9VDOfus50QPLMbCWzmN5vfV9bNa5oIp f0eW2QdCX6E9uzVoHrETfwXN8uXhfZBdg X-Google-Smtp-Source: AGHT+IHZC11P2r6yWWiMXZInO6Dhw7wT58DlAkNAduPrrBw5mt65J/nBZJA4dsvINARg1p7KksLMXg== X-Received: by 2002:a05:6a00:4603:b0:748:ff39:a0ed with SMTP id d2e1a72fcca58-74ee37292e9mr3764827b3a.20.1752240098084; Fri, 11 Jul 2025 06:21:38 -0700 (PDT) Received: from localhost.localdomain ([38.99.248.174]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74eb9f4bc51sm5338840b3a.116.2025.07.11.06.21.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 11 Jul 2025 06:21:37 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jul 2025 21:20:48 +0800 Message-ID: <20250711132120.38507-4-jacklau1222@qq.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250711132120.38507-1-jacklau1222@qq.com> References: <20250711132120.38507-1-jacklau1222@qq.com> MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH v2 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".