min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
0x676e67 2024-11-21 10:02:26 +08:00
parent 1893144398 2b75e1e127
commit 5422a6bdce
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.toml
View File

@ -8,8 +8,8 @@ members = [
resolver = "2"
[workspace.package]
version = "4.11.1"
repository = "https://github.com/cloudflare/boring"
version = "4.12.0"
repository = "https://github.com/penumbra-x/boring2"
edition = "2021"
[workspace.metadata.release]
@ -19,9 +19,9 @@ tag-prefix = ""
publish = false
[workspace.dependencies]
boring-sys = { package = "boring-sys2", version = "4.11.0", path = "./boring-sys" }
boring = { package = "boring2", version = "4.11.0", path = "./boring" }
tokio-boring = { package = "tokio-boring2", version = "4.11.0", path = "./tokio-boring" }
boring-sys = { package = "boring-sys2", version = "4.12.0", path = "./boring-sys" }
boring = { package = "boring2", version = "4.12.0", path = "./boring" }
tokio-boring = { package = "tokio-boring2", version = "4.12.0", path = "./tokio-boring" }
bindgen = { version = "0.70.1", default-features = false, features = ["runtime"] }
bytes = "1"

8
RELEASE_NOTES
View File

@ -1,3 +1,9 @@
4.12.0
- 2024-11-20 Add bindings for SSL_CB_ACCEPT_EXIT and SSL_CB_CONNECT_EXIT
- 2024-10-22 (ci): brew link x86 toolchain for macos13 runner
- 2024-10-22 Skip bindgen 0.70's layout tests before Rust 1.77
- 2024-10-18 Add `set_cert_verify_callback` (`SSL_CTX_set_cert_verify`)
4.11.0
- 2024-10-17 boring-sys: include HPKE header file for bindgen
- 2024-10-17 Add "fips-compat" feature
@ -468,7 +474,7 @@
- 2019-12-01 Change *const to *mut to try if it fixes tests
- 2019-12-01 move EVP_PKCS82PKEY into evp module
- 2019-12-01 Support for PKCS#8 unencrypted private key deserialization
- 2019-11-23 Update openssl/src/hash.rs
- 2019-11-23 Update openssl/src/hash.rs
- 2019-11-22 Add EVP_md_null() and MessageDigest::md_null()
- 2019-11-22 Fix up base64 docs
- 2019-11-22 Cleanup

6
boring/src/ssl/mod.rs
View File

@ -853,6 +853,12 @@ impl SslInfoCallbackMode {
/// Signaled when a handshake progresses to a new state.
pub const ACCEPT_LOOP: Self = Self(ffi::SSL_CB_ACCEPT_LOOP);
/// Signaled when the current iteration of the server-side handshake state machine completes.
pub const ACCEPT_EXIT: Self = Self(ffi::SSL_CB_ACCEPT_EXIT);
/// Signaled when the current iteration of the client-side handshake state machine completes.
pub const CONNECT_EXIT: Self = Self(ffi::SSL_CB_CONNECT_EXIT);
}
/// The `value` argument to an info callback. The most-significant byte is the alert level, while