#include "errno-util.h"
#include "escape.h"
#include "memory-util.h"
-#include "pwquality-util.h"
+#include "password-quality-util.h"
#include "strv.h"
int load_volume_key_password(
}
}
- r = quality_check_password(new_password, /* old */ NULL, /* user */ NULL, &error);
+ r = check_password_quality(new_password, /* old */ NULL, /* user */ NULL, &error);
if (r < 0) {
if (ERRNO_IS_NOT_SUPPORTED(r))
log_warning("Password quality check is not supported, proceeding anyway.");
#include "os-util.h"
#include "parse-argument.h"
#include "parse-util.h"
+#include "password-quality-util.h"
#include "path-util.h"
#include "pretty-print.h"
#include "proc-cmdline.h"
-#include "pwquality-util.h"
#include "random-util.h"
#include "smack-util.h"
#include "string-util.h"
break;
}
- r = quality_check_password(*a, /* old */ NULL, "root", &error);
+ r = check_password_quality(*a, /* old */ NULL, "root", &error);
if (r < 0) {
if (ERRNO_IS_NOT_SUPPORTED(r))
log_warning("Password quality check is not supported, proceeding anyway.");
#include "pager.h"
#include "parse-argument.h"
#include "parse-util.h"
+#include "password-quality-util.h"
#include "path-util.h"
#include "percent-util.h"
#include "pkcs11-util.h"
#include "pretty-print.h"
#include "process-util.h"
-#include "pwquality-util.h"
#include "rlimit-util.h"
#include "spawn-polkit-agent.h"
#include "terminal-util.h"
#include "uid-alloc-range.h"
#include "user-record.h"
-#include "user-record-pwquality.h"
+#include "user-record-password-quality.h"
#include "user-record-show.h"
#include "user-record-util.h"
#include "user-util.h"
/* If password quality enforcement is disabled, let's at least warn client side */
- r = user_record_quality_check_password(hr, hr, &error);
+ r = user_record_check_password_quality(hr, hr, &error);
if (r < 0)
log_warning_errno(r, "Specified password does not pass quality checks (%s), proceeding anyway.", bus_error_message(&error, r));
}
#include "mkdir.h"
#include "path-util.h"
#include "process-util.h"
-#include "pwquality-util.h"
#include "quota-util.h"
#include "resize-fs.h"
#include "set.h"
#include "string-table.h"
#include "strv.h"
#include "uid-alloc-range.h"
-#include "user-record-pwquality.h"
+#include "user-record-password-quality.h"
#include "user-record-sign.h"
#include "user-record-util.h"
#include "user-record.h"
if (h->record->enforce_password_policy == false)
log_debug("Password quality check turned off for account, skipping.");
else {
- r = user_record_quality_check_password(h->record, secret, error);
+ r = user_record_check_password_quality(h->record, secret, error);
if (r < 0)
return r;
}
if (c->enforce_password_policy == false)
log_debug("Password quality check turned off for account, skipping.");
else {
- r = user_record_quality_check_password(c, merged_secret, error);
+ r = user_record_check_password_quality(c, merged_secret, error);
if (r < 0)
return r;
}
'homed-operation.c',
'homed-varlink.c',
'homed.c',
- 'user-record-pwquality.c',
+ 'user-record-password-quality.c',
'user-record-sign.c',
'user-record-util.c',
)
'homectl-pkcs11.c',
'homectl-recovery-key.c',
'homectl.c',
- 'user-record-pwquality.c',
+ 'user-record-password-quality.c',
'user-record-util.c',
)
#include "errno-util.h"
#include "home-util.h"
#include "libcrypt-util.h"
-#include "pwquality-util.h"
+#include "password-quality-util.h"
#include "strv.h"
-#include "user-record-pwquality.h"
+#include "user-record-password-quality.h"
#include "user-record-util.h"
#if HAVE_PWQUALITY
-int user_record_quality_check_password(
+int user_record_check_password_quality(
UserRecord *hr,
UserRecord *secret,
sd_bus_error *error) {
assert(hr);
assert(secret);
- /* This is a bit more complex than one might think at first. quality_check_password() would like to know the
+ /* This is a bit more complex than one might think at first. check_password_quality() would like to know the
* old password to make security checks. We support arbitrary numbers of passwords however, hence we
* call the function once for each combination of old and new password. */
if (r > 0) /* This is a new password, not suitable as old password */
continue;
- r = quality_check_password(*pp, *old, hr->user_name, &auxerror);
+ r = check_password_quality(*pp, *old, hr->user_name, &auxerror);
if (r <= 0)
goto error;
if (called)
continue;
- /* If there are no old passwords, let's call quality_check_password() without any. */
- r = quality_check_password(*pp, /* old */ NULL, hr->user_name, &auxerror);
+ /* If there are no old passwords, let's call check_password_quality() without any. */
+ r = check_password_quality(*pp, /* old */ NULL, hr->user_name, &auxerror);
if (r <= 0)
goto error;
}
-
return 1;
error:
#else
-int user_record_quality_check_password(
+int user_record_check_password_quality(
UserRecord *hr,
UserRecord *secret,
sd_bus_error *error) {
#include "sd-bus.h"
#include "user-record.h"
-int user_record_quality_check_password(UserRecord *hr, UserRecord *secret, sd_bus_error *error);
+int user_record_check_password_quality(UserRecord *hr, UserRecord *secret, sd_bus_error *error);
'pager.c',
'parse-argument.c',
'parse-helpers.c',
+ 'password-quality-util-pwquality.c',
'pcre2-util.c',
'pkcs11-util.c',
'pretty-print.c',
'ptyfwd.c',
- 'pwquality-util.c',
'qrcode-util.c',
'quota-util.c',
'reboot-util.c',
#include "log.h"
#include "macro.h"
#include "memory-util.h"
-#include "pwquality-util.h"
+#include "password-quality-util.h"
#include "strv.h"
#if HAVE_PWQUALITY
DLSYM_ARG(pwquality_strerror));
}
-void pwq_maybe_disable_dictionary(pwquality_settings_t *pwq) {
+static void pwq_maybe_disable_dictionary(pwquality_settings_t *pwq) {
char buf[PWQ_MAX_ERROR_MESSAGE_LEN];
const char *path;
int r;
sym_pwquality_strerror(buf, sizeof(buf), r, NULL));
}
-int pwq_allocate_context(pwquality_settings_t **ret) {
+static int pwq_allocate_context(pwquality_settings_t **ret) {
_cleanup_(sym_pwquality_free_settingsp) pwquality_settings_t *pwq = NULL;
char buf[PWQ_MAX_ERROR_MESSAGE_LEN];
void *auxerror;
return 0;
}
-#define N_SUGGESTIONS 6
-
int suggest_passwords(void) {
_cleanup_(sym_pwquality_free_settingsp) pwquality_settings_t *pwq = NULL;
_cleanup_strv_free_erase_ char **suggestions = NULL;
return 1;
}
-int quality_check_password(const char *password, const char *old, const char *username, char **ret_error) {
+int check_password_quality(const char *password, const char *old, const char *username, char **ret_error) {
_cleanup_(sym_pwquality_free_settingsp) pwquality_settings_t *pwq = NULL;
char buf[PWQ_MAX_ERROR_MESSAGE_LEN];
void *auxerror;
r = sym_pwquality_check(pwq, password, old, username, &auxerror);
if (r < 0) {
-
if (ret_error) {
_cleanup_free_ char *e = NULL;
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(pwquality_settings_t*, sym_pwquality_free_settings, NULL);
-void pwq_maybe_disable_dictionary(pwquality_settings_t *pwq);
-int pwq_allocate_context(pwquality_settings_t **ret);
int suggest_passwords(void);
-int quality_check_password(const char *password, const char *old, const char *username, char **ret_error);
-
-#else
-
-static inline int suggest_passwords(void) {
- return 0;
-}
-
-static inline int quality_check_password(const char *password, const char *old, const char *username, char **ret_error) {
- if (ret_error)
- *ret_error = NULL;
- return 1; /* all good */
-}
+int check_password_quality(const char *password, const char *old, const char *username, char **ret_error);
#endif
--- /dev/null
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+#define N_SUGGESTIONS 6
+
+#if HAVE_PWQUALITY
+
+#include "password-quality-util-pwquality.h"
+
+#else
+
+static inline int suggest_passwords(void) {
+ return 0;
+}
+
+static inline int check_password_quality(
+ const char *password,
+ const char *old,
+ const char *username,
+ char **ret_error) {
+ if (ret_error)
+ *ret_error = NULL;
+ return 1; /* all good */
+}
+
+#endif
#include "libfido2-util.h"
#include "macro.h"
#include "main-func.h"
+#include "password-quality-util-pwquality.h"
#include "pcre2-util.h"
#include "pkcs11-util.h"
-#include "pwquality-util.h"
#include "qrcode-util.h"
#include "tests.h"
#include "tpm2-util.h"