Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 16 insertions, 4 deletions

diff --git a/vendor/security-framework-sys/.cargo-checksum.json b/vendor/security-framework-sys/.cargo-checksum.json
index c3ffc9bc9..21eb66b35 100644
--- a/vendor/security-framework-sys/.cargo-checksum.json
+++ b/vendor/security-framework-sys/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"20e20b7fc4f390987e5610851e872cabe3bca0b67a0740278fe7f89fc304fcc5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"91e934255ba3b2f21103d68c5581c23ef34aa95c4628e4405b8c901935e11c69","README.md":"ff1d022f35ff76531a361ad421ba7ee61ce186dc6516f72fc819ec4b2a5567a4","src/access.rs":"5a3793ee3b77360f183404c1543111d6e96f5a0728f7ebdf3f6112594d9c4deb","src/access_control.rs":"097eb2ac649fed2e4b9eca8e5115ab0cb7e72cb148c2bed44f056c786d2d4691","src/authorization.rs":"82823dc5a60a7cd23bd5ee551685dd2fdc3744ab6563d838a9def393b4bba235","src/base.rs":"d4451e5dc4bb152bec38933a57de4779de491dd113308907fa39bd9720e55e7d","src/certificate.rs":"789a17be2f930fd5083e01c815551174d8cebd2435b238865724295c1580deb0","src/certificate_oids.rs":"67f6b691925133c2501e0be31aea514b3ef0e9d382281cb283bd9aa6614dc580","src/cipher_suite.rs":"d86cad8b3e48240642595b2e1518d36ecffd0fc5bcb09fbff22d6b211cde93da","src/code_signing.rs":"1120f85df71179a2261afcbbd4cf6d0c0c18c164f9b6d2c1f912fb58194ed23a","src/digest_transform.rs":"230c1ca843df534de6d5ea33d623781c0e5fac6063f472b727b118a5abea99d2","src/encrypt_transform.rs":"0992ad3ac4da00e31bc3fc481ec94e35b37f2816903872bfe9a7ef0e7547c318","src/identity.rs":"90d90db56ae650113bdb09743882b62cd426bca50be5ac2fb99e9375a932d91b","src/import_export.rs":"4efb4c41581ccdc16411e2b3a068a02a0b0ef68ebf689014240e4916ebab768e","src/item.rs":"adc4ae21067f8b65954dab3e2b71aee64715200c565ceb2222e5dac6c8fe1e1a","src/key.rs":"d9afccbeaa42c2ae2ad2f8b9f762a39239b960da7826124b610ef949a0b8be8b","src/keychain.rs":"b1c1a5d5bab31e3658b4bcfa501d8e96f15cb76f38e15d1b86ed1edfc728b992","src/keychain_item.rs":"ac7be52b5e055f934379048623c0d68cd5e24a0cf9436fa0dcd9d66c2a0598ec","src/lib.rs":"6740d2c9b3f11cc21005f021c9f4b21fcba11018b67e23dec1b34882a7758c3d","src/policy.rs":"cc33c34452cdcceb88e6d9bb890a552b8d0fc1db5ac7db98df2c418c7cca6ac8","src/random.rs":"4a9104ef3644d870d50cf3239bf690cd448225fc267214538c4f5bdb1e669052","src/secure_transport.rs":"bb1a5aa05cb6d565e312cc62dbec53305e4ad4a542ec37de4bb5a92021458de9","src/transform.rs":"4768b1f14ad8e72c696c5c68bfddc7cc39caa223caf081c1ff119feeddc9733f","src/trust.rs":"d6ae4ac02466949a7960c470b62f05d865783e4a1010bb76fff0c99ace476d30","src/trust_settings.rs":"21b89cbf485be9c40fd0418553167bfa75a00a7bfc697df558dc4fd86a692239"},"package":"f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"}
\ No newline at end of file
+{"files":{"Cargo.toml":"f4a50cb4b4329cd4bf3e8267b8cffb9f8d717624330e602afcac873cd98216e9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"91e934255ba3b2f21103d68c5581c23ef34aa95c4628e4405b8c901935e11c69","README.md":"ff1d022f35ff76531a361ad421ba7ee61ce186dc6516f72fc819ec4b2a5567a4","src/access.rs":"5a3793ee3b77360f183404c1543111d6e96f5a0728f7ebdf3f6112594d9c4deb","src/access_control.rs":"62791223617cfb55a2bc944e687da85798a6c7cd363ce2c5d3474f998f63e503","src/authorization.rs":"82823dc5a60a7cd23bd5ee551685dd2fdc3744ab6563d838a9def393b4bba235","src/base.rs":"4668b229fae9530d5fece1766749f4d75eb49955eab35490a2ea14edd067d8d6","src/certificate.rs":"789a17be2f930fd5083e01c815551174d8cebd2435b238865724295c1580deb0","src/certificate_oids.rs":"67f6b691925133c2501e0be31aea514b3ef0e9d382281cb283bd9aa6614dc580","src/cipher_suite.rs":"d86cad8b3e48240642595b2e1518d36ecffd0fc5bcb09fbff22d6b211cde93da","src/code_signing.rs":"1120f85df71179a2261afcbbd4cf6d0c0c18c164f9b6d2c1f912fb58194ed23a","src/digest_transform.rs":"230c1ca843df534de6d5ea33d623781c0e5fac6063f472b727b118a5abea99d2","src/encrypt_transform.rs":"0992ad3ac4da00e31bc3fc481ec94e35b37f2816903872bfe9a7ef0e7547c318","src/identity.rs":"90d90db56ae650113bdb09743882b62cd426bca50be5ac2fb99e9375a932d91b","src/import_export.rs":"4efb4c41581ccdc16411e2b3a068a02a0b0ef68ebf689014240e4916ebab768e","src/item.rs":"adc4ae21067f8b65954dab3e2b71aee64715200c565ceb2222e5dac6c8fe1e1a","src/key.rs":"d9afccbeaa42c2ae2ad2f8b9f762a39239b960da7826124b610ef949a0b8be8b","src/keychain.rs":"b1c1a5d5bab31e3658b4bcfa501d8e96f15cb76f38e15d1b86ed1edfc728b992","src/keychain_item.rs":"ac7be52b5e055f934379048623c0d68cd5e24a0cf9436fa0dcd9d66c2a0598ec","src/lib.rs":"6740d2c9b3f11cc21005f021c9f4b21fcba11018b67e23dec1b34882a7758c3d","src/policy.rs":"cc33c34452cdcceb88e6d9bb890a552b8d0fc1db5ac7db98df2c418c7cca6ac8","src/random.rs":"4a9104ef3644d870d50cf3239bf690cd448225fc267214538c4f5bdb1e669052","src/secure_transport.rs":"bb1a5aa05cb6d565e312cc62dbec53305e4ad4a542ec37de4bb5a92021458de9","src/transform.rs":"4768b1f14ad8e72c696c5c68bfddc7cc39caa223caf081c1ff119feeddc9733f","src/trust.rs":"d6ae4ac02466949a7960c470b62f05d865783e4a1010bb76fff0c99ace476d30","src/trust_settings.rs":"21b89cbf485be9c40fd0418553167bfa75a00a7bfc697df558dc4fd86a692239"},"package":"e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"}
\ No newline at end of file
diff --git a/vendor/security-framework-sys/Cargo.toml b/vendor/security-framework-sys/Cargo.toml
index 5213eeb08..dea106695 100644
--- a/vendor/security-framework-sys/Cargo.toml
+++ b/vendor/security-framework-sys/Cargo.toml
@@ -10,9 +10,9 @@
 # See Cargo.toml.orig for the original contents.
 
 [package]
-edition = "2018"
+edition = "2021"
 name = "security-framework-sys"
-version = "2.9.0"
+version = "2.9.1"
 authors = [
     "Steven Fackler <sfackler@gmail.com>",
     "Kornel <kornel@geekhood.net>",
@@ -33,6 +33,7 @@ categories = [
 ]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/kornelski/rust-security-framework"
+resolver = "1"
 
 [package.metadata.docs.rs]
 targets = [
@@ -57,4 +58,4 @@ OSX_10_9 = []
 default = ["OSX_10_9"]
 
 [badges.maintenance]
-status = "passively-maintained"
+status = "looking-for-maintainer"
diff --git a/vendor/security-framework-sys/src/access_control.rs b/vendor/security-framework-sys/src/access_control.rs
index 07c21e4a2..9089ab64a 100644
--- a/vendor/security-framework-sys/src/access_control.rs
+++ b/vendor/security-framework-sys/src/access_control.rs
@@ -1,6 +1,7 @@
 use core_foundation_sys::base::CFOptionFlags;
 use core_foundation_sys::base::{CFAllocatorRef, CFTypeID, CFTypeRef};
 use core_foundation_sys::error::CFErrorRef;
+use core_foundation_sys::string::CFStringRef;
 
 use crate::base::SecAccessControlRef;
 
@@ -24,6 +25,15 @@ mod access_control_flags {
 pub use access_control_flags::*;
 
 extern "C" {
+    pub static kSecAttrAccessibleWhenUnlocked: CFStringRef;
+    pub static kSecAttrAccessibleAfterFirstUnlock: CFStringRef;
+    pub static kSecAttrAccessibleAlways: CFStringRef;
+    pub static kSecAttrAccessibleWhenUnlockedThisDeviceOnly: CFStringRef;
+    pub static kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly: CFStringRef;
+    pub static kSecAttrAccessibleAlwaysThisDeviceOnly: CFStringRef;
+}
+
+extern "C" {
     pub fn SecAccessControlGetTypeID() -> CFTypeID;
 
     pub fn SecAccessControlCreateWithFlags(
diff --git a/vendor/security-framework-sys/src/base.rs b/vendor/security-framework-sys/src/base.rs
index ea0e7f419..fafc57cc2 100644
--- a/vendor/security-framework-sys/src/base.rs
+++ b/vendor/security-framework-sys/src/base.rs
@@ -60,6 +60,7 @@ pub const errSecInvalidExtendedKeyUsage: OSStatus = -67609;
 pub const errSecTrustSettingDeny: OSStatus = -67654;
 pub const errSecCertificateRevoked: OSStatus = -67820;
 pub const errSecNotTrusted: OSStatus = -67843;
+pub const errSecInternalComponent: OSStatus = -2070;
 
 extern "C" {
     // this is available on iOS 11.3+, MacOS 10.3+