Differential D3929

Replace sys/crypto/sha2/sha2.c with lib/libmd/sha512c.c
ClosedPublic
Actions

Authored by allanjude on Oct 17 2015, 8:52 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Thu, Dec 19, 12:09 AM

	Unknown Object (File)
	Mon, Dec 16, 3:49 PM

	Unknown Object (File)
	Wed, Dec 11, 1:54 PM

	Unknown Object (File)
	Thu, Dec 5, 6:52 AM

	Unknown Object (File)
	Tue, Dec 3, 6:15 AM

	Unknown Object (File)
	Sun, Dec 1, 9:54 AM

	Unknown Object (File)
	Thu, Nov 28, 7:27 PM

	Unknown Object (File)
	Thu, Nov 28, 10:24 AM

Subscribers

Details

Reviewers

jmg
delphij
bapt
cperciva
des

Group Reviewers

manpages
secteam

Commits

rS292782: Replace sys/crypto/sha2/sha2.c with lib/libmd/sha512c.c

Summary

cperciva's libmd implementation is 5-30% faster (also seen here: https://svnweb.freebsd.org/changeset/base/r263218 )

cperciva's implementation was lacking SHA-384 which I implemented
Extend sbin/md5 to create sha384(1)

In a separate commit, I will also add SHA-512/256 (required by new ZFS features)

Chase dependancies on sys/crypto/sha2/sha2.{c,h} and replace them with sha512{c.c,.h}

Will extend reviewers to include secteam@ once the first round of issues are dealt with

Test Plan

benchmark results: http://www.allanjude.com/bsd/sha512_results.txt

The output of the new SHA-384 implementation were verified against openssl sha384 and http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA384.pdf

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 805
Build 805: arc lint + arc unit

Event Timeline

allanjude updated this revision to Diff 9476.Oct 17 2015, 8:52 PM

allanjude retitled this revision from to Replace sys/crypto/sha2/sha2.c with lib/libmd/sha512c.c.

allanjude updated this object.

allanjude edited the test plan for this revision. (Show Details)

allanjude added reviewers: jmg, cperciva.

Herald added reviewers: manpages, secteam. · View Herald TranscriptOct 17 2015, 8:52 PM

Herald added subscribers: delphij, imp. · View Herald Transcript

allanjude updated this object.Oct 17 2015, 8:55 PM

allanjude edited edge metadata.

Just a few comments.

lib/libmd/Makefile
40	is this tab/space matching others or is this just a phab misformating issue?
sys/conf/files
559	I don't see bde using SHA256, we should probably remove it, though maybe as a different commit? Looks like the module also compiles it. A quick compile of the module does look like it uses it.
561	I don't think you need zfs here yet. I'd add ZFS when you finally enable sha512/256 support.

allanjude marked an inline comment as done.Oct 17 2015, 9:30 PM

allanjude added inline comments.

lib/libmd/Makefile
40	i put a tab when I shouldn't have, fixed in my local copy, will update with other changes
sys/conf/files
559	yeah, that was already there, I didn't change it. geom_eli uses both 256 and 512, should it be listed in both places?
561	the zfs SRCS= line references both, and again, I just updated sha2.c -> sha512c.c (and changed the order to make sense). But yeah, I could remove ZFS here and readd it in the next commit.

Minor updates to address feedback from jmg@

Herald edited edge metadata. · View Herald TranscriptOct 18 2015, 12:44 AM

emaste added a subscriber: emaste.Oct 19 2015, 4:23 PM

jmg added inline comments.Oct 20 2015, 11:34 PM

sys/conf/files
559	bde != eli.. They are different, so commenting that eli uses 256 and 512 is unrelated to my bde comment.
561	Since you're adding the line fresh, it's best to keep it minimal.

allanjude added inline comments.Oct 22 2015, 3:09 PM

sys/conf/files
559	that should have been a separate comment. Unrelated to geom_bde: geom_eli uses both SHA256 and SHA512, should it be listed in this file?

bapt added a subscriber: bapt.Oct 24 2015, 2:12 PM

Update the diff to put sha384 prototypes in their own file as requested by cperciva

Herald edited edge metadata. · View Herald TranscriptNov 28 2015, 7:05 AM

Looks good to me.

des accepted this revision.Dec 18 2015, 3:30 AM

des added a reviewer: des.

bapt accepted this revision.Dec 24 2015, 1:33 PM

bapt added a reviewer: bapt.

Approved by so, too. Sorry for the delay and thanks for working on this.

This revision is now accepted and ready to land.Dec 27 2015, 5:19 PM

Closed by commit rS292782: Replace sys/crypto/sha2/sha2.c with lib/libmd/sha512c.c (authored by allanjude). · Explain WhyDec 27 2015, 5:34 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

lib/

libcrypt/

1 line

libmd/

35 lines

42 lines

3 lines

sbin/

gbde/

2 lines

2 lines

geom/

class/

eli/

3 lines

md5/

2 lines

14 lines

16 lines

sys/

cddl/

contrib/

opensolaris/

uts/

common/

fs/

zfs/

2 lines

conf/

3 lines

crypto/

sha2/

10 lines

dev/

random/

2 lines

4 lines

2 lines

other_algorithm.c

2 lines

2 lines

2 lines

4 lines

geom/

bde/

2 lines

2 lines

2 lines

2 lines

eli/

3 lines

modules/

crypto/

2 lines

geom/

geom_bde/

2 lines

zfs/

2 lines

netinet/

2 lines

opencrypto/

3 lines

	sys/	crypto/	sha2/
		lib/	libmd/

60 lines

95 lines

Diff 9482

lib/libcrypt/Makefile

Loading...

lib/libmd/Makefile

Loading...

lib/libmd/sha512.h

Loading...

lib/libmd/sha512.3

Loading...

lib/libmd/sha512c.c

Loading...

lib/libmd/shadriver.c

Loading...

sbin/gbde/Makefile

Loading...

sbin/gbde/gbde.c

Loading...

sbin/geom/class/eli/Makefile

Loading...

sbin/md5/Makefile

Loading...

sbin/md5/md5.1

Loading...

sbin/md5/md5.c

Loading...

sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c

Loading...

sys/conf/files

Loading...

sys/crypto/sha2/sha2.h

Loading...

sys/crypto/sha2/sha2.c

Loading...

sys/crypto/sha2/sha256.h

Loading...

sys/crypto/sha2/sha512.h

Loading...

sys/crypto/sha2/sha512c.c

Loading...

sys/dev/random/build.sh

Loading...

sys/dev/random/fortuna.c

Loading...

sys/dev/random/hash.c

Loading...

sys/dev/random/other_algorithm.c

Loading...

sys/dev/random/randomdev.c

Loading...

sys/dev/random/unit_test.c

Loading...

sys/dev/random/yarrow.c

Loading...

sys/geom/bde/g_bde.c

Loading...

sys/geom/bde/g_bde_crypt.c

Loading...

sys/geom/bde/g_bde_lock.c

Loading...

sys/geom/bde/g_bde_work.c

Loading...

sys/geom/eli/g_eli.h

Loading...

sys/modules/crypto/Makefile

Loading...

sys/modules/geom/geom_bde/Makefile

Loading...

sys/modules/zfs/Makefile

Loading...

sys/netinet/sctp_os_bsd.h

Loading...

sys/opencrypto/xform.h

Loading...