aboutsummaryrefslogtreecommitdiff
path: root/tests/sys/opencrypto
Commit message (Collapse)AuthorAgeFilesLines
* tests/sys/opencrypto: use require.kmods property instead of ad-hoc checksSiva Mahadevan2025-09-052-22/+33
| | | | | | | Signed-off-by: Siva Mahadevan <me@svmhdvn.name> Sponsored by: The FreeBSD Foundation Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1780
* Remove residual blank line at start of MakefileWarner Losh2024-07-151-1/+0
| | | | | | | This is a residual of the $FreeBSD$ removal. MFC After: 3 days (though I'll just run the command on the branches) Sponsored by: Netflix
* Revert "cdefs: Remove __func__ define"Warner Losh2023-11-271-0/+4
| | | | | | | This reverts commit 17a238a15fbed01477fbc54744d35cbccdb65871. There were too many other changes accidentally mixed in. Sponsored by: Netflix
* cdefs: Remove __func__ defineWarner Losh2023-11-271-4/+0
| | | | | | | | | | | We require an ANSI-C compiler to build the base system. It's required that __func__ work. Remove this define since the only known problem compilers are ancient history (gcc 2.6 from 1994, almost pre-dating the project). 3rd party code that used this define will now need to provide it via some other means when using non-ansi-c compilers. PR: 275221 (exp-run) Sponsored by: Netflix
* cdefs: Remove CC_SUPPORTS macros, they are unusedWarner Losh2023-11-271-7/+0
| | | | | | | | | | | | | Remove __CC_SUPPORTS_INLINE, __CC_SUPPORTS___INLINE__, __CC_SUPPORTS___FUNC__, __CC_SUPPORTS_WARNING, __CC_SUPPORTS_VARADIC_XXX, __CC_SUPPORTS_DYNAMIC_ARRAY_INIT: they are unused. Also remove them from the generated cryptodevh.py script. Retain, for the moment, __CC_SUPPORTS___INLINE, since it's used in this file. PR: 275221 (exp-run) Sponsored by: Netflix
* cdefs: Remove some builtin defines, they are unusedWarner Losh2023-11-271-2/+0
| | | | | | | | | Remove __GNUCLIKE_BUILTIN_NEXT_ARG, __GNUCLIKE_MATH_BUILTIN_RELOPS, __GNUCLIKE_BUILTIN_MEMCPY: they are unused. Also remove them from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix
* cdefs: Remove vararg related defines, they are unused.Warner Losh2023-11-271-4/+0
| | | | | | | | | Remove __GNUCLIKE_BUILTIN_VARARGS, __GNUCLIKE_BUILTIN_STDARG, __GNUCLIKE_BUILTIN_VAALIST, __GNUC_VA_LIST_COMPATIBILITY: they are unused. Also remove them from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix
* cdefs: Remove __GNUCLIKE_BUILTIN_CONSTANT_P, it's unusedWarner Losh2023-11-271-1/+0
| | | | | | | | __GNUCLIKE_BUILTIN_CONSTANT_P is unused, remove it. Also remove it from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix
* cdefs: Remove __GNUCLIKE_CTOR_SECTION_HANDLING, it's unusedWarner Losh2023-11-271-1/+0
| | | | | | | | __GNUCLIKE_CTOR_SECTION_HANDLING is unused, remove it. Also remove it from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix
* cdefs: Remove __GNUCLIKE___SECTION, it's unused.Warner Losh2023-11-271-1/+0
| | | | | | | | __GNUCLIKE___SECTION is unused, remove it. Also remove it from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix
* cdefs: Remove __GNUCLIKE_ASMWarner Losh2023-11-201-2/+0
| | | | | | | It's no longer used in the tree. Exp Run PR: 275123 Sponsored by: Netflix
* cdefs: Remove __GNUCLIKE___TYPEOF from cdefs.hWarner Losh2023-11-201-1/+0
| | | | | | | It's been unused for quite some time, so remove it from sys/cdefs.h. Exp Run PR: 275123 Sponsored by: Netflix
* dirdeps: Update Makefile.depend* files with empty contentsStephen J. Kiernan2023-10-291-0/+6
| | | | | Some Makefile.depend* files were committed with no contents or empty DIRDEPS list, but they should have DIRDEPS with some contents.
* Remove $FreeBSD$: one-line bare tagWarner Losh2023-08-161-2/+0
| | | | Remove /^\s*\$FreeBSD\$$\n/
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-166-6/+0
| | | | Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
* Remove $FreeBSD$: two-line .h patternWarner Losh2023-08-162-4/+0
| | | | Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/
* test/sys/opencrypto: Fix NIST KAT parser iteratorKornel Dulęba2022-10-061-19/+19
| | | | | | | | | | | | | | When yield a.k.a "generator" iterator is used we need to return all data using "yield", before returning from the function. Because of that only encryption tests were run for AES-CBC, other modes were affected as well. Add one more loop to the iterator "next" routine to fix that. This unveiled a problem in the GCM AEAD parser logic, which didn't correctly handle tests cases with empty plaintext, i.e. AAD only. Include the fix in this patch as it's a rather trivial one. Obtained from: Semihalf Differential Revision: https://reviews.freebsd.org/D36861
* ossl: Add support for AES-CBC cipherKornel Duleba2021-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | AES-CBC OpenSSL assembly is used underneath. The glue layer(ossl_aes.c) is based on CHACHA20 implementation. Contrary to the SHA and CHACHA20, AES OpenSSL assembly logic does not have a fallback implementation in case CPU doesn't support required instructions. Because of that CPU caps are checked during initialization and AES support is advertised only if available. The feature is available on all architectures that ossl supports: i386, amd64, arm64. The biggest advantage of this patch over existing solutions (aesni(4) and armv8crypto(4)) is that it supports SHA, allowing for ETA operations. Sponsored by: Stormshield Obtained from: Semihalf Reviewed by: jhb (previous version) Differential revision: https://reviews.freebsd.org/D32099
* Revert "ossl: Add support for AES-CBC cipher"Wojciech Macek2021-11-061-1/+1
| | | | This reverts commit 849faf4e0ba9a8b8f24ff34da93a0fd46c14eda9.
* ossl: Add support for AES-CBC cipherKornel Duleba2021-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | AES-CBC OpenSSL assembly is used underneath. The glue layer(ossl_aes.c) is based on CHACHA20 implementation. Contrary to the SHA and CHACHA20, AES OpenSSL assembly logic does not have a fallback implementation in case CPU doesn't support required instructions. Because of that CPU caps are checked during initialization and AES support is advertised only if available. The feature is available on all architectures that ossl supports: i386, amd64, arm64. The biggest advantage of this patch over existing solutions (aesni(4) and armv8crypto(4)) is that it supports SHA, allowing for ETA operations. Sponsored by: Stormshield Obtained from: Semihalf Reviewed by: jhb Differential revision: https://reviews.freebsd.org/D32099
* crypto: Test all of the AES-CCM KAT vectors.John Baldwin2021-10-062-39/+56
| | | | | | | | | | | | | | | | | | | Previously, only test vectors which used the default nonce and tag sizes (12 and 16, respectively) were tested. This now tests all of the vectors. This exposed some additional issues around requests with an empty payload (which wasn't supported) and an empty AAD (which falls back to CIOCCRYPT instead of CIOCCRYPTAEAD). - Make use of the 'ivlen' and 'maclen' fields for CIOGSESSION2 to test AES-CCM vectors with non-default nonce and tag lengths. - Permit requests with an empty payload. - Permit an input MAC for requests without AAD. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32121
* cdefs.h: Remove __GNUCLIKE___OFFSETOF, it's unusedWarner Losh2021-05-061-1/+0
| | | | | | | __GNUCLIKE___OFFSETOF is unreferenced in the tree, remove it as long obsolete. Sponsored by: Netflix
* Remove __NO_TLS.Konstantin Belousov2021-02-231-1/+0
| | | | | | | | | All supported platforms support thread-local vars and __thread. Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D28796
* ossl: port to arm64Mitchell Horne2020-12-041-1/+1
| | | | | | | | | | | | | | Enable in-kernel acceleration of SHA1 and SHA2 operations on arm64 by adding support for the ossl(4) crypto driver. This uses OpenSSL's assembly routines under the hood, which will detect and use SHA intrinsics if they are supported by the CPU. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D27390 Notes: svn path=/head/; revision=368350
* Remove uses of CRIOGET in OCF tests after r368005.John Baldwin2020-11-253-32/+7
| | | | | | | | | Pointy hat to: jhb Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D27367 Notes: svn path=/head/; revision=368008
* cryptotest: Add qat(4) coverageMark Johnston2020-11-051-2/+3
| | | | | | | | MFC after: 3 days Sponsored by: Rubicon Communications, LLC (Netgate) Notes: svn path=/head/; revision=367388
* Make the tests work without COMPAT_FREEBSD12 in kernel.Jung-uk Kim2020-11-043-6/+6
| | | | | | | | | sysctl 'kern.cryptodevallowsoft' was renamed to 'kern.crypto.allow_soft' in r359374 and the prevous one is only available in kernel built with "options COMPAT_FREEBSD12". Notes: svn path=/head/; revision=367351
* Add ossl(4) to cryptotest.Jung-uk Kim2020-10-302-2/+3
| | | | Notes: svn path=/head/; revision=367185
* Do a sweep and remove most WARNS=6 settingsKyle Evans2020-10-011-2/+0
| | | | | | | | | | | | | | | Repeating the default WARNS here makes it slightly more difficult to experiment with default WARNS changes, e.g. if we did something absolutely bananas and introduced a WARNS=7 and wanted to try lifting the default to that. Drop most of them; there is one in the blake2 kernel module, but I suspect it should be dropped -- the default WARNS in the rest of the build doesn't currently apply to kernel modules, and I haven't put too much thought into whether it makes sense to make it so. Notes: svn path=/head/; revision=366304
* tests/sys/opencrypto: use python3Alan Somers2020-07-204-6/+6
| | | | | | | | | | | | python2 will be EOL soon Reviewed by: lwhsu, jmg MFC after: 2 weeks Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D25682 Notes: svn path=/head/; revision=363361
* Add safexcel(4) to cryptotest.Mark Johnston2020-07-141-2/+3
| | | | | | | | MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) Notes: svn path=/head/; revision=363181
* Remove support for the algorithms deprecated in r348876.John Baldwin2020-05-021-41/+0
| | | | | | | | | | | | | | | | | | | | | | This removes support for the following algorithms: - ARC4 - Blowfish - CAST128 - DES - 3DES - MD5-HMAC - Skipjack Since /dev/crypto no longer supports 3DES, stop testing the 3DES KAT vectors in cryptotest.py. Reviewed by: cem (previous version) Relnotes: yes Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24346 Notes: svn path=/head/; revision=360562
* Update blake2 accelerated software tests to work after OCF refactoring.John Baldwin2020-04-221-14/+23
| | | | | | | | | | | | | | | | - Lookup device drivers to test by name instead of assuming that the software / hardware flags will select specific drivers. - Set the sysctl to permit software /dev/crypto requests when testing the accelerated software blake2 driver. PR: 245825 Reported by: lwhsu Reviewed by: cem, lwhsu Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24540 Notes: svn path=/head/; revision=360203
* Temporarily skip sys.opencrypto.blake2_test.blake2{b,s}_vectors_x86 in CILi-Wen Hsu2020-04-221-0/+6
| | | | | | | | PR: 245825 Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=360198
* Refactor driver and consumer interfaces for OCF (in-kernel crypto).John Baldwin2020-03-273-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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: cem Relnotes: yes Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D23677 Notes: svn path=/head/; revision=359374
* tests/sys/opencrypto: enable armv8crypto on aarch64Enji Cooper2019-08-102-3/+16
| | | | | | | | | | | | | | This change makes required modifications in runtests to also only require the aesni module on Intel (i386/amd64) platforms, as it is an Intel specific module. MFC after: 1 month MFC to: ^/stable/12 (support not present on ^/stable/11) Submitted by: Greg V <greg@unrelenting.technology> Differential Revision: https://reviews.freebsd.org/D21018 Notes: svn path=/head/; revision=350837
* Correct definitions in sys.opencrypto.runtests.main for 32bit platformLi-Wen Hsu2019-07-101-3/+9
| | | | | | | | | | Reviewed by: cem, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D20894 Notes: svn path=/head/; revision=349872
* Add my name to the copyrightEnji Cooper2019-05-213-0/+3
| | | | | | | | | | | I have contributed a number of changes to these tests over the past few hundred revisions, and believe I deserve credit for the changes I have made (plus, the copyright hadn't been updated since 2014). MFC after: 1 week Notes: svn path=/head/; revision=348047
* Follow up to r348042: cast `aad` to a byte arrayEnji Cooper2019-05-211-0/+1
| | | | | | | | | | | | This is not completely necessary today, but this change is being made in a conservative manner to avoid accidental breakage in the future, if this ever was a unicode string. PR: 237403 MFC after: 1 week Notes: svn path=/head/; revision=348045
* Fix encoding issues with python 3Enji Cooper2019-05-211-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In python 3, the default encoding was switched from ascii character sets to unicode character sets in order to support internationalization by default. Some interfaces, like ioctls and packets, however, specify data in terms of non-unicode encodings formats, either in host endian (`fcntl.ioctl`) or network endian (`dpkt`) byte order/format. This change alters assumptions made by previous code where it was all data objects were assumed to be basestrings, when they should have been treated as byte arrays. In order to achieve this the following are done: * str objects with encodings needing to be encoded as ascii byte arrays are done so via `.encode("ascii")`. In order for this to work on python 3 in a type agnostic way (as it anecdotally varied depending on the caller), call `.encode("ascii")` only on str objects with python 3 to cast them to ascii byte arrays in a helper function name `str_to_ascii(..)`. * `dpkt.Packet` objects needing to be passed in to `fcntl.ioctl(..)` are done so by casting them to byte arrays via `bytes()`, which calls `dpkt.Packet__str__` under the covers and does the necessary str to byte array conversion needed for the `dpkt` APIs and `struct` module. In order to accomodate this change, apply the necessary typecasting for the byte array literal in order to search `fop.name` for nul bytes. This resolves all remaining python 2.x and python 3.x compatibility issues on amd64. More work needs to be done for the tests to function with i386, in general (this is a legacy issue). PR: 237403 MFC after: 1 week Tested with: python 2.7.16 (amd64), python 3.6.8 (amd64) Notes: svn path=/head/; revision=348042
* Remove spurious newlineEnji Cooper2019-05-211-1/+0
| | | | | | | | | | | Even though some python styles suggest there should be multiple newlines between methods/classes, for consistency with the surrounding code, it's best to be consistent by having merely one newline between each functional block. MFC after: 1 week Notes: svn path=/head/; revision=348039
* Fix `KAT(CCM)?Parser` file descriptor leaksEnji Cooper2019-05-212-28/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `KAT(CCM)?Parser` into a context suite-capable object by implementing `__enter__` and `__exit__` methods which manage opening up the file descriptors and closing them on context exit. This implementation was decided over adding destructor logic to a `__del__` method, as there are a number of issues around object lifetimes when dealing with threading cleanup, atexit handlers, and a number of other less obvious edgecases. Plus, the architected solution is more pythonic and clean. Complete the iterator implementation by implementing a `__next__` method for both classes which handles iterating over the data using a generator pattern, and by changing `__iter__` to return the object instead of the data which it would iterate over. Alias the `__next__` method to `next` when working with python 2.x in order to maintain functional compatibility between the two major versions. As part of this work and to ensure readability, push the initialization of the parser objects up one layer and pass it down to a helper function. This could have been done via a decorator, but I was trying to keep it simple for other developers to make it easier to modify in the future. This fixes ResourceWarnings with python 3. PR: 237403 MFC after: 1 week Tested with: python 2.7.16 (amd64), python 3.6.8 (amd64) Notes: svn path=/head/; revision=348032
* Squash deprecation warning related to array.array(..).tostring()Enji Cooper2019-05-211-4/+10
| | | | | | | | | | | | In version 3.2+, `array.array(..).tostring()` was renamed to `array.array(..).tobytes()`. Conditionally call `array.array(..).tobytes()` if the python version is 3.2+. PR: 237403 MFC after: 1 week Notes: svn path=/head/; revision=348031
* Followup to r347996Enji Cooper2019-05-211-4/+4
| | | | | | | | | | | Replace uses of `foo.encode("hex")` with `binascii.hexlify(foo)` for forwards compatibility between python 2.x and python 3. PR: 237403 MFC after: 1 week Notes: svn path=/head/; revision=348024
* Allow the end-user to pass along arguments to cryptotest.py via ↵Enji Cooper2019-05-201-1/+1
| | | | | | | | | `$CRYPTOTEST_ARGS` This allows someone to use `-v` to dump out standard output. Notes: svn path=/head/; revision=348019
* Replace uses of `foo.(de|en)code('hex')` with `binascii.(un)?hexlify(foo)`Enji Cooper2019-05-202-69/+73
| | | | | | | | | | | | | | | | | | | | Python 3 no longer doesn't support encoding/decoding hexadecimal numbers using the `str.format` method. The backwards compatible new method (using the binascii module/methods) is a comparable means of converting to/from hexadecimal format. In short, the functional change is the following: * `foo.decode('hex')` -> `binascii.unhexlify(foo)` * `foo.encode('hex')` -> `binascii.hexlify(foo)` While here, move the dpkt import in `cryptodev.py` down per PEP8, so it comes after the standard library provided imports. PR: 237403 MFC after: 1 week Notes: svn path=/head/; revision=347996
* Refactor tests/sys/opencrypto/runtestsEnji Cooper2019-05-103-171/+33
| | | | | | | | | | | | | | | | * Convert from plain to TAP for slightly improved introspection when skipping the tests due to requirements not being met. * Test for the net/py-dpkt (origin) package being required when running the tests, instead of relying on a copy of the dpkt.py module from 2014. This enables the tests to work with py3. Subsequently, remove `tests/sys/opencrypto/dpkt.py(c)?` via `make delete-old`. * Parameterize out `python2` as `$PYTHON`. PR: 237403 MFC after: 1 week Notes: svn path=/head/; revision=347417
* Use `range` instead of `xrange`Enji Cooper2019-04-241-4/+4
| | | | | | | | | | | `xrange` is a pre-python 2.x compatible idiom. Use `range` instead. The values being iterated over are sufficiently small that using range on python 2.x won't be a noticeable issue. MFC after: 2 months Notes: svn path=/head/; revision=346627
* Fix typo: `Plen` should be `plen`Enji Cooper2019-04-241-1/+1
| | | | | | | | | MFC after: 1 month MFC with: r346617 Reported by: pylint -E Notes: svn path=/head/; revision=346626
* Don't leak `fd` when manipulating the device via `_getdev()`Enji Cooper2019-04-241-3/+5
| | | | | | | | | | Close the file descriptor when done calling ioctl with a try-finally block so it doesn't get leaked. MFC after: 2 months Notes: svn path=/head/; revision=346625
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-11 13:02:52 +0000