From: tb <tb@openbsd.org>
Date: Sat, 30 Jul 2022 11:27:06 +0000 (+0000)
Subject: Eliminate the somewhat pointless Ij variable
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2e58c7339de4fd7d54d5f4ebc50a0fa942c0683e;p=openbsd

Eliminate the somewhat pointless Ij variable

Requested by & ok jsing
---

diff --git a/lib/libcrypto/pkcs12/p12_key.c b/lib/libcrypto/pkcs12/p12_key.c
index f4013dbbc9a..d226525b0e4 100644
--- a/lib/libcrypto/pkcs12/p12_key.c
+++ b/lib/libcrypto/pkcs12/p12_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_key.c,v 1.30 2022/07/30 11:24:52 tb Exp $ */
+/* $OpenBSD: p12_key.c,v 1.31 2022/07/30 11:27:06 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -169,14 +169,13 @@ PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
 			B[j] = Ai[j % u];
 
 		for (j = 0; j < Ilen; j += v) {
-			unsigned char *Ij = &I[j];
 			uint16_t c = 1;
 			int k;
 
-			/* Work out Ij = Ij + B + 1. */
+			/* Work out I[j] = I[j] + B + 1. */
 			for (k = v - 1; k >= 0; k--) {
-				c += Ij[k] + B[k];
-				Ij[k] = (unsigned char)c;
+				c += I[j + k] + B[k];
+				I[j + k] = (unsigned char)c;
 				c >>= 8;
 			}
 		}