Skip to content

Commit f826776

Browse files
baloobaloo
committed
[u8] type is not accessible to ctest
Signed-off-by: Arthur Gautier <[email protected]>
1 parent 6278a38 commit f826776

File tree

3 files changed

+57
-57
lines changed

3 files changed

+57
-57
lines changed

‎openssl-sys/src/kdf.rs

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
use *;
22

33
/* KDF / PRF parameters */
4-
pub const OSSL_KDF_PARAM_SECRET: &[u8] = b"secret\0";
5-
pub const OSSL_KDF_PARAM_KEY: &[u8] = b"key\0";
6-
pub const OSSL_KDF_PARAM_SALT: &[u8] = b"salt\0";
7-
pub const OSSL_KDF_PARAM_PASSWORD: &[u8] = b"pass\0";
8-
pub const OSSL_KDF_PARAM_DIGEST: &[u8] = OSSL_ALG_PARAM_DIGEST;
9-
pub const OSSL_KDF_PARAM_CIPHER: &[u8] = OSSL_ALG_PARAM_CIPHER;
10-
pub const OSSL_KDF_PARAM_MAC: &[u8] = OSSL_ALG_PARAM_MAC;
11-
pub const OSSL_KDF_PARAM_MAC_SIZE: &[u8] = b"maclen\0";
12-
pub const OSSL_KDF_PARAM_PROPERTIES: &[u8] = OSSL_ALG_PARAM_PROPERTIES;
13-
pub const OSSL_KDF_PARAM_ITER: &[u8] = b"iter\0";
14-
pub const OSSL_KDF_PARAM_MODE: &[u8] = b"mode\0";
15-
pub const OSSL_KDF_PARAM_PKCS5: &[u8] = b"pkcs5\0";
16-
pub const OSSL_KDF_PARAM_UKM: &[u8] = b"ukm\0";
17-
pub const OSSL_KDF_PARAM_CEK_ALG: &[u8] = b"cekalg\0";
18-
pub const OSSL_KDF_PARAM_SCRYPT_N: &[u8] = b"n\0";
19-
pub const OSSL_KDF_PARAM_SCRYPT_R: &[u8] = b"r\0";
20-
pub const OSSL_KDF_PARAM_SCRYPT_P: &[u8] = b"p\0";
21-
pub const OSSL_KDF_PARAM_SCRYPT_MAXMEM: &[u8] = b"maxmem_bytes\0";
22-
pub const OSSL_KDF_PARAM_INFO: &[u8] = b"info\0";
23-
pub const OSSL_KDF_PARAM_SEED: &[u8] = b"seed\0";
24-
pub const OSSL_KDF_PARAM_SSHKDF_XCGHASH: &[u8] = b"xcghash\0";
25-
pub const OSSL_KDF_PARAM_SSHKDF_SESSION_ID: &[u8] = b"session_id\0";
26-
pub const OSSL_KDF_PARAM_SSHKDF_TYPE: &[u8] = b"type\0";
27-
pub const OSSL_KDF_PARAM_SIZE: &[u8] = b"size\0";
28-
pub const OSSL_KDF_PARAM_CONSTANT: &[u8] = b"constant\0";
29-
pub const OSSL_KDF_PARAM_PKCS12_ID: &[u8] = b"id\0";
30-
pub const OSSL_KDF_PARAM_KBKDF_USE_L: &[u8] = b"use-l\0";
31-
pub const OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR: &[u8] = b"use-separator\0";
32-
pub const OSSL_KDF_PARAM_X942_PARTYUINFO: &[u8] = b"partyu-info\0";
33-
pub const OSSL_KDF_PARAM_X942_PARTYVINFO: &[u8] = b"partyv-info\0";
34-
pub const OSSL_KDF_PARAM_X942_SUPP_PUBINFO: &[u8] = b"supp-pubinfo\0";
35-
pub const OSSL_KDF_PARAM_X942_SUPP_PRIVINFO: &[u8] = b"supp-privinfo\0";
36-
pub const OSSL_KDF_PARAM_X942_USE_KEYBITS: &[u8] = b"use-keybits\0";
4+
pub const OSSL_KDF_PARAM_SECRET: *const u8 = b"secret\0" as *const u8;
5+
pub const OSSL_KDF_PARAM_KEY: *const u8 = b"key\0" as *const u8;
6+
pub const OSSL_KDF_PARAM_SALT: *const u8 = b"salt\0" as *const u8;
7+
pub const OSSL_KDF_PARAM_PASSWORD: *const u8 = b"pass\0" as *const u8;
8+
pub const OSSL_KDF_PARAM_DIGEST: *const u8 = OSSL_ALG_PARAM_DIGEST;
9+
pub const OSSL_KDF_PARAM_CIPHER: *const u8 = OSSL_ALG_PARAM_CIPHER;
10+
pub const OSSL_KDF_PARAM_MAC: *const u8 = OSSL_ALG_PARAM_MAC;
11+
pub const OSSL_KDF_PARAM_MAC_SIZE: *const u8 = b"maclen\0" as *const u8;
12+
pub const OSSL_KDF_PARAM_PROPERTIES: *const u8 = OSSL_ALG_PARAM_PROPERTIES;
13+
pub const OSSL_KDF_PARAM_ITER: *const u8 = b"iter\0" as *const u8;
14+
pub const OSSL_KDF_PARAM_MODE: *const u8 = b"mode\0" as *const u8;
15+
pub const OSSL_KDF_PARAM_PKCS5: *const u8 = b"pkcs5\0" as *const u8;
16+
pub const OSSL_KDF_PARAM_UKM: *const u8 = b"ukm\0" as *const u8;
17+
pub const OSSL_KDF_PARAM_CEK_ALG: *const u8 = b"cekalg\0" as *const u8;
18+
pub const OSSL_KDF_PARAM_SCRYPT_N: *const u8 = b"n\0" as *const u8;
19+
pub const OSSL_KDF_PARAM_SCRYPT_R: *const u8 = b"r\0" as *const u8;
20+
pub const OSSL_KDF_PARAM_SCRYPT_P: *const u8 = b"p\0" as *const u8;
21+
pub const OSSL_KDF_PARAM_SCRYPT_MAXMEM: *const u8 = b"maxmem_bytes\0" as *const u8;
22+
pub const OSSL_KDF_PARAM_INFO: *const u8 = b"info\0" as *const u8;
23+
pub const OSSL_KDF_PARAM_SEED: *const u8 = b"seed\0" as *const u8;
24+
pub const OSSL_KDF_PARAM_SSHKDF_XCGHASH: *const u8 = b"xcghash\0" as *const u8;
25+
pub const OSSL_KDF_PARAM_SSHKDF_SESSION_ID: *const u8 = b"session_id\0" as *const u8;
26+
pub const OSSL_KDF_PARAM_SSHKDF_TYPE: *const u8 = b"type\0" as *const u8;
27+
pub const OSSL_KDF_PARAM_SIZE: *const u8 = b"size\0" as *const u8;
28+
pub const OSSL_KDF_PARAM_CONSTANT: *const u8 = b"constant\0" as *const u8;
29+
pub const OSSL_KDF_PARAM_PKCS12_ID: *const u8 = b"id\0" as *const u8;
30+
pub const OSSL_KDF_PARAM_KBKDF_USE_L: *const u8 = b"use-l\0" as *const u8;
31+
pub const OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR: *const u8 = b"use-separator\0" as *const u8;
32+
pub const OSSL_KDF_PARAM_X942_PARTYUINFO: *const u8 = b"partyu-info\0" as *const u8;
33+
pub const OSSL_KDF_PARAM_X942_PARTYVINFO: *const u8 = b"partyv-info\0" as *const u8;
34+
pub const OSSL_KDF_PARAM_X942_SUPP_PUBINFO: *const u8 = b"supp-pubinfo\0" as *const u8;
35+
pub const OSSL_KDF_PARAM_X942_SUPP_PRIVINFO: *const u8 = b"supp-privinfo\0" as *const u8;
36+
pub const OSSL_KDF_PARAM_X942_USE_KEYBITS: *const u8 = b"use-keybits\0" as *const u8;
3737

3838
/* Known KDF names */
39-
pub const OSSL_KDF_NAME_HKDF: &[u8] = b"HKDF\0";
40-
pub const OSSL_KDF_NAME_PBKDF2: &[u8] = b"PBKDF2\0";
41-
pub const OSSL_KDF_NAME_SCRYPT: &[u8] = b"SCRYPT\0";
42-
pub const OSSL_KDF_NAME_SSHKDF: &[u8] = b"SSHKDF\0";
43-
pub const OSSL_KDF_NAME_SSKDF: &[u8] = b"SSKDF\0";
44-
pub const OSSL_KDF_NAME_TLS1_PRF: &[u8] = b"TLS1-PRF\0";
45-
pub const OSSL_KDF_NAME_X942KDF_ASN1: &[u8] = b"X942KDF-ASN1\0";
46-
pub const OSSL_KDF_NAME_X942KDF_CONCAT: &[u8] = b"X942KDF-CONCAT\0";
47-
pub const OSSL_KDF_NAME_X963KDF: &[u8] = b"X963KDF\0";
48-
pub const OSSL_KDF_NAME_KBKDF: &[u8] = b"KBKDF\0";
49-
pub const OSSL_KDF_NAME_KRB5KDF: &[u8] = b"KRB5KDF\0";
39+
pub const OSSL_KDF_NAME_HKDF: *const u8 = b"HKDF\0" as *const u8;
40+
pub const OSSL_KDF_NAME_PBKDF2: *const u8 = b"PBKDF2\0" as *const u8;
41+
pub const OSSL_KDF_NAME_SCRYPT: *const u8 = b"SCRYPT\0" as *const u8;
42+
pub const OSSL_KDF_NAME_SSHKDF: *const u8 = b"SSHKDF\0" as *const u8;
43+
pub const OSSL_KDF_NAME_SSKDF: *const u8 = b"SSKDF\0" as *const u8;
44+
pub const OSSL_KDF_NAME_TLS1_PRF: *const u8 = b"TLS1-PRF\0" as *const u8;
45+
pub const OSSL_KDF_NAME_X942KDF_ASN1: *const u8 = b"X942KDF-ASN1\0" as *const u8;
46+
pub const OSSL_KDF_NAME_X942KDF_CONCAT: *const u8 = b"X942KDF-CONCAT\0" as *const u8;
47+
pub const OSSL_KDF_NAME_X963KDF: *const u8 = b"X963KDF\0" as *const u8;
48+
pub const OSSL_KDF_NAME_KBKDF: *const u8 = b"KBKDF\0" as *const u8;
49+
pub const OSSL_KDF_NAME_KRB5KDF: *const u8 = b"KRB5KDF\0" as *const u8;

‎openssl-sys/src/params.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ extern "C" {
102102
pub fn OSSL_PARAM_construct_end() -> OSSL_PARAM;
103103
}
104104

105-
pub const OSSL_ALG_PARAM_DIGEST: &[u8] = b"digest\0";
106-
pub const OSSL_ALG_PARAM_CIPHER: &[u8] = b"cipher\0";
107-
pub const OSSL_ALG_PARAM_ENGINE: &[u8] = b"engine\0";
108-
pub const OSSL_ALG_PARAM_MAC: &[u8] = b"mac\0";
109-
pub const OSSL_ALG_PARAM_PROPERTIES: &[u8] = b"properties\0";
105+
pub const OSSL_ALG_PARAM_DIGEST: *const u8 = b"digest\0" as *const u8;
106+
pub const OSSL_ALG_PARAM_CIPHER: *const u8 = b"cipher\0" as *const u8;
107+
pub const OSSL_ALG_PARAM_ENGINE: *const u8 = b"engine\0" as *const u8;
108+
pub const OSSL_ALG_PARAM_MAC: *const u8 = b"mac\0" as *const u8;
109+
pub const OSSL_ALG_PARAM_PROPERTIES: *const u8 = b"properties\0" as *const u8;

‎openssl/src/params.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl Drop for Param {
8080
}
8181
}
8282

83-
pub struct ParamsBuilder(Vec<(&'static [u8], Param)>);
83+
pub struct ParamsBuilder(Vec<(*const u8, Param)>);
8484

8585
impl ParamsBuilder {
8686
pub fn with_capacity(capacity: usize) -> Self {
@@ -107,15 +107,15 @@ impl ParamsBuilder {
107107
let v = unsafe {
108108
match p {
109109
I32(v) => {
110-
let pname = name.as_ptr() as *const i8;
110+
let pname = *name as *const i8;
111111
ffi::OSSL_PARAM_construct_int(pname, *v)
112112
}
113113
Vec(buf, len) => {
114-
let pname = name.as_ptr() as *const i8;
114+
let pname = *name as *const i8;
115115
ffi::OSSL_PARAM_construct_octet_string(pname, *buf, *len)
116116
}
117117
String(buf, len) => {
118-
let pname = name.as_ptr() as *const i8;
118+
let pname = *name as *const i8;
119119
ffi::OSSL_PARAM_construct_utf8_string(pname, *buf, *len)
120120
}
121121
}
@@ -130,7 +130,7 @@ impl ParamsBuilder {
130130
macro_rules! add_construct {
131131
($func:ident, $name:ident, $ty:ty) => {
132132
impl ParamsBuilder {
133-
pub fn $func(&mut self, key: &'static [u8], val: $ty) -> Result<(), ErrorStack> {
133+
pub fn $func(&mut self, key: *const u8, val: $ty) -> Result<(), ErrorStack> {
134134
self.0.push((key, Param::$name(val)?));
135135
Ok(())
136136
}
@@ -144,7 +144,7 @@ add_construct!(add_slice, alloc_vec, &[u8]);
144144
// TODO(baloo): add u32, etc
145145

146146
pub struct Params {
147-
fixed: Vec<(&'static [u8], Param)>,
147+
fixed: Vec<(*const u8, Param)>,
148148
output: Vec<ffi::OSSL_PARAM>,
149149
}
150150

@@ -169,8 +169,8 @@ impl fmt::Debug for Params {
169169
write!(f, "OSSL_PARAM {{")?;
170170
if o.data_type != 0 {
171171
write!(f, "name = {:?}, ", unsafe { CStr::from_ptr(o.key) })?;
172-
write!(f, "buf = {:?}, ", o.data )?;
173-
write!(f, "len = {:?}", o.data_size )?;
172+
write!(f, "buf = {:?}, ", o.data)?;
173+
write!(f, "len = {:?}", o.data_size)?;
174174
} else {
175175
write!(f, "END")?;
176176
}

0 commit comments

Comments
 (0)