Merge branch 'jb44692' into 'master'

JB#44692: Add support for wpa_supplicant blobs of inlined cert data See merge request mer-core/libgsupplicant!4
sailfishos · May 24, 2019 · 709f77b · 709f77b
2 parents 5b68bdc + 11fe50f
commit 709f77b
Show file tree

Hide file tree

Showing 7 changed files with 375 additions and 30 deletions.
diff --git a/include/gsupplicant_interface.h b/include/gsupplicant_interface.h
@@ -331,6 +331,23 @@ gsupplicant_interface_reattach(
     GSupplicantInterfaceResultFunc fn,
     void* data);
 
+GCancellable*
+gsupplicant_interface_add_blob(
+    GSupplicantInterface* self,
+    GCancellable* cancel,
+    const char* name,
+    GBytes* blob,
+    GSupplicantInterfaceResultFunc fn,
+    void* data); /* Since 1.0.12 */
+
+GCancellable*
+gsupplicant_interface_remove_blob(
+    GSupplicantInterface* iface,
+    GCancellable* cancel,
+    const char* name,
+    GSupplicantInterfaceResultFunc fn,
+    void* data); /* Since 1.0.12 */
+
 #define GSUPPLICANT_ADD_NETWORK_DELETE_OTHER  (0x01)
 #define GSUPPLICANT_ADD_NETWORK_SELECT        (0x02)
 #define GSUPPLICANT_ADD_NETWORK_ENABLE        (0x04)
@@ -353,6 +370,17 @@ gsupplicant_interface_add_network_full(
     GDestroyNotify destroy,
     void* data);
 
+GCancellable*
+gsupplicant_interface_add_network_full2(
+    GSupplicantInterface* iface,
+    GCancellable* cancel,
+    const GSupplicantNetworkParams* params,
+    guint flags, /* See above */
+    GHashTable* blobs, /* char * => gbytes * */
+    GSupplicantInterfaceStringResultFunc fn,
+    GDestroyNotify destroy,
+    void* data); /* Since 1.0.12 */
+
 GCancellable*
 gsupplicant_interface_select_network(
     GSupplicantInterface* iface,

diff --git a/include/gsupplicant_types.h b/include/gsupplicant_types.h
@@ -137,9 +137,11 @@ typedef enum gsupplicant_eap_method {
     GSUPPLICANT_EAP_METHOD_PWD          = (0x00040000)
 } GSUPPLICANT_EAP_METHOD;
 
-typedef enum gsupplicant_auth_fags {
+typedef enum gsupplicant_auth_flags {
     GSUPPLICANT_AUTH_DEFAULT            = (0x00000000),
-    GSUPPLICANT_AUTH_PHASE2_AUTHEAP     = (0x00000001)
+    GSUPPLICANT_AUTH_PHASE2_AUTHEAP     = (0x00000001),
+    GSUPPLICANT_AUTH_PHASE1_PEAPV0      = (0x00000002), /* Since 1.0.12 */
+    GSUPPLICANT_AUTH_PHASE1_PEAPV1      = (0x00000004)  /* Since 1.0.12 */
 } GSUPPLICANT_AUTH_FLAGS;
 
 typedef enum gsupplicant_op_mode {

diff --git a/spec/fi.w1.wpa_supplicant1.Interface.xml b/spec/fi.w1.wpa_supplicant1.Interface.xml
@@ -31,7 +31,9 @@
     </method>
     <method name="AddBlob">
       <arg name="name" type="s" direction="in"/>
-      <arg name="data" type="ay" direction="in"/>
+      <arg name="data" type="ay" direction="in">
+          <annotation name="org.gtk.GDBus.C.ForceGVariant" value="true"/>
+      </arg>
     </method>
     <method name="GetBlob">
       <arg name="name" type="s" direction="in"/>