2 Commits

Include renames

Author	SHA1	Message	Date
Jeong, YunWonandIvan Mironov	de6053099a	ssl: take the OID table and the OpenSSL cipher-string parser from #8007 (#8646) ... * ssl: read the OID table out of OpenSSL's object database `txt2obj` and `nid2obj` have to answer with OpenSSL's own numbers, and the table behind them was 39 entries transcribed by hand, so every object outside that set was reported unknown. Read OpenSSL's own files instead: `obj_mac.num` carries each object's NID and `objects.txt` carries its OID, short name and description, and the identifier `objects.pl` derives per object -- the `!Cname` override, else the description, else the short name, each qualified by the enclosing `!module` with `-` spelled `_` -- joins the two. `OidEntry`, `OidTable` and the `find_by_*` functions keep their shape, so `ssl.rs` only changes where an object has no OID to report. Three details the object database settles that a curated table did not have to: - an object written with one name carries it as both, so `nid2obj(48)` is `('emailAddress', 'emailAddress', ...)`; - an object need not have an OID at all -- `DES-EDE3` and 139 other algorithm names have a NID and nothing to encode -- so the fourth field of the tuple is None for those, as it is on OpenSSL; - one arc does not encode, since DER packs the first two into a byte, so the bare roots `iso` and `itu-t` are OID-less too, while two arcs such as X500's `2.5` are a real object. Checked against `_ssl.nid2obj` on CPython built with OpenSSL, over every NID it answers: 1387 of its 1390 present, with no disagreement on any of them, up from 39. The three absent are OpenSSL's unnamed placeholder slots, which it reports as ('NULL', 'NULL', None). The data files come from openssl/openssl `crypto/objects/`, via the rustls integration rewrite in #8007. Co-authored-by: Ivan Mironov <mironov.ivan@gmail.com> Assisted-by: Claude * ssl: parse OpenSSL cipher strings in set_ciphers Replaces the pattern matcher `set_ciphers` used with the grammar `man openssl-ciphers` documents, in a new `ssl/cipher.rs` taken from #8007: `!`, `-`, `+`, `@STRENGTH`, `@SECLEVEL=n`, `+`-joined conjunctions, the DEFAULT/ALL/COMPLEMENTOF* groups, protocol versions, SUITEB*, and the aXXX/kXXX/eXXX prefixes. `set_ciphers` raises "No cipher can be selected." for a string that names nothing the provider offers, which is the one failure SSL_CTX_set_cipher_list reports, and keeps the TLS 1.3 suites selected in provider order because that setter does not reach them. A SUITEB* string pins its own key exchange groups, which `prepare_kx_groups` now reads. Against CPython's OpenSSL over 78 cipher strings, the selections agree except under `@SECLEVEL=n`, which OpenSSL applies at handshake time and this applies to the selection. `CryptoExt` gains `default_cipher_suites` so that `DEFAULT` and `ALL` are distinguishable. Co-authored-by: Ivan Mironov <mironov.ivan@gmail.com> Assisted-by: Claude * ssl: finish cipher reporting and provider handling Use the provider-ordered cipher metadata table as the single source for parsing, reporting, OpenSSL names and descriptions. This makes get_ciphers reflect the context selection and validates curves and Suite B against the active provider. Keep set_ciphers from changing TLS 1.3 suites, preserve the provider's order, fix empty conjunctions, and keep FIPS initialization within the provider's filtered cipher and key-exchange defaults. Co-authored-by: Ivan Mironov <mironov.ivan@gmail.com> Assisted-by: Claude Assisted-by: CodeRabbit Assisted-by: OpenAI Codex: GPT-5 * ssl: preserve OpenSSL OID lookup rules Keep object-name lookup case-sensitive and canonicalize numeric OID arcs before consulting the generated OpenSSL object table. Assisted-by: OpenAI Codex: GPT-5 * ssl: preserve cleartext after MemoryBIO shutdown Read at most one TLS record while waiting for close_notify in BIO mode, leaving any post-TLS cleartext queued for the BIO owner. Co-authored-by: Ivan Mironov <mironov.ivan@gmail.com> Assisted-by: OpenAI Codex: GPT-5 * ssl: reject empty cipher conjunction operands Keep empty operands visible to the parser so malformed OpenSSL cipher strings such as AES+ and ALL++AES are rejected instead of normalized. Assisted-by: CodeRabbit Assisted-by: OpenAI Codex: GPT-5 * ssl: make Suite B cipher ids unambiguous Spell out the u16 conversion so Windows-only iterator implementations cannot make collection type inference ambiguous. Assisted-by: OpenAI Codex: GPT-5 * ssl: move native certificate loading behind host_env Keep platform trust-store loading and filesystem predicates on the host boundary while exposing backend-neutral certificate bytes to the rustls integration. Assisted-by: OpenAI Codex: GPT-5 * ssl: invalidate server config after cipher changes Rebuild cached server configuration after set_ciphers updates the selected suites or Suite B key-exchange groups. Assisted-by: CodeRabbit Assisted-by: OpenAI Codex: GPT-5 * ssl: load default certificate sources independently Honor SSL_CERT_FILE and SSL_CERT_DIR independently. Keep directory certificates as lazy capath candidates, and fall back to native roots only when no environment certificate file was loaded. Co-authored-by: Ivan Mironov <mironov.ivan@gmail.com> Assisted-by: OpenAI Codex: GPT-5 --------- Co-authored-by: Ivan Mironov <mironov.ivan@gmail.com>	2026-09-04 22:49:06 +09:00
Joshua MegnauthandJeong, YunWon	f347ae4fbb	Support custom rustls providers (#7657) ... * Modularize rustls as work towards providers `rustls`'s architecture is very clean and trait-driven. There are many providers for `rustls` including the built-in `aws-lc-rs` and `ring` as well as backends for `boringssl`, `graviola`, `openssl`, `mbedtls`, etc. This commit removes the hard dependency on `aws-lc-rs` and adds support for `ring`. It works towards #7059 as well. * Clean up rustls features * Remove ring as an explicit feature * ssl-rustls is the default and implies aws-lc * Support custom rustls crypto providers The new feature, `ssl-rustls-no-provider`, enables custom rustls providers. By default, `aws-lc-rs` is enabled which matches the old behavior and keeps backward compatibility. I wrote a new type that abstracts what we need from crypto providers. CryptoExt encapsulates the ticketer as well as cipher suites and KX groups. I wrote fallbacks to help select a reasonable default if a provider is missing features (they all seem to support the same things though). I also wrote an example to show how to actually use custom providers. * Fix duplicate VERIFY_X509 constants and unused imports in ssl module Remove duplicate VERIFY_X509_STRICT/VERIFY_X509_PARTIAL_CHAIN definitions from compat.rs (already defined in _ssl module with #[pyattr]). Remove unused imports: ClientConnection, ServerConnection. * no-provider as default * Fix CI failures: openssl build, wasm target, cargo-shear - Update openssl.rs to use renamed sock_wait/SockWaitKind and add vm parameter - Add skip_ssl for wasm32-wasip2 target (aws-lc-sys cannot build for wasm) - Remove unused workspace dependency aws-lc-rs - Fix foreign-types-shared version to match openssl's dependency (0.1) - Restore Cargo.lock from upstream/main --------- Co-authored-by: Jeong, YunWon <jeong@youknowone.org>	2026-05-28 11:07:09 +09:00