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 <[email protected]>

Author: bors[bot]

.travis.yml

@@ -8,16 +8,13 @@ branches:
     - master
 language: rust
 os: linux
-dist: xenial
+dist: focal
 addons:
   apt:
     sources:
-    - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-11 main"
+    - sourceline: "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main"
       key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
     packages:
-    - llvm-3.9-dev
-    - libclang-3.9-dev
-    - clang-3.9
     - clang-11
     - cmake
     - qemu-user
@@ -34,7 +31,6 @@ env:
     # Pinned to this particular nightly version because of core_io. This can be
     # re-pinned whenever core_io is updated to the latest nightly.
     - CORE_IO_NIGHTLY=nightly-2021-03-25
-    - LLVM_CONFIG_PATH=llvm-config-3.9
 jobs:
   include:
     # Test additional Rust toolchains on x86_64

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mbedtls"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["Jethro Beekman <[email protected]>"]
 build = "build.rs"
 edition = "2018"

mbedtls/Cargo.toml

@@ -352,6 +352,7 @@ impl BERDecodable for EncryptedData {
 
 // EncryptedContentInfo from PKCS7 see RFC 2315 section 10.1
 #[derive(Debug, Clone)]
+#[allow(dead_code)]
 struct EncryptedContentInfo {
     content_type: ObjectIdentifier,
     encryption_algo: AlgorithmIdentifier,
@@ -454,6 +455,7 @@ enum Pkcs12BagSet {
 }
 
 #[derive(Debug, Clone)]
+#[allow(dead_code)]
 struct SafeBag {
     bag_id: ObjectIdentifier,
     bag_value: Pkcs12BagSet,

mbedtls/src/pkcs12/mod.rs

@@ -28,7 +28,6 @@ pub use self::profile::Profile;
 use mbedtls_sys::*;
 use mbedtls_sys::types::raw_types::c_uint;
 bitflags! {
-    #[doc(inline)]
     pub struct KeyUsage: c_uint {
         const DIGITAL_SIGNATURE  = X509_KU_DIGITAL_SIGNATURE as c_uint;
         const NON_REPUDIATION    = X509_KU_NON_REPUDIATION as c_uint;
@@ -43,7 +42,6 @@ bitflags! {
 }
 
 bitflags! {
-    #[doc(inline)]
     pub struct VerifyError: u32 {
         const CERT_BAD_KEY       = X509_BADCERT_BAD_KEY as u32;
         const CERT_BAD_MD        = X509_BADCERT_BAD_MD as u32;

mbedtls/src/x509/mod.rs

@@ -1,55 +1,56 @@
------BEGIN CERTIFICATE-----
-MIIJ4zCCB8ugAwIBAgIUYWBon4vyPRA0NbJ13YfQ3yGZKo0wDQYJKoZIhvcNAQEL
-BQAwXTELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBC
-LlYuMSwwKgYDVQQDDCNRdW9WYWRpcyBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAy
-MDAeFw0yMDA4MjIxNTI0MjVaFw0yMTA4MjIxNTM0MDBaMG8xCzAJBgNVBAYTAk5M
-MRUwEwYDVQQIDAxadWlkLUhvbGxhbmQxFjAUBgNVBAcMDSdzLUdyYXZlbmhhZ2Ux
-FjAUBgNVBAoMDVJpamtzb3ZlcmhlaWQxGTAXBgNVBAMMEHJpamtzb3ZlcmhlaWQu
-bmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+sblYOMViTpphpjAW
-JTTGPQlPYk7eA5dxAkPnViIpSZQf2qEXAhlMevdQFzJ4pDBQXgft2DE8mqnlkyP+
-9AwHEGPYR57GJ2j+Gjs2maz1af3RTAvqPEHoTLytE4hnpj0TKICqvmPz9t2urjB4
-x/66z/e4uy/vIq6O+FKEBRgK9wKlc1U+KmWvD9ZUwLdkBhUEVjagEcfZo5c+2APo
-oCj4vWiPFrEEKt2vVZCcg896HJx3+df38H6oRrVxumJ26pkpXh/4qcHAT1oDVYrf
-Fhy5ZNIAWEfCsWoOOGlnfba1BKK4JFsiYOwF0mxfIPA3hATI75zQoKe+xi7CVFm7
-85DLAgMBAAGjggWHMIIFgzAfBgNVHSMEGDAWgBQitz3ATmZvWKhzsBLf/7vTjhOY
-5zCBiwYIKwYBBQUHAQEEfzB9ME8GCCsGAQUFBzAChkNodHRwOi8vdHJ1c3QucXVv
-dmFkaXNnbG9iYWwuY29tL3F1b3ZhZGlzcGtpb3ZlcmhlaWRzZXJ2ZXJjYTIwMjAu
-Y3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20w
-ggFcBgNVHREEggFTMIIBT4IQcmlqa3NvdmVyaGVpZC5ubIIUd3d3LnJpamtzb3Zl
-cmhlaWQubmyCGm1hZ2F6aW5lcy5yaWprc292ZXJoZWlkLm5sgiBtYWdhemluZXNp
-bnRlcm4ucmlqa3NvdmVyaGVpZC5ubIIZb3BlbmRhdGEucmlqa3NvdmVyaGVpZC5u
-bIIWZmVlZHMucmlqa3NvdmVyaGVpZC5ubIIXc3RhdGljLnJpamtzb3ZlcmhlaWQu
-bmyCDWdvdmVybm1lbnQubmyCEXd3dy5nb3Zlcm5tZW50Lm5sghdtYWdhemluZXMu
-Z292ZXJubWVudC5ubIIdbWFnYXppbmVzaW50ZXJuLmdvdmVybm1lbnQubmyCFm9w
-ZW5kYXRhLmdvdmVybm1lbnQubmyCE2ZlZWRzLmdvdmVybm1lbnQubmyCFHN0YXRp
-Yy5nb3Zlcm5tZW50Lm5sMIIBxAYDVR0gBIIBuzCCAbcwggGpBgpghBABh2sBAgUJ
-MIIBmTA1BggrBgEFBQcCARYpaHR0cHM6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29t
-L3JlcG9zaXRvcnkwggFeBggrBgEFBQcCAjCCAVAeggFMAFIAZQBsAGkAYQBuAGMA
-ZQAgAG8AbgAgAHQAaABpAHMAIABjAGUAcgB0AGkAZgBpAGMAYQB0AGUAIABiAHkA
-IABhAG4AeQAgAHAAYQByAHQAeQAgAGEAcwBzAHUAbQBlAHMAIABhAGMAYwBlAHAA
-dABhAG4AYwBlACAAbwBmACAAdABoAGUAIAByAGUAbABlAHYAYQBuAHQAIABRAHUA
-bwBWAGEAZABpAHMAIABDAGUAcgB0AGkAZgBpAGMAYQB0AGkAbwBuACAAUAByAGEA
-YwB0AGkAYwBlACAAUwB0AGEAdABlAG0AZQBuAHQAIABhAG4AZAAgAG8AdABoAGUA
-cgAgAGQAbwBjAHUAbQBlAG4AdABzACAAaQBuACAAdABoAGUAIABRAHUAbwBWAGEA
-ZABpAHMAIAByAGUAcABvAHMAaQB0AG8AcgB5AC4wCAYGZ4EMAQICMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATBSBgNVHR8ESzBJMEegRaBDhkFodHRwOi8v
-Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdW92YWRpc3BraW92ZXJoZWlkc2VydmVy
-Y2EyMDIwLmNybDAdBgNVHQ4EFgQU73sJ3Pm4d1/AKFrv+Gckp97BkQ4wDgYDVR0P
-AQH/BAQDAgWgMIIBBgYKKwYBBAHWeQIEAgSB9wSB9ADyAHcAfT7y+I//iFVoJMLA
-yp5SiXkrxQ54CX8uapdomX4i8NcAAAF0Fs59qQAABAMASDBGAiEA/JsQAVVTQ1cL
-lV/j64XHyEz1GcX2tM3WMEiIaZ6+hpkCIQDhPookIbP7rf5S5S8V4Vun4QICuJra
-oUBp8Eg6ZyfFrAB3AESUZS6w7s6vxEAH2Kj+KMDa5oK+2MsxtT/TM5a1toGoAAAB
-dBbOfgEAAAQDAEgwRgIhAIPbdf/tGUnPhyMuLfav6lnJrgnSe5FyZI96T+lICqwt
-AiEAt+Is214T+NmPe0pVhQ+xqITBQgWy271YyQu8kpol2bMwDQYJKoZIhvcNAQEL
-BQADggIBABNR8VjcozKxXJ/y3kF55IcM3xGIqzfSgcNIBmZF5VziJOzzKVA2nFAW
-Cv/gyAylcnFRo8Zy2M0zFrV9kQn5MRmHZRy9Vqh4rtpMxr1uw31gckl3nxYrX4qb
-Lri/AgAlQStMTYQc4aKHeeTnA9X3VE9DOrzbeV4rRS5+1JhYDsBYn495Xz1CpGx3
-s9XA2okn+yCTQIcFOjQeyX+tHdOTPR+IEh73dFUo68q1+ZiWhDmFIxGPfYOOrrMP
-qVeBm5Mrm9v2lnskEwv/v2E9fiDFi9Y82DTMm4NY2rZ48MnZeONoydb3XJwlK68N
-9ykgQRmj7we3fimd/7I9MQNy8pPG0u3LMVwqnNlzTaPSZ8ChrPMZGb74AgxvrX0p
-myIXghnpBTWar8Dmg9iDVwpg+dSBHUK/oSusaCNpjCAw+i9WKvuRMUjzthxHtpdd
-NkFnCF2oTD8CiAQghj/t9nzwMbU3X3+80El/K7FCpLQuAA9iQB0GTYEVZNTN+0Az
-GeDqsmcO7lRB3w4iAkDv2yqXTrbimxAjhd/fgS2tXJzzHPMCxs5YNHPVCYRZs852
-S6pyfCoD1WcmvTooW47p8MjF4nVcgiL0Bo02UAPLTc1mWm2uE4LaeTj/H2dVccnR
-I8/g5vjg+Z6jeT70MWDiweM7hrbgwYq0AiF+omyGGMs0RSV8xjEO
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIJ8jCCB9qgAwIBAgIUIJ6pIvPB2TvJeHIj/wAgIHMRsfYwDQYJKoZIhvcNAQEL
+BQAwXTELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBC
+LlYuMSwwKgYDVQQDDCNRdW9WYWRpcyBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAy
+MDAeFw0yMTA3MDcxMDUyMDNaFw0yMjA3MDcxMTAyMDBaMG8xCzAJBgNVBAYTAk5M
+MRUwEwYDVQQIDAxadWlkLUhvbGxhbmQxFjAUBgNVBAcMDSdzLUdyYXZlbmhhZ2Ux
+FjAUBgNVBAoMDVJpamtzb3ZlcmhlaWQxGTAXBgNVBAMMEHJpamtzb3ZlcmhlaWQu
+bmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCppsJK0V/zM55iAjZG
+CgOwrrpjqxbuy/35IkSlzLqdI4VcJ9NgU0H3GyWt+NMzpw8zP6+bLIPEaNRqedYi
+jI9egjbli6YsZ9T6seXH0gcDc5Gvw993osJvwKNSzs8bh1NyhYr9IG7X9txmPqPs
+TjdevdSgzO+gztHxZLfmIf0B6AlwxssDkGBxmYcw+MkFF4WIkN9Dbq/8GCZGUsVA
+WuY/pHW7B6/i+0x7pTTgj7pKNxH+niLcuc8PgsZn0MXH4yQAXBTIX8CkYcfc+ZhQ
+aD2t/5wx9mZekQQbj6Uc1ITgfRipLIKmOB4+uSQqZLw0BXTYu2v1NsJcgeTbx022
+LanvAgMBAAGjggWWMIIFkjAfBgNVHSMEGDAWgBQitz3ATmZvWKhzsBLf/7vTjhOY
+5zCBiwYIKwYBBQUHAQEEfzB9ME8GCCsGAQUFBzAChkNodHRwOi8vdHJ1c3QucXVv
+dmFkaXNnbG9iYWwuY29tL3F1b3ZhZGlzcGtpb3ZlcmhlaWRzZXJ2ZXJjYTIwMjAu
+Y3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20w
+ggEnBgNVHREEggEeMIIBGoIQcmlqa3NvdmVyaGVpZC5ubIIUd3d3LnJpamtzb3Zl
+cmhlaWQubmyCGm1hZ2F6aW5lcy5yaWprc292ZXJoZWlkLm5sgiBtYWdhemluZXNp
+bnRlcm4ucmlqa3NvdmVyaGVpZC5ubIIZb3BlbmRhdGEucmlqa3NvdmVyaGVpZC5u
+bIIWZmVlZHMucmlqa3NvdmVyaGVpZC5ubIIXc3RhdGljLnJpamtzb3ZlcmhlaWQu
+bmyCDWdvdmVybm1lbnQubmyCEXd3dy5nb3Zlcm5tZW50Lm5sghdtYWdhemluZXMu
+Z292ZXJubWVudC5ubIIWb3BlbmRhdGEuZ292ZXJubWVudC5ubIITZmVlZHMuZ292
+ZXJubWVudC5ubDCCARkGA1UdIASCARAwggEMMIH/BgpghBABh2sBAgUJMIHwMDUG
+CCsGAQUFBwIBFilodHRwczovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3Np
+dG9yeTCBtgYIKwYBBQUHAgIwgakMgaZSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHJlbGV2
+YW50IFF1b1ZhZGlzIENlcnRpZmljYXRpb24gUHJhY3RpY2UgU3RhdGVtZW50IGFu
+ZCBvdGhlciBkb2N1bWVudHMgaW4gdGhlIFF1b1ZhZGlzIHJlcG9zaXRvcnkuMAgG
+BmeBDAECAjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwUgYDVR0fBEsw
+STBHoEWgQ4ZBaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXVvdmFkaXNw
+a2lvdmVyaGVpZHNlcnZlcmNhMjAyMC5jcmwwHQYDVR0OBBYEFECweAcItBPGKhfw
+U9qDCAUBuOudMA4GA1UdDwEB/wQEAwIFoDCCAfUGCisGAQQB1nkCBAIEggHlBIIB
+4QHfAHcAKXm+8J45OSHwVnOfY6V35b5XfZxgCvj5TV0mXCVdx4QAAAF6gKHGnwAA
+BAMASDBGAiEAscoQWVf6xJr+c9v7mSNzQgl2F0AefyOkY52MJy2HRB4CIQCjUWTV
+qpYF6xnxFn0rN60HyeKbhzxWEW6PU392sPL8eQB2AEalVet1+pEgMLWiiWn0830R
+LEF0vv1JuIWr8vxw/m1HAAABeoChxmYAAAQDAEcwRQIgUgtvGhMIZIeGo39mCPad
+yFeFIitfybU+bQaReCwwGAUCIQD/avbXZe8jO/i01ggE7QrqYR56AGvQGSzntpWO
+HmzQUgB1AFGjsPX9AXmcVm24N3iPDKR6zBsny/eeiEKaDf7UiwXlAAABeoChx18A
+AAQDAEYwRAIgOOZKFFA72XFAX0RJ+83mEtwgOhegLHS06Jny/abr5OQCIGM/Hgxg
+LFDIGhU6eDJ+RcEgA54k7xCJyAtmZREeD7nhAHUAQcjKsd8iRkoQxqE6CUKHXk4x
+ixsD6+tLx2jwkGKWBvYAAAF6gKHG1gAABAMARjBEAiABD+4dHF0CHPr88pN3RjPP
+e5q4Brqkpt19x6vhCAvxdgIgQWgfMhb3cCz1rzKA/b2M9occr+qKeTDnkINPraxE
+yCgwDQYJKoZIhvcNAQELBQADggIBABq+UC0PTOIlUQLoqrB6fgTUlcMLCXs5xtOj
+M3x7LTWAuayh6kWP1BEihPvf1olL5UIT2RgtNlVGI3badNzzBhaw4LFSsHUDzQkM
+XUocw4kXz14Cqt+sco1xERBX+mKPAOy+ikOwl148ucbYqzMGxevyj9y3eQEYivyM
+m25meyGb8u7ma2Q0eSHDFIV9J6990vuZRGRhX0HwfGJql4IfoA35jm3h6oO/njdZ
+7v4zOhjbvUfCTReqAVS06L4W7OpB8+eqrOp7fiP3XRw0sexF5WCN2X132n1hVdn1
+UyAbU0oKJ64llY2RTadxFuVx+LP1y3ahePdtU1xgF/C31glh1Qu/0kdmmzjszeqs
+ZEkt/ejhd/mnqqOaeGTYt3HUkqERbEhg+vaC3pnVD1jDJTzUKrpYv5T+JigXPW3b
+f+mVVAHuBgTkRqI2R6klx2rPQ4FMVbwNQPMXggp/MsAE7UOpzhaQLo1EyexuOsUR
+ZZp/X31SqpZAD7GUCTiMOpgOSusDjc5avN1zHn45VRFtbElqi1ysI+evEM4kyUAF
+7gBzfdst1Dm9bCrqQ2vcXnjlfLvsCypClWnrL3fgwoeSKTu7fbNnwoDPSwHRMdfb
+B0oX9jgftJbKdNY3yvO2CpnxGF/qmTLcYLKSRU83NXI4slCHVAqymco67LxiwuEd
+MJQkFtxt
+-----END CERTIFICATE-----