Explicitly zero hash results and context in glxsb_authcompute().Reviewed by: delphijSponsored by: Chelsio CommunicationsDifferential Revision: https://reviews.freebsd.org/D25438
Use zfree() instead of bzero() and free().These bzero's should have been explicit_bzero's.Reviewed by: cem, delphijSponsored by: Chelsio CommunicationsDifferential Revision: https://reviews.fre
Use zfree() instead of bzero() and free().These bzero's should have been explicit_bzero's.Reviewed by: cem, delphijSponsored by: Chelsio CommunicationsDifferential Revision: https://reviews.freebsd.org/D25437
show more ...
Adjust crypto_apply function callbacks for OCF.- crypto_apply() is only used for reading a buffer to compute a digest, so change the data pointer to a const pointer.- To better match m_apply(),
Adjust crypto_apply function callbacks for OCF.- crypto_apply() is only used for reading a buffer to compute a digest, so change the data pointer to a const pointer.- To better match m_apply(), change the data pointer type to void * and the length from uint16_t to u_int. The length field in particular matters as none of the apply logic was splitting requests larger than UINT16_MAX.- Adjust the auth_xform Update callback to match the function prototype passed to crypto_apply() and crypto_apply_buf(). This removes the needs for casts when using the Update callback.- Change the Reinit and Setkey callbacks to also use a u_int length instead of uint16_t.- Update auth transforms for the changes. While here, use C99 initializers for auth_hash structures and avoid casts on callbacks.Reviewed by: cemSponsored by: Chelsio CommunicationsDifferential Revision: https://reviews.freebsd.org/D25171
Remove MD5 HMAC from OCF.There are no in-kernel consumers.Reviewed by: cemRelnotes: yesSponsored by: Chelsio CommunicationsDifferential Revision: https://reviews.freebsd.org/D24775
Retire the CRYPTO_F_IV_GENERATE flag.The sole in-tree user of this flag has been retired, so remove thiscomplexity from all drivers. While here, add a helper routine driverscan use to read the c
Retire the CRYPTO_F_IV_GENERATE flag.The sole in-tree user of this flag has been retired, so remove thiscomplexity from all drivers. While here, add a helper routine driverscan use to read the current request's IV into a local buffer. Usethis routine to replace duplicated code in nearly all drivers.Reviewed by: cemSponsored by: NetflixDifferential Revision: https://reviews.freebsd.org/D24450
Refactor driver and consumer interfaces for OCF (in-kernel crypto).- The linked list of cryptoini structures used in session initialization is replaced with a new flat structure: struct crypto_
Refactor driver and consumer interfaces for OCF (in-kernel crypto).- The linked list of cryptoini structures used in session initialization is replaced with a new flat structure: struct crypto_session_params. This session includes a new mode to define how the other fields should be interpreted. Available modes include: - COMPRESS (for compression/decompression) - CIPHER (for simply encryption/decryption) - DIGEST (computing and verifying digests) - AEAD (combined auth and encryption such as AES-GCM and AES-CCM) - ETA (combined auth and encryption using encrypt-then-authenticate) Additional modes could be added in the future (e.g. if we wanted to support TLS MtE for AES-CBC in the kernel we could add a new mode for that. TLS modes might also affect how AAD is interpreted, etc.) The flat structure also includes the key lengths and algorithms as before. However, code doesn't have to walk the linked list and switch on the algorithm to determine which key is the auth key vs encryption key. The 'csp_auth_*' fields are always used for auth keys and settings and 'csp_cipher_*' for cipher. (Compression algorithms are stored in csp_cipher_alg.)- Drivers no longer register a list of supported algorithms. This doesn't quite work when you factor in modes (e.g. a driver might support both AES-CBC and SHA2-256-HMAC separately but not combined for ETA). Instead, a new 'crypto_probesession' method has been added to the kobj interface for symmteric crypto drivers. This method returns a negative value on success (similar to how device_probe works) and the crypto framework uses this value to pick the "best" driver. There are three constants for hardware (e.g. ccr), accelerated software (e.g. aesni), and plain software (cryptosoft) that give preference in that order. One effect of this is that if you request only hardware when creating a new session, you will no longer get a session using accelerated software. Another effect is that the default setting to disallow software crypto via /dev/crypto now disables accelerated software. Once a driver is chosen, 'crypto_newsession' is invoked as before.- Crypto operations are now solely described by the flat 'cryptop' structure. The linked list of descriptors has been removed. A separate enum has been added to describe the type of data buffer in use instead of using CRYPTO_F_* flags to make it easier to add more types in the future if needed (e.g. wired userspace buffers for zero-copy). It will also make it easier to re-introduce separate input and output buffers (in-kernel TLS would benefit from this). Try to make the flags related to IV handling less insane: - CRYPTO_F_IV_SEPARATE means that the IV is stored in the 'crp_iv' member of the operation structure. If this flag is not set, the IV is stored in the data buffer at the 'crp_iv_start' offset. - CRYPTO_F_IV_GENERATE means that a random IV should be generated and stored into the data buffer. This cannot be used with CRYPTO_F_IV_SEPARATE. If a consumer wants to deal with explicit vs implicit IVs, etc. it can always generate the IV however it needs and store partial IVs in the buffer and the full IV/nonce in crp_iv and set CRYPTO_F_IV_SEPARATE. The layout of the buffer is now described via fields in cryptop. crp_aad_start and crp_aad_length define the boundaries of any AAD. Previously with GCM and CCM you defined an auth crd with this range, but for ETA your auth crd had to span both the AAD and plaintext (and they had to be adjacent). crp_payload_start and crp_payload_length define the boundaries of the plaintext/ciphertext. Modes that only do a single operation (COMPRESS, CIPHER, DIGEST) should only use this region and leave the AAD region empty. If a digest is present (or should be generated), it's starting location is marked by crp_digest_start. Instead of using the CRD_F_ENCRYPT flag to determine the direction of the operation, cryptop now includes an 'op' field defining the operation to perform. For digests I've added a new VERIFY digest mode which assumes a digest is present in the input and fails the request with EBADMSG if it doesn't match the internally-computed digest. GCM and CCM already assumed this, and the new AEAD mode requires this for decryption. The new ETA mode now also requires this for decryption, so IPsec and GELI no longer do their own authentication verification. Simple DIGEST operations can also do this, though there are no in-tree consumers. To eventually support some refcounting to close races, the session cookie is now passed to crypto_getop() and clients should no longer set crp_sesssion directly.- Assymteric crypto operation structures should be allocated via crypto_getkreq() and freed via crypto_freekreq(). This permits the crypto layer to track open asym requests and close races with a driver trying to unregister while asym requests are in flight.- crypto_copyback, crypto_copydata, crypto_apply, and crypto_contiguous_subsegment now accept the 'crp' object as the first parameter instead of individual members. This makes it easier to deal with different buffer types in the future as well as separate input and output buffers. It's also simpler for driver writers to use.- bus_dmamap_load_crp() loads a DMA mapping for a crypto buffer. This understands the various types of buffers so that drivers that use DMA do not have to be aware of different buffer types.- Helper routines now exist to build an auth context for HMAC IPAD and OPAD. This reduces some duplicated work among drivers.- Key buffers are now treated as const throughout the framework and in device drivers. However, session key buffers provided when a session is created are expected to remain alive for the duration of the session.- GCM and CCM sessions now only specify a cipher algorithm and a cipher key. The redundant auth information is not needed or used.- For cryptosoft, split up the code a bit such that the 'process' callback now invokes a function pointer in the session. This function pointer is set based on the mode (in effect) though it simplifies a few edge cases that would otherwise be in the switch in 'process'. It does split up GCM vs CCM which I think is more readable even if there is some duplication.- I changed /dev/crypto to support GMAC requests using CRYPTO_AES_NIST_GMAC as an auth algorithm and updated cryptocheck to work with it.- Combined cipher and auth sessions via /dev/crypto now always use ETA mode. The COP_F_CIPHER_FIRST flag is now a no-op that is ignored. This was actually documented as being true in crypto(4) before, but the code had not implemented this before I added the CIPHER_FIRST flag.- I have not yet updated /dev/crypto to be aware of explicit modes for sessions. I will probably do that at some point in the future as well as teach it about IV/nonce and tag lengths for AEAD so we can support all of the NIST KAT tests for GCM and CCM.- I've split up the exising crypto.9 manpage into several pages of which many are written from scratch.- I have converted all drivers and consumers in the tree and verified that they compile, but I have not tested all of them. I have tested the following drivers: - cryptosoft - aesni (AES only) - blake2 - ccr and the following consumers: - cryptodev - IPsec - ktls_ocf - GELI (lightly) I have not tested the following: - ccp - aesni with sha - hifn - kgssapi_krb5 - ubsec - padlock - safe - armv8_crypto (aarch64) - glxsb (i386) - sec (ppc) - cesa (armv7) - cryptocteon (mips64) - nlmsec (mips64)Discussed with: cemRelnotes: yesSponsored by: Chelsio CommunicationsDifferential Revision: https://reviews.freebsd.org/D23677
Remove the Yarrow PRNG algorithm option in accordance with due noticegiven in random(4).This includes updating of the relevant man pages, and no-longer-usedharvesting parameters.Ensure that the
Remove the Yarrow PRNG algorithm option in accordance with due noticegiven in random(4).This includes updating of the relevant man pages, and no-longer-usedharvesting parameters.Ensure that the pseudo-unit-test still does something useful, now alsowith the "other" algorithm instead of Yarrow.PR: 230870Reviewed by: cemApproved by: so(delphij,gtetlow)Approved by: re(marius)Differential Revision: https://reviews.freebsd.org/D16898
glxsb: Convert remaining OCF driver to new interfaceglxsb, an i386 AMD Geode specific driver, was missed in r336439. Correct thatmistake and adapt it to the new interface as well.X-MFC-with: 33
glxsb: Convert remaining OCF driver to new interfaceglxsb, an i386 AMD Geode specific driver, was missed in r336439. Correct thatmistake and adapt it to the new interface as well.X-MFC-with: 336439
sys/dev: further adoption of SPDX licensing ID tags.Mainly focus on files that use BSD 2-Clause license, however the tool Iwas using misidentified many licenses so this was mostly a manual - error
sys/dev: further adoption of SPDX licensing ID tags.Mainly focus on files that use BSD 2-Clause license, however the tool Iwas using misidentified many licenses so this was mostly a manual - errorprone - task.The Software Package Data Exchange (SPDX) group provides a specificationto make it easier for automated tools to detect and summarize well knownopensource licenses. We are gradually adopting the specification, notingthat the tags are considered only advisory and do not, in any way,superceed or replace the license texts.
Huge cleanup of random(4) code.* GENERAL- Update copyright.- Make kernel options for RANDOM_YARROW and RANDOM_DUMMY. Set neither to ON, which means we want Fortuna- If there is no 'device rand
Huge cleanup of random(4) code.* GENERAL- Update copyright.- Make kernel options for RANDOM_YARROW and RANDOM_DUMMY. Set neither to ON, which means we want Fortuna- If there is no 'device random' in the kernel, there will be NO random(4) device in the kernel, and the KERN_ARND sysctl will return nothing. With RANDOM_DUMMY there will be a random(4) that always blocks.- Repair kern.arandom (KERN_ARND sysctl). The old version went through arc4random(9) and was a bit weird.- Adjust arc4random stirring a bit - the existing code looks a little suspect.- Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks.- Redo read_random(9) so as to duplicate random(4)'s read internals. This makes it a first-class citizen rather than a hack.- Move stuff out of locked regions when it does not need to be there.- Trim RANDOM_DEBUG printfs. Some are excess to requirement, some behind boot verbose.- Use SYSINIT to sequence the startup.- Fix init/deinit sysctl stuff.- Make relevant sysctls also tunables.- Add different harvesting "styles" to allow for different requirements (direct, queue, fast).- Add harvesting of FFS atime events. This needs to be checked for weighing down the FS code.- Add harvesting of slab allocator events. This needs to be checked for weighing down the allocator code.- Fix the random(9) manpage.- Loadable modules are not present for now. These will be re-engineered when the dust settles.- Use macros for locks.- Fix comments.* src/share/man/...- Update the man pages.* src/etc/...- The startup/shutdown work is done in D2924.* src/UPDATING- Add UPDATING announcement.* src/sys/dev/random/build.sh- Add copyright.- Add libz for unit tests.* src/sys/dev/random/dummy.c- Remove; no longer needed. Functionality incorporated into randomdev.*.* live_entropy_sources.c live_entropy_sources.h- Remove; content moved.- move content to randomdev.[ch] and optimise.* src/sys/dev/random/random_adaptors.c src/sys/dev/random/random_adaptors.h- Remove; plugability is no longer used. Compile-time algorithm selection is the way to go.* src/sys/dev/random/random_harvestq.c src/sys/dev/random/random_harvestq.h- Add early (re)boot-time randomness caching.* src/sys/dev/random/randomdev_soft.c src/sys/dev/random/randomdev_soft.h- Remove; no longer needed.* src/sys/dev/random/uint128.h- Provide a fake uint128_t; if a real one ever arrived, we can use that instead. All that is needed here is N=0, N++, N==0, and some localised trickery is used to manufacture a 128-bit 0ULLL.* src/sys/dev/random/unit_test.c src/sys/dev/random/unit_test.h- Improve unit tests; previously the testing human needed clairvoyance; now the test will do a basic check of compressibility. Clairvoyant talent is still a good idea.- This is still a long way off a proper unit test.* src/sys/dev/random/fortuna.c src/sys/dev/random/fortuna.h- Improve messy union to just uint128_t.- Remove unneeded 'static struct fortuna_start_cache'.- Tighten up up arithmetic.- Provide a method to allow eternal junk to be introduced; harden it against blatant by compress/hashing.- Assert that locks are held correctly.- Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks.- Turn into self-sufficient module (no longer requires randomdev_soft.[ch])* src/sys/dev/random/yarrow.c src/sys/dev/random/yarrow.h- Improve messy union to just uint128_t.- Remove unneeded 'staic struct start_cache'.- Tighten up up arithmetic.- Provide a method to allow eternal junk to be introduced; harden it against blatant by compress/hashing.- Assert that locks are held correctly.- Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks.- Turn into self-sufficient module (no longer requires randomdev_soft.[ch])- Fix some magic numbers elsewhere used as FAST and SLOW.Differential Revision: https://reviews.freebsd.org/D2025Reviewed by: vsevolod,delphij,rwatson,trasz,jmgApproved by: so (delphij)
CALLOUT_MPSAFE has lost its meaning since r141428, i.e., for more than tenyears for head. However, it is continuously misused as the mpsafe argumentfor callout_init(9). Deprecate the flag and cle
CALLOUT_MPSAFE has lost its meaning since r141428, i.e., for more than tenyears for head. However, it is continuously misused as the mpsafe argumentfor callout_init(9). Deprecate the flag and clean up callout_init() callsto make them more consistent.Differential Revision: https://reviews.freebsd.org/D2613Reviewed by: jhbMFC after: 2 weeks
This is the much-discussed major upgrade to the random(4) device, known to you all as /dev/random.This code has had an extensive rewrite and a good series of reviews, both by the author and other p
This is the much-discussed major upgrade to the random(4) device, known to you all as /dev/random.This code has had an extensive rewrite and a good series of reviews, both by the author and other parties. This means a lot of code has been simplified. Pluggable structures for high-rate entropy generators are available, and it is most definitely not the case that /dev/random can be driven by only a hardware souce any more. This has been designed out of the device. Hardware sources are stirred into the CSPRNG (Yarrow, Fortuna) like any other entropy source. Pluggable modules may be written by third parties for additional sources.The harvesting structures and consequently the locking have been simplified. Entropy harvesting is done in a more general way (the documentation for this will follow). There is some GREAT entropy to be had in the UMA allocator, but it is disabled for now as messing with that is likely to annoy many people.The venerable (but effective) Yarrow algorithm, which is no longer supported by its authors now has an alternative, Fortuna. For now, Yarrow is retained as the default algorithm, but this may be changed using a kernel option. It is intended to make Fortuna the default algorithm for 11.0. Interested parties are encouraged to read ISBN 978-0-470-47424-2 "Cryptography Engineering" By Ferguson, Schneier and Kohno for Fortuna's gory details. Heck, read it anyway.Many thanks to Arthur Mesh who did early grunt work, and who got caught in the crossfire rather more than he deserved to.My thanks also to folks who helped me thresh this out on whiteboards and in the odd "Hallway track", or otherwise.My Nomex pants are on. Let the feedback commence!Reviewed by: trasz,des(partial),imp(partial?),rwatson(partial?)Approved by: so(des)
Snapshot. This passes the build test, but has not yet been finished or debugged.Contains:* Refactor the hardware RNG CPU instruction sources to feed intothe software mixer. This is unfinished. T
Snapshot. This passes the build test, but has not yet been finished or debugged.Contains:* Refactor the hardware RNG CPU instruction sources to feed intothe software mixer. This is unfinished. The actual harvesting needsto be sorted out. Modified by me (see below).* Remove 'frac' parameter from random_harvest(). This was neverused and adds extra code for no good reason.* Remove device write entropy harvesting. This provided a weakattack vector, was not very good at bootstrapping the device. Tofollow will be a replacement explicit reseed knob.* Separate out all the RANDOM_PURE sources into separate harvestentities. This adds some secuity in the case where more than oneis present.* Review all the code and fix anything obviously messy or inconsistent.Address som review concerns while I'm here, like rename the pseudo-rngto 'dummy'.Submitted by: Arthur Mesh <[email protected]> (the first item)
Yarrow wants entropy estimations to be conservative; the usual ideais that if you are certain you have N bits of entropy, you declareN/2.
More conversions of drivers to use the PCI parent DMA tag.
Fix two possible (but unlikely) NULL-pointer dereferences in glxsb(4).Spotted by: CoverityMFC after: 1 week
- Convert sc_sessions_mtx mutex to a rwlock, so in the fast path (glxsb_process()) we don't block others when looking for our session.- Simplify the loop responsible for freeing sessions on detach
- Convert sc_sessions_mtx mutex to a rwlock, so in the fast path (glxsb_process()) we don't block others when looking for our session.- Simplify the loop responsible for freeing sessions on detach.- No need to drop a lock around malloc(M_NOWAIT).- Treat ses_used as boolean.- Avoid gotos where possible.- Various style(9) fixes.Reviewed by: philip, Patrick Lamaiziere <[email protected]>
Add glxsb(4) driver for the Security Block in AMD Geode LX processors (asfound in Soekris hardware, for instance). The hardware supports accelerationof AES-128-CBC accessible through crypto(4) and
Add glxsb(4) driver for the Security Block in AMD Geode LX processors (asfound in Soekris hardware, for instance). The hardware supports accelerationof AES-128-CBC accessible through crypto(4) and supplies entropy to random(4).TODO: o Implement rndtest(4) support o Performance enhancementsSubmitted by: Patrick Lamaizière <patfbsd -at- davenulle.org>Reviewed by: jhb, samMFC after: 1 week