diff options
| author | cperciva <cperciva@FreeBSD.org> | 2005-03-09 19:23:04 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2005-03-09 19:23:04 +0000 |
| commit | 180357cd92d662043a6a43cdca0e95a9d7cc2abe (patch) | |
| tree | 93545178ed2cf6089bb2b9ecddb45ad729186e96 /sbin/md5 | |
| parent | a601ac81480a3fa885a89ae7890ff410cf797d87 (diff) | |
| download | FreeBSD-src-180357cd92d662043a6a43cdca0e95a9d7cc2abe.zip FreeBSD-src-180357cd92d662043a6a43cdca0e95a9d7cc2abe.tar.gz | |
In light of the recent 2^69 operation collision-finding attack on SHA1,
add support for SHA256.
Tested on: i386, sparc64
Tested using: NIST test vectors, built-in tests
X-MFC-after: 5.4-RELEASE
Diffstat (limited to 'sbin/md5')
| -rw-r--r-- | sbin/md5/Makefile | 6 | ||||
| -rw-r--r-- | sbin/md5/md5.c | 22 |
2 files changed, 24 insertions, 4 deletions
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile index 007fb4c..07c4109 100644 --- a/sbin/md5/Makefile +++ b/sbin/md5/Makefile @@ -4,10 +4,12 @@ PROG= md5 LINKS= ${BINDIR}/md5 ${BINDIR}/rmd160 \ - ${BINDIR}/md5 ${BINDIR}/sha1 + ${BINDIR}/md5 ${BINDIR}/sha1 \ + ${BINDIR}/md5 ${BINDIR}/sha256 MLINKS= md5.1 rmd160.1 \ - md5.1 sha1.1 + md5.1 sha1.1 \ + md5.1 sha256.1 WARNS?= 6 WFORMAT?= 1 diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 454ada8..1423b16 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -27,6 +27,7 @@ __FBSDID("$FreeBSD$"); #include <md5.h> #include <ripemd.h> #include <sha.h> +#include <sha256.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -50,6 +51,7 @@ typedef char *(DIGEST_End)(void *, char *); extern const char *MD5TestOutput[MDTESTCOUNT]; extern const char *SHA1_TestOutput[MDTESTCOUNT]; +extern const char *SHA256_TestOutput[MDTESTCOUNT]; extern const char *RIPEMD160_TestOutput[MDTESTCOUNT]; typedef struct Algorithm_t { @@ -73,11 +75,13 @@ static void usage(Algorithm_t *); typedef union { MD5_CTX md5; SHA1_CTX sha1; + SHA256_CTX sha256; RIPEMD160_CTX ripemd160; } DIGEST_CTX; -/* max(MD5_DIGEST_LENGTH, SHA_DIGEST_LENGTH, RIPEMD160_DIGEST_LENGTH)*2+1 */ -#define HEX_DIGEST_LENGTH 41 +/* max(MD5_DIGEST_LENGTH, SHA_DIGEST_LENGTH, + SHA256_DIGEST_LENGTH, RIPEMD160_DIGEST_LENGTH)*2+1 */ +#define HEX_DIGEST_LENGTH 65 /* algorithm function table */ @@ -88,6 +92,9 @@ struct Algorithm_t Algorithm[] = { { "sha1", "SHA1", &SHA1_TestOutput, (DIGEST_Init*)&SHA1_Init, (DIGEST_Update*)&SHA1_Update, (DIGEST_End*)&SHA1_End, &SHA1_Data, &SHA1_File }, + { "sha256", "SHA256", &SHA256_TestOutput, (DIGEST_Init*)&SHA256_Init, + (DIGEST_Update*)&SHA256_Update, (DIGEST_End*)&SHA256_End, + &SHA256_Data, &SHA256_File }, { "rmd160", "RMD160", &RIPEMD160_TestOutput, (DIGEST_Init*)&RIPEMD160_Init, (DIGEST_Update*)&RIPEMD160_Update, (DIGEST_End*)&RIPEMD160_End, &RIPEMD160_Data, &RIPEMD160_File } @@ -279,6 +286,17 @@ const char *SHA1_TestOutput[MDTESTCOUNT] = { "18eca4333979c4181199b7b4fab8786d16cf2846" }; +const char *SHA256_TestOutput[MDTESTCOUNT] = { + "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb", + "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", + "f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650", + "71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73", + "db4bfcbd4da0cd85a60c3c37d3fbd8805c77f15fc6b1fdfe614ee0a7c8fdb4c0", + "f371bc4a311f2b009eef952dd83ca80e2b60026c8e935592d0f9c308453c813e", + "e6eae09f10ad4122a0e2a4075761d185a272ebd9f5aa489e998ff2f09cbfdd9f" +}; + const char *RIPEMD160_TestOutput[MDTESTCOUNT] = { "9c1185a5c5e9fc54612808977ee8f548b2258d31", "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe", |
