diff --git a/rust-bindings/rust/conf/ostree.toml b/rust-bindings/rust/conf/ostree.toml index 512beefb..69a1c5cc 100644 --- a/rust-bindings/rust/conf/ostree.toml +++ b/rust-bindings/rust/conf/ostree.toml @@ -47,9 +47,6 @@ generate = [ "OSTree.RepoPullFlags", "OSTree.RepoRemoteChange", "OSTree.RepoResolveRevExtFlags", - "OSTree.Sign", - "OSTree.SignDummy", - "OSTree.SignEd25519", "OSTree.SePolicy", "OSTree.SePolicyRestoreconFlags", "OSTree.StaticDeltaGenerateOpt", @@ -187,6 +184,13 @@ status = "generate" init_function_expression = "|_ptr| ()" clear_function_expression = "|_ptr| ()" +[[object]] +name = "OSTree.Sign" +status = "generate" + [[object.function]] + pattern = "dummy_.+|ed25519_.+" + ignore = true + [[object]] name = "OSTree.*" status = "generate" diff --git a/rust-bindings/rust/src/auto/mod.rs b/rust-bindings/rust/src/auto/mod.rs index 468b873b..64123ae8 100644 --- a/rust-bindings/rust/src/auto/mod.rs +++ b/rust-bindings/rust/src/auto/mod.rs @@ -62,11 +62,8 @@ 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; @@ -180,6 +177,5 @@ 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 a5b2626c..005a6018 100644 --- a/rust-bindings/rust/src/auto/sign.rs +++ b/rust-bindings/rust/src/auto/sign.rs @@ -2,9 +2,7 @@ // 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::*; @@ -12,9 +10,7 @@ use glib::translate::*; 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! { @@ -64,60 +60,6 @@ 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"))] fn get_name(&self) -> Option; @@ -136,7 +78,6 @@ 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>; } @@ -195,156 +136,6 @@ 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(); - let _ = ostree_sys::ostree_sign_dummy_add_pk(self.as_ref().to_glib_none().0, key.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_dummy_data(self.as_ref().to_glib_none().0, data.to_glib_none().0, signature.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(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> { - unsafe { - let mut error = ptr::null_mut(); - let _ = ostree_sys::ostree_sign_dummy_data_verify(self.as_ref().to_glib_none().0, data.to_glib_none().0, signatures.to_glib_none().0, success_message.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_dummy_set_pk(self.as_ref().to_glib_none().0, key.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_dummy_set_sk(self.as_ref().to_glib_none().0, key.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_ed25519_add_pk(self.as_ref().to_glib_none().0, public_key.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[cfg(any(feature = "v2020_2", feature = "dox"))] - fn ed25519_clear_keys(&self) -> Result<(), glib::Error> { - unsafe { - let mut error = ptr::null_mut(); - let _ = ostree_sys::ostree_sign_ed25519_clear_keys(self.as_ref().to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_ed25519_data(self.as_ref().to_glib_none().0, data.to_glib_none().0, signature.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(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> { - unsafe { - let mut error = ptr::null_mut(); - let _ = ostree_sys::ostree_sign_ed25519_data_verify(self.as_ref().to_glib_none().0, data.to_glib_none().0, signatures.to_glib_none().0, out_success_message.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_ed25519_load_pk(self.as_ref().to_glib_none().0, options.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_ed25519_set_pk(self.as_ref().to_glib_none().0, public_key.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - #[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(); - let _ = ostree_sys::ostree_sign_ed25519_set_sk(self.as_ref().to_glib_none().0, secret_key.to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - #[cfg(any(feature = "v2020_2", feature = "dox"))] fn get_name(&self) -> Option { unsafe { @@ -393,7 +184,6 @@ 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 315b4dc6..b1be1873 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 @ 56af1d5+) +from gir-files (https://github.com/gtk-rs/gir-files @ e0f160c+) diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt index 315b4dc6..b1be1873 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 @ 56af1d5+) +from gir-files (https://github.com/gtk-rs/gir-files @ e0f160c+) diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/rust/sys/src/lib.rs index 38867df9..ed4508e3 100644 --- a/rust-bindings/rust/sys/src/lib.rs +++ b/rust-bindings/rust/sys/src/lib.rs @@ -1618,41 +1618,23 @@ 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; @@ -1666,7 +1648,6 @@ 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; //=========================================================================