Skip to content

Commit

Permalink
Mark Openssl # deprecated functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@CfirTsabari
CfirTsabari committed Dec 20, 2022
1 parent 64ba480 commit 56af744
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 26 deletions.
25 changes: 15 additions & 10 deletions openssl-sys/src/handwritten/aes.rs
View file
Expand Up @@ -11,16 +11,7 @@ pub struct AES_KEY {
extern "C" {
pub fn AES_set_encrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int;
pub fn AES_set_decrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int;

pub fn AES_ige_encrypt(
in_: *const c_uchar,
out: *mut c_uchar,
length: size_t,
key: *const AES_KEY,
ivec: *mut c_uchar,
enc: c_int,
);


pub fn AES_wrap_key(
key: *mut AES_KEY,
iv: *const c_uchar,
Expand All @@ -37,3 +28,17 @@ extern "C" {
inlen: c_uint,
) -> c_int;
}
cfg_if! {
if #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))] {
extern "C" {
pub fn AES_ige_encrypt(
in_: *const c_uchar,
out: *mut c_uchar,
length: size_t,
key: *const AES_KEY,
ivec: *mut c_uchar,
enc: c_int,
);
}
}
}
37 changes: 22 additions & 15 deletions openssl-sys/src/handwritten/bn.rs
View file
Expand Up @@ -7,9 +7,7 @@ extern "C" {
pub fn BN_CTX_secure_new() -> *mut BN_CTX;
pub fn BN_CTX_free(ctx: *mut BN_CTX);
pub fn BN_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int;
pub fn BN_pseudo_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int;
pub fn BN_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int;
pub fn BN_pseudo_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int;
pub fn BN_new() -> *mut BIGNUM;
#[cfg(ossl110)]
pub fn BN_secure_new() -> *mut BIGNUM;
Expand Down Expand Up @@ -122,20 +120,29 @@ extern "C" {
rem: *const BIGNUM,
cb: *mut BN_GENCB,
) -> c_int;
pub fn BN_is_prime_ex(
p: *const BIGNUM,
checks: c_int,
ctx: *mut BN_CTX,
cb: *mut BN_GENCB,
) -> c_int;
pub fn BN_is_prime_fasttest_ex(
p: *const BIGNUM,
checks: c_int,
ctx: *mut BN_CTX,
do_trial_division: c_int,
cb: *mut BN_GENCB,
) -> c_int;
}
cfg_if! {
if #[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))] {
extern "C" {
pub fn BN_pseudo_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int;
pub fn BN_pseudo_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int;
pub fn BN_is_prime_ex(
p: *const BIGNUM,
checks: c_int,
ctx: *mut BN_CTX,
cb: *mut BN_GENCB,
) -> c_int;
pub fn BN_is_prime_fasttest_ex(
p: *const BIGNUM,
checks: c_int,
ctx: *mut BN_CTX,
do_trial_division: c_int,
cb: *mut BN_GENCB,
) -> c_int;

}
}
}

cfg_if! {
if #[cfg(any(ossl110, libressl350))] {
Expand Down
4 changes: 3 additions & 1 deletion openssl/src/aes.rs
View file
Expand Up @@ -23,7 +23,7 @@
//! # Examples

#![cfg_attr(
not(boringssl),
all(not(boringssl),not(osslconf = "OPENSSL_NO_DEPRECATED_3_0")),
doc = r#"\
## AES IGE
```rust
Expand Down Expand Up @@ -156,6 +156,7 @@ impl AesKey {
/// Panics if `in_` is not the same length as `out`, if that length is not a multiple of 16, or if
/// `iv` is not at least 32 bytes.
#[cfg(not(boringssl))]
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[corresponds(AES_ige_encrypt)]
pub fn aes_ige(in_: &[u8], out: &mut [u8], key: &AesKey, iv: &mut [u8], mode: Mode) {
unsafe {
Expand Down Expand Up @@ -268,6 +269,7 @@ mod test {
// From https://www.mgp25.com/AESIGE/
#[test]
#[cfg(not(boringssl))]
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
fn ige_vector_1() {
let raw_key = "000102030405060708090A0B0C0D0E0F";
let raw_iv = "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F";
Expand Down
7 changes: 7 additions & 0 deletions openssl/src/bn.rs
View file
Expand Up @@ -217,6 +217,7 @@ impl BigNumRef {
}

/// The cryptographically weak counterpart to `rand_in_range`.
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[corresponds(BN_pseudo_rand_range)]
pub fn pseudo_rand_range(&self, rnd: &mut BigNumRef) -> Result<(), ErrorStack> {
unsafe { cvt(ffi::BN_pseudo_rand_range(rnd.as_ptr(), self.as_ptr())).map(|_| ()) }
Expand Down Expand Up @@ -385,6 +386,7 @@ impl BigNumRef {
}

/// The cryptographically weak counterpart to `rand`. Not suitable for key generation.
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[corresponds(BN_pseudo_rand)]
#[allow(clippy::useless_conversion)]
pub fn pseudo_rand(&mut self, bits: i32, msb: MsbOption, odd: bool) -> Result<(), ErrorStack> {
Expand Down Expand Up @@ -722,6 +724,7 @@ impl BigNumRef {
/// # Return Value
///
/// Returns `true` if `self` is prime with an error probability of less than `0.25 ^ checks`.
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[corresponds(BN_is_prime_ex)]
#[allow(clippy::useless_conversion)]
pub fn is_prime(&self, checks: i32, ctx: &mut BigNumContextRef) -> Result<bool, ErrorStack> {
Expand All @@ -745,6 +748,7 @@ impl BigNumRef {
/// # Return Value
///
/// Returns `true` if `self` is prime with an error probability of less than `0.25 ^ checks`.
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[corresponds(BN_is_prime_fasttest_ex)]
#[allow(clippy::useless_conversion)]
pub fn is_prime_fasttest(
Expand Down Expand Up @@ -1388,6 +1392,7 @@ mod tests {
assert_eq!(a, &(&a << 1) >> 1);
}

#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[test]
fn test_rand_range() {
let range = BigNum::from_u32(909_829_283).unwrap();
Expand All @@ -1396,6 +1401,7 @@ mod tests {
assert!(result >= BigNum::from_u32(0).unwrap() && result < range);
}

#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[test]
fn test_pseudo_rand_range() {
let range = BigNum::from_u32(909_829_283).unwrap();
Expand All @@ -1404,6 +1410,7 @@ mod tests {
assert!(result >= BigNum::from_u32(0).unwrap() && result < range);
}

#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
#[test]
fn test_prime_numbers() {
let a = BigNum::from_u32(19_029_017).unwrap();
Expand Down

0 comments on commit 56af744

Please sign in to comment.