From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E870670 for ; Tue, 13 Jul 2021 18:46:34 +0000 (UTC) Received: by mail-ej1-f51.google.com with SMTP id hd33so14621675ejc.9 for ; Tue, 13 Jul 2021 11:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uZCD8zEFZfiBDd2pp94vqMa1qM/uM1MO0tR4Do8NO9I=; b=QOm25nPiezRVaPDCN4I2K3StsoeQ23bPBgiWI6sVxjua0vNHSjaI09mJxA0bpLM857 4eNJ7StB9ZeM3mri41JlknuVuZTIa0m+2bg7GdXPalWBwRKHqRRuIhuyTXj6SX4dhDPs I9RI1mOcnnDhenDyRZaJYuOOdFNAmaOE+WKwZot/MMo5EfEBMZKmFmy/0w3cHNBa9N89 dHFwF16BodoZm20xhSm5cg6wh8zKS1jdd4gCM8JSaWBQ+PpFL02mpjOjlnXzCi4hGGt/ /2ILlFWp3oQQRnySnWJRtQnxNTshIYe37ZG4vc+Wikrfd3XiOkcXgOk/2pcc0XUVuHgj Jb+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uZCD8zEFZfiBDd2pp94vqMa1qM/uM1MO0tR4Do8NO9I=; b=to7HLMN6lsdq5a2VhxyEUDsYkVDf2Owa3gdn7x2OG1vRyPeraCLx3//BIwE1pBr6RF NMWtjUcu2KAOlKzoFkV+UwpB4iAMXVXPC10Ia55gjZ2rpkN/gc8IMmsMa07uJAr93Kra jRWGze2iOrAGxKmxISrsT2ZaWCc11FGWeZw8ognj2aXyRlyluQf1/jFqrdU5Y+ft6l5/ Qt/LRQtGg24/fDz+VJHmDW1D/TRRzmATdL98iIfZ154CXvI/MpKBbH0ZHKq7HJcJNekR caYI3XYxrMjZGbxwL8AjUBEurxiijiOaPlqZEXqr8YAQJ7Zj8KB2FpInQG3cNN/eW4tP RlQQ== X-Gm-Message-State: AOAM531lTs1ib6A7wuj2nmhxGBefMPnkSCHO/qdRoAWy6xYQRSANNAbJ 4cBkdjh8dg7QwyEiLK863GM= X-Google-Smtp-Source: ABdhPJwpFI+wg5vNsqtctNDH9anW4yZdnwDnJA1smF+y5f6Ubqk4ED4Nlzymj3oJu4a9g0wSvyly/A== X-Received: by 2002:a17:906:5957:: with SMTP id g23mr7361434ejr.484.1626201993247; Tue, 13 Jul 2021 11:46:33 -0700 (PDT) Received: from localhost.localdomain (host-79-27-97-200.retail.telecomitalia.it. [79.27.97.200]) by smtp.gmail.com with ESMTPSA id a16sm6419317edv.69.2021.07.13.11.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jul 2021 11:46:32 -0700 (PDT) From: "Fabio M. De Francesco" To: Larry Finger , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, fabioaiuto83@gmail.com Cc: "Fabio M. De Francesco" Subject: [PATCH v2] staging: rtl8188eu: Replace a custom function with crc32_le() Date: Tue, 13 Jul 2021 20:46:29 +0200 Message-Id: <20210713184629.7358-1-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.32.0 Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use kernel API crc32_le() in place of the custom getcrc32(). Signed-off-by: Fabio M. De Francesco --- v1 --> v2: Use cpu_to_le32() to assign native endian return value of crc32_le to crc. drivers/staging/rtl8188eu/core/rtw_security.c | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c index 1b2cb6196463..e9de61afe881 100644 --- a/drivers/staging/rtl8188eu/core/rtw_security.c +++ b/drivers/staging/rtl8188eu/core/rtw_security.c @@ -11,6 +11,7 @@ #include #include #include +#include /* WEP related ===== */ @@ -111,21 +112,6 @@ static void crc32_init(void) bcrc32initialized = 1; } -static __le32 getcrc32(u8 *buf, int len) -{ - u8 *p; - u32 crc; - - if (bcrc32initialized == 0) - crc32_init(); - - crc = 0xffffffff; /* preload shift register, per CRC-32 spec */ - - for (p = buf; len > 0; ++p, --len) - crc = crc32_table[(crc ^ *p) & 0xff] ^ (crc >> 8); - return cpu_to_le32(~crc); /* transmit complement, per CRC-32 spec */ -} - /* Need to consider the fragment situation */ void rtw_wep_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe) { @@ -609,14 +595,15 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, struct xmit_frame *pxmitframe) if ((curfragnum + 1) == pattrib->nr_frags) { /* 4 the last fragment */ length = pattrib->last_txcmdsz - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len; - *((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/ + *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length)); arcfour_init(&mycontext, rc4key, 16); arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload + length, crc, 4); } else { length = pxmitpriv->frag_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len; - *((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/ + *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length)); + arcfour_init(&mycontext, rc4key, 16); arcfour_encrypt(&mycontext, payload, payload, length); arcfour_encrypt(&mycontext, payload + length, crc, 4); @@ -682,7 +669,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, struct recv_frame *precvframe) arcfour_init(&mycontext, rc4key, 16); arcfour_encrypt(&mycontext, payload, payload, length); - *((__le32 *)crc) = getcrc32(payload, length - 4); + *((__le32 *)crc) = cpu_to_le32(~crc32_le(~0, payload, length - 4)); if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] || -- 2.32.0