Skip to content
Snippets Groups Projects
Commit 88faa60b authored by Emmanuel Lepage Vallée's avatar Emmanuel Lepage Vallée Committed by Adrien Béraud
Browse files

security: Remove the error when there is no certificate authority

Early versions of the Ring protocol generated a mandatory self
signed CA cert. This isn't true anymore. The error is just noise.

This also fixes the error message. The enum to string mapping was
in the wrong order.

Change-Id: I0ca67b7185065e12a44c15dd5bbd4fdf170a8ec3
parent fbfc1409
No related branches found
No related tags found
No related merge requests found
...@@ -43,8 +43,8 @@ const QString SecurityEvaluationModelPrivate::messages[enum_class_size<SecurityE ...@@ -43,8 +43,8 @@ const QString SecurityEvaluationModelPrivate::messages[enum_class_size<SecurityE
/*VERIFY_ANSWER_ENABLED */QObject::tr("The \"verify answer certificate\" option is disabled, this leave you vulnerable to man in the middle attack"), /*VERIFY_ANSWER_ENABLED */QObject::tr("The \"verify answer certificate\" option is disabled, this leave you vulnerable to man in the middle attack"),
/*REQUIRE_CERTIFICATE_ENABLED */QObject::tr("None of your certificate provide a private key, this is required. Please select a private key" /*REQUIRE_CERTIFICATE_ENABLED */QObject::tr("None of your certificate provide a private key, this is required. Please select a private key"
" or use a certificate with one built-in"), " or use a certificate with one built-in"),
/*NOT_MISSING_CERTIFICATE */QObject::tr("No certificate authority is provided, it won't be possible to validate if the answer certificates are valid. Some account may also not work."),
/* NOT_MISSING_CERTIFICATE */QObject::tr("No certificate has been provided. This is, for now, unsupported by Ring"), /* NOT_MISSING_CERTIFICATE */QObject::tr("No certificate has been provided. This is, for now, unsupported by Ring"),
/* NOT_MISSING_AUTHORITY */QObject::tr("No certificate authority is provided, it won't be possible to validate if the answer certificates are valid. Some account may also not work."),
}; };
static const QString s1 = QObject::tr("Your certificate is expired, please contact your system administrator."); static const QString s1 = QObject::tr("Your certificate is expired, please contact your system administrator.");
...@@ -60,7 +60,7 @@ SecurityEvaluationModelPrivate::maximumSecurityLevel = {{ ...@@ -60,7 +60,7 @@ SecurityEvaluationModelPrivate::maximumSecurityLevel = {{
/* VERIFY_ANSWER_ENABLED */ SecurityEvaluationModel::SecurityLevel::MEDIUM , /* VERIFY_ANSWER_ENABLED */ SecurityEvaluationModel::SecurityLevel::MEDIUM ,
/* REQUIRE_CERTIFICATE_ENABLED */ SecurityEvaluationModel::SecurityLevel::WEAK , /* REQUIRE_CERTIFICATE_ENABLED */ SecurityEvaluationModel::SecurityLevel::WEAK ,
/* NOT_MISSING_CERTIFICATE */ SecurityEvaluationModel::SecurityLevel::WEAK , /* NOT_MISSING_CERTIFICATE */ SecurityEvaluationModel::SecurityLevel::WEAK ,
/* NOT_MISSING_AUTHORITY */ SecurityEvaluationModel::SecurityLevel::NONE , //This won't work /* NOT_MISSING_AUTHORITY */ SecurityEvaluationModel::SecurityLevel::ACCEPTABLE ,
}}; }};
const TypedStateMachine< SecurityEvaluationModel::Severity , SecurityEvaluationModel::AccountSecurityChecks > const TypedStateMachine< SecurityEvaluationModel::Severity , SecurityEvaluationModel::AccountSecurityChecks >
...@@ -73,7 +73,7 @@ SecurityEvaluationModelPrivate::flawSeverity = {{ ...@@ -73,7 +73,7 @@ SecurityEvaluationModelPrivate::flawSeverity = {{
/* VERIFY_ANSWER_ENABLED */ SecurityEvaluationModel::Severity::ISSUE , /* VERIFY_ANSWER_ENABLED */ SecurityEvaluationModel::Severity::ISSUE ,
/* REQUIRE_CERTIFICATE_ENABLED */ SecurityEvaluationModel::Severity::ISSUE , /* REQUIRE_CERTIFICATE_ENABLED */ SecurityEvaluationModel::Severity::ISSUE ,
/* NOT_MISSING_CERTIFICATE */ SecurityEvaluationModel::Severity::WARNING , /* NOT_MISSING_CERTIFICATE */ SecurityEvaluationModel::Severity::WARNING ,
/* NOT_MISSING_AUTHORITY */ SecurityEvaluationModel::Severity::ERROR , /* NOT_MISSING_AUTHORITY */ SecurityEvaluationModel::Severity::INFORMATION ,
}}; }};
const TypedStateMachine< SecurityEvaluationModel::SecurityLevel , Certificate::Checks > SecurityEvaluationModelPrivate::maximumCertificateSecurityLevel = {{ const TypedStateMachine< SecurityEvaluationModel::SecurityLevel , Certificate::Checks > SecurityEvaluationModelPrivate::maximumCertificateSecurityLevel = {{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment