summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2023-05-25Forcibly update the EVP_PKEY's internal keyOmar Polo
To aid privilege separation, libtls maintains application-specific data on the key inside the EVP_PKEY abstraction because the EVP API doesn't provide a way to do that on the EVP_PKEY itself. OpenSSL 3 changed behavior of EVP_PKEY_get1_RSA() and related functions. These now return a struct from some cache. Thus, modifying the RSA will no longer modify the EVP_PKEY like it did previously, which was clearly implied to be the case in the older documentation. This is a subtle breaking change that affects several applications. While this is documented, no real solution is provided. The transition plan from one OpenSSL major version to the next one tends to involve many #ifdef in the ecosystem, and the only suggestion provided by the new documentation is to switch to a completely unrelated, new API. Instead, forcibly reset the internal key on EVP_PKEY after modification, this way the change is picked up also by OpenSSL 3. Fixes issue 1171 in OpenSMTPD-portable ok tb@, jsing@
2023-05-24Update X509_VERIFY_PARAM_inherit() to reflect the change of behaviorTheo Buehler
in x509_vpm.c r1.39.
2023-05-24Copy the verify param hostflags independently of the host listTheo Buehler
Without this, hostflags set on the SSL_CTX would not propagate to newly created SSL. This is surprising behavior that was changed in OpenSSL 1.1 by Christian Heimes after the issue was flagged by Quentin Pradet: https://bugs.python.org/issue43522 This is a version of the fix that landed in OpenSSL. There used to be a workaround in place in urllib3, but that was removed at some point. We haven't fixed this earlier since it wasn't reported. It only showed up after recent fallout of extraordinarily strict library checking in urllib3 coming from their own interpretation of the implications of PEP 644. ok jsing
2023-05-24Provide X509_VERIFY_PARAM_set_hostflags()Theo Buehler
This is needed for an upcoming regress test that needs to access the hostflag. This is public API in OpenSSL but since nothing seems to be using this, this accessor will be kept internal-only for the time being. ok jsing
2023-05-23Avoid calling malloc with a zero length argument.Claudio Jeker
ibuf_open() will return an error in this case while ibuf_dynamic() accepts a 0 len argument and just initialized the buffer and length to zero. A later ibuf_realloc() call will take care of allocating the buffer. Additionally switch from malloc() to calloc() when allocating the buffer this way the buffer is initalized and in ibuf_reserve() an addtional memset() is used to make sure that the reserved data is zeroed. OK tb@
2023-05-23Simplify OBJ_obj2txt()Theo Buehler
Instead of adding a NUL termination to OBJ_obj2txt(), move the aobj == NULL or aobj->data == NULL checks to i2t_ASN1_OBJECT_internal(). The only other caller, i2t_ASN1_OBJECT(), fails on aobj == NULL and aobj->length == 0, and the latter condition is implied by aobj->data. Cleaner solution for obj_dat.c r1.52 suggested by/ok jsing
2023-05-23Always NUL terminate buf in OBJ_obj2txt()Theo Buehler
OBJ_obj2txt() is often called without error checking and is used for reporting unexpected or malformed objects. As such, we should ensure buf is a string even on failure. This had long been the case before it was lost in a recent rewrite. If obj and obj->data are both non-NULL this is already taken care of by i2t_ASN1_OBJECT_internal(), so many callers were still safe. ok miod
2023-05-23cms_asn1.c: zap stray tabsTheo Buehler
2023-05-22Remove misplaced semicolons in .FaTheo Buehler
2023-05-19Add missing rsa_security_bit() handler to the RSA-PSS ASN1_METHODTheo Buehler
Prompted by a report by Steffen Ullrich on libressl@openbsd.org ok jsing
2023-05-19Since waitid(2) shares code with wait4(2) and doesn't expose anyPhilip Guenther
non-trivial new information or code-paths over wait4(), include it in pledge("stdio") discussed with deraadt@
2023-05-19backout alignment changes (breaking at least two architectures)Theo de Raadt
2023-05-18memmove() entry point is declared with NENTRY() and isn't consecutivePhilip Guenther
with an ENTRY(), so it needs its own endbr64 for IBT ok deraadt@
2023-05-18Add PROTO_NORMAL() declarations for the remaining syscalls, to avoidPhilip Guenther
future, inadvertant PLT entries. Move the __getcwd and __realpath declarations to hidden/{stdlib,unistd}.h to consolidate and remove duplication. ok tb@ otto@ deraadt@
2023-05-18Add PROTO_NORMAL() declarations for utrace (and ktrace) syscallsPhilip Guenther
so that the internal call can't be interposed over by the app. ok tb@ otto@ deraadt@
2023-05-18Make two corrections to the vfork(2) stub:Philip Guenther
* with IBT, it can't return via an indirect jump as that would require the *caller* to have an endbr64 * to support a potential vmspace-sharing implementation, keep the retguard value in an arg register across the underlying syscall ok kettenis@ deraadt@
2023-05-17Use crypto_internal.h's CTASSERT()Theo Buehler
Now that this macro is available in a header, let's use that version rather than copies in several .c files. discussed with jsing
2023-05-17Clean up alignment handling for SHA-512.Joel Sing
All assembly implementations are required to perform their own alignment handling. In the case of the C implementation, on strict alignment platforms, unaligned data will be copied into an aligned buffer. However, most platforms then perform byte-by-byte reads (via the PULL64 macros). Instead, remove SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA and alignment handling to sha512_block_data_order() - if the data is aligned then simply perform 64 bit loads and then do endian conversion via be64toh(). If the data is unaligned then use memcpy() and be64toh() (in the form of crypto_load_be64toh()). Overall this reduces complexity and can improve performance (on aarch64 we get a ~10% performance gain with aligned input and about ~1-2% gain on armv7), while the same movq/bswapq is generated for amd64 and movl/bswapl for i386. ok tb@
2023-05-16add net.inet.tcp.tso;Jason McIntyre
ok jan bluhm
2023-05-16add missing pointer invalidationJoshua Stein
ok tb
2023-05-16Clean up SHA-512 input handling and round macros.Joel Sing
Avoid reach around and initialisation outside of the macro, cleaning up the call sites to remove the initialisation. Use a T2 variable to more closely follow the documented algorithm and remove the gorgeous compound statement X = Y += A + B + C. There is no change to the clang generated assembly on aarch64. ok tb@
2023-05-14Rename arguments of X509_STORE_CTX_init()Theo Buehler
It is higly confusing to call the list of untrusted certs chain, when you're later going to call X509_STORE_CTX_get0_chain() to get a completely unrelated chain by the verifier. Other X509_STORE_CTX APIs call this list of certs 'untrusted', so go with that. At the same time, rename the x509 into leaf, which is more explicit. suggested by/ok jsing
2023-05-14Fix X509error() and X509V3error()Theo Buehler
When v3err.c was merged into x509_err.c nearly three years ago, it was overlooked that the code needed two distinct pairs of ERR_FUNC/ERR_REASON, one for ERR_LIB_X509 and one for ERR_LIB_X509V3. The result is that the reason strings for the X509_R_* codes would be overwritten by the ones for X509V3_R_* with the same value while the reason strings for all X509V3_R_* would be left undefined. Fix this by an #undef/#define dance for ERR_LIB_X509V3 once we no longer the ERR_FUNC/ERR_REASON pair for ERR_LIB_X509. reported by job ok jsing
2023-05-14Send the linebuffer BIO to the atticTheo Buehler
*) On VMS, stdout may very well lead to a file that is written to in a record-oriented fashion. That means that every write() will write a separate record, which will be read separately by the programs trying to read from it. This can be very confusing. The solution is to put a BIO filter in the way that will buffer text until a linefeed is reached, and then write everything a line at a time, so every record written will be an actual line, not chunks of lines and not (usually doesn't happen, but I've seen it once) several lines in one record. BIO_f_linebuffer() is the answer. Currently, it's a VMS-only method, because that's where it has been tested well enough. [Richard Levitte] Yeah, no, we don't care about any of this and haven't compiled this file since forever. Looks like tedu's chainsaw got blunt at some point...
2023-05-14Fix another mandoc -Tlint warningTheo Buehler
With this the only -Tlint warnings are about Xr to undocumented functions: EVP_CIPHER_CTX_copy, EVP_CIPHER_CTX_get_cipher_data, X509V3_EXT_get_nid.
2023-05-14Rephrase a sentence slightly to apease mandoc -TlintTheo Buehler
2023-05-14Fix Xr as BN_is_prime(3) is in the atticTheo Buehler
2023-05-14Zap trailing commaTheo Buehler
2023-05-14X509_policy_tree_level_count(3) is goneTheo Buehler
2023-05-14add missing #include <string.h>; ok tb@Omar Polo
2023-05-13default path includes /usr/local/sbinKlemens Nanni
Improve markup while here. Feedback tb jmc OK millert
2023-05-12Bob points out that one error should be an X509V3error()Theo Buehler
2023-05-12x509_utl.c: fix some style nits.Theo Buehler
2023-05-12Rewrite string_to_hex() and hex_to_string() using CBB/CBSTheo Buehler
These helpers used to contain messy pointer bashing some with weird logic for NUL termination. This can be written more safely and cleanly using CBB/CBS, so do that. The result is nearly but not entirely identical to code used elsewhere due to some strange semantics. Apart from errors pushed on the stack due to out-of-memory conditions, care was taken to preserve error codes. ok jsing
2023-05-12Reduce the number of SHA-512 C implementations from three to one.Joel Sing
We currently have three C implementations for SHA-512 - a version that is optimised for CPUs with minimal registers (specifically i386), a regular implementation and a semi-unrolled implementation. Testing on a ~15 year old i386 CPU, the fastest version is actually the semi-unrolled version (not to mention that we still currently have an i586 assembly implementation that is used on i386 instead...). More decent architectures do not seem to care between the regular and semi-unrolled version, presumably since they are effectively doing the same thing in hardware during execution. Remove all except the semi-unrolled version. ok tb@
2023-05-12primility -> primalityJonathan Gray
ok tb@
2023-05-12Be a bit more precise on how s2i_ASN1_OCTET_STRING handles colonsTheo Buehler
2023-05-11Retguard addition in commit 72pYktDvmJhq7OyF was based on the understandingPhilip Guenther
that the removal of the off_t padding, amd64 syscalls no longer passed a 7th or later argument. We overlooked that syscall(2) bumps the arg count by one, so six argument calls like SYS_sysctl still pass an argument on the stack. So, repush the 7th argument so it's at the expected stack offset after the retguard register is pushed. problem reported and ok bluhm@
2023-05-11tls_verify.c: give up on variable alignment in this fileTheo Buehler
The previous commit resulted in misalignment, which impacts my OCD worse than no alignment at all. Alignment wasn't consistently done in this file anyway. op tells me it won't affect current efforts in reducing the diff.
2023-05-11Document recent changes in primality testingTheo Buehler
With input from beck and jsing
2023-05-10Use is_pseudoprime instead of is_prime in bn_bpsw.cTheo Buehler
This is more accurate and improves readability a bit. Apart from a comment tweak this is sed + knfmt (which resulted in four wrapped lines). Discussed with beck and jsing
2023-05-10switch two ASN1_STRING_data() to ASN1_STRING_get0_data()Omar Polo
and while here mark as const data. This diff is actually from gilles@, in OpenSMTPD-portable bundled libtls. ok tb@, jsing@
2023-05-10Add Miller-Rabin test for random bases to BPSWTheo Buehler
The behavior of the BPSW primality test for numbers > 2^64 is not very well understood. While there is no known composite that passes the test, there are heuristics that indicate that there are likely infinitely many. Therefore it seems appropriate to harden the test. Having a settable number of MR rounds before doing a version of BPSW is also the approach taken by Go's primality check in math/big. This adds a new implementation of the old MR test that runs before running the strong Lucas test. I like to imagine that it's slightly cleaner code. We're effectively at about twice the cost of what we had a year ago. In addition, it adds some non-determinism in case there actually are false positives for the BPSW test. The implementation is straightforward. It could easily be tweaked to use the additional gcds in the "enhanced" MR test of FIPS 186-5, but as long as we are only going to throw away the additional info, that's not worth much. This is a first step towards incorporating some of the considerations in "A performant misuse-resistant API for Primality Testing" by Massimo and Paterson. Further work will happen in tree. In particular, there are plans to crank the number of Miller-Rabin tests considerably so as to have a guaranteed baseline. The manual will be updated shortly. positive feedback beck ok jsing
2023-05-10As mmap(2) is no longer a LOCK syscall, do away with the extraOtto Moerbeek
unlock-lock dance it serves no real purpose any more. Confirmed by a small performance increase in tests. ok @tb
2023-05-09Make failure mode of EVP_AEAD_CTX_new() more explicitTheo Buehler
Pointed out and ok by dlg
2023-05-09bn_exp: also special case -1 modulusTheo Buehler
Anything taken to the power of 0 is 1, and then reduced mod 1 or mod -1 it will be 0. If "anything" includes 0 or not is a matter of convention, but it should not depend on the sign of the modulus... Reported by Guido Vranken ok jsing (who had the same diff)
2023-05-09Rewrite BN_bn2hex() using CBB/CBS.Joel Sing
ok tb@
2023-05-09Rewrite BN_bn2dec() using CBB/CBS.Joel Sing
ok tb@
2023-05-08Rename the other_ctx in X509_STORE_CTX into trustedTheo Buehler
The other_ctx is a strong contender for the worst name of a struct member in OpenSSL. It's a void * member whose only purpose ever was to be set to a STACK_OF(X509) * via X509_STORE_CTX_trusted_stack() (yes, this is obviously a setter, why do you ask?) and then to be used by the get_issuer() callback (which of course isn't there to find any old issuer, but only to look for issuers among the 'trusted' certs). Anyway, we may want to rename untrusted into intermediates and trusted into roots later on, but for now let's match the lovely public API. While there rename get_issuer_sk() into get_trusted_issuer() which is a more accurate and slightly less silly name. ok jsing
2023-05-08Add RCS tagTheo Buehler