Skip to content

Commit 1d27299

Browse files
bors[bot]raoulstrackx
bors[bot]
and
raoulstrackx
authored
Merge #166
166: Fix unknown rustdoc attribute + replace test certificate r=jethrogb a=raoulstrackx This PR: - fixes an issue where `doc(inline)` annotations are only allowed on 'use' items. Two occurrences are removed [https://github.com/rust-lang/rust/issues/82730](#82730) - updates a leaf certificate that is used for testing but has been expired. It is replaced with a new one. - silences a compiler warning where a field of a struct is written to, but never read - updates the Travis CI to use ubuntu20 - bumps the version of mbedtls Co-authored-by: Raoul Strackx <raoul.strackx@fortanix.com>
2 parents e482ea5 + 11c4f7f commit 1d27299

File tree

6 files changed

+62
-65
lines changed

6 files changed

+62
-65
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ branches:
88
- master
99
language: rust
1010
os: linux
11-
dist: xenial
11+
dist: focal
1212
addons:
1313
apt:
1414
sources:
15-
- sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-11 main"
15+
- sourceline: "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main"
1616
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
1717
packages:
18-
- llvm-3.9-dev
19-
- libclang-3.9-dev
20-
- clang-3.9
2118
- clang-11
2219
- cmake
2320
- qemu-user
@@ -34,7 +31,6 @@ env:
3431
# Pinned to this particular nightly version because of core_io. This can be
3532
# re-pinned whenever core_io is updated to the latest nightly.
3633
- CORE_IO_NIGHTLY=nightly-2021-03-25
37-
- LLVM_CONFIG_PATH=llvm-config-3.9
3834
jobs:
3935
include:
4036
# Test additional Rust toolchains on x86_64

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mbedtls/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mbedtls"
3-
version = "0.8.1"
3+
version = "0.8.2"
44
authors = ["Jethro Beekman <jethro@fortanix.com>"]
55
build = "build.rs"
66
edition = "2018"

‎mbedtls/src/pkcs12/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ impl BERDecodable for EncryptedData {
352352

353353
// EncryptedContentInfo from PKCS7 see RFC 2315 section 10.1
354354
#[derive(Debug, Clone)]
355+
#[allow(dead_code)]
355356
struct EncryptedContentInfo {
356357
content_type: ObjectIdentifier,
357358
encryption_algo: AlgorithmIdentifier,
@@ -454,6 +455,7 @@ enum Pkcs12BagSet {
454455
}
455456

456457
#[derive(Debug, Clone)]
458+
#[allow(dead_code)]
457459
struct SafeBag {
458460
bag_id: ObjectIdentifier,
459461
bag_value: Pkcs12BagSet,

‎mbedtls/src/x509/mod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ pub use self::profile::Profile;
2828
use mbedtls_sys::*;
2929
use mbedtls_sys::types::raw_types::c_uint;
3030
bitflags! {
31-
#[doc(inline)]
3231
pub struct KeyUsage: c_uint {
3332
const DIGITAL_SIGNATURE = X509_KU_DIGITAL_SIGNATURE as c_uint;
3433
const NON_REPUDIATION = X509_KU_NON_REPUDIATION as c_uint;
@@ -43,7 +42,6 @@ bitflags! {
4342
}
4443

4544
bitflags! {
46-
#[doc(inline)]
4745
pub struct VerifyError: u32 {
4846
const CERT_BAD_KEY = X509_BADCERT_BAD_KEY as u32;
4947
const CERT_BAD_MD = X509_BADCERT_BAD_MD as u32;

‎mbedtls/tests/data/chain-leaf.crt‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,56 @@
1-
-----BEGIN CERTIFICATE-----
2-
MIIJ4zCCB8ugAwIBAgIUYWBon4vyPRA0NbJ13YfQ3yGZKo0wDQYJKoZIhvcNAQEL
3-
BQAwXTELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBC
4-
LlYuMSwwKgYDVQQDDCNRdW9WYWRpcyBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAy
5-
MDAeFw0yMDA4MjIxNTI0MjVaFw0yMTA4MjIxNTM0MDBaMG8xCzAJBgNVBAYTAk5M
6-
MRUwEwYDVQQIDAxadWlkLUhvbGxhbmQxFjAUBgNVBAcMDSdzLUdyYXZlbmhhZ2Ux
7-
FjAUBgNVBAoMDVJpamtzb3ZlcmhlaWQxGTAXBgNVBAMMEHJpamtzb3ZlcmhlaWQu
8-
bmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+sblYOMViTpphpjAW
9-
JTTGPQlPYk7eA5dxAkPnViIpSZQf2qEXAhlMevdQFzJ4pDBQXgft2DE8mqnlkyP+
10-
9AwHEGPYR57GJ2j+Gjs2maz1af3RTAvqPEHoTLytE4hnpj0TKICqvmPz9t2urjB4
11-
x/66z/e4uy/vIq6O+FKEBRgK9wKlc1U+KmWvD9ZUwLdkBhUEVjagEcfZo5c+2APo
12-
oCj4vWiPFrEEKt2vVZCcg896HJx3+df38H6oRrVxumJ26pkpXh/4qcHAT1oDVYrf
13-
Fhy5ZNIAWEfCsWoOOGlnfba1BKK4JFsiYOwF0mxfIPA3hATI75zQoKe+xi7CVFm7
14-
85DLAgMBAAGjggWHMIIFgzAfBgNVHSMEGDAWgBQitz3ATmZvWKhzsBLf/7vTjhOY
15-
5zCBiwYIKwYBBQUHAQEEfzB9ME8GCCsGAQUFBzAChkNodHRwOi8vdHJ1c3QucXVv
16-
dmFkaXNnbG9iYWwuY29tL3F1b3ZhZGlzcGtpb3ZlcmhlaWRzZXJ2ZXJjYTIwMjAu
17-
Y3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20w
18-
ggFcBgNVHREEggFTMIIBT4IQcmlqa3NvdmVyaGVpZC5ubIIUd3d3LnJpamtzb3Zl
19-
cmhlaWQubmyCGm1hZ2F6aW5lcy5yaWprc292ZXJoZWlkLm5sgiBtYWdhemluZXNp
20-
bnRlcm4ucmlqa3NvdmVyaGVpZC5ubIIZb3BlbmRhdGEucmlqa3NvdmVyaGVpZC5u
21-
bIIWZmVlZHMucmlqa3NvdmVyaGVpZC5ubIIXc3RhdGljLnJpamtzb3ZlcmhlaWQu
22-
bmyCDWdvdmVybm1lbnQubmyCEXd3dy5nb3Zlcm5tZW50Lm5sghdtYWdhemluZXMu
23-
Z292ZXJubWVudC5ubIIdbWFnYXppbmVzaW50ZXJuLmdvdmVybm1lbnQubmyCFm9w
24-
ZW5kYXRhLmdvdmVybm1lbnQubmyCE2ZlZWRzLmdvdmVybm1lbnQubmyCFHN0YXRp
25-
Yy5nb3Zlcm5tZW50Lm5sMIIBxAYDVR0gBIIBuzCCAbcwggGpBgpghBABh2sBAgUJ
26-
MIIBmTA1BggrBgEFBQcCARYpaHR0cHM6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29t
27-
L3JlcG9zaXRvcnkwggFeBggrBgEFBQcCAjCCAVAeggFMAFIAZQBsAGkAYQBuAGMA
28-
ZQAgAG8AbgAgAHQAaABpAHMAIABjAGUAcgB0AGkAZgBpAGMAYQB0AGUAIABiAHkA
29-
IABhAG4AeQAgAHAAYQByAHQAeQAgAGEAcwBzAHUAbQBlAHMAIABhAGMAYwBlAHAA
30-
dABhAG4AYwBlACAAbwBmACAAdABoAGUAIAByAGUAbABlAHYAYQBuAHQAIABRAHUA
31-
bwBWAGEAZABpAHMAIABDAGUAcgB0AGkAZgBpAGMAYQB0AGkAbwBuACAAUAByAGEA
32-
YwB0AGkAYwBlACAAUwB0AGEAdABlAG0AZQBuAHQAIABhAG4AZAAgAG8AdABoAGUA
33-
cgAgAGQAbwBjAHUAbQBlAG4AdABzACAAaQBuACAAdABoAGUAIABRAHUAbwBWAGEA
34-
ZABpAHMAIAByAGUAcABvAHMAaQB0AG8AcgB5AC4wCAYGZ4EMAQICMB0GA1UdJQQW
35-
MBQGCCsGAQUFBwMCBggrBgEFBQcDATBSBgNVHR8ESzBJMEegRaBDhkFodHRwOi8v
36-
Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdW92YWRpc3BraW92ZXJoZWlkc2VydmVy
37-
Y2EyMDIwLmNybDAdBgNVHQ4EFgQU73sJ3Pm4d1/AKFrv+Gckp97BkQ4wDgYDVR0P
38-
AQH/BAQDAgWgMIIBBgYKKwYBBAHWeQIEAgSB9wSB9ADyAHcAfT7y+I//iFVoJMLA
39-
yp5SiXkrxQ54CX8uapdomX4i8NcAAAF0Fs59qQAABAMASDBGAiEA/JsQAVVTQ1cL
40-
lV/j64XHyEz1GcX2tM3WMEiIaZ6+hpkCIQDhPookIbP7rf5S5S8V4Vun4QICuJra
41-
oUBp8Eg6ZyfFrAB3AESUZS6w7s6vxEAH2Kj+KMDa5oK+2MsxtT/TM5a1toGoAAAB
42-
dBbOfgEAAAQDAEgwRgIhAIPbdf/tGUnPhyMuLfav6lnJrgnSe5FyZI96T+lICqwt
43-
AiEAt+Is214T+NmPe0pVhQ+xqITBQgWy271YyQu8kpol2bMwDQYJKoZIhvcNAQEL
44-
BQADggIBABNR8VjcozKxXJ/y3kF55IcM3xGIqzfSgcNIBmZF5VziJOzzKVA2nFAW
45-
Cv/gyAylcnFRo8Zy2M0zFrV9kQn5MRmHZRy9Vqh4rtpMxr1uw31gckl3nxYrX4qb
46-
Lri/AgAlQStMTYQc4aKHeeTnA9X3VE9DOrzbeV4rRS5+1JhYDsBYn495Xz1CpGx3
47-
s9XA2okn+yCTQIcFOjQeyX+tHdOTPR+IEh73dFUo68q1+ZiWhDmFIxGPfYOOrrMP
48-
qVeBm5Mrm9v2lnskEwv/v2E9fiDFi9Y82DTMm4NY2rZ48MnZeONoydb3XJwlK68N
49-
9ykgQRmj7we3fimd/7I9MQNy8pPG0u3LMVwqnNlzTaPSZ8ChrPMZGb74AgxvrX0p
50-
myIXghnpBTWar8Dmg9iDVwpg+dSBHUK/oSusaCNpjCAw+i9WKvuRMUjzthxHtpdd
51-
NkFnCF2oTD8CiAQghj/t9nzwMbU3X3+80El/K7FCpLQuAA9iQB0GTYEVZNTN+0Az
52-
GeDqsmcO7lRB3w4iAkDv2yqXTrbimxAjhd/fgS2tXJzzHPMCxs5YNHPVCYRZs852
53-
S6pyfCoD1WcmvTooW47p8MjF4nVcgiL0Bo02UAPLTc1mWm2uE4LaeTj/H2dVccnR
54-
I8/g5vjg+Z6jeT70MWDiweM7hrbgwYq0AiF+omyGGMs0RSV8xjEO
55-
-----END CERTIFICATE-----
1+
-----BEGIN CERTIFICATE-----
2+
MIIJ8jCCB9qgAwIBAgIUIJ6pIvPB2TvJeHIj/wAgIHMRsfYwDQYJKoZIhvcNAQEL
3+
BQAwXTELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBC
4+
LlYuMSwwKgYDVQQDDCNRdW9WYWRpcyBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAy
5+
MDAeFw0yMTA3MDcxMDUyMDNaFw0yMjA3MDcxMTAyMDBaMG8xCzAJBgNVBAYTAk5M
6+
MRUwEwYDVQQIDAxadWlkLUhvbGxhbmQxFjAUBgNVBAcMDSdzLUdyYXZlbmhhZ2Ux
7+
FjAUBgNVBAoMDVJpamtzb3ZlcmhlaWQxGTAXBgNVBAMMEHJpamtzb3ZlcmhlaWQu
8+
bmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCppsJK0V/zM55iAjZG
9+
CgOwrrpjqxbuy/35IkSlzLqdI4VcJ9NgU0H3GyWt+NMzpw8zP6+bLIPEaNRqedYi
10+
jI9egjbli6YsZ9T6seXH0gcDc5Gvw993osJvwKNSzs8bh1NyhYr9IG7X9txmPqPs
11+
TjdevdSgzO+gztHxZLfmIf0B6AlwxssDkGBxmYcw+MkFF4WIkN9Dbq/8GCZGUsVA
12+
WuY/pHW7B6/i+0x7pTTgj7pKNxH+niLcuc8PgsZn0MXH4yQAXBTIX8CkYcfc+ZhQ
13+
aD2t/5wx9mZekQQbj6Uc1ITgfRipLIKmOB4+uSQqZLw0BXTYu2v1NsJcgeTbx022
14+
LanvAgMBAAGjggWWMIIFkjAfBgNVHSMEGDAWgBQitz3ATmZvWKhzsBLf/7vTjhOY
15+
5zCBiwYIKwYBBQUHAQEEfzB9ME8GCCsGAQUFBzAChkNodHRwOi8vdHJ1c3QucXVv
16+
dmFkaXNnbG9iYWwuY29tL3F1b3ZhZGlzcGtpb3ZlcmhlaWRzZXJ2ZXJjYTIwMjAu
17+
Y3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20w
18+
ggEnBgNVHREEggEeMIIBGoIQcmlqa3NvdmVyaGVpZC5ubIIUd3d3LnJpamtzb3Zl
19+
cmhlaWQubmyCGm1hZ2F6aW5lcy5yaWprc292ZXJoZWlkLm5sgiBtYWdhemluZXNp
20+
bnRlcm4ucmlqa3NvdmVyaGVpZC5ubIIZb3BlbmRhdGEucmlqa3NvdmVyaGVpZC5u
21+
bIIWZmVlZHMucmlqa3NvdmVyaGVpZC5ubIIXc3RhdGljLnJpamtzb3ZlcmhlaWQu
22+
bmyCDWdvdmVybm1lbnQubmyCEXd3dy5nb3Zlcm5tZW50Lm5sghdtYWdhemluZXMu
23+
Z292ZXJubWVudC5ubIIWb3BlbmRhdGEuZ292ZXJubWVudC5ubIITZmVlZHMuZ292
24+
ZXJubWVudC5ubDCCARkGA1UdIASCARAwggEMMIH/BgpghBABh2sBAgUJMIHwMDUG
25+
CCsGAQUFBwIBFilodHRwczovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3Np
26+
dG9yeTCBtgYIKwYBBQUHAgIwgakMgaZSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmlj
27+
YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHJlbGV2
28+
YW50IFF1b1ZhZGlzIENlcnRpZmljYXRpb24gUHJhY3RpY2UgU3RhdGVtZW50IGFu
29+
ZCBvdGhlciBkb2N1bWVudHMgaW4gdGhlIFF1b1ZhZGlzIHJlcG9zaXRvcnkuMAgG
30+
BmeBDAECAjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwUgYDVR0fBEsw
31+
STBHoEWgQ4ZBaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXVvdmFkaXNw
32+
a2lvdmVyaGVpZHNlcnZlcmNhMjAyMC5jcmwwHQYDVR0OBBYEFECweAcItBPGKhfw
33+
U9qDCAUBuOudMA4GA1UdDwEB/wQEAwIFoDCCAfUGCisGAQQB1nkCBAIEggHlBIIB
34+
4QHfAHcAKXm+8J45OSHwVnOfY6V35b5XfZxgCvj5TV0mXCVdx4QAAAF6gKHGnwAA
35+
BAMASDBGAiEAscoQWVf6xJr+c9v7mSNzQgl2F0AefyOkY52MJy2HRB4CIQCjUWTV
36+
qpYF6xnxFn0rN60HyeKbhzxWEW6PU392sPL8eQB2AEalVet1+pEgMLWiiWn0830R
37+
LEF0vv1JuIWr8vxw/m1HAAABeoChxmYAAAQDAEcwRQIgUgtvGhMIZIeGo39mCPad
38+
yFeFIitfybU+bQaReCwwGAUCIQD/avbXZe8jO/i01ggE7QrqYR56AGvQGSzntpWO
39+
HmzQUgB1AFGjsPX9AXmcVm24N3iPDKR6zBsny/eeiEKaDf7UiwXlAAABeoChx18A
40+
AAQDAEYwRAIgOOZKFFA72XFAX0RJ+83mEtwgOhegLHS06Jny/abr5OQCIGM/Hgxg
41+
LFDIGhU6eDJ+RcEgA54k7xCJyAtmZREeD7nhAHUAQcjKsd8iRkoQxqE6CUKHXk4x
42+
ixsD6+tLx2jwkGKWBvYAAAF6gKHG1gAABAMARjBEAiABD+4dHF0CHPr88pN3RjPP
43+
e5q4Brqkpt19x6vhCAvxdgIgQWgfMhb3cCz1rzKA/b2M9occr+qKeTDnkINPraxE
44+
yCgwDQYJKoZIhvcNAQELBQADggIBABq+UC0PTOIlUQLoqrB6fgTUlcMLCXs5xtOj
45+
M3x7LTWAuayh6kWP1BEihPvf1olL5UIT2RgtNlVGI3badNzzBhaw4LFSsHUDzQkM
46+
XUocw4kXz14Cqt+sco1xERBX+mKPAOy+ikOwl148ucbYqzMGxevyj9y3eQEYivyM
47+
m25meyGb8u7ma2Q0eSHDFIV9J6990vuZRGRhX0HwfGJql4IfoA35jm3h6oO/njdZ
48+
7v4zOhjbvUfCTReqAVS06L4W7OpB8+eqrOp7fiP3XRw0sexF5WCN2X132n1hVdn1
49+
UyAbU0oKJ64llY2RTadxFuVx+LP1y3ahePdtU1xgF/C31glh1Qu/0kdmmzjszeqs
50+
ZEkt/ejhd/mnqqOaeGTYt3HUkqERbEhg+vaC3pnVD1jDJTzUKrpYv5T+JigXPW3b
51+
f+mVVAHuBgTkRqI2R6klx2rPQ4FMVbwNQPMXggp/MsAE7UOpzhaQLo1EyexuOsUR
52+
ZZp/X31SqpZAD7GUCTiMOpgOSusDjc5avN1zHn45VRFtbElqi1ysI+evEM4kyUAF
53+
7gBzfdst1Dm9bCrqQ2vcXnjlfLvsCypClWnrL3fgwoeSKTu7fbNnwoDPSwHRMdfb
54+
B0oX9jgftJbKdNY3yvO2CpnxGF/qmTLcYLKSRU83NXI4slCHVAqymco67LxiwuEd
55+
MJQkFtxt
56+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)