Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for writing sha256, sha384, and sha512 digests to 

a metalog.  mtree(8) has supported these for a long time.
This commit is contained in:
apb 2009-05-01 20:16:23 +00:00
parent 8f7e60d3bc
commit be7721cd8f
2 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/xinstall/install.1
View File

@ -1,4 +1,4 @@
.\" $NetBSD: install.1,v 1.42 2004/01/29 11:17:37 wiz Exp $
.\" $NetBSD: install.1,v 1.43 2009/05/01 20:16:23 apb Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@ -249,6 +249,18 @@ The MD5 cryptographic message digest.
The RMD-160 cryptographic message digest.
.It Sy sha1
The SHA-1 cryptographic message digest.
.It Sy sha256
The 256-bits
.Tn SHA-2
cryptographic message digest of the file.
.It Sy sha384
The 384-bits
.Tn SHA-2
cryptographic message digest of the file.
.It Sy sha512
The 512-bits
.Tn SHA-2
cryptographic message digest of the file.
.El
.It Fl l Ar linkflags
Instead of copying the file make a link to the source.

59
usr.bin/xinstall/xinstall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xinstall.c,v 1.108 2009/04/17 06:09:08 apb Exp $ */
/* $NetBSD: xinstall.c,v 1.109 2009/05/01 20:16:23 apb Exp $ */
/*
* Copyright (c) 1987, 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#else
__RCSID("$NetBSD: xinstall.c,v 1.108 2009/04/17 06:09:08 apb Exp $");
__RCSID("$NetBSD: xinstall.c,v 1.109 2009/05/01 20:16:23 apb Exp $");
#endif
#endif /* not lint */
@ -75,6 +75,7 @@ __RCSID("$NetBSD: xinstall.c,v 1.108 2009/04/17 06:09:08 apb Exp $");
#include <md5.h>
#include <rmd160.h>
#include <sha1.h>
#include <sha2.h>
#include "pathnames.h"
#include "mtree.h"
@ -102,6 +103,9 @@ enum {
DIGEST_MD5,
DIGEST_RMD160,
DIGEST_SHA1,
DIGEST_SHA256,
DIGEST_SHA384,
DIGEST_SHA512,
} digesttype = DIGEST_NONE;
char *digest;
@ -294,6 +298,12 @@ main(int argc, char *argv[])
digesttype = DIGEST_RMD160;
} else if (strcmp(digest, "sha1") == 0) {
digesttype = DIGEST_SHA1;
} else if (strcmp(digest, "sha256") == 0) {
digesttype = DIGEST_SHA256;
} else if (strcmp(digest, "sha384") == 0) {
digesttype = DIGEST_SHA384;
} else if (strcmp(digest, "sha512") == 0) {
digesttype = DIGEST_SHA512;
} else {
warnx("unknown digest `%s'", digest);
usage();
@ -509,6 +519,15 @@ makelink(char *from_name, char *to_name)
case DIGEST_SHA1:
dres = SHA1File(from_name, NULL);
break;
case DIGEST_SHA256:
dres = SHA256_File(from_name, NULL);
break;
case DIGEST_SHA384:
dres = SHA384_File(from_name, NULL);
break;
case DIGEST_SHA512:
dres = SHA512_File(from_name, NULL);
break;
default:
dres = NULL;
}
@ -793,6 +812,9 @@ copy(int from_fd, char *from_name, int to_fd, char *to_name, off_t size)
MD5_CTX ctxMD5;
RMD160_CTX ctxRMD160;
SHA1_CTX ctxSHA1;
SHA256_CTX ctxSHA256;
SHA384_CTX ctxSHA384;
SHA512_CTX ctxSHA512;
switch (digesttype) {
case DIGEST_MD5:
@ -804,6 +826,15 @@ copy(int from_fd, char *from_name, int to_fd, char *to_name, off_t size)
case DIGEST_SHA1:
SHA1Init(&ctxSHA1);
break;
case DIGEST_SHA256:
SHA256_Init(&ctxSHA256);
break;
case DIGEST_SHA384:
SHA384_Init(&ctxSHA384);
break;
case DIGEST_SHA512:
SHA512_Init(&ctxSHA512);
break;
case DIGEST_NONE:
if (to_fd < 0)
return NULL; /* no need to do anything */
@ -850,6 +881,15 @@ copy(int from_fd, char *from_name, int to_fd, char *to_name, off_t size)
case DIGEST_SHA1:
SHA1Update(&ctxSHA1, p, size);
break;
case DIGEST_SHA256:
SHA256_Update(&ctxSHA256, p, size);
break;
case DIGEST_SHA384:
SHA384_Update(&ctxSHA384, p, size);
break;
case DIGEST_SHA512:
SHA512_Update(&ctxSHA512, p, size);
break;
default:
break;
}
@ -874,6 +914,15 @@ copy(int from_fd, char *from_name, int to_fd, char *to_name, off_t size)
case DIGEST_SHA1:
SHA1Update(&ctxSHA1, buf, nr);
break;
case DIGEST_SHA256:
SHA256_Update(&ctxSHA256, buf, nr);
break;
case DIGEST_SHA384:
SHA384_Update(&ctxSHA384, buf, nr);
break;
case DIGEST_SHA512:
SHA512_Update(&ctxSHA512, buf, nr);
break;
default:
break;
}
@ -892,6 +941,12 @@ copy(int from_fd, char *from_name, int to_fd, char *to_name, off_t size)
return RMD160End(&ctxRMD160, NULL);
case DIGEST_SHA1:
return SHA1End(&ctxSHA1, NULL);
case DIGEST_SHA256:
return SHA256_End(&ctxSHA256, NULL);
case DIGEST_SHA384:
return SHA384_End(&ctxSHA384, NULL);
case DIGEST_SHA512:
return SHA512_End(&ctxSHA512, NULL);
default:
return NULL;
}