Index of new symbols in 1.28

+--- a/docs/reference/libmbim-glib/libmbim-glib-docs.xml ++++ b/docs/reference/libmbim-glib/libmbim-glib-docs.xml +@@ -23,6 +23,7 @@ + 2019 + 2020 + 2021 ++ 2022 + The libmbim-glib authors + + +@@ -103,6 +104,7 @@ + + + ++ + + + +@@ -188,6 +190,10 @@ + Index of new symbols in 1.28 + + ++ ++ Index of new symbols in 1.30 ++ ++ + + + +--- a/src/libmbim-glib/generated/meson.build ++++ b/src/libmbim-glib/generated/meson.build +@@ -108,6 +108,7 @@ + ['sms'], + ['stk'], + ['ussd'], ++ ['intel-mutual-authentication'], + ] + + foreach service_data: services_data +--- a/src/libmbim-glib/libmbim-glib.h ++++ b/src/libmbim-glib/libmbim-glib.h +@@ -4,6 +4,7 @@ + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * Copyright (C) 2013 - 2014 Aleksander Morgado ++ * Copyright (C) 2022 Intel Corporation + */ + + #ifndef _LIBMBIM_GLIB_H_ +@@ -45,6 +46,7 @@ + #include "mbim-quectel.h" + #include "mbim-intel-thermal-rf.h" + #include "mbim-ms-voice-extensions.h" ++#include "mbim-intel-mutual-authentication.h" + + /* backwards compatibility */ + #include "mbim-compat.h" +--- a/src/libmbim-glib/mbim-cid.c ++++ b/src/libmbim-glib/mbim-cid.c +@@ -4,6 +4,7 @@ + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * Copyright (C) 2013 - 2014 Aleksander Morgado ++ * Copyright (C) 2022 Intel Corporation + */ + + #include "mbim-cid.h" +@@ -228,6 +229,12 @@ + { NO_SET, QUERY, NOTIFY }, /* MBIM_CID_MS_VOICE_EXTENSIONS_NITZ */ + }; + ++/* Note: index of the array is CID-1 */ ++#define MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_LAST MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_FCC_LOCK ++static const CidConfig cid_intel_mutual_authentication_config [MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_LAST] = { ++ { SET, QUERY, NO_NOTIFY }, /* MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_FCC_LOCK */ ++}; ++ + gboolean + mbim_cid_can_set (MbimService service, + guint cid) +@@ -279,6 +286,8 @@ + return cid_intel_thermal_rf_config[cid - 1].set; + case MBIM_SERVICE_MS_VOICE_EXTENSIONS: + return cid_ms_voice_extensions_config[cid - 1].set; ++ case MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: ++ return cid_intel_mutual_authentication_config[cid - 1].set; + case MBIM_SERVICE_INVALID: + case MBIM_SERVICE_LAST: + default: +@@ -338,6 +347,8 @@ + return cid_intel_thermal_rf_config[cid - 1].query; + case MBIM_SERVICE_MS_VOICE_EXTENSIONS: + return cid_ms_voice_extensions_config[cid - 1].query; ++ case MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: ++ return cid_intel_mutual_authentication_config[cid - 1].query; + case MBIM_SERVICE_INVALID: + case MBIM_SERVICE_LAST: + default: +@@ -397,6 +408,8 @@ + return cid_intel_thermal_rf_config[cid - 1].notify; + case MBIM_SERVICE_MS_VOICE_EXTENSIONS: + return cid_ms_voice_extensions_config[cid - 1].notify; ++ case MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: ++ return cid_intel_mutual_authentication_config[cid - 1].notify; + case MBIM_SERVICE_INVALID: + case MBIM_SERVICE_LAST: + default: +@@ -457,6 +470,8 @@ + return mbim_cid_intel_thermal_rf_get_string (cid); + case MBIM_SERVICE_MS_VOICE_EXTENSIONS: + return mbim_cid_ms_voice_extensions_get_string (cid); ++ case MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: ++ return mbim_cid_intel_mutual_authentication_get_string (cid); + case MBIM_SERVICE_LAST: + default: + g_assert_not_reached (); +--- a/src/libmbim-glib/mbim-cid.h ++++ b/src/libmbim-glib/mbim-cid.h +@@ -4,6 +4,7 @@ + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * Copyright (C) 2013 - 2018 Aleksander Morgado ++ * Copyright (C) 2022 Intel Corporation + */ + + #ifndef _LIBMBIM_GLIB_MBIM_CID_H_ +@@ -429,6 +430,20 @@ + } MbimCidIntelThermalRf; + + /** ++ * MbimCidIntelMutualAuthentication: ++ * @MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_UNKNOWN: Unknown command. ++ * @MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_FCC_LOCK: FCC lock set. ++ * ++ * MBIM commands in the %MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION service. ++ * ++ * Since: 1.30 ++ */ ++typedef enum { /*< since=1.30 >*/ ++ MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_UNKNOWN = 0, ++ MBIM_CID_INTEL_MUTUAL_AUTHENTICATION_FCC_LOCK = 1, ++} MbimCidIntelMutualAuthentication; ++ ++/** + * MbimCidMsVoiceExtensions: + * @MBIM_CID_MS_VOICE_EXTENSIONS_UNKNOWN: Unknown command. + * @MBIM_CID_MS_VOICE_EXTENSIONS_NITZ: Network Identity and Time Zone information command. +--- a/src/libmbim-glib/mbim-message.c ++++ b/src/libmbim-glib/mbim-message.c +@@ -5,6 +5,7 @@ + * + * Copyright (C) 2013 - 2022 Aleksander Morgado + * Copyright (C) 2022 Google, Inc. ++ * Copyright (C) 2022 Intel Corporation + */ + + #include +@@ -39,6 +40,7 @@ + #include "mbim-quectel.h" + #include "mbim-intel-thermal-rf.h" + #include "mbim-ms-voice-extensions.h" ++#include "mbim-intel-mutual-authentication.h" + + /*****************************************************************************/ + +@@ -2166,6 +2168,9 @@ + case MBIM_SERVICE_MS_VOICE_EXTENSIONS: + fields_printable = __mbim_message_ms_voice_extensions_get_printable_fields (self, line_prefix, &inner_error); + break; ++ case MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: ++ fields_printable = __mbim_message_intel_mutual_authentication_get_printable_fields (self, line_prefix, &inner_error); ++ break; + case MBIM_SERVICE_INVALID: + case MBIM_SERVICE_LAST: + g_assert_not_reached (); +--- a/src/libmbim-glib/mbim-uuid.c ++++ b/src/libmbim-glib/mbim-uuid.c +@@ -6,6 +6,7 @@ + * Copyright (C) 2013 - 2014 Aleksander Morgado + * Copyright (C) 2014 NVDIA Corporation + * Copyright (C) 2014 Smith Micro Software, Inc. ++ * Copyright (C) 2022 Intel Corporation + */ + + #include +@@ -256,6 +257,14 @@ + .e = { 0x61, 0xcb, 0x03, 0x4a, 0x70, 0x2e } + }; + ++static const MbimUuid uuid_intel_mutual_authentication = { ++ .a = { 0xf8, 0x5d, 0x46, 0xef }, ++ .b = { 0xab, 0x26 }, ++ .c = { 0x40, 0x81 }, ++ .d = { 0x98, 0x68 }, ++ .e = { 0x4d, 0x18, 0x3c, 0x0a, 0x3a, 0xec } ++}; ++ + static GList *mbim_custom_service_list = NULL; + + typedef struct { +@@ -391,6 +400,8 @@ + return &uuid_intel_thermal_rf; + case MBIM_SERVICE_MS_VOICE_EXTENSIONS: + return &uuid_ms_voice_extensions; ++ case MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: ++ return &uuid_intel_mutual_authentication; + case MBIM_SERVICE_LAST: + g_assert_not_reached (); + default: +@@ -467,6 +478,9 @@ + if (mbim_uuid_cmp (uuid, &uuid_ms_voice_extensions)) + return MBIM_SERVICE_MS_VOICE_EXTENSIONS; + ++ if (mbim_uuid_cmp (uuid, &uuid_intel_mutual_authentication)) ++ return MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION; ++ + for (l = mbim_custom_service_list; l != NULL; l = l->next) { + if (mbim_uuid_cmp (&((MbimCustomService *)l->data)->uuid, uuid)) + return ((MbimCustomService *)l->data)->service_id; +--- a/src/libmbim-glib/mbim-uuid.h ++++ b/src/libmbim-glib/mbim-uuid.h +@@ -4,6 +4,7 @@ + * libmbim-glib -- GLib/GIO based library to control MBIM devices + * + * Copyright (C) 2013 - 2014 Aleksander Morgado ++ * Copyright (C) 2022 Intel Corporation + */ + + #ifndef _LIBMBIM_GLIB_MBIM_UUID_H_ +@@ -113,6 +114,7 @@ + * @MBIM_SERVICE_QUECTEL: Quectel specific operations. Since 1.26.2. + * @MBIM_SERVICE_INTEL_THERMAL_RF: Intel thermal rf related commands. Since 1.28 + * @MBIM_SERVICE_MS_VOICE_EXTENSIONS: Microsoft Voice extensions service. Since 1.28. ++ * @MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: Intel mutual authentication commands. Since 1.30. + * @MBIM_SERVICE_LAST: Internal value. + * + * Enumeration of the generic MBIM services. +@@ -141,6 +143,7 @@ + MBIM_SERVICE_QUECTEL = 18, + MBIM_SERVICE_INTEL_THERMAL_RF = 19, + MBIM_SERVICE_MS_VOICE_EXTENSIONS = 20, ++ MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION = 21, + #if defined LIBMBIM_GLIB_COMPILATION + MBIM_SERVICE_LAST /*< skip >*/ + #endif +@@ -379,6 +382,17 @@ + #define MBIM_UUID_MS_VOICE_EXTENSIONS mbim_uuid_from_service (MBIM_SERVICE_MS_VOICE_EXTENSIONS) + + /** ++ * MBIM_UUID_INTEL_MUTUAL_AUTHENTICATION: ++ * ++ * Get the UUID of the %MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION service. ++ * ++ * Returns: (transfer none): a #MbimUuid. ++ * ++ * Since: 1.30 ++ */ ++#define MBIM_UUID_INTEL_MUTUAL_AUTHENTICATION mbim_uuid_from_service (MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION) ++ ++/** + * mbim_service_lookup_name: + * @service: a MbimService or custom service. + * +--- /dev/null ++++ b/src/mbimcli/mbimcli-intel-mutual-authentication.c +@@ -0,0 +1,207 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* SPDX-License-Identifier: GPL-2.0-or-later */ ++/* ++ * mbimcli -- Command line interface to control MBIM devices ++ * ++ * Copyright (C) 2022 Intel Corporation ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include ++ ++#include "mbim-common.h" ++#include "mbimcli.h" ++#include "mbimcli-helpers.h" ++ ++/* Context */ ++typedef struct { ++ MbimDevice *device; ++ GCancellable *cancellable; ++} Context; ++static Context *ctx; ++ ++/* Options */ ++static gboolean query_fcc_lock_flag; ++static gchar *set_fcc_lock_str; ++ ++static GOptionEntry entries[] = { ++ { "query-fcc-lock", 0, 0, G_OPTION_ARG_NONE, &query_fcc_lock_flag, ++ "Query FCC lock information", ++ NULL ++ }, ++ { "set-fcc-lock", 0, 0, G_OPTION_ARG_STRING, &set_fcc_lock_str, ++ "Set FCC lock information", ++ "[(ResponsePresent),(Response)]" ++ }, ++ {NULL} ++}; ++ ++GOptionGroup * ++mbimcli_intel_mutual_authentication_get_option_group (void) ++{ ++ GOptionGroup *group; ++ ++ group = g_option_group_new ("intel-mutual-authentication", ++ "Intel mutual authentication Service options:", ++ "Show Intel mutual authentication Service options", ++ NULL, ++ NULL); ++ g_option_group_add_entries (group, entries); ++ ++ return group; ++} ++ ++gboolean ++mbimcli_intel_mutual_authentication_options_enabled (void) ++{ ++ static guint n_actions = 0; ++ static gboolean checked = FALSE; ++ ++ if (checked) ++ return !!n_actions; ++ ++ n_actions = (query_fcc_lock_flag + ++ !!set_fcc_lock_str); ++ ++ if (n_actions > 1) { ++ g_printerr ("error: too many Intel mutual Authentication actions requested\n"); ++ exit (EXIT_FAILURE); ++ } ++ ++ checked = TRUE; ++ return !!n_actions; ++} ++ ++static void ++context_free (Context *context) ++{ ++ if (!context) ++ return; ++ ++ if (context->cancellable) ++ g_object_unref (context->cancellable); ++ if (context->device) ++ g_object_unref (context->device); ++ g_slice_free (Context, context); ++} ++ ++static void ++shutdown (gboolean operation_status) ++{ ++ /* Cleanup context and finish async operation */ ++ context_free (ctx); ++ mbimcli_async_operation_done (operation_status); ++} ++ ++static void ++query_fcc_lock_ready (MbimDevice *device, ++ GAsyncResult *res, ++ gpointer user_data) ++{ ++ MbimMessage *response = NULL; ++ GError *error = NULL; ++ gboolean challenge_present = FALSE; ++ guint32 challenge = 0; ++ ++ response = mbim_device_command_finish (device, res, &error); ++ if (!response || !mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error)) { ++ g_printerr ("error: operation failed: %s\n", error->message); ++ shutdown (FALSE); ++ return; ++ } ++ ++ if (!mbim_message_intel_mutual_authentication_fcc_lock_response_parse (response, ++ &challenge_present, ++ &challenge, ++ &error)) { ++ g_printerr ("error: couldn't parse response message: %s\n", error->message); ++ shutdown (FALSE); ++ return; ++ } ++ ++ g_print ("FCC lock status: %s\n", challenge_present ? "locked" : "unlocked"); ++ if (challenge_present) ++ g_print ("\tChallenge: %u\n", challenge); ++ ++ shutdown (TRUE); ++} ++ ++void ++mbimcli_intel_mutual_authentication_run (MbimDevice *device, ++ GCancellable *cancellable) ++{ ++ g_autoptr(MbimMessage) request = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ /* Initialize context */ ++ ctx = g_slice_new (Context); ++ ctx->device = g_object_ref (device); ++ ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL; ++ ++ /* Query FCC lock information */ ++ if (query_fcc_lock_flag) { ++ g_debug ("Asynchronously querying FCC lock information..."); ++ ++ request = mbim_message_intel_mutual_authentication_fcc_lock_query_new (NULL); ++ mbim_device_command (ctx->device, ++ request, ++ 10, ++ ctx->cancellable, ++ (GAsyncReadyCallback)query_fcc_lock_ready, ++ NULL); ++ return; ++ } ++ ++ /* Set FCC lock information */ ++ if (set_fcc_lock_str) { ++ gboolean response_present = FALSE; ++ guint32 response = 0; ++ g_auto(GStrv) split = NULL; ++ ++ split = g_strsplit (set_fcc_lock_str, ",", -1); ++ ++ if (g_strv_length (split) < 2) { ++ g_printerr ("error: couldn't parse input arguments, missing arguments\n"); ++ shutdown (FALSE); ++ return; ++ } ++ ++ if (g_strv_length (split) > 2) { ++ g_printerr ("error: couldn't parse input arguments, too many arguments\n"); ++ shutdown (FALSE); ++ return; ++ } ++ ++ if (!mbimcli_read_boolean_from_string (split[0], &response_present)) { ++ g_printerr ("error: couldn't parse input, wrong value given\n"); ++ shutdown (FALSE); ++ return; ++ } ++ ++ if (!mbimcli_read_uint_from_string (split[1], &response)) { ++ g_printerr ("error: couldn't parse input, wrong value given\n"); ++ shutdown (FALSE); ++ return; ++ } ++ ++ request = mbim_message_intel_mutual_authentication_fcc_lock_set_new (response_present, response, NULL); ++ mbim_device_command (ctx->device, ++ request, ++ 10, ++ ctx->cancellable, ++ (GAsyncReadyCallback)query_fcc_lock_ready, ++ NULL); ++ return; ++ } ++ g_warn_if_reached (); ++} +--- a/src/mbimcli/mbimcli.c ++++ b/src/mbimcli/mbimcli.c +@@ -4,6 +4,7 @@ + * mbimcli -- Command line interface to control MBIM devices + * + * Copyright (C) 2013 - 2014 Aleksander Morgado ++ * Copyright (C) 2022 Intel Corporation + */ + + #include "config.h" +@@ -311,6 +312,9 @@ + case MBIM_SERVICE_MS_UICC_LOW_LEVEL_ACCESS: + mbimcli_ms_uicc_low_level_access_run (dev, cancellable); + return; ++ case MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION: ++ mbimcli_intel_mutual_authentication_run (dev, cancellable); ++ return; + case MBIM_SERVICE_SMS: + case MBIM_SERVICE_USSD: + case MBIM_SERVICE_STK: +@@ -447,6 +451,11 @@ + actions_enabled++; + } + ++ if (mbimcli_intel_mutual_authentication_options_enabled ()) { ++ service = MBIM_SERVICE_INTEL_MUTUAL_AUTHENTICATION; ++ actions_enabled++; ++ } ++ + /* Noop */ + if (noop_flag) + actions_enabled++; +@@ -495,6 +504,7 @@ + g_option_context_add_group (context, mbimcli_intel_thermal_rf_get_option_group ()); + g_option_context_add_group (context, mbimcli_ms_voice_extensions_get_option_group ()); + g_option_context_add_group (context, mbimcli_ms_uicc_low_level_access_get_option_group ()); ++ g_option_context_add_group (context, mbimcli_intel_mutual_authentication_get_option_group ()); + g_option_context_add_main_entries (context, main_entries, NULL); + if (!g_option_context_parse (context, &argc, &argv, &error)) { + g_printerr ("error: %s\n", error->message); +--- a/src/mbimcli/mbimcli.h ++++ b/src/mbimcli/mbimcli.h +@@ -4,6 +4,7 @@ + * mbimcli -- Command line interface to control MBIM devices + * + * Copyright (C) 2013 - 2014 Aleksander Morgado ++ * Copyright (C) 2022 Intel Corporation + */ + + #include +@@ -30,6 +31,7 @@ + GOptionGroup *mbimcli_intel_thermal_rf_get_option_group (void); + GOptionGroup *mbimcli_ms_voice_extensions_get_option_group (void); + GOptionGroup *mbimcli_ms_uicc_low_level_access_get_option_group (void); ++GOptionGroup *mbimcli_intel_mutual_authentication_get_option_group (void); + + gboolean mbimcli_basic_connect_options_enabled (void); + gboolean mbimcli_phonebook_options_enabled (void); +@@ -44,6 +46,7 @@ + gboolean mbimcli_intel_thermal_rf_options_enabled (void); + gboolean mbimcli_ms_voice_extensions_options_enabled (void); + gboolean mbimcli_ms_uicc_low_level_access_options_enabled (void); ++gboolean mbimcli_intel_mutual_authentication_options_enabled (void); + + void mbimcli_basic_connect_run (MbimDevice *device, + GCancellable *cancellable); +@@ -71,6 +74,8 @@ + GCancellable *cancellable); + void mbimcli_ms_uicc_low_level_access_run (MbimDevice *device, + GCancellable *cancellable); ++void mbimcli_intel_mutual_authentication_run (MbimDevice *device, ++ GCancellable *cancellable); + + + /* link management */ +--- a/src/mbimcli/meson.build ++++ b/src/mbimcli/meson.build +@@ -16,6 +16,7 @@ + 'mbimcli-ms-voice-extensions.c', + 'mbimcli-phonebook.c', + 'mbimcli-quectel.c', ++ 'mbimcli-intel-mutual-authentication.c', + ) + + sources = mbimcli_sources + files( diff -Nru libmbim-1.28.0/debian/patches/series libmbim-1.28.0/debian/patches/series --- libmbim-1.28.0/debian/patches/series 2022-11-22 12:21:42.000000000 +0000 +++ libmbim-1.28.0/debian/patches/series 2023-03-31 07:44:23.000000000 +0000 @@ -0,0 +1 @@ +intel-mutual-authentication.patch