andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 5 months ago
Clone

Blame SOURCES/0026-Hardcode-gost-crypt-passsword-storage-scheme.patch

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