changed default authentication algorithm to CHAP
CHAP is almost universal nowadays, and so it is a better default than PAP Not changed for uBlox, that prefers an error if not specified, and for Huawei, which uses NONE with user/pwd and has 2 CHAP choices
This commit is contained in:
+3
-3
@@ -636,10 +636,10 @@ build_start_network_input (ConnectContext *ctx)
|
||||
/* Need to add auth info? */
|
||||
if (has_user || has_password || ctx->auth != QMI_WDS_AUTHENTICATION_NONE) {
|
||||
/* We define a valid auth preference if we have either user or password, or an explicit
|
||||
* request for one to be set. If no explicit one was given, default to PAP. */
|
||||
* request for one to be set. If no explicit one was given, default to CHAP. */
|
||||
qmi_message_wds_start_network_input_set_authentication_preference (
|
||||
input,
|
||||
(ctx->auth != QMI_WDS_AUTHENTICATION_NONE) ? ctx->auth : QMI_WDS_AUTHENTICATION_PAP,
|
||||
(ctx->auth != QMI_WDS_AUTHENTICATION_NONE) ? ctx->auth : QMI_WDS_AUTHENTICATION_CHAP,
|
||||
NULL);
|
||||
|
||||
if (has_user)
|
||||
@@ -1740,7 +1740,7 @@ _connect (MMBaseBearer *_self,
|
||||
g_object_unref (properties);
|
||||
|
||||
if (auth == MM_BEARER_ALLOWED_AUTH_UNKNOWN) {
|
||||
/* We'll default to PAP later if needed */
|
||||
/* We'll default to CHAP later if needed */
|
||||
ctx->auth = QMI_WDS_AUTHENTICATION_NONE;
|
||||
} else if (auth & (MM_BEARER_ALLOWED_AUTH_PAP |
|
||||
MM_BEARER_ALLOWED_AUTH_CHAP |
|
||||
|
||||
@@ -375,13 +375,13 @@ mm_bearer_allowed_auth_to_mbim_auth_protocol (MMBearerAllowedAuth bearer_auth,
|
||||
/* NOTE: the input is a BITMASK, so we try to find a "best match" */
|
||||
|
||||
if (bearer_auth == MM_BEARER_ALLOWED_AUTH_UNKNOWN) {
|
||||
mm_obj_dbg (log_object, "using default (PAP) authentication method");
|
||||
return MBIM_AUTH_PROTOCOL_PAP;
|
||||
mm_obj_dbg (log_object, "using default (CHAP) authentication method");
|
||||
return MBIM_AUTH_PROTOCOL_CHAP;
|
||||
}
|
||||
if (bearer_auth & MM_BEARER_ALLOWED_AUTH_PAP)
|
||||
return MBIM_AUTH_PROTOCOL_PAP;
|
||||
if (bearer_auth & MM_BEARER_ALLOWED_AUTH_CHAP)
|
||||
return MBIM_AUTH_PROTOCOL_CHAP;
|
||||
if (bearer_auth & MM_BEARER_ALLOWED_AUTH_PAP)
|
||||
return MBIM_AUTH_PROTOCOL_PAP;
|
||||
if (bearer_auth & MM_BEARER_ALLOWED_AUTH_MSCHAPV2)
|
||||
return MBIM_AUTH_PROTOCOL_MSCHAPV2;
|
||||
if (bearer_auth & MM_BEARER_ALLOWED_AUTH_NONE)
|
||||
|
||||
Reference in New Issue
Block a user