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 6B52641000 for ; Sun, 13 Jul 2025 19:26:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3A2AF68E32C; Sun, 13 Jul 2025 22:25:38 +0300 (EEST) Received: from btbn.de (btbn.de [144.76.60.213]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 7FD6368E30F for ; Sun, 13 Jul 2025 22:25:28 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 0CBF727FD36E8; Sun, 13 Jul 2025 21:25:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1752434725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kv1LrQgfVFaHZRi+B0Mjw19dz935iz+de9gRHM/Ej1k=; b=d8VKopXzS0iSZtpCQw+ywYg2BOsG1fVcjy++wu3oV2fA0mQ4xRLxGDWWCm9bzzrPnO17Tz 4DRsrQ1uNoh5lixRHcAqoucZGgOeua5LOFwFtMYiUxaL1laRE/NJCJJhwFqML6+duv0622 kwNe2J/IHQqxsCWkKrQU/b2LjkRpVDoSB583hpYHhJu8P1VteXAj3BeJnvf1N078/+HqPq BOEw5Ub6Y2fFeGYaNEJeWIdXvdf1r2iQBBiB/yqbKP5Gv1J1q1C3RiunjmiQd4eBJmfCEn a5rLLmoe/P9WBQ6XZuEyPeJmfMmSAlPlLXsKh25VIuGoYTlNHWUffbZbTAbTzQ== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jul 2025 21:24:46 +0200 Message-ID: <20250713192512.928390-12-timo@rothenpieler.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250713192512.928390-1-timo@rothenpieler.org> References: <20250713192512.928390-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/14] avformat/tls_openssl: don't expose deprecated EC_KEY outside of its function 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: Timo Rothenpieler 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: --- libavformat/tls_openssl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 34dd22daf7..cd11419fee 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -235,7 +235,7 @@ end: return ret; } -static int openssl_gen_private_key(EVP_PKEY **pkey, EC_KEY **eckey) +static int openssl_gen_private_key(EVP_PKEY **pkey) { int ret = 0; @@ -250,6 +250,7 @@ static int openssl_gen_private_key(EVP_PKEY **pkey, EC_KEY **eckey) */ #if OPENSSL_VERSION_NUMBER < 0x30000000L /* OpenSSL 3.0 */ EC_GROUP *ecgroup = NULL; + EC_KEY *eckey = NULL; int curve = NID_X9_62_prime256v1; #else const char *curve = SN_X9_62_prime256v1; @@ -260,8 +261,8 @@ static int openssl_gen_private_key(EVP_PKEY **pkey, EC_KEY **eckey) if (!*pkey) return AVERROR(ENOMEM); - *eckey = EC_KEY_new(); - if (!*eckey) { + eckey = EC_KEY_new(); + if (!eckey) { EVP_PKEY_free(*pkey); *pkey = NULL; return AVERROR(ENOMEM); @@ -273,17 +274,17 @@ static int openssl_gen_private_key(EVP_PKEY **pkey, EC_KEY **eckey) goto einval_end; } - if (EC_KEY_set_group(*eckey, ecgroup) != 1) { + if (EC_KEY_set_group(eckey, ecgroup) != 1) { av_log(NULL, AV_LOG_ERROR, "TLS: Generate private key, EC_KEY_set_group failed, %s\n", ERR_error_string(ERR_get_error(), NULL)); goto einval_end; } - if (EC_KEY_generate_key(*eckey) != 1) { + if (EC_KEY_generate_key(eckey) != 1) { av_log(NULL, AV_LOG_ERROR, "TLS: Generate private key, EC_KEY_generate_key failed, %s\n", ERR_error_string(ERR_get_error(), NULL)); goto einval_end; } - if (EVP_PKEY_set1_EC_KEY(*pkey, *eckey) != 1) { + if (EVP_PKEY_set1_EC_KEY(*pkey, eckey) != 1) { av_log(NULL, AV_LOG_ERROR, "TLS: Generate private key, EVP_PKEY_set1_EC_KEY failed, %s\n", ERR_error_string(ERR_get_error(), NULL)); goto einval_end; } @@ -298,13 +299,12 @@ static int openssl_gen_private_key(EVP_PKEY **pkey, EC_KEY **eckey) einval_end: ret = AVERROR(EINVAL); - EC_KEY_free(*eckey); EVP_PKEY_free(*pkey); - *eckey = NULL; *pkey = NULL; end: #if OPENSSL_VERSION_NUMBER < 0x30000000L /* OpenSSL 3.0 */ EC_GROUP_free(ecgroup); + EC_KEY_free(eckey); #endif return ret; } @@ -395,11 +395,10 @@ int ff_ssl_gen_key_cert(char *key_buf, size_t key_sz, char *cert_buf, size_t cer { int ret = 0; EVP_PKEY *pkey = NULL; - EC_KEY *ec_key = NULL; X509 *cert = NULL; char *key_tem = NULL, *cert_tem = NULL; - ret = openssl_gen_private_key(&pkey, &ec_key); + ret = openssl_gen_private_key(&pkey); if (ret < 0) goto error; ret = openssl_gen_certificate(pkey, &cert, fingerprint); @@ -415,7 +414,6 @@ int ff_ssl_gen_key_cert(char *key_buf, size_t key_sz, char *cert_buf, size_t cer av_free(cert_tem); error: X509_free(cert); - EC_KEY_free(ec_key); EVP_PKEY_free(pkey); 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".