Page MenuHomeFreeBSD
Differential D8277

Fix C++ includability of crypto headers with static array sizes
ClosedPublic
Actions

Authored by asomers on Oct 18 2016, 3:02 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, May 2, 4:10 PM
Unknown Object (File)
Wed, Apr 24, 7:22 PM
Unknown Object (File)
Wed, Apr 24, 7:21 PM
Unknown Object (File)
Tue, Apr 23, 4:25 AM
Unknown Object (File)
Fri, Apr 12, 2:27 PM
Unknown Object (File)
Apr 10 2024, 12:53 AM
Unknown Object (File)
Mar 8 2024, 8:30 PM
Unknown Object (File)
Mar 8 2024, 8:30 PM
View All 74 Files
Subscribers
imp

Details

Reviewers
cem
jmg
ed
Commits
rS307584: Fix C++ includability of crypto headers with static array sizes
Summary

C99 allows array function parameters to use the static keyword for their
sizes. This tells the compiler that the parameter will have at least the
specified size, and calling code will fail to compile if that guarantee is
not met. However, this syntax is not legal in C++.

This commit reverts r300824, which worked around the problem for
sys/sys/md5.h only, and introduces a new macro: min_size(). min_size(x)
can be used in headers as a static array size, but will still compile in C++
mode.

Test Plan

Include all of the affected headers in an otherwise empty file, and compile
it in both C and C++ mode.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

asomers updated this revision to Diff 21477.Oct 18 2016, 3:02 PM
asomers retitled this revision from to Fix C++ includability of crypto headers with static array sizes.
asomers updated this object.
asomers edited the test plan for this revision. (Show Details)
asomers added reviewers: cem, ed.
Herald added a reviewer: jmg. · View Herald TranscriptOct 18 2016, 3:02 PM
Herald added a subscriber: imp. · View Herald Transcript
ed accepted this revision.Oct 18 2016, 3:04 PM
ed edited edge metadata.
ed added inline comments.
sys/sys/cdefs.h
351 ↗(On Diff #21477)

Maybe we should also test for __STDC_VERSION__ here? Pre-C99 also doesn't support this.

This revision is now accepted and ready to land.Oct 18 2016, 3:04 PM
cem added inline comments.Oct 18 2016, 3:51 PM
sys/sys/cdefs.h
354 ↗(On Diff #21477)

Is this correct in C++? Or should it just be an empty definition?

ed added inline comments.Oct 18 2016, 4:43 PM
sys/sys/cdefs.h
354 ↗(On Diff #21477)

Yes, it is correct as it is right now.

cem accepted this revision.Oct 18 2016, 5:56 PM
cem edited edge metadata.
asomers updated this revision to Diff 21480.Oct 18 2016, 5:56 PM
asomers edited edge metadata.

Use STDC_VERSION, even though clang allows static array sizes in c89 mode

This revision now requires review to proceed.Oct 18 2016, 5:56 PM
Herald edited edge metadata. · View Herald TranscriptOct 18 2016, 5:56 PM
cem accepted this revision.Oct 18 2016, 5:58 PM
cem edited edge metadata.
This revision is now accepted and ready to land.Oct 18 2016, 5:58 PM
ed accepted this revision.Oct 18 2016, 8:12 PM
ed edited edge metadata.
ed added inline comments.
sys/sys/cdefs.h
351 ↗(On Diff #21477)

I'm not a fan of the extraneous parentheses, but it looks good enough to me. ;-)

Closed by commit rS307584: Fix C++ includability of crypto headers with static array sizes (authored by asomers). · Explain WhyOct 18 2016, 11:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
lib/
libmd/
8 lines
sys/
crypto/
aesni/
12 lines
2 lines
sha2/
3 lines
3 lines
3 lines
6 lines
siphash/
9 lines
skein/
9 lines
sys/
14 lines
2 lines
2 lines

Diff 21486

View Options

head/lib/libmd/md5.h

Loading...
View Options

head/sys/crypto/aesni/aesni.h

Loading...
View Options

head/sys/crypto/sha1.h

Loading...
View Options

head/sys/crypto/sha2/sha256.h

Loading...
View Options

head/sys/crypto/sha2/sha384.h

Loading...
View Options

head/sys/crypto/sha2/sha512.h

Loading...
View Options

head/sys/crypto/sha2/sha512t.h

Loading...
View Options

head/sys/crypto/siphash/siphash.h

Loading...
View Options

head/sys/crypto/skein/skein_freebsd.h

Loading...
View Options

head/sys/sys/cdefs.h

Loading...
View Options

head/sys/sys/md4.h

Loading...
View Options

head/sys/sys/md5.h

Loading...