Skip to content

Commit

Permalink
address pr feedback
Browse files Browse the repository at this point in the history
* add libressl360 cfg statement
* add 0-5 reference to documentation
  • Loading branch information
jmayclin committed Oct 28, 2023
1 parent aebfe8e commit d6591bb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions openssl-sys/src/handwritten/ssl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -926,15 +926,15 @@ extern "C" {
}

extern "C" {
#[cfg(ossl110)]
#[cfg(any(ossl110, libressl360))]
pub fn SSL_CTX_set_security_level(ctx: *mut SSL_CTX, level: c_int);

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

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

#[cfg(ossl110)]
#[cfg(any(ossl110, libressl360))]
pub fn SSL_get_security_level(s: *const SSL) -> c_int;
}
16 changes: 8 additions & 8 deletions openssl/src/ssl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1718,12 +1718,12 @@ 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.
/// Set the context's security level to a value between 0 and 5, inclusive.
/// A security value of 0 allows allows all parameters and algorithms.
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_CTX_set_security_level)]
#[cfg(ossl110)]
#[cfg(any(ossl110, libressl360))]
pub fn set_security_level(&mut self, level: u32) {
unsafe { ffi::SSL_CTX_set_security_level(self.as_ptr(), level as c_int) }
}
Expand Down Expand Up @@ -1937,7 +1937,7 @@ impl SslContextRef {
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_CTX_get_security_level)]
#[cfg(ossl110)]
#[cfg(any(ossl110, libressl360))]
pub fn security_level(&self) -> u32 {
unsafe { ffi::SSL_CTX_get_security_level(self.as_ptr()) as u32 }
}
Expand Down Expand Up @@ -3426,12 +3426,12 @@ impl SslRef {
unsafe { ffi::SSL_get_num_tickets(self.as_ptr()) }
}

/// Set the connection's security level, which controls the allowed parameters
/// and algorithms.
/// Set the context's security level to a value between 0 and 5, inclusive.
/// A security value of 0 allows allows all parameters and algorithms.
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_set_security_level)]
#[cfg(ossl110)]
#[cfg(any(ossl110, libressl360))]
pub fn set_security_level(&mut self, level: u32) {
unsafe { ffi::SSL_set_security_level(self.as_ptr(), level as c_int) }
}
Expand All @@ -3441,7 +3441,7 @@ impl SslRef {
///
/// Requires OpenSSL 1.1.0 or newer.
#[corresponds(SSL_get_security_level)]
#[cfg(ossl110)]
#[cfg(any(ossl110, libressl360))]
pub fn security_level(&self) -> u32 {
unsafe { ffi::SSL_get_security_level(self.as_ptr()) as u32 }
}
Expand Down

0 comments on commit d6591bb

Please sign in to comment.