Skip to content

Add SSL_CIPHER_get_auth_nid and SSL_CIPHER_get_kx_nid #74

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 21, 2025
Merged

Add SSL_CIPHER_get_auth_nid and SSL_CIPHER_get_kx_nid #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2633768
Implement `SSL_CIPHER_get_auth_nid`
ctz May 21, 2025
584c328
Implement `SSL_CIPHER_get_kx_nid`
ctz May 21, 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
4 changes: 2 additions & 2 deletions MATRIX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
| `SRP_Calc_A_param` [^deprecatedin_3_0] [^srp] | | | | |
| `SSL_CIPHER_description` | | :white_check_mark: | | :white_check_mark: |
| `SSL_CIPHER_find` | | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| `SSL_CIPHER_get_auth_nid` | | | :white_check_mark: | |
| `SSL_CIPHER_get_auth_nid` | | | :white_check_mark: | :white_check_mark: |
| `SSL_CIPHER_get_bits` | | | :white_check_mark: | :white_check_mark: |
| `SSL_CIPHER_get_cipher_nid` | | | | |
| `SSL_CIPHER_get_digest_nid` | | | | |
| `SSL_CIPHER_get_handshake_digest` | | | | |
| `SSL_CIPHER_get_id` | | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| `SSL_CIPHER_get_kx_nid` | | | | |
| `SSL_CIPHER_get_kx_nid` | | | | :white_check_mark: |
| `SSL_CIPHER_get_name` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| `SSL_CIPHER_get_protocol_id` | | | | :white_check_mark: |
| `SSL_CIPHER_get_version` | | | | :white_check_mark: |
Expand Down
2 changes: 2 additions & 0 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ const ENTRYPOINTS: &[&str] = &[
"SSL_check_private_key",
"SSL_CIPHER_description",
"SSL_CIPHER_find",
"SSL_CIPHER_get_auth_nid",
"SSL_CIPHER_get_bits",
"SSL_CIPHER_get_id",
"SSL_CIPHER_get_kx_nid",
"SSL_CIPHER_get_name",
"SSL_CIPHER_get_protocol_id",
"SSL_CIPHER_get_version",
Expand Down
7 changes: 7 additions & 0 deletions src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,10 @@ pub fn named_group_to_nid(group: NamedGroup) -> Option<c_int> {
_ => None,
}
}

pub(super) const NID_AUTH_ANY: c_int = 1064;
pub(super) const NID_AUTH_ECDSA: c_int = 1047;
pub(super) const NID_AUTH_RSA: c_int = 1046;

pub(super) const NID_KX_ANY: c_int = 1063;
pub(super) const NID_KX_ECDHE: c_int = 1038;
12 changes: 12 additions & 0 deletions src/entry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,6 +1550,18 @@ entry! {
}
}

entry! {
pub fn _SSL_CIPHER_get_auth_nid(cipher: *const SSL_CIPHER) -> c_int {
try_ref_from_ptr!(cipher).auth
}
}

entry! {
pub fn _SSL_CIPHER_get_kx_nid(cipher: *const SSL_CIPHER) -> c_int {
try_ref_from_ptr!(cipher).kx
}
}

entry! {
pub fn _SSL_CIPHER_get_protocol_id(cipher: *const SSL_CIPHER) -> u16 {
try_ref_from_ptr!(cipher).protocol_id()
Expand Down
20 changes: 20 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ static TLS_METHOD: SslMethod = SslMethod {
/// Functions that return `SSL_CIPHER` give static-lifetime pointers.
pub struct SslCipher {
pub bits: usize,
pub auth: i32,
pub kx: i32,
pub openssl_name: &'static CStr,
pub standard_name: &'static CStr,
pub version: &'static CStr,
Expand Down Expand Up @@ -139,6 +141,8 @@ impl SslCipher {

static TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
auth: constants::NID_AUTH_ECDSA,
kx: constants::NID_KX_ECDHE,
bits: 128,
openssl_name: c"ECDHE-ECDSA-AES128-GCM-SHA256",
standard_name: c"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
Expand All @@ -148,6 +152,8 @@ static TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: SslCipher = SslCipher {

static TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
auth: constants::NID_AUTH_ECDSA,
kx: constants::NID_KX_ECDHE,
bits: 256,
openssl_name: c"ECDHE-ECDSA-AES256-GCM-SHA384",
standard_name: c"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
Expand All @@ -157,6 +163,8 @@ static TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: SslCipher = SslCipher {

static TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
auth: constants::NID_AUTH_ECDSA,
kx: constants::NID_KX_ECDHE,
bits: 256,
openssl_name: c"ECDHE-ECDSA-CHACHA20-POLY1305",
standard_name: c"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
Expand All @@ -166,6 +174,8 @@ static TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {

static TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
auth: constants::NID_AUTH_RSA,
kx: constants::NID_KX_ECDHE,
bits: 128,
openssl_name: c"ECDHE-RSA-AES128-GCM-SHA256",
standard_name: c"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
Expand All @@ -175,6 +185,8 @@ static TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: SslCipher = SslCipher {

static TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
auth: constants::NID_AUTH_RSA,
kx: constants::NID_KX_ECDHE,
bits: 256,
openssl_name: c"ECDHE-RSA-AES256-GCM-SHA384",
standard_name: c"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
Expand All @@ -184,6 +196,8 @@ static TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: SslCipher = SslCipher {

static TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
auth: constants::NID_AUTH_RSA,
kx: constants::NID_KX_ECDHE,
bits: 256,
openssl_name: c"ECDHE-RSA-CHACHA20-POLY1305",
standard_name: c"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
Expand All @@ -193,6 +207,8 @@ static TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {

static TLS13_AES_128_GCM_SHA256: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS13_AES_128_GCM_SHA256,
auth: constants::NID_AUTH_ANY,
kx: constants::NID_KX_ANY,
bits: 128,
openssl_name: c"TLS_AES_128_GCM_SHA256",
standard_name: c"TLS_AES_128_GCM_SHA256",
Expand All @@ -202,6 +218,8 @@ static TLS13_AES_128_GCM_SHA256: SslCipher = SslCipher {

static TLS13_AES_256_GCM_SHA384: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS13_AES_256_GCM_SHA384,
auth: constants::NID_AUTH_ANY,
kx: constants::NID_KX_ANY,
bits: 256,
openssl_name: c"TLS_AES_256_GCM_SHA384",
standard_name: c"TLS_AES_256_GCM_SHA384",
Expand All @@ -211,6 +229,8 @@ static TLS13_AES_256_GCM_SHA384: SslCipher = SslCipher {

static TLS13_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {
rustls: &provider::cipher_suite::TLS13_CHACHA20_POLY1305_SHA256,
auth: constants::NID_AUTH_ANY,
kx: constants::NID_KX_ANY,
bits: 256,
openssl_name: c"TLS_CHACHA20_POLY1305_SHA256",
standard_name: c"TLS_CHACHA20_POLY1305_SHA256",
Expand Down
11 changes: 6 additions & 5 deletions tests/ciphers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@

static void print_cipher(const SSL_CIPHER *cipher) {
if (cipher) {
printf("openssl_id=0x%08x protocol_id=0x%08x ", SSL_CIPHER_get_id(cipher),
SSL_CIPHER_get_protocol_id(cipher));
printf("openssl_id=0x%08x protocol_id=0x%08x auth=%d kx=%d ",
SSL_CIPHER_get_id(cipher), SSL_CIPHER_get_protocol_id(cipher),
SSL_CIPHER_get_auth_nid(cipher), SSL_CIPHER_get_kx_nid(cipher));
} else {
// SSL_CIPHER_get_id(NULL) and SSL_CIPHER_get_protocol_id(NULL) both
// segfault
printf("openssl_id=undef protocol_id=undef ");
// SSL_CIPHER_get_id(NULL), SSL_CIPHER_get_protocol_id(NULL),
// SSL_CIPHER_get_auth_nid(NULL), SSL_CIPHER_get_kx_nid(NULL) all segfault
printf("openssl_id=undef protocol_id=undef auth=undef kx=undef ");
}
int alg_bits = -1;
printf("bits=%d ", SSL_CIPHER_get_bits(cipher, &alg_bits));
Expand Down