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 345374E62E for ; Wed, 11 Jun 2025 01:54:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 4EE2068C08D; Wed, 11 Jun 2025 04:54:43 +0300 (EEST) Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 7789B68BEBF for ; Wed, 11 Jun 2025 04:54:36 +0300 (EEST) Received: by mail-vs1-f54.google.com with SMTP id ada2fe7eead31-4e6fc4b2cd3so1881597137.2 for ; Tue, 10 Jun 2025 18:54:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749606875; x=1750211675; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pryvNzmSEeOmMvfOGLEboKFJ6V1dw/pijn9vFuTF51A=; b=nXx1A1VKckyDsgJOw8RWWr8tx+ESrn8tyMj1ziSYGdHLq0SRRAyoWPF9ZxcRRrOiOp SMy52UptEwtmxQ1bs1TZD3y090MNO2bj70MoAdlSZX6ZRAsvE3hHTlmVeynwrFePuOdc 6pZv8/5rYD/ebhB/AsSwXxrmRZg3DJScbeweHhy2TyYvR34G48Epd+xa7Gd0g4/GB+pU 6gG1P4SJ6yKli58ZJUdPZafCjbM2hRDzjBn/r+t39/dfkIs+GElYEiKw/2IyYkin4gd6 q/V0Qtz78csKhxe6ke/8zwcVWa0PTZZv9CYmAK9reVkpTJx0pSmyBOYb6mNDutsXE3BJ afpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749606875; x=1750211675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pryvNzmSEeOmMvfOGLEboKFJ6V1dw/pijn9vFuTF51A=; b=jh8CkpkJ9Wv3hNg1feQyofGIA7dYlyiWY8g9dHes87tsvfAZL1qLIpyE2FQQA/zNL5 usdiCaa3MZ9EQsv7XW4QUB0beuapCsQQPXIIC+jJBY51Q4C/xVrf8abuvU6Y7LXEBgBR UJx3XyJw8mD/crFbYin6rsufEF4U7rSUxMDOOljkhhFXS4B4c5asH4Yiz1u2wgtI/7ZE TAaIHsSKPb+0vBiKHzFsM5XaNbfrYW1EdaHbi3pp2AcKNwwktZL8BF40+xL/ykBfHJs8 fb1k8ljN91bCQx/U0+UQNJSVxsiMZEN6rQjiySn8aziqfm+86RVOu0RJidOtYuaTVCcl mKYQ== X-Gm-Message-State: AOJu0YxO5mJ1MS3z8xlZ+QYEF/Ct8mecX79eU6SN6JL5GOBLNmiPm6h9 qv3PpUBTLh9X1dAdkQ+XP+TuZPxGgkxCzB98lQXX8TTDcFgb2GxHoKLobXCm5w== X-Gm-Gg: ASbGncuUFrhXcPQpEWbG3GUh7ZosfpFP9vkMR8fZhA4COtazz/5BbHKCERerc/DHBOA YkyVv78/CjYHTTTUpq8FzXqfvsp3puJBVms3M0kRghy5buP/5boot6Ly9N7tPcBWeUxtGL3TGta AgfolwL2XQCGxidLJtFnbbxqVrr/Ic8JPu1KYjK5Q1KMFw/lx7hjyCvCPfXs7BQWTW0pADx/317 JmM7WEVo1Sqmey7Hg6UM8J/GuzV809ccCxL65mzvX0cQOrUsi7m50Gokfr29CPA/YA2OQL1T7ej Gjy2+7WeTluDaNxZZ9O5ha1H3Ntlxn8Ydvxfyv8w1sIbe8dmQCA2vOx686NXRM4eKzNW5ioBIdD 04fc= X-Google-Smtp-Source: AGHT+IFgQUfRAugnP6w1fS3kwM7L0dW+ngkM2Tv+lqXw3K0+K7itkOSExdsM2IVW+DN9HkFdodXOnQ== X-Received: by 2002:a05:6102:3f8a:b0:4e5:a567:8e57 with SMTP id ada2fe7eead31-4e7baf6afc4mr1700722137.24.1749606874748; Tue, 10 Jun 2025 18:54:34 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:4125:db3:37dc:a9ca]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-87eeaf6e05bsm2151838241.28.2025.06.10.18.54.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 18:54:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jun 2025 22:54:14 -0300 Message-ID: <20250611015415.19575-2-jamrial@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611015415.19575-1-jamrial@gmail.com> References: <20250611015415.19575-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avutil/aes: remove superfluous rounds argument 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 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: It's set during int and never changed. Signed-off-by: James Almer --- libavutil/aes.c | 10 +++++----- libavutil/aes_internal.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavutil/aes.c b/libavutil/aes.c index 3c8ac1c349..7fe42a5548 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -137,10 +137,10 @@ static inline void aes_crypt(AVAES *a, int s, const uint8_t *sbox, } static void aes_encrypt(AVAES *a, uint8_t *dst, const uint8_t *src, - int count, uint8_t *iv, int rounds) + int count, uint8_t *iv) { while (count--) { - addkey_s(&a->state[1], src, &a->round_key[rounds]); + addkey_s(&a->state[1], src, &a->round_key[a->rounds]); if (iv) addkey_s(&a->state[1], iv, &a->state[1]); aes_crypt(a, 2, sbox, enc_multbl); @@ -153,10 +153,10 @@ static void aes_encrypt(AVAES *a, uint8_t *dst, const uint8_t *src, } static void aes_decrypt(AVAES *a, uint8_t *dst, const uint8_t *src, - int count, uint8_t *iv, int rounds) + int count, uint8_t *iv) { while (count--) { - addkey_s(&a->state[1], src, &a->round_key[rounds]); + addkey_s(&a->state[1], src, &a->round_key[a->rounds]); aes_crypt(a, 0, inv_sbox, dec_multbl); if (iv) { addkey_s(&a->state[0], iv, &a->state[0]); @@ -171,7 +171,7 @@ static void aes_decrypt(AVAES *a, uint8_t *dst, const uint8_t *src, void av_aes_crypt(AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt) { - a->crypt(a, dst, src, count, iv, a->rounds); + a->crypt(a, dst, src, count, iv); } static void init_multbl2(uint32_t tbl[][256], const int c[4], diff --git a/libavutil/aes_internal.h b/libavutil/aes_internal.h index 17f79d3ce3..e2de382f26 100644 --- a/libavutil/aes_internal.h +++ b/libavutil/aes_internal.h @@ -37,7 +37,7 @@ typedef struct AVAES { DECLARE_ALIGNED(16, av_aes_block, round_key)[15]; DECLARE_ALIGNED(16, av_aes_block, state)[2]; int rounds; - void (*crypt)(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int rounds); + void (*crypt)(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv); } AVAES; void ff_init_aes_x86(AVAES *a, int decrypt); -- 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".