wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-26 17:42:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rust wrapper: use SHA256::DIGEST_SIZE instead of WC_SHA256_DIGEST_SIZE

Browse Source
This commit is contained in:
Josh Holtrop
2025-10-23 16:24:09 -04:00
parent 5b8115ed8f
commit b75be94f0d
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wrapper/rust/wolfssl/src/wolfcrypt/hkdf.rs
View File

@@ -52,10 +52,10 @@ use wolfssl_sys as ws;
/// ```rust
/// use wolfssl::wolfcrypt::hkdf::*;
/// use wolfssl::wolfcrypt::hmac::HMAC;
/// use wolfssl_sys as ws;
/// use wolfssl::wolfcrypt::sha::SHA256;
/// let ikm = b"MyPassword0";
/// let salt = b"12345678ABCDEFGH";
/// let mut extract_out = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
/// let mut extract_out = [0u8; SHA256::DIGEST_SIZE];
/// hkdf_extract(HMAC::TYPE_SHA256, Some(salt), ikm, &mut extract_out).expect("Error with hkdf_extract()");
/// ```
pub fn hkdf_extract(typ: i32, salt: Option<&[u8]>, key: &[u8], out: &mut [u8]) -> Result<(), i32> {
@@ -102,10 +102,10 @@ pub fn hkdf_extract(typ: i32, salt: Option<&[u8]>, key: &[u8], out: &mut [u8]) -
/// ```rust
/// use wolfssl::wolfcrypt::hkdf::*;
/// use wolfssl::wolfcrypt::hmac::HMAC;
/// use wolfssl_sys as ws;
/// use wolfssl::wolfcrypt::sha::SHA256;
/// let ikm = b"MyPassword0";
/// let salt = b"12345678ABCDEFGH";
/// let mut extract_out = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
/// let mut extract_out = [0u8; SHA256::DIGEST_SIZE];
/// hkdf_extract(HMAC::TYPE_SHA256, Some(salt), ikm, &mut extract_out).expect("Error with hkdf_extract()");
/// let info = b"0";
/// let mut expand_out = [0u8; 16];

10
wrapper/rust/wolfssl/src/wolfcrypt/kdf.rs
View File

@@ -50,8 +50,8 @@ use wolfssl_sys as ws;
/// ```rust
/// use wolfssl::wolfcrypt::hmac::HMAC;
/// use wolfssl::wolfcrypt::kdf::*;
/// use wolfssl_sys as ws;
/// let mut secret = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
/// use wolfssl::wolfcrypt::sha::SHA256;
/// let mut secret = [0u8; SHA256::DIGEST_SIZE];
/// tls13_hkdf_extract(HMAC::TYPE_SHA256, None, None, &mut secret).expect("Error with tls13_hkdf_extract()");
/// ```
pub fn tls13_hkdf_extract(typ: i32, salt: Option<&[u8]>, key: Option<&mut [u8]>, out: &mut [u8]) -> Result<(), i32> {
@@ -108,7 +108,7 @@ pub fn tls13_hkdf_extract(typ: i32, salt: Option<&[u8]>, key: Option<&mut [u8]>,
/// ```rust
/// use wolfssl::wolfcrypt::hmac::HMAC;
/// use wolfssl::wolfcrypt::kdf::*;
/// use wolfssl_sys as ws;
/// use wolfssl::wolfcrypt::sha::SHA256;
/// let hash_hello1 = [
/// 0x63u8, 0x83, 0x58, 0xab, 0x36, 0xcd, 0x0c, 0xf3,
/// 0x26, 0x07, 0xb5, 0x5f, 0x0b, 0x8b, 0x45, 0xd6,
@@ -120,11 +120,11 @@ pub fn tls13_hkdf_extract(typ: i32, salt: Option<&[u8]>, key: Option<&mut [u8]>,
/// 0xb0, 0xfc, 0x45, 0xd0, 0x62, 0xb9, 0xbb, 0x38, 0x69, 0x05, 0x7b, 0xb4,
/// 0x5e, 0x58, 0x5d, 0xed, 0xcd, 0x0b, 0x96, 0xd3
/// ];
/// let mut secret = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
/// let mut secret = [0u8; SHA256::DIGEST_SIZE];
/// tls13_hkdf_extract(HMAC::TYPE_SHA256, None, None, &mut secret).expect("Error with tls13_hkdf_extract()");
/// let protocol_label = b"tls13 ";
/// let ce_traffic_label = b"c e traffic";
/// let mut expand_out = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
/// let mut expand_out = [0u8; SHA256::DIGEST_SIZE];
/// tls13_hkdf_expand_label(HMAC::TYPE_SHA256, &secret,
/// protocol_label, ce_traffic_label,
/// &hash_hello1, &mut expand_out).expect("Error with tls13_hkdf_expand_label()");

4
wrapper/rust/wolfssl/tests/test_hkdf.rs
View File

@@ -1,12 +1,12 @@
use wolfssl::wolfcrypt::hkdf::*;
use wolfssl::wolfcrypt::hmac::HMAC;
use wolfssl_sys as ws;
use wolfssl::wolfcrypt::sha::SHA256;
#[test]
fn test_hkdf_extract_expand() {
let ikm = b"MyPassword0";
let salt = b"12345678ABCDEFGH";
let mut extract_out = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
let mut extract_out = [0u8; SHA256::DIGEST_SIZE];
hkdf_extract(HMAC::TYPE_SHA256, Some(salt), ikm, &mut extract_out).expect("Error with hkdf_extract()");
let info = b"0";

8
wrapper/rust/wolfssl/tests/test_hmac.rs
View File

@@ -1,10 +1,10 @@
use wolfssl::wolfcrypt::hmac::*;
use wolfssl_sys as ws;
use wolfssl::wolfcrypt::sha::SHA256;
#[test]
fn test_hmac_sha256() {
let hmac_size = HMAC::get_hmac_size_by_type(HMAC::TYPE_SHA256).expect("Error with get_hmac_size_by_type()");
assert_eq!(hmac_size, ws::WC_SHA256_DIGEST_SIZE as usize);
assert_eq!(hmac_size, SHA256::DIGEST_SIZE);
let keys: [&[u8]; 5] = [
b"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
@@ -38,9 +38,9 @@ fn test_hmac_sha256() {
HMAC::new(HMAC::TYPE_SHA256, keys[i]).expect("Error with new()")
};
let hmac_size = hmac.get_hmac_size().expect("Error with get_hmac_size()");
assert_eq!(hmac_size, ws::WC_SHA256_DIGEST_SIZE as usize);
assert_eq!(hmac_size, SHA256::DIGEST_SIZE);
hmac.update(inputs[i]).expect("Error with update()");
let mut hash = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
let mut hash = [0u8; SHA256::DIGEST_SIZE];
hmac.finalize(&mut hash).expect("Error with finalize()");
assert_eq!(*expected[i], hash);
}

6
wrapper/rust/wolfssl/tests/test_kdf.rs
View File

@@ -1,6 +1,6 @@
use wolfssl::wolfcrypt::hmac::HMAC;
use wolfssl::wolfcrypt::kdf::*;
use wolfssl_sys as ws;
use wolfssl::wolfcrypt::sha::SHA256;
#[test]
fn test_tls13_hkdf_extract_expand() {
@@ -16,13 +16,13 @@ fn test_tls13_hkdf_extract_expand() {
0x5e, 0x58, 0x5d, 0xed, 0xcd, 0x0b, 0x96, 0xd3
];
let mut secret = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
let mut secret = [0u8; SHA256::DIGEST_SIZE];
tls13_hkdf_extract(HMAC::TYPE_SHA256, None, None, &mut secret).expect("Error with tls13_hkdf_extract()");
let protocol_label = b"tls13 ";
let ce_traffic_label = b"c e traffic";
let mut expand_out = [0u8; ws::WC_SHA256_DIGEST_SIZE as usize];
let mut expand_out = [0u8; SHA256::DIGEST_SIZE];
tls13_hkdf_expand_label(HMAC::TYPE_SHA256, &secret,
protocol_label, ce_traffic_label,