From e76a6b48ffbfdf86e4829d1bd3641279f96acb49 Mon Sep 17 00:00:00 2001 From: Felix Krull Date: Tue, 25 Aug 2020 19:34:31 +0200 Subject: [PATCH] PATCH: versions on ostree_sign_* functions --- rust-bindings/rust/gir-files/OSTree-1.0.gir | 31 ++++++++++---- rust-bindings/rust/src/auto/mod.rs | 4 ++ rust-bindings/rust/src/auto/sign.rs | 43 ++++++++++++++++++++ rust-bindings/rust/src/auto/versions.txt | 2 +- rust-bindings/rust/sys/src/auto/versions.txt | 2 +- rust-bindings/rust/sys/src/lib.rs | 19 +++++++++ 6 files changed, 92 insertions(+), 9 deletions(-) diff --git a/rust-bindings/rust/gir-files/OSTree-1.0.gir b/rust-bindings/rust/gir-files/OSTree-1.0.gir index 41dab726..6f236c57 100644 --- a/rust-bindings/rust/gir-files/OSTree-1.0.gir +++ b/rust-bindings/rust/gir-files/OSTree-1.0.gir @@ -14408,6 +14408,7 @@ or #ostree_sign_load_pk. @@ -14424,6 +14425,7 @@ or #ostree_sign_load_pk. @@ -14449,6 +14451,7 @@ or #ostree_sign_load_pk. @@ -14469,7 +14472,7 @@ or #ostree_sign_load_pk. - + @@ -14481,7 +14484,8 @@ or #ostree_sign_load_pk. + c:identifier="ostree_sign_dummy_metadata_format" + version="2020.2"> @@ -14493,7 +14497,8 @@ or #ostree_sign_load_pk. + c:identifier="ostree_sign_dummy_metadata_key" + version="2020.2"> @@ -14506,6 +14511,7 @@ or #ostree_sign_load_pk. @@ -14522,6 +14528,7 @@ or #ostree_sign_load_pk. @@ -14538,6 +14545,7 @@ or #ostree_sign_load_pk. @@ -14554,6 +14562,7 @@ or #ostree_sign_load_pk. @@ -14567,6 +14576,7 @@ or #ostree_sign_load_pk. @@ -14592,6 +14602,7 @@ or #ostree_sign_load_pk. @@ -14613,7 +14624,8 @@ or #ostree_sign_load_pk. + c:identifier="ostree_sign_ed25519_get_name" + version="2020.2"> @@ -14626,6 +14638,7 @@ or #ostree_sign_load_pk. @@ -14641,7 +14654,8 @@ or #ostree_sign_load_pk. + c:identifier="ostree_sign_ed25519_metadata_format" + version="2020.2"> @@ -14653,7 +14667,8 @@ or #ostree_sign_load_pk. + c:identifier="ostree_sign_ed25519_metadata_key" + version="2020.2"> @@ -14666,6 +14681,7 @@ or #ostree_sign_load_pk. @@ -14682,6 +14698,7 @@ or #ostree_sign_load_pk. @@ -14872,7 +14889,7 @@ The @secret_key argument depends of the particular engine implementation. - + Add a signature to a summary file. diff --git a/rust-bindings/rust/src/auto/mod.rs b/rust-bindings/rust/src/auto/mod.rs index 64123ae8..468b873b 100644 --- a/rust-bindings/rust/src/auto/mod.rs +++ b/rust-bindings/rust/src/auto/mod.rs @@ -62,8 +62,11 @@ pub use self::repo_finder_override::RepoFinderOverrideExt; mod se_policy; pub use self::se_policy::{SePolicy, SePolicyClass}; +#[cfg(any(feature = "v2020_2", feature = "dox"))] mod sign; +#[cfg(any(feature = "v2020_2", feature = "dox"))] pub use self::sign::{Sign, NONE_SIGN}; +#[cfg(any(feature = "v2020_2", feature = "dox"))] pub use self::sign::SignExt; mod sysroot; @@ -177,5 +180,6 @@ pub mod traits { pub use super::RepoFinderMountExt; #[cfg(any(feature = "v2018_6", feature = "dox"))] pub use super::RepoFinderOverrideExt; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub use super::SignExt; } diff --git a/rust-bindings/rust/src/auto/sign.rs b/rust-bindings/rust/src/auto/sign.rs index 2c4f7275..a5b2626c 100644 --- a/rust-bindings/rust/src/auto/sign.rs +++ b/rust-bindings/rust/src/auto/sign.rs @@ -2,14 +2,19 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +#[cfg(any(feature = "v2020_2", feature = "dox"))] use gio; +#[cfg(any(feature = "v2020_2", feature = "dox"))] use glib; use glib::object::IsA; use glib::translate::*; +#[cfg(any(feature = "v2020_2", feature = "dox"))] use glib::GString; use ostree_sys; use std::fmt; +#[cfg(any(feature = "v2020_2", feature = "dox"))] use std::ptr; +#[cfg(any(feature = "v2020_2", feature = "dox"))] use Repo; glib_wrapper! { @@ -59,40 +64,58 @@ pub trait SignExt: 'static { #[cfg(any(feature = "v2020_2", feature = "dox"))] fn data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant, out_success_message: &str) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_add_pk(&self, key: &glib::Variant) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_data>(&self, data: &glib::Bytes, signature: &glib::Bytes, cancellable: Option<&P>) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant, success_message: &str) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_get_name(&self) -> Option; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_metadata_format(&self) -> Option; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_metadata_key(&self) -> Option; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_set_pk(&self, key: &glib::Variant) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_set_sk(&self, key: &glib::Variant) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_add_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_clear_keys(&self) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_data>(&self, data: &glib::Bytes, signature: &glib::Bytes, cancellable: Option<&P>) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant, out_success_message: &str) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_get_name(&self) -> Option; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_load_pk(&self, options: &glib::Variant) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_metadata_format(&self) -> Option; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_metadata_key(&self) -> Option; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_set_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_set_sk(&self, secret_key: &glib::Variant) -> Result<(), glib::Error>; #[cfg(any(feature = "v2020_2", feature = "dox"))] @@ -113,6 +136,7 @@ pub trait SignExt: 'static { #[cfg(any(feature = "v2020_2", feature = "dox"))] fn set_sk(&self, secret_key: &glib::Variant) -> Result<(), glib::Error>; + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn summary>(&self, repo: &Repo, keys: &glib::Variant, cancellable: Option<&P>) -> Result<(), glib::Error>; } @@ -171,6 +195,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_add_pk(&self, key: &glib::Variant) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -179,6 +204,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_data>(&self, data: &glib::Bytes, signature: &glib::Bytes, cancellable: Option<&P>) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -187,6 +213,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant, success_message: &str) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -195,24 +222,28 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_get_name(&self) -> Option { unsafe { from_glib_none(ostree_sys::ostree_sign_dummy_get_name(self.as_ref().to_glib_none().0)) } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_metadata_format(&self) -> Option { unsafe { from_glib_none(ostree_sys::ostree_sign_dummy_metadata_format(self.as_ref().to_glib_none().0)) } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_metadata_key(&self) -> Option { unsafe { from_glib_none(ostree_sys::ostree_sign_dummy_metadata_key(self.as_ref().to_glib_none().0)) } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_set_pk(&self, key: &glib::Variant) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -221,6 +252,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn dummy_set_sk(&self, key: &glib::Variant) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -229,6 +261,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_add_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -237,6 +270,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_clear_keys(&self) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -245,6 +279,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_data>(&self, data: &glib::Bytes, signature: &glib::Bytes, cancellable: Option<&P>) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -253,6 +288,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant, out_success_message: &str) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -261,12 +297,14 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_get_name(&self) -> Option { unsafe { from_glib_none(ostree_sys::ostree_sign_ed25519_get_name(self.as_ref().to_glib_none().0)) } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_load_pk(&self, options: &glib::Variant) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -275,18 +313,21 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_metadata_format(&self) -> Option { unsafe { from_glib_none(ostree_sys::ostree_sign_ed25519_metadata_format(self.as_ref().to_glib_none().0)) } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_metadata_key(&self) -> Option { unsafe { from_glib_none(ostree_sys::ostree_sign_ed25519_metadata_key(self.as_ref().to_glib_none().0)) } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_set_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -295,6 +336,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn ed25519_set_sk(&self, secret_key: &glib::Variant) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); @@ -351,6 +393,7 @@ impl> SignExt for O { } } + #[cfg(any(feature = "v2020_2", feature = "dox"))] fn summary>(&self, repo: &Repo, keys: &glib::Variant, cancellable: Option<&P>) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt index e425b4d9..315b4dc6 100644 --- a/rust-bindings/rust/src/auto/versions.txt +++ b/rust-bindings/rust/src/auto/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1) -from gir-files (https://github.com/gtk-rs/gir-files @ b1bed0a+) +from gir-files (https://github.com/gtk-rs/gir-files @ 56af1d5+) diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt index e425b4d9..315b4dc6 100644 --- a/rust-bindings/rust/sys/src/auto/versions.txt +++ b/rust-bindings/rust/sys/src/auto/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1) -from gir-files (https://github.com/gtk-rs/gir-files @ b1bed0a+) +from gir-files (https://github.com/gtk-rs/gir-files @ 56af1d5+) diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/rust/sys/src/lib.rs index ed4508e3..38867df9 100644 --- a/rust-bindings/rust/sys/src/lib.rs +++ b/rust-bindings/rust/sys/src/lib.rs @@ -1618,23 +1618,41 @@ extern "C" { pub fn ostree_sign_data(self_: *mut OstreeSign, data: *mut glib::GBytes, signature: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_data_verify(self_: *mut OstreeSign, data: *mut glib::GBytes, signatures: *mut glib::GVariant, out_success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_add_pk(self_: *mut OstreeSign, key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_data(self_: *mut OstreeSign, data: *mut glib::GBytes, signature: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_data_verify(self_: *mut OstreeSign, data: *mut glib::GBytes, signatures: *mut glib::GVariant, success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_get_name(self_: *mut OstreeSign) -> *const c_char; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_metadata_format(self_: *mut OstreeSign) -> *const c_char; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_metadata_key(self_: *mut OstreeSign) -> *const c_char; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_set_pk(self_: *mut OstreeSign, key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_dummy_set_sk(self_: *mut OstreeSign, key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_add_pk(self_: *mut OstreeSign, public_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_clear_keys(self_: *mut OstreeSign, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_data(self_: *mut OstreeSign, data: *mut glib::GBytes, signature: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_data_verify(self_: *mut OstreeSign, data: *mut glib::GBytes, signatures: *mut glib::GVariant, out_success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_get_name(self_: *mut OstreeSign) -> *const c_char; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_load_pk(self_: *mut OstreeSign, options: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_metadata_format(self_: *mut OstreeSign) -> *const c_char; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_metadata_key(self_: *mut OstreeSign) -> *const c_char; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_set_pk(self_: *mut OstreeSign, public_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_ed25519_set_sk(self_: *mut OstreeSign, secret_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_get_name(self_: *mut OstreeSign) -> *const c_char; @@ -1648,6 +1666,7 @@ extern "C" { pub fn ostree_sign_set_pk(self_: *mut OstreeSign, public_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_set_sk(self_: *mut OstreeSign, secret_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2020_2", feature = "dox"))] pub fn ostree_sign_summary(self_: *mut OstreeSign, repo: *mut OstreeRepo, keys: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; //=========================================================================