Date: Sat, 4 Feb 2023 15:55:48 +0000 (UTC) From: Pedro Giffuni <pfg@freebsd.org> To: "freebsd-ppc@FreeBSD.org" <freebsd-ppc@FreeBSD.org> Subject: Does hastd work on Big Endian? Fw: git: 6998572a74a9 - main - hastd: use zlib's crc32 implementation. Message-ID: <1967210382.221190.1675526148958@mail.yahoo.com> In-Reply-To: <202302030714.3137EVRQ088519@gitrepo.freebsd.org> References: <202302030714.3137EVRQ088519@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_221189_1075028453.1675526148956 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi; Not really concerned about the commit here .. but about the last comment. C= hecksums may need adjustments for endianness. Cheers, Pedro.=C2=A0 ----- Forwarded Message ----- From: Xin LI <delphij@freebsd.org>To: "src= -committers@freebsd.org" <src-committers@freebsd.org>; "dev-commits-src-all= @freebsd.org" <dev-commits-src-all@freebsd.org>; "dev-commits-src-main@free= bsd.org" <dev-commits-src-main@freebsd.org>Sent: Friday, February 3, 2023 a= t 02:14:34=E2=80=AFAM GMT-5Subject: git: 6998572a74a9 - main - hastd: use z= lib's crc32 implementation. The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=3D6998572a74a98721781ecd5b6829= 435259f9825a commit 6998572a74a98721781ecd5b6829435259f9825a Author:=C2=A0 =C2=A0 Xin LI <delphij@FreeBSD.org> AuthorDate: 2023-02-03 07:14:21 +0000 Commit:=C2=A0 =C2=A0 Xin LI <delphij@FreeBSD.org> CommitDate: 2023-02-03 07:14:21 +0000 =C2=A0 =C2=A0 hastd: use zlib's crc32 implementation. =C2=A0 =C2=A0=20 =C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 pjd =C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks =C2=A0 =C2=A0 Differential Revision: https://reviews.freebsd.org/D35767 --- ...<snip>...diff --git a/sbin/hastd/hast_checksum.c b/sbin/hastd/hast_check= sum.c index f7ef6a64b4e1..dccba3752cb1 100644 --- a/sbin/hastd/hast_checksum.c +++ b/sbin/hastd/hast_checksum.c @@ -33,10 +33,10 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <strings.h> =20 -#include <crc32.h> #include <hast.h> #include <nv.h> #include <sha256.h> +#include <zlib.h> #include <pjdlog.h> =20 #include "hast_checksum.h" @@ -49,7 +49,9 @@ hast_crc32_checksum(const unsigned char *data, size_t siz= e, { =C2=A0=C2=A0=C2=A0 uint32_t crc; =20 -=C2=A0=C2=A0=C2=A0 crc =3D crc32(data, size); +=C2=A0=C2=A0=C2=A0 crc =3D crc32(0L, Z_NULL, 0); +=C2=A0=C2=A0=C2=A0 crc =3D crc32(crc, data, size); + =C2=A0=C2=A0=C2=A0 /* XXXPJD: Do we have to use htole32() on crc first? */ =C2=A0=C2=A0=C2=A0 bcopy(&crc, hash, sizeof(crc)); =C2=A0=C2=A0=C2=A0 *hsizep =3D sizeof(crc); =20 ------=_Part_221189_1075028453.1675526148956 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <html><head></head><body><div class=3D"ydp40090edayahoo-style-wrap" style= =3D"font-family:Helvetica Neue, Helvetica, Arial, sans-serif;font-size:16px= ;"><div></div> <div dir=3D"ltr" data-setdir=3D"false">Hi;</div><div dir=3D"ltr" da= ta-setdir=3D"false"><br></div><div dir=3D"ltr" data-setdir=3D"false">Not re= ally concerned about the commit here .. but about the last comment. Checksu= ms may need adjustments for endianness.</div><div dir=3D"ltr" data-setdir= =3D"false"><br></div><div dir=3D"ltr" data-setdir=3D"false">Cheers,</div><d= iv dir=3D"ltr" data-setdir=3D"false"><br></div><div dir=3D"ltr" data-setdir= =3D"false">Pedro.</div><div dir=3D"ltr" data-setdir=3D"false"> </div><= div><br></div> =20 </div><div id=3D"ydp6137779fyahoo_quoted_6456486321" class=3D"ydp61= 37779fyahoo_quoted"> <div style=3D"font-family:'Helvetica Neue', Helvetica, Arial, s= ans-serif;font-size:13px;color:#26282a;"> <div>----- Forwarded Message -----</div> <div><b>From:</b> Xin LI <delphij@freebsd.org></div><= div><b>To:</b> "src-committers@freebsd.org" <src-committers@freebsd.org&= gt;; "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org&= gt;; "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.or= g></div><div><b>Sent:</b> Friday, February 3, 2023 at 02:14:34=E2=80=AFA= M GMT-5</div><div><b>Subject:</b> git: 6998572a74a9 - main - hastd: use zli= b's crc32 implementation.</div><div><br></div> <div><div dir=3D"ltr">The branch main has been updated by d= elphij:<br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr">URL: <a href= =3D"https://cgit.FreeBSD.org/src/commit/?id=3D6998572a74a98721781ecd5b68294= 35259f9825a" rel=3D"nofollow" target=3D"_blank">https://cgit.FreeBSD.org/sr= c/commit/?id=3D6998572a74a98721781ecd5b6829435259f9825a</a><br></div><div d= ir=3D"ltr"><br></div><div dir=3D"ltr">commit 6998572a74a98721781ecd5b682943= 5259f9825a<br></div><div dir=3D"ltr">Author: Xin LI <<a hr= ef=3D"mailto:delphij@FreeBSD.org" rel=3D"nofollow" target=3D"_blank">delphi= j@FreeBSD.org</a>><br></div><div dir=3D"ltr">AuthorDate: 2023-02-03 07:1= 4:21 +0000<br></div><div dir=3D"ltr">Commit: Xin LI <<a hr= ef=3D"mailto:delphij@FreeBSD.org" rel=3D"nofollow" target=3D"_blank">delphi= j@FreeBSD.org</a>><br></div><div dir=3D"ltr">CommitDate: 2023-02-03 07:1= 4:21 +0000<br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr"> &nbs= p; hastd: use zlib's crc32 implementation.<br></div><div dir=3D"ltr"> = <br></div><div dir=3D"ltr"> Reviewed by: = pjd<br></div><div dir=3D"ltr"> MFC after: = 2 weeks<br></div><div dir=3D"ltr"> Differential Revision: <a h= ref=3D"https://reviews.freebsd.org/D35767" rel=3D"nofollow" target=3D"_blan= k">https://reviews.freebsd.org/D35767</a><br></div><div dir=3D"ltr">---<br>= </div><div dir=3D"ltr">...</div><div dir=3D"ltr" data-setdir=3D"false"><= snip></div><div dir=3D"ltr" data-setdir=3D"false">...</div><div dir=3D"l= tr">diff --git a/sbin/hastd/hast_checksum.c b/sbin/hastd/hast_checksum.c<br= ></div><div dir=3D"ltr">index f7ef6a64b4e1..dccba3752cb1 100644<br></div><d= iv dir=3D"ltr">--- a/sbin/hastd/hast_checksum.c<br></div><div dir=3D"ltr">+= ++ b/sbin/hastd/hast_checksum.c<br></div><div dir=3D"ltr">@@ -33,10 +33,10 = @@ __FBSDID("$FreeBSD$");<br></div><div dir=3D"ltr"> #include <string.h&= gt;<br></div><div dir=3D"ltr"> #include <strings.h><br></div><div dir= =3D"ltr"> <br></div><div dir=3D"ltr">-#include <crc32.h><br></div><di= v dir=3D"ltr"> #include <hast.h><br></div><div dir=3D"ltr"> #include = <nv.h><br></div><div dir=3D"ltr"> #include <sha256.h><br></div>= <div dir=3D"ltr">+#include <zlib.h><br></div><div dir=3D"ltr"> #inclu= de <pjdlog.h><br></div><div dir=3D"ltr"> <br></div><div dir=3D"ltr"> = #include "hast_checksum.h"<br></div><div dir=3D"ltr">@@ -49,7 +49,9 @@ hast= _crc32_checksum(const unsigned char *data, size_t size,<br></div><div dir= =3D"ltr"> {<br></div><div dir=3D"ltr"> uint32_t crc;<br>= </div><div dir=3D"ltr"> <br></div><div dir=3D"ltr">- crc = =3D crc32(data, size);<br></div><div dir=3D"ltr">+ crc = =3D crc32(0L, Z_NULL, 0);<br></div><div dir=3D"ltr">+ crc= =3D crc32(crc, data, size);<br></div><div dir=3D"ltr">+<br></div><div dir= =3D"ltr"> /* XXXPJD: Do we have to use htole32() on crc = first? */<br></div><div dir=3D"ltr"> bcopy(&crc, has= h, sizeof(crc));<br></div><div dir=3D"ltr"> *hsizep =3D = sizeof(crc);<br></div></div> </div> </div></body></html> ------=_Part_221189_1075028453.1675526148956--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1967210382.221190.1675526148958>