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 2715E4D6A1 for ; Tue, 17 Jun 2025 14:08:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 07FAD68D322; Tue, 17 Jun 2025 17:08:20 +0300 (EEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id DDCBF68C891 for ; Tue, 17 Jun 2025 17:08:13 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-234c5b57557so55257475ad.3 for ; Tue, 17 Jun 2025 07:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750169292; x=1750774092; darn=ffmpeg.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=JCmNTQnFC1pU4NxO0GWAD7onpNz0+lWibc8A95WDEUM=; b=PgoWxlf7QoUVX7CpDv2EoaQqVqeGRdXqpYTbgXzlut2E/eClJPmCvoOoR1QpnpkaB4 TcysnTMz7OvBWt24EjEnnuXxb9flvk0jGWywbYW1hrR+NK7O06EfCfcvPtLh8g00MN9m TWvl6TLkFVqzvDbMjiPJ2N9wudD87Kn8fZ9eLTua7T7weCedrNEMLxkzGknlH0wW/B40 Xke9Dqf4M2HwCEieNH9EPZ6Duc5Ifa0DT4CGX6EjmgD8dII7cfZ49CodahRDlf4SqRFs 8ZMYeI5IyOPIXJZrcj9HkedNbNAUD18ZpK6Xoecej08osSgWADv8X5NaFX+Y9sV8VjCW nMcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750169292; x=1750774092; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JCmNTQnFC1pU4NxO0GWAD7onpNz0+lWibc8A95WDEUM=; b=biZT8Aq6+CgWAHhX7vkFRy6EXcyisb9uyHdqrLqhjbIP+Lg2phimueR2EyVnraoIK+ Ean7RLB3pKdsYBbn/CE34Fx/47PTdGvo2Qif4Petem4Qz0e1f5eWLMEcRLLObBpCPVtp gwh60KaoDuHsr6KDI+bVZvpRAItd44TtnFi4n1im5AA3Y8Wly9KVb5Tg05zFuTqpDbSS sn+VN508KOaJQ3cxspVRqATXLipnAGFwXlF6Htzalm2fYGkQQG3dC9iKCQo4+WiDjxRB PKFNyQ9SxCs9sgd/aDESOyHprE/0gewyYYLzP0OVo+hxIkIWlY6X9fOQxNpHA63zGKN4 rnLw== X-Gm-Message-State: AOJu0YypBTCfRgUex9z25CtqJf/WgEIIszS785OFfPaoJaNcIsH2YZDS PDtLnF4pCgdGDZvmIvkRCOyOLodRPBjpqRg1G6x8j7W9tblRq3p5WVriPJmjZOrnZRQ= X-Gm-Gg: ASbGnctkeJQEaoo9lQVLs5Vm1NsXkZuVbB75O8OZfi19upM6F9j6IksJAz7Cwezku1a w2hV+z69bNU7RpifDosYAhTyBNA0RX1cpw2+IvFIeRIaFAiI5X+DdyLp/naSd4RW75MhkSyRQsu jLmv1bwQ623ravs+oTjWzkqUxS59bmrySy7RlFQ1/1VJ5fTR2xuE/aTb2r83vXKNRM56jsG1bX9 LmQbnEkPl5pPQsnMR/WJoxl+JT3/iXJQGHxct9Hj23Z/vODfcZNfxyJjC00FUmeSrZGxZyS25YY w024g7NriMmmn06zGJkIM6oKMflfN2w3XgCgFbVjH7hSXmUZotPNZGz+rG+pF/NgrqB8mClfPQ8 = X-Google-Smtp-Source: AGHT+IEaDjBr0mUSB/GujLxy/pEjW3V2PC/phRE2l6wm4ookImxcDkqAVwbSudcDr+wO9xiV1/noCg== X-Received: by 2002:a17:902:d489:b0:234:c2e7:a0e4 with SMTP id d9443c01a7336-2366b32e46bmr179858915ad.3.1750169291570; Tue, 17 Jun 2025 07:08:11 -0700 (PDT) Received: from smtpclient.apple ([23.247.137.216]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365d88c034sm80210915ad.50.2025.06.17.07.08.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2025 07:08:11 -0700 (PDT) Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) From: Jack Lau In-Reply-To: Date: Tue, 17 Jun 2025 22:07:53 +0800 Message-Id: <9E666C6A-DFDA-4440-8E23-DD06AAB23684@gmail.com> References: To: FFmpeg development discussions and patches X-Mailer: Apple Mail (2.3826.600.51.1.1) Subject: Re: [FFmpeg-devel] [PATCH v3] avformat/tls_openssl: fix warnings when openssl is lower version 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: Andreas Rheinhardt 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: > On Jun 15, 2025, at 23:54, Andreas Rheinhardt wrote: > > Jack Lau via ffmpeg-devel: >> diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c >> index 86e8935fee..2a3905891d 100644 >> --- a/libavformat/tls_openssl.c >> +++ b/libavformat/tls_openssl.c >> @@ -415,7 +415,11 @@ error: >> */ >> static EVP_PKEY *pkey_from_pem_string(const char *pem_str, int is_priv) >> { >> +#if OPENSSL_VERSION_NUMBER < 0x10002000L /* OpenSSL 1.0.2 */ >> + BIO *mem = BIO_new_mem_buf((void *)pem_str, -1); >> +#else >> BIO *mem = BIO_new_mem_buf(pem_str, -1); >> +#endif >> if (!mem) { >> av_log(NULL, AV_LOG_ERROR, "BIO_new_mem_buf failed\n"); >> return NULL; >> @@ -445,7 +449,11 @@ static EVP_PKEY *pkey_from_pem_string(const char *pem_str, int is_priv) >> */ >> static X509 *cert_from_pem_string(const char *pem_str) >> { >> +#if OPENSSL_VERSION_NUMBER < 0x10002000L /* OpenSSL 1.0.2 */ >> + BIO *mem = BIO_new_mem_buf((void *)pem_str, -1); >> +#else >> BIO *mem = BIO_new_mem_buf(pem_str, -1); >> +#endif >> if (!mem) { >> av_log(NULL, AV_LOG_ERROR, "BIO_new_mem_buf failed\n"); >> return NULL; > > That's what I had in mind. Thanks for your review! If everything looks good, could you help merge this please? > > - Andreas Best regards Jack > > _______________________________________________ > 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". _______________________________________________ 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".