|
 |
6d0b66 |
From 616dc9964a4675dea2ab2c2efb9bd31c3903e29d Mon Sep 17 00:00:00 2001
|
|
|
6d0b66 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
6d0b66 |
Date: Mon, 26 Jul 2021 15:22:08 -0400
|
|
|
6d0b66 |
Subject: [PATCH] Hardcode gost crypt passsword storage scheme
|
|
|
6d0b66 |
|
|
|
6d0b66 |
---
|
|
|
6d0b66 |
.../plugins/pwdstorage/gost_yescrypt.c | 22 -------------------
|
|
|
6d0b66 |
1 file changed, 22 deletions(-)
|
|
|
6d0b66 |
|
|
|
6d0b66 |
diff --git a/ldap/servers/plugins/pwdstorage/gost_yescrypt.c b/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
|
|
|
6d0b66 |
index 67b39395e..7b0d1653c 100644
|
|
|
6d0b66 |
--- a/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
|
|
|
6d0b66 |
+++ b/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
|
|
|
6d0b66 |
@@ -11,7 +11,6 @@
|
|
|
6d0b66 |
|
|
|
6d0b66 |
#include <crypt.h>
|
|
|
6d0b66 |
|
|
|
6d0b66 |
-#ifdef XCRYPT_VERSION_STR
|
|
|
6d0b66 |
#include <errno.h>
|
|
|
6d0b66 |
int
|
|
|
6d0b66 |
gost_yescrypt_pw_cmp(const char *userpwd, const char *dbpwd)
|
|
|
6d0b66 |
@@ -64,24 +63,3 @@ gost_yescrypt_pw_enc(const char *pwd)
|
|
|
6d0b66 |
return enc;
|
|
|
6d0b66 |
}
|
|
|
6d0b66 |
|
|
|
6d0b66 |
-#else
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
-/*
|
|
|
6d0b66 |
- * We do not have xcrypt, so always fail all checks.
|
|
|
6d0b66 |
- */
|
|
|
6d0b66 |
-int
|
|
|
6d0b66 |
-gost_yescrypt_pw_cmp(const char *userpwd __attribute__((unused)), const char *dbpwd __attribute__((unused)))
|
|
|
6d0b66 |
-{
|
|
|
6d0b66 |
- slapi_log_err(SLAPI_LOG_ERR, GOST_YESCRYPT_SCHEME_NAME,
|
|
|
6d0b66 |
- "Unable to use gost_yescrypt_pw_cmp, xcrypt is not available.\n");
|
|
|
6d0b66 |
- return 1;
|
|
|
6d0b66 |
-}
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
-char *
|
|
|
6d0b66 |
-gost_yescrypt_pw_enc(const char *pwd __attribute__((unused)))
|
|
|
6d0b66 |
-{
|
|
|
6d0b66 |
- slapi_log_err(SLAPI_LOG_ERR, GOST_YESCRYPT_SCHEME_NAME,
|
|
|
6d0b66 |
- "Unable to use gost_yescrypt_pw_enc, xcrypt is not available.\n");
|
|
|
6d0b66 |
- return NULL;
|
|
|
6d0b66 |
-}
|
|
|
6d0b66 |
-#endif
|
|
|
6d0b66 |
--
|
|
|
6d0b66 |
2.31.1
|
|
|
6d0b66 |
|