Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
81cee40
macros: add cstr_const
huwcbjones Sep 8, 2025
c7a8f2c
kdf: use cstr_const
huwcbjones Sep 8, 2025
adec1b4
kdf/argon2 helpers: make kdf names const
huwcbjones Sep 8, 2025
5b5bca6
pkey: add common OSSL params
huwcbjones Sep 8, 2025
428ddb1
partial revert: Remove unused param builder methods
huwcbjones Sep 11, 2025
4561f00
ossl_param: add tests
huwcbjones Aug 6, 2025
7e868d4
ossl_params/arrayref: refactor locate_octet_string to use locate
huwcbjones Aug 6, 2025
a494671
ossl_param/array: implement locate_bn
huwcbjones Sep 12, 2025
e3d09ac
ossl_param/array: implement merge
huwcbjones Sep 12, 2025
aff8b08
pkey_ctx/set_nonce_type: use ParamBuilder
huwcbjones Aug 6, 2025
e1f17e9
pkey_ctx: add Selection trait for Param/Public/Private markers
huwcbjones Aug 6, 2025
b30c65f
pkey_ctx: add ability to create a PKey from params
huwcbjones Aug 6, 2025
8abc19e
pkey: implement to_data
huwcbjones Sep 12, 2025
6e95c59
pkey: test round-robin to_data => from_data
huwcbjones Sep 12, 2025
6dbe468
Add encoder wrapper
huwcbjones Aug 11, 2025
f85c60e
pkey/Id: implement TryInto<&str>
huwcbjones Aug 15, 2025
0d973f6
pkey/Id: implement TryInto<&CStr>
huwcbjones Aug 15, 2025
3edbd2e
Add decoder wrapper
huwcbjones Aug 13, 2025
094a36d
rsa: improve coverage of de-/serialisation methods
huwcbjones Aug 13, 2025
43d73d7
ec: add coverage of de-/serialisation methods
huwcbjones Aug 20, 2025
8b3997a
dsa: improve coverage of de-/serialisation methods
huwcbjones Aug 20, 2025
8802755
Merge branch 'huw/evp-from-params' into huw/non-deprecated
huwcbjones Sep 11, 2025
3d02295
Merge branch 'huw/encdec' into huw/non-deprecated
huwcbjones Sep 11, 2025
f281c5c
rsa: add accessors test
huwcbjones Aug 4, 2025
0f1c45f
rsa: add from_private_components test
huwcbjones Aug 6, 2025
8dd04f7
bn: implement clone
huwcbjones Aug 8, 2025
747f926
pkey: add check_key
huwcbjones Aug 21, 2025
5fee1ed
pkey: add get bn, bytes, & utf-8 param
huwcbjones Aug 4, 2025
e672908
pkey: add KeyID trait
huwcbjones Sep 12, 2025
1c34607
macros/generic_foreign_type_and_impl_send_sync: back with key pkey sh…
huwcbjones Aug 21, 2025
133e2cc
macros/to-from: use non-deprecated APIs
huwcbjones Aug 19, 2025
5b56a6c
rsa: use non-deprecated functions for ossl300+
huwcbjones Aug 4, 2025
ee3bfa0
dsa: use non-deprecated functions for ossl300+
huwcbjones Aug 21, 2025
a1d6d97
macros/generic_foreign_type_and_impl_send_sync: implement From borrow…
huwcbjones Sep 8, 2025
a88b4e9
macros: add key_check macro
huwcbjones Aug 26, 2025
4167e76
ecdsa: use non-deprecated functions
huwcbjones Aug 26, 2025
32801ae
ec: use non-deprecated functions for ossl300+
huwcbjones Aug 26, 2025
7b5df6c
sha: fixup for no deprecated ossl300+
huwcbjones Sep 15, 2025
6a26932
bn: fixup unused imports for no deprecated ossl300
huwcbjones Sep 15, 2025
bda268c
aes: cfg out for deprecated ossl3
huwcbjones Sep 3, 2025
e09a280
dh: use non-deprecated functions for ossl300+
huwcbjones Sep 12, 2025
2368bda
pkey: use non-deprecated functions for ossl300+
huwcbjones Sep 15, 2025
0f13c9d
x509: cfg out ossl3 deprecated types
huwcbjones Sep 15, 2025
0ecf3cc
ci: run all tests with no deprecated symbols
huwcbjones Sep 15, 2025
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,6 @@ jobs:
cargo run --manifest-path=systest/Cargo.toml --target ${{ matrix.target }} $features
if: ${{ !(matrix.library.name == 'boringssl' || matrix.library.name == 'aws-lc') }}
- name: Test openssl
if: ${{ ! endsWith(matrix.library.name, 'no-deprecated') }}
run: |
if [[ "${{ matrix.library.name }}" == "boringssl" && "${{ matrix.bindgen }}" != "true" ]]; then
features="--features unstable_boringssl"
Expand All @@ -437,4 +436,4 @@ jobs:
features="$features --features openssl-sys/bindgen"
fi
cargo test --manifest-path=openssl-errors/Cargo.toml --target ${{ matrix.target }} $features
if: ${{ !(matrix.library.name == 'boringssl' || matrix.library.name == 'aws-lc' || endsWith(matrix.library.name, 'no-deprecated')) }}
if: ${{ !(matrix.library.name == 'boringssl' || matrix.library.name == 'aws-lc') }}
8 changes: 1 addition & 7 deletions openssl/src/aes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@
//! # Examples

#![cfg_attr(
all(
not(boringssl),
not(awslc),
not(osslconf = "OPENSSL_NO_DEPRECATED_3_0")
),
all(not(boringssl), not(awslc),),
doc = r#"\
## AES IGE
```rust
Expand Down Expand Up @@ -160,7 +156,6 @@ 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(any(boringssl, awslc)))]
#[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 @@ -273,7 +268,6 @@ mod test {
// From https://www.mgp25.com/AESIGE/
#[test]
#[cfg(not(any(boringssl, awslc)))]
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
fn ige_vector_1() {
let raw_key = "000102030405060708090A0B0C0D0E0F";
let raw_iv = "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F";
Expand Down
5 changes: 4 additions & 1 deletion openssl/src/bn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ use std::ops::{Add, Deref, Div, Mul, Neg, Rem, Shl, Shr, Sub};
use std::{fmt, ptr};

use crate::asn1::Asn1Integer;
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
use crate::cvt_n;
use crate::error::ErrorStack;
use crate::string::OpensslString;
use crate::{cvt, cvt_n, cvt_p, LenType};
use crate::{cvt, cvt_p, LenType};
use openssl_macros::corresponds;

cfg_if! {
Expand Down Expand Up @@ -133,6 +135,7 @@ impl BigNumContext {
foreign_type_and_impl_send_sync! {
type CType = ffi::BIGNUM;
fn drop = ffi::BN_free;
fn clone = ffi::BN_dup;

/// Dynamically sized large number implementation
///
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/cipher_ctx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ mod test {
#[cfg(not(any(boringssl, awslc)))]
fn seal_open() {
let private_pem = include_bytes!("../test/rsa.pem");
let public_pem = include_bytes!("../test/rsa.pem.pub");
let public_pem = include_bytes!("../test/rsa.pub.pem");
let private_key = PKey::private_key_from_pem(private_pem).unwrap();
let public_key = PKey::public_key_from_pem(public_pem).unwrap();
let cipher = Cipher::aes_256_cbc();
Expand Down
Loading
Loading