summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2022-01-21 13:22:56 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2022-01-21 13:22:56 +0100
commit6638adafd2274ff8942c7c4bebc4dfa88dbd51c8 (patch)
tree6b674da5ace4afc374e451cd52a9f170418ab05c
parenteea3a2ac0e6ef4e88df5e9424b486f399d7ff036 (diff)
downloadvala-6638adafd2274ff8942c7c4bebc4dfa88dbd51c8.tar.gz
glib-2.0,gio-2.0: Update 2.72 symbols
-rw-r--r--vapi/gio-2.0.vapi15
-rw-r--r--vapi/glib-2.0.vapi2
-rw-r--r--vapi/metadata/Gio-2.0.metadata2
3 files changed, 18 insertions, 1 deletions
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 92df9f787..384d4d5a5 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -3083,12 +3083,18 @@ namespace GLib {
[CCode (has_construct_function = false)]
public TlsCertificate.from_file (string file) throws GLib.Error;
[CCode (has_construct_function = false)]
+ [Version (since = "2.72")]
+ public TlsCertificate.from_file_with_password (string file, string password) throws GLib.Error;
+ [CCode (has_construct_function = false)]
public TlsCertificate.from_files (string cert_file, string key_file) throws GLib.Error;
[CCode (has_construct_function = false)]
public TlsCertificate.from_pem (string data, ssize_t length) throws GLib.Error;
[CCode (has_construct_function = false)]
[Version (since = "2.68")]
public TlsCertificate.from_pkcs11_uris (string pkcs11_uri, string? private_key_pkcs11_uri) throws GLib.Error;
+ [CCode (has_construct_function = false)]
+ [Version (since = "2.72")]
+ public TlsCertificate.from_pkcs12 ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gsize", type = "const guint8*")] uint8[] data, string? password) throws GLib.Error;
[Version (since = "2.70")]
public GLib.GenericArray<weak GLib.Bytes>? get_dns_names ();
[Version (since = "2.70")]
@@ -3122,9 +3128,15 @@ namespace GLib {
[Version (since = "2.70")]
public GLib.DateTime not_valid_before { owned get; }
[NoAccessorMethod]
+ [Version (since = "2.72")]
+ public string password { construct; }
+ [NoAccessorMethod]
[Version (since = "2.68")]
public string pkcs11_uri { owned get; construct; }
[NoAccessorMethod]
+ [Version (since = "2.72")]
+ public GLib.ByteArray pkcs12_data { construct; }
+ [NoAccessorMethod]
public GLib.ByteArray private_key { owned get; construct; }
[NoAccessorMethod]
public string private_key_pem { owned get; construct; }
@@ -5028,7 +5040,8 @@ namespace GLib {
HANDSHAKE,
CERTIFICATE_REQUIRED,
EOF,
- INAPPROPRIATE_FALLBACK;
+ INAPPROPRIATE_FALLBACK,
+ BAD_CERTIFICATE_PASSWORD;
public static GLib.Quark quark ();
}
[CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 2e99c6e61..d43dec06d 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -5402,6 +5402,8 @@ namespace GLib {
[CCode (cname = "g_hash_table_new_full", simple_generics = true)]
public HashTable (HashFunc<K>? hash_func, EqualFunc<K>? key_equal_func);
public HashTable.full (HashFunc<K>? hash_func, EqualFunc<K>? key_equal_func, DestroyNotify? key_destroy_func, DestroyNotify? value_destroy_func);
+ [Version (since = "2.72")]
+ public HashTable.similar (HashTable<K,V> other_hash_table);
public void insert (owned K key, owned V value);
public void replace (owned K key, owned V value);
[Version (since = "2.32", deprecated_since = "vala-0.26", replacement = "GenericSet.add")]
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 18ea8c8f1..e70332418 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -297,6 +297,8 @@ PollableOutputStream
.create_source type="GLib.PollableSource"
.write_nonblocking#virtual_method name="write_nonblocking_fn" no_wrapper
.writev_nonblocking#virtual_method name="writev_nonblocking_fn" no_wrapper
+TlsCertificate
+ .new_from_pkcs12.data array array_length_idx=1
TlsClientConnection
.new nullable
.accepted_cas type="GLib.List<GLib.ByteArray>"