A mirror of https://github.com/libressl/openbsd.git https://git.lua4.win/openbsd/atom?h=OPENBSD_7_9_BASE 2025-01-18T12:20:37+00:00 2025-01-18T12:20:37+00:00 tb 2025-01-18T12:20:37+00:00 urn:sha1:654faa6c28836cacae767a8b090cb602270e8d34 ok jsing 2025-01-18T10:53:04+00:00 tb 2025-01-18T10:53:04+00:00 urn:sha1:64cef3984ff2947a8e23ee783cf2cb4c3e683165 ok jsing 2024-08-31T12:46:55+00:00 jsing 2024-08-31T12:46:55+00:00 urn:sha1:55830d0a034a2c58c258e7b84cf9109a49f3b3e7 ok tb@ 2024-08-31T10:51:48+00:00 tb 2024-08-31T10:51:48+00:00 urn:sha1:a0ced14fec228fa0dfd2fa5d87c942b0af9326d8 2024-07-23T14:40:54+00:00 jsing 2024-07-23T14:40:54+00:00 urn:sha1:db84a0d6a236726c87d7c4ee86e95e65452b429e Inline the get_cipher implementation (including the special handling for DTLS) in ssl_cipher_collect_ciphers() (the only consumer), remove the get_cipher member of SSL_METHOD and mop up dtls1_get_cipher(). ssl3_get_cipher() has always had a strange property of being a reverse index, which is relied on by the cipher list ordering code, since it currently assumes that high cipher suite values are preferable. Rather than complicating ssl3_get_cipher() (and regress), change the iteration order in ssl_cipher_collect_ciphers() to match what it requires. Lastly, rename ssl3_get_cipher() to be more descriptive. ok tb@ 2024-07-22T14:47:15+00:00 jsing 2024-07-22T14:47:15+00:00 urn:sha1:bad64c687dbea7670efcb08ff393fe641d0e673d OpenSSL has had the concept of cipher IDs, which were a way of working around overlapping cipher suite values between SSLv2 and SSLv3. Given that we no longer have to deal with this issue, replace the use of IDs with cipher suite values. In particular, this means that we can stop mapping back and forth between the two, simplifying things considerably. While here, remove the 'valid' member of the SSL_CIPHER. The ssl3_ciphers[] table is no longer mutable, meaning that ciphers cannot be disabled at runtime (and we have `#if 0' if we want to do it at compile time). Clean up the comments and add/update RFC references for cipher suites. ok tb@ 2024-07-20T04:04:23+00:00 jsing 2024-07-20T04:04:23+00:00 urn:sha1:026ea65c83ed46dcfd89ada1f6250daa4fcc01b3 For a long time SSL_SESSION has had both a cipher ID and a pointer to an SSL_CIPHER (and not both are guaranteed to be populated). There is also a pointer to an SSL_CIPHER in the SSL_HANDSHAKE that denotes the cipher being used for this connection. Some code has been using the cipher from SSL_SESSION and some code has been using the cipher from SSL_HANDSHAKE. Remove cipher from SSL_SESSION and use the version in SSL_HANDSHAKE everywhere. If resuming from a session then we need to use the SSL_SESSION cipher ID to set the SSL_HANDSHAKE cipher. And we still need to ensure that we update the cipher ID in the SSL_SESSION whenever the SSL_HANDSHAKE cipher changes (this only occurs in a few places). ok tb@ 2024-07-16T14:38:04+00:00 jsing 2024-07-16T14:38:04+00:00 urn:sha1:ea3c4b33c8da0b7467a6306a9c964b492f836294 The handshake MAC needs to be upgraded when TLSv1.0 and TLSv1.1 ciphersuites are used with TLSv1.2. Since we no longer support TLSv1.0 and TLSv1.1, we can simply upgrade the handshake MAC in the ciphersuite table and remove the various defines/macros/code that existed to handle the upgrade. ok tb@ 2024-07-14T15:39:36+00:00 tb 2024-07-14T15:39:36+00:00 urn:sha1:e4ca538cbd7bb43768a6ebdf1fa7c4cd248be01b Needed by newer freeradius. This is a straightforward implementation that essentially duplicates tls13_cipher_hash(). ok jsing 2024-05-09T07:55:48+00:00 tb 2024-05-09T07:55:48+00:00 urn:sha1:747edbb78c66cbd1410136b50d2cc88571522d98