Date: Wed, 3 Aug 2022 13:18:56 -0700 From: Xin LI <delphij@gmail.com> To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= <des@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c7a8e8d372b2 - main - xinstall: make md5 and ripemd160 conditional Message-ID: <CAGMYy3sCgz_vYAxLtTFwL2VLmSO-dLH1C3vsxqQm=%2BHGUe30GQ@mail.gmail.com> In-Reply-To: <202208031925.273JPBMo049062@gitrepo.freebsd.org> References: <202208031925.273JPBMo049062@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Can we also make SHA1 optional too? On Wed, Aug 3, 2022 at 12:25 PM Dag-Erling Smørgrav <des@freebsd.org> wrote: > The branch main has been updated by des: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=c7a8e8d372b212c97dde6ce2731db27aa0b2201c > > commit c7a8e8d372b212c97dde6ce2731db27aa0b2201c > Author: Dag-Erling Smørgrav <des@FreeBSD.org> > AuthorDate: 2022-08-03 19:20:47 +0000 > Commit: Dag-Erling Smørgrav <des@FreeBSD.org> > CommitDate: 2022-08-03 19:24:07 +0000 > > xinstall: make md5 and ripemd160 conditional > > Sponsored by: Klara, Inc. > --- > usr.bin/xinstall/Makefile | 3 ++- > usr.bin/xinstall/xinstall.c | 32 ++++++++++++++++++++++++++++++++ > 2 files changed, 34 insertions(+), 1 deletion(-) > > diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile > index ce70cb882190..9969ef104e98 100644 > --- a/usr.bin/xinstall/Makefile > +++ b/usr.bin/xinstall/Makefile > @@ -14,7 +14,8 @@ MAN= install.1 > CFLAGS+= -I${SRCTOP}/contrib/mtree > CFLAGS+= -I${SRCTOP}/lib/libnetbsd > > -LIBADD= md > +LIBADD= md > +CFLAGS+= -DWITH_MD5 -DWITH_RIPEMD160 > > HAS_TESTS= > SUBDIR.${MK_TESTS}+= tests > diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c > index ddad7ba9115e..a236838c8fd1 100644 > --- a/usr.bin/xinstall/xinstall.c > +++ b/usr.bin/xinstall/xinstall.c > @@ -57,10 +57,14 @@ __FBSDID("$FreeBSD$"); > #include <fcntl.h> > #include <grp.h> > #include <libgen.h> > +#ifdef WITH_MD5 > #include <md5.h> > +#endif > #include <paths.h> > #include <pwd.h> > +#ifdef WITH_RIPEMD160 > #include <ripemd.h> > +#endif > #include <sha.h> > #include <sha256.h> > #include <sha512.h> > @@ -100,8 +104,12 @@ __FBSDID("$FreeBSD$"); > #define BACKUP_SUFFIX ".old" > > typedef union { > +#ifdef WITH_MD5 > MD5_CTX MD5; > +#endif > +#ifdef WITH_RIPEMD160 > RIPEMD160_CTX RIPEMD160; > +#endif > SHA1_CTX SHA1; > SHA256_CTX SHA256; > SHA512_CTX SHA512; > @@ -109,8 +117,12 @@ typedef union { > > static enum { > DIGEST_NONE = 0, > +#ifdef WITH_MD5 > DIGEST_MD5, > +#endif > +#ifdef WITH_RIPEMD160 > DIGEST_RIPEMD160, > +#endif > DIGEST_SHA1, > DIGEST_SHA256, > DIGEST_SHA512, > @@ -288,10 +300,14 @@ main(int argc, char *argv[]) > if (digest != NULL) { > if (strcmp(digest, "none") == 0) { > digesttype = DIGEST_NONE; > +#ifdef WITH_MD5 > } else if (strcmp(digest, "md5") == 0) { > digesttype = DIGEST_MD5; > +#endif > +#ifdef WITH_RIPEMD160 > } else if (strcmp(digest, "rmd160") == 0) { > digesttype = DIGEST_RIPEMD160; > +#endif > } else if (strcmp(digest, "sha1") == 0) { > digesttype = DIGEST_SHA1; > } else if (strcmp(digest, "sha256") == 0) { > @@ -402,10 +418,14 @@ digest_file(const char *name) > { > > switch (digesttype) { > +#ifdef WITH_MD5 > case DIGEST_MD5: > return (MD5File(name, NULL)); > +#endif > +#ifdef WITH_RIPEMD160 > case DIGEST_RIPEMD160: > return (RIPEMD160_File(name, NULL)); > +#endif > case DIGEST_SHA1: > return (SHA1_File(name, NULL)); > case DIGEST_SHA256: > @@ -424,12 +444,16 @@ digest_init(DIGEST_CTX *c) > switch (digesttype) { > case DIGEST_NONE: > break; > +#ifdef WITH_MD5 > case DIGEST_MD5: > MD5Init(&(c->MD5)); > break; > +#endif > +#ifdef WITH_RIPEMD160 > case DIGEST_RIPEMD160: > RIPEMD160_Init(&(c->RIPEMD160)); > break; > +#endif > case DIGEST_SHA1: > SHA1_Init(&(c->SHA1)); > break; > @@ -449,12 +473,16 @@ digest_update(DIGEST_CTX *c, const char *data, > size_t len) > switch (digesttype) { > case DIGEST_NONE: > break; > +#ifdef WITH_MD5 > case DIGEST_MD5: > MD5Update(&(c->MD5), data, len); > break; > +#endif > +#ifdef WITH_RIPEMD160 > case DIGEST_RIPEMD160: > RIPEMD160_Update(&(c->RIPEMD160), data, len); > break; > +#endif > case DIGEST_SHA1: > SHA1_Update(&(c->SHA1), data, len); > break; > @@ -472,10 +500,14 @@ digest_end(DIGEST_CTX *c, char *buf) > { > > switch (digesttype) { > +#ifdef WITH_MD5 > case DIGEST_MD5: > return (MD5End(&(c->MD5), buf)); > +#endif > +#ifdef WITH_RIPEMD160 > case DIGEST_RIPEMD160: > return (RIPEMD160_End(&(c->RIPEMD160), buf)); > +#endif > case DIGEST_SHA1: > return (SHA1_End(&(c->SHA1), buf)); > case DIGEST_SHA256: > [-- Attachment #2 --] <div dir="ltr"><div class="gmail_default" style="font-family:monospace,monospace">Can we also make SHA1 optional too?</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Aug 3, 2022 at 12:25 PM Dag-Erling Smørgrav <<a href="mailto:des@freebsd.org">des@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by des:<br> <br> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=c7a8e8d372b212c97dde6ce2731db27aa0b2201c" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=c7a8e8d372b212c97dde6ce2731db27aa0b2201c</a><br>; <br> commit c7a8e8d372b212c97dde6ce2731db27aa0b2201c<br> Author: Dag-Erling Smørgrav <des@FreeBSD.org><br> AuthorDate: 2022-08-03 19:20:47 +0000<br> Commit: Dag-Erling Smørgrav <des@FreeBSD.org><br> CommitDate: 2022-08-03 19:24:07 +0000<br> <br> xinstall: make md5 and ripemd160 conditional<br> <br> Sponsored by: Klara, Inc.<br> ---<br> usr.bin/xinstall/Makefile | 3 ++-<br> usr.bin/xinstall/xinstall.c | 32 ++++++++++++++++++++++++++++++++<br> 2 files changed, 34 insertions(+), 1 deletion(-)<br> <br> diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile<br> index ce70cb882190..9969ef104e98 100644<br> --- a/usr.bin/xinstall/Makefile<br> +++ b/usr.bin/xinstall/Makefile<br> @@ -14,7 +14,8 @@ MAN= install.1<br> CFLAGS+= -I${SRCTOP}/contrib/mtree<br> CFLAGS+= -I${SRCTOP}/lib/libnetbsd<br> <br> -LIBADD= md<br> +LIBADD= md<br> +CFLAGS+= -DWITH_MD5 -DWITH_RIPEMD160<br> <br> HAS_TESTS=<br> SUBDIR.${MK_TESTS}+= tests<br> diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c<br> index ddad7ba9115e..a236838c8fd1 100644<br> --- a/usr.bin/xinstall/xinstall.c<br> +++ b/usr.bin/xinstall/xinstall.c<br> @@ -57,10 +57,14 @@ __FBSDID("$FreeBSD$");<br> #include <fcntl.h><br> #include <grp.h><br> #include <libgen.h><br> +#ifdef WITH_MD5<br> #include <md5.h><br> +#endif<br> #include <paths.h><br> #include <pwd.h><br> +#ifdef WITH_RIPEMD160<br> #include <ripemd.h><br> +#endif<br> #include <sha.h><br> #include <sha256.h><br> #include <sha512.h><br> @@ -100,8 +104,12 @@ __FBSDID("$FreeBSD$");<br> #define BACKUP_SUFFIX ".old"<br> <br> typedef union {<br> +#ifdef WITH_MD5<br> MD5_CTX MD5;<br> +#endif<br> +#ifdef WITH_RIPEMD160<br> RIPEMD160_CTX RIPEMD160;<br> +#endif<br> SHA1_CTX SHA1;<br> SHA256_CTX SHA256;<br> SHA512_CTX SHA512;<br> @@ -109,8 +117,12 @@ typedef union {<br> <br> static enum {<br> DIGEST_NONE = 0,<br> +#ifdef WITH_MD5<br> DIGEST_MD5,<br> +#endif<br> +#ifdef WITH_RIPEMD160<br> DIGEST_RIPEMD160,<br> +#endif<br> DIGEST_SHA1,<br> DIGEST_SHA256,<br> DIGEST_SHA512,<br> @@ -288,10 +300,14 @@ main(int argc, char *argv[])<br> if (digest != NULL) {<br> if (strcmp(digest, "none") == 0) {<br> digesttype = DIGEST_NONE;<br> +#ifdef WITH_MD5<br> } else if (strcmp(digest, "md5") == 0) {<br> digesttype = DIGEST_MD5;<br> +#endif<br> +#ifdef WITH_RIPEMD160<br> } else if (strcmp(digest, "rmd160") == 0) {<br> digesttype = DIGEST_RIPEMD160;<br> +#endif<br> } else if (strcmp(digest, "sha1") == 0) {<br> digesttype = DIGEST_SHA1;<br> } else if (strcmp(digest, "sha256") == 0) {<br> @@ -402,10 +418,14 @@ digest_file(const char *name)<br> {<br> <br> switch (digesttype) {<br> +#ifdef WITH_MD5<br> case DIGEST_MD5:<br> return (MD5File(name, NULL));<br> +#endif<br> +#ifdef WITH_RIPEMD160<br> case DIGEST_RIPEMD160:<br> return (RIPEMD160_File(name, NULL));<br> +#endif<br> case DIGEST_SHA1:<br> return (SHA1_File(name, NULL));<br> case DIGEST_SHA256:<br> @@ -424,12 +444,16 @@ digest_init(DIGEST_CTX *c)<br> switch (digesttype) {<br> case DIGEST_NONE:<br> break;<br> +#ifdef WITH_MD5<br> case DIGEST_MD5:<br> MD5Init(&(c->MD5));<br> break;<br> +#endif<br> +#ifdef WITH_RIPEMD160<br> case DIGEST_RIPEMD160:<br> RIPEMD160_Init(&(c->RIPEMD160));<br> break;<br> +#endif<br> case DIGEST_SHA1:<br> SHA1_Init(&(c->SHA1));<br> break;<br> @@ -449,12 +473,16 @@ digest_update(DIGEST_CTX *c, const char *data, size_t len)<br> switch (digesttype) {<br> case DIGEST_NONE:<br> break;<br> +#ifdef WITH_MD5<br> case DIGEST_MD5:<br> MD5Update(&(c->MD5), data, len);<br> break;<br> +#endif<br> +#ifdef WITH_RIPEMD160<br> case DIGEST_RIPEMD160:<br> RIPEMD160_Update(&(c->RIPEMD160), data, len);<br> break;<br> +#endif<br> case DIGEST_SHA1:<br> SHA1_Update(&(c->SHA1), data, len);<br> break;<br> @@ -472,10 +500,14 @@ digest_end(DIGEST_CTX *c, char *buf)<br> {<br> <br> switch (digesttype) {<br> +#ifdef WITH_MD5<br> case DIGEST_MD5:<br> return (MD5End(&(c->MD5), buf));<br> +#endif<br> +#ifdef WITH_RIPEMD160<br> case DIGEST_RIPEMD160:<br> return (RIPEMD160_End(&(c->RIPEMD160), buf));<br> +#endif<br> case DIGEST_SHA1:<br> return (SHA1_End(&(c->SHA1), buf));<br> case DIGEST_SHA256:<br> </blockquote></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGMYy3sCgz_vYAxLtTFwL2VLmSO-dLH1C3vsxqQm=%2BHGUe30GQ>