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

Fix support for fips-link-precompiled 

This feature expects a recent boringssl checkout (such as the one
found in boring-sys/deps/boringssl), so it should not be using
the same bindings as the fips feature, which are based on
boring-sys/deps/boringssl-fips, which is older and with a different
API.
This commit is contained in:
Anthony Ramine 2023-12-20 13:13:28 +01:00 committed by Anthony Ramine
parent f9dfd2c47e
commit 20f9991c18
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boring/src/bio.rs
View File

@ -19,9 +19,9 @@ impl<'a> Drop for MemBioSlice<'a> {
impl<'a> MemBioSlice<'a> { impl<'a> MemBioSlice<'a> {
pub fn new(buf: &'a [u8]) -> Result<MemBioSlice<'a>, ErrorStack> { pub fn new(buf: &'a [u8]) -> Result<MemBioSlice<'a>, ErrorStack> {
#[cfg(not(any(feature = "fips", feature = "fips-link-precompiled")))] #[cfg(not(feature = "fips"))]
type BufLen = isize; type BufLen = isize;
#[cfg(any(feature = "fips", feature = "fips-link-precompiled"))] #[cfg(feature = "fips")]
type BufLen = libc::c_int; type BufLen = libc::c_int;
ffi::init(); ffi::init();

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

@ -688,7 +688,7 @@ impl SslCurve {
pub const X25519: SslCurve = SslCurve(ffi::NID_X25519); pub const X25519: SslCurve = SslCurve(ffi::NID_X25519);
#[cfg(not(any(feature = "fips", feature = "fips-link-precompiled")))] #[cfg(not(feature = "fips"))]
pub const X25519_KYBER768_DRAFT00: SslCurve = SslCurve(ffi::NID_X25519Kyber768Draft00); pub const X25519_KYBER768_DRAFT00: SslCurve = SslCurve(ffi::NID_X25519Kyber768Draft00);
#[cfg(feature = "pq-experimental")] #[cfg(feature = "pq-experimental")]
@ -1402,10 +1402,7 @@ impl SslContextBuilder {
/// [`SSL_CTX_set_alpn_protos`]: https://www.openssl.org/docs/man1.1.0/ssl/SSL_CTX_set_alpn_protos.html /// [`SSL_CTX_set_alpn_protos`]: https://www.openssl.org/docs/man1.1.0/ssl/SSL_CTX_set_alpn_protos.html
pub fn set_alpn_protos(&mut self, protocols: &[u8]) -> Result<(), ErrorStack> { pub fn set_alpn_protos(&mut self, protocols: &[u8]) -> Result<(), ErrorStack> {
unsafe { unsafe {
#[cfg_attr( #[cfg_attr(not(feature = "fips"), allow(clippy::unnecessary_cast))]
not(any(feature = "fips", feature = "fips-link-precompiled")),
allow(clippy::unnecessary_cast)
)]
{ {
assert!(protocols.len() <= ProtosLen::max_value() as usize); assert!(protocols.len() <= ProtosLen::max_value() as usize);
} }
@ -2121,9 +2118,9 @@ impl SslContextRef {
#[derive(Debug)] #[derive(Debug)]
pub struct GetSessionPendingError; pub struct GetSessionPendingError;
#[cfg(not(any(feature = "fips", feature = "fips-link-precompiled")))] #[cfg(not(feature = "fips"))]
type ProtosLen = usize; type ProtosLen = usize;
#[cfg(any(feature = "fips", feature = "fips-link-precompiled"))] #[cfg(feature = "fips")]
type ProtosLen = libc::c_uint; type ProtosLen = libc::c_uint;
/// Information about the state of a cipher. /// Information about the state of a cipher.
@ -2814,10 +2811,7 @@ impl SslRef {
/// [`SSL_set_alpn_protos`]: https://www.openssl.org/docs/man1.1.0/ssl/SSL_set_alpn_protos.html /// [`SSL_set_alpn_protos`]: https://www.openssl.org/docs/man1.1.0/ssl/SSL_set_alpn_protos.html
pub fn set_alpn_protos(&mut self, protocols: &[u8]) -> Result<(), ErrorStack> { pub fn set_alpn_protos(&mut self, protocols: &[u8]) -> Result<(), ErrorStack> {
unsafe { unsafe {
#[cfg_attr( #[cfg_attr(not(feature = "fips"), allow(clippy::unnecessary_cast))]
not(any(feature = "fips", feature = "fips-link-precompiled")),
allow(clippy::unnecessary_cast)
)]
{ {
assert!(protocols.len() <= ProtosLen::max_value() as usize); assert!(protocols.len() <= ProtosLen::max_value() as usize);
} }

4
boring/src/x509/mod.rs
View File

@ -982,9 +982,9 @@ impl X509NameBuilder {
} }
} }
#[cfg(not(any(feature = "fips", feature = "fips-link-precompiled")))] #[cfg(not(feature = "fips"))]
type ValueLen = isize; type ValueLen = isize;
#[cfg(any(feature = "fips", feature = "fips-link-precompiled"))] #[cfg(feature = "fips")]
type ValueLen = i32; type ValueLen = i32;
foreign_type_and_impl_send_sync! { foreign_type_and_impl_send_sync! {