Skip to content

Commit 5652d9c

Browse files
committed
try fix CI
1 parent 8d4f2f9 commit 5652d9c

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.travis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ branches:
88
- master
99
language: rust
1010
os: linux
11-
dist: xenial
11+
dist: focal
1212
addons:
1313
apt:
14+
sources:
15+
- sourceline: "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main"
16+
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
1417
packages:
15-
- llvm-3.8-dev
16-
- libclang-3.8-dev
17-
- clang-3.8
18+
- clang-11
1819
- cmake
1920
rust:
2021
- stable
@@ -29,6 +30,5 @@ env:
2930
# re-pinned whenever core_io is updated to the latest nightly.
3031
- CORE_IO_NIGHTLY=nightly-2019-07-01
3132
- SGX_NIGHTLY=nightly-2019-10-28
32-
- LLVM_CONFIG_PATH=llvm-config-3.8
3333
script:
3434
- ./ct.sh

mbedtls/src/bignum/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl Mpi {
173173
mpi_write_string(
174174
&self.inner,
175175
radix,
176-
buf.as_mut_ptr() as *mut i8,
176+
buf.as_mut_ptr() as *mut _,
177177
buf.len(),
178178
&mut olen,
179179
)

mbedtls/src/pk/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const CUSTOM_PK_INFO: pk_info_t = {
129129
sign_func: None,
130130
verify_func: None,
131131
get_bitlen: None,
132-
name: b"\0" as *const u8 as *const i8,
132+
name: b"\0" as *const u8 as *const _,
133133
ctx_alloc_func: Some(alloc_custom_pk_ctx),
134134
ctx_free_func: Some(free_custom_pk_ctx),
135135
}

mbedtls/src/pkcs12/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ impl BERDecodable for EncryptedData {
356356

357357
// EncryptedContentInfo from PKCS7 see RFC 2315 section 10.1
358358
#[derive(Debug, Clone)]
359+
#[allow(dead_code)]
359360
struct EncryptedContentInfo {
360361
content_type: ObjectIdentifier,
361362
encryption_algo: AlgorithmIdentifier,
@@ -458,6 +459,7 @@ enum Pkcs12BagSet {
458459
}
459460

460461
#[derive(Debug, Clone)]
462+
#[allow(dead_code)]
461463
struct SafeBag {
462464
bag_id: ObjectIdentifier,
463465
bag_value: Pkcs12BagSet,

0 commit comments

Comments
 (0)