Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add security level bindings #2074

Merged
merged 2 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions openssl-sys/src/handwritten/ssl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -924,3 +924,17 @@ extern "C" {
#[cfg(all(ossl111, not(ossl111b)))]
pub fn SSL_get_num_tickets(s: *mut SSL) -> size_t;
}

extern "C" {
#[cfg(ossl110)]
jmayclin marked this conversation as resolved.
Show resolved Hide resolved
pub fn SSL_CTX_set_security_level(ctx: *mut SSL_CTX, level: c_int);

#[cfg(ossl110)]
pub fn SSL_set_security_level(s: *mut SSL, level: c_int);

#[cfg(ossl110)]
pub fn SSL_CTX_get_security_level(ctx: *const SSL_CTX) -> c_int;

#[cfg(ossl110)]
pub fn SSL_get_security_level(s: *const SSL) -> c_int;
}
40 changes: 40 additions & 0 deletions openssl/src/ssl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1718,6 +1718,16 @@ impl SslContextBuilder {
unsafe { cvt(ffi::SSL_CTX_set_num_tickets(self.as_ptr(), num_tickets)).map(|_| ()) }
}

/// Set the context's security level, which controls the allowed parameters
/// and algorithms.
jmayclin marked this conversation as resolved.
Show resolved Hide resolved
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_CTX_set_security_level)]
#[cfg(ossl110)]
pub fn set_security_level(&mut self, level: u32) {
unsafe { ffi::SSL_CTX_set_security_level(self.as_ptr(), level as c_int) }
}

/// Consumes the builder, returning a new `SslContext`.
pub fn build(self) -> SslContext {
self.0
Expand Down Expand Up @@ -1921,6 +1931,16 @@ impl SslContextRef {
pub fn num_tickets(&self) -> usize {
unsafe { ffi::SSL_CTX_get_num_tickets(self.as_ptr()) }
}

/// Get the context's security level, which controls the allowed parameters
/// and algorithms.
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_CTX_get_security_level)]
#[cfg(ossl110)]
pub fn security_level(&self) -> u32 {
unsafe { ffi::SSL_CTX_get_security_level(self.as_ptr()) as u32 }
}
}

/// Information about the state of a cipher.
Expand Down Expand Up @@ -3405,6 +3425,26 @@ impl SslRef {
pub fn num_tickets(&self) -> usize {
unsafe { ffi::SSL_get_num_tickets(self.as_ptr()) }
}

/// Set the connection's security level, which controls the allowed parameters
/// and algorithms.
jmayclin marked this conversation as resolved.
Show resolved Hide resolved
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_set_security_level)]
#[cfg(ossl110)]
pub fn set_security_level(&mut self, level: u32) {
unsafe { ffi::SSL_set_security_level(self.as_ptr(), level as c_int) }
}

/// Get the connection's security level, which controls the allowed parameters
/// and algorithms.
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_get_security_level)]
#[cfg(ossl110)]
pub fn security_level(&self) -> u32 {
unsafe { ffi::SSL_get_security_level(self.as_ptr()) as u32 }
}
}

/// An SSL stream midway through the handshake process.
Expand Down
14 changes: 14 additions & 0 deletions openssl/src/ssl/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1574,3 +1574,17 @@ fn set_num_tickets() {
let ssl = ssl;
assert_eq!(5, ssl.num_tickets());
}

#[test]
#[cfg(ossl110)]
fn set_security_level() {
let mut ctx = SslContext::builder(SslMethod::tls_server()).unwrap();
ctx.set_security_level(3);
let ctx = ctx.build();
assert_eq!(3, ctx.security_level());

let mut ssl = Ssl::new(&ctx).unwrap();
ssl.set_security_level(4);
let ssl = ssl;
assert_eq!(4, ssl.security_level());
}