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 735A64E3A4 for ; Wed, 9 Jul 2025 13:37:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id E187668F71B; Wed, 9 Jul 2025 16:36:57 +0300 (EEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9EF7F68F718 for ; Wed, 9 Jul 2025 16:36:56 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-73972a54919so5015133b3a.3 for ; Wed, 09 Jul 2025 06:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752068215; x=1752673015; 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=cmvl6bXpo9vMgEj9fzcg8IMpXZJenmlmMbH+B/Qv3Es=; b=lgyFW0dVZUm6LJpLPWdWhbVE2iEVNRiNHnunEsXQd6eMNhl/2BuMC5q/8TIGz/o8+0 LyWZWNWNCXVFERo7X16XQTVxWgW96VY36Fq8vWAug879pow73oVu21s7LdXUjl7u9oqr Wk5NsJbhLvegQA7WcekHUj+0XyxXLiVjn6UHW7PYQif73gXw8WnDssYR71YOfe9xRdTh 8VYCbjmvl0L/7X3MXhX8GwxUPywvFR9XcbwsjlXNm/G/qMaeKvnESy9dEsLim40sloQa zjRuqsVSnuhrQfi5slTuQ8bxocm7w13G0clcv/aTKPRfsZeNe27FkvbXgbn3h8mHMR0N R+/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752068215; x=1752673015; 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=cmvl6bXpo9vMgEj9fzcg8IMpXZJenmlmMbH+B/Qv3Es=; b=cfnwP0aPBk99+Z6xAVBIUWhAFn7BYsB80GHfCwt3W+JFWkKALtoDNKZFSnFkxVRRVn RWMV0vgm9DAMa+CYW4S4bkLTxNbhJxLcfg3SqtNvBYsTolWos0I7DD06WvDNS8OXKhE+ w9ojtHbjjxA4RMz68RM6ARy/QwO4hZgh1lo47SHKpMDAIijgUkbHwj51bMrfx0QQgsW2 bYCuie/DM4I3p60f2gPgr2gv5lKj1Q3Cdp58rgatgKQGQb6RNOdhU0Rwtgal1ChxjUhr PGeBB+VOfiPNk/yCDG3Bpfj3Qn/CGP/CFV4CoACp/ChyS+q5cikX+3bytKEEiut/j+cC 02ZA== X-Gm-Message-State: AOJu0YzJKvSuFTfPNXjK2MVkRKw1BF9wpaEkmDyYMIAp8Y87f707wAOt CvIhm6KWvA8+jg8bb+1AAVpKumvrnluREQyPYE/pZa5fxp6ue9xbl3dEcD+y066V X-Gm-Gg: ASbGncu25Hzh+GuMoYNnAfxFU/W1NEGztvlHtLMToRa/db/HWR9GxV54pNqB4krbFuA lbDY9dHrbgLWtoJdofisjPc0rAW7gN2zfZMSj2iDNnJzCioAV+ynLk0i8FHiGoaYMgk8A0pBxQL AV4wkgBJmvJAfQQnzn1aIJdQku8XcNX/Sm5c7ET/A9XLRPQ5dmaWVAz6gIwqq+9g4vYSeYHYes8 ap257bHI6wP8xcQOgmu+NXQayMS6EpYYMqxCvfaOy0F8yNjwiFyXOIxYbrv9cB4wr91G7z/WJmT whRi2b75A5anTEtbJjFaRQEeZe65CPiWEed1l0UAEz3y35eitssET5pXflQ9Td+7wR/fUH34/WT g+qRicnw= X-Google-Smtp-Source: AGHT+IGNFoaTF/Q+PbbvBWgl9D19nJCE0xel810G/v01N3xHCGnP0QTea22Cl9NAAqQBUW7sK/X+Uw== X-Received: by 2002:a05:6a20:a11c:b0:222:d817:3578 with SMTP id adf61e73a8af0-22cd7992766mr4736535637.36.1752068214454; Wed, 09 Jul 2025 06:36:54 -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.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 09 Jul 2025 06:36:54 -0700 (PDT) From: Jack Lau X-Google-Original-From: Jack Lau To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Jul 2025 21:36:27 +0800 Message-ID: <20250709133635.22936-3-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 2/4] avformat/tls_openssl: fix dtls_handshake return code 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: If the handshake is still in progress, dtls_handshake should return a positive status code. Signed-off-by: Jack Lau --- libavformat/tls_openssl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 8639ac9758..ffd9cd51d2 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -716,15 +716,14 @@ static int openssl_dtls_verify_callback(int preverify_ok, X509_STORE_CTX *ctx) static int dtls_handshake(URLContext *h) { - int ret = 0, r0, r1; + int ret = EINPROGRESS, r0, r1; TLSContext *p = h->priv_data; r0 = SSL_do_handshake(p->ssl); r1 = SSL_get_error(p->ssl, r0); if (r0 <= 0) { if (r1 != SSL_ERROR_WANT_READ && r1 != SSL_ERROR_WANT_WRITE && r1 != SSL_ERROR_ZERO_RETURN) { - av_log(p, AV_LOG_ERROR, "TLS: Read failed, r0=%d, r1=%d %s\n", r0, r1, openssl_get_error(p)); - ret = AVERROR(EIO); + ret = print_ssl_error(h, r1); goto end; } } else { @@ -734,7 +733,7 @@ static int dtls_handshake(URLContext *h) /* Check whether the DTLS is completed. */ if (SSL_is_init_finished(p->ssl) != 1) goto end; - + ret = 0; p->tls_shared.state = DTLS_STATE_FINISHED; end: return ret; -- 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".