Skip to content

Commit 87c40e3

Browse files
committed
bump nightly version
1 parent b56ae10 commit 87c40e3

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

ledger_device_sdk/src/libcall/swap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ pub fn get_check_address_params<
205205
}
206206

207207
debug_print("==> GET_REF_ADDRESS\n");
208-
let (address, address_len) = read_c_string::<ADDRESS_BUF_SIZE>(params.address_to_check);
208+
let (address, address_len) = read_c_string::<ADDRESS_BUF_SIZE>(params.address_to_check as *const i8);
209209
check_address_params.ref_address = address;
210210
check_address_params.ref_address_len = address_len;
211211

@@ -340,13 +340,13 @@ pub fn sign_tx_params<
340340
}
341341

342342
debug_print("==> GET_DESTINATION_ADDRESS\n");
343-
let (address, address_len) = read_c_string::<ADDRESS_BUF_SIZE>(params.destination_address);
343+
let (address, address_len) = read_c_string::<ADDRESS_BUF_SIZE>(params.destination_address as *const i8);
344344
create_tx_params.dest_address = address;
345345
create_tx_params.dest_address_len = address_len;
346346

347347
debug_print("==> GET_DESTINATION_ADDRESS_EXTRA_ID\n");
348348
let (extra_id, extra_id_len) =
349-
read_c_string::<ADDRESS_EXTRA_ID_BUF_SIZE>(params.destination_address_extra_id);
349+
read_c_string::<ADDRESS_EXTRA_ID_BUF_SIZE>(params.destination_address_extra_id as *const i8);
350350
create_tx_params.dest_address_extra_id = extra_id;
351351
create_tx_params.dest_address_extra_id_len = extra_id_len;
352352

ledger_device_sdk/src/nbgl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ impl From<&Field<'_>> for CField {
228228
impl From<&CField> for nbgl_contentTagValue_t {
229229
fn from(field: &CField) -> nbgl_contentTagValue_t {
230230
nbgl_contentTagValue_t {
231-
item: (*field).name.as_ptr() as *const i8,
232-
value: (*field).value.as_ptr() as *const i8,
231+
item: (*field).name.as_ptr() as *const ::core::ffi::c_char,
232+
value: (*field).value.as_ptr() as *const ::core::ffi::c_char,
233233
..Default::default()
234234
}
235235
}

ledger_device_sdk/src/nbgl/nbgl_advance_review.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ impl<'a> NbglAdvanceReview<'a> {
161161
let warning_details = match &self.warning_details_type {
162162
Some(w) => nbgl_warning_t {
163163
predefinedSet: (1u32 << W3C_RISK_DETECTED_WARN),
164-
dAppProvider: w.dapp_provider_name.as_ptr() as *const i8,
165-
reportUrl: w.report_url.as_ptr() as *const i8,
166-
reportProvider: w.report_provider.as_ptr() as *const i8,
167-
providerMessage: w.provider_message.as_ptr() as *const i8,
164+
dAppProvider: w.dapp_provider_name.as_ptr() as *const ::core::ffi::c_char,
165+
reportUrl: w.report_url.as_ptr() as *const ::core::ffi::c_char,
166+
reportProvider: w.report_provider.as_ptr() as *const ::core::ffi::c_char,
167+
providerMessage: w.provider_message.as_ptr() as *const ::core::ffi::c_char,
168168
..Default::default()
169169
},
170170
None => nbgl_warning_t::default(),

ledger_device_sdk/src/nbgl/nbgl_generic_settings.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ impl NbglGenericSettings {
8787
}
8888

8989
self.info_list = Some(nbgl_contentInfoList_t {
90-
infoTypes: self.info.fields_ptr[..].as_ptr(),
91-
infoContents: self.info.values_ptr[..].as_ptr(),
90+
infoTypes: self.info.fields_ptr[..].as_ptr() as *const *const ::core::ffi::c_char,
91+
infoContents: self.info.values_ptr[..].as_ptr() as *const *const ::core::ffi::c_char,
9292
nbInfos: fields_values.len() as u8,
9393
infoExtensions: core::ptr::null(),
9494
token: 0,

ledger_device_sdk/src/nbgl/nbgl_streaming_review.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ impl NbglStreamingReview {
145145
Some(w) => {
146146
let warning_details = nbgl_warning_t {
147147
predefinedSet: (1u32 << W3C_RISK_DETECTED_WARN),
148-
dAppProvider: w.dapp_provider_name.as_ptr() as *const i8,
149-
reportUrl: w.report_url.as_ptr() as *const i8,
150-
reportProvider: w.report_provider.as_ptr() as *const i8,
151-
providerMessage: w.provider_message.as_ptr() as *const i8,
148+
dAppProvider: w.dapp_provider_name.as_ptr() as *const ::core::ffi::c_char,
149+
reportUrl: w.report_url.as_ptr() as *const ::core::ffi::c_char,
150+
reportProvider: w.report_provider.as_ptr() as *const ::core::ffi::c_char,
151+
providerMessage: w.provider_message.as_ptr() as *const ::core::ffi::c_char,
152152
..Default::default()
153153
};
154154
nbgl_useCaseAdvancedReviewStreamingStart(
@@ -271,8 +271,8 @@ impl NbglStreamingReview {
271271
let mut tag_value_array: Vec<nbgl_contentTagValue_t> = Vec::new();
272272
for field in v.iter() {
273273
let val = nbgl_contentTagValue_t {
274-
item: field.name.as_ptr() as *const i8,
275-
value: field.value.as_ptr() as *const i8,
274+
item: field.name.as_ptr() as *const ::core::ffi::c_char,
275+
value: field.value.as_ptr() as *const ::core::ffi::c_char,
276276
..Default::default()
277277
};
278278
tag_value_array.push(val);

ledger_secure_sdk_sys/devices/apex_p/apex_p.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"relocation-model": "ropi-rwpi",
2626
"singlethread": true,
27-
"target-pointer-width": "32",
27+
"target-pointer-width": 32,
2828
"os": "apex_p",
2929
"target-family": [ "bolos" ]
3030
}

ledger_secure_sdk_sys/devices/flex/flex.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"relocation-model": "ropi-rwpi",
2626
"singlethread": true,
27-
"target-pointer-width": "32",
27+
"target-pointer-width": 32,
2828
"os": "flex",
2929
"target-family": [ "bolos" ]
3030
}

ledger_secure_sdk_sys/devices/nanosplus/nanosplus.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"relocation-model": "ropi-rwpi",
2626
"singlethread": true,
27-
"target-pointer-width": "32",
27+
"target-pointer-width": 32,
2828
"os": "nanosplus",
2929
"target-family": [ "bolos" ]
3030
}

ledger_secure_sdk_sys/devices/nanox/nanox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"relocation-model": "ropi-rwpi",
2626
"singlethread": true,
27-
"target-pointer-width": "32",
27+
"target-pointer-width": 32,
2828
"os": "nanox",
2929
"target-family": [ "bolos" ]
3030
}

ledger_secure_sdk_sys/devices/stax/stax.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"relocation-model": "ropi-rwpi",
2626
"singlethread": true,
27-
"target-pointer-width": "32",
27+
"target-pointer-width": 32,
2828
"os": "stax",
2929
"target-family": [ "bolos" ]
3030
}

0 commit comments

Comments
 (0)