|
 |
6d0b66 |
From 120511d35095a48d60abbb7cb2367d0c30fbc757 Mon Sep 17 00:00:00 2001
|
|
|
6d0b66 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
6d0b66 |
Date: Wed, 25 Aug 2021 13:20:56 -0400
|
|
|
6d0b66 |
Subject: [PATCH] Remove GOST-YESCRYPT password sotrage scheme
|
|
|
6d0b66 |
|
|
|
6d0b66 |
---
|
|
|
6d0b66 |
.../tests/suites/password/pwd_algo_test.py | 1 -
|
|
|
6d0b66 |
ldap/ldif/template-dse-minimal.ldif.in | 9 ---------
|
|
|
6d0b66 |
ldap/ldif/template-dse.ldif.in | 9 ---------
|
|
|
6d0b66 |
ldap/servers/plugins/pwdstorage/pwd_init.c | 18 ------------------
|
|
|
6d0b66 |
ldap/servers/slapd/fedse.c | 13 -------------
|
|
|
6d0b66 |
5 files changed, 50 deletions(-)
|
|
|
6d0b66 |
|
|
|
6d0b66 |
diff --git a/dirsrvtests/tests/suites/password/pwd_algo_test.py b/dirsrvtests/tests/suites/password/pwd_algo_test.py
|
|
|
6d0b66 |
index 66bda420e..88f8e40b7 100644
|
|
|
6d0b66 |
--- a/dirsrvtests/tests/suites/password/pwd_algo_test.py
|
|
|
6d0b66 |
+++ b/dirsrvtests/tests/suites/password/pwd_algo_test.py
|
|
|
6d0b66 |
@@ -124,7 +124,6 @@ def _test_algo_for_pbkdf2(inst, algo_name):
|
|
|
6d0b66 |
('CLEAR', 'CRYPT', 'CRYPT-MD5', 'CRYPT-SHA256', 'CRYPT-SHA512',
|
|
|
6d0b66 |
'MD5', 'SHA', 'SHA256', 'SHA384', 'SHA512', 'SMD5', 'SSHA',
|
|
|
6d0b66 |
'SSHA256', 'SSHA384', 'SSHA512', 'PBKDF2_SHA256', 'DEFAULT',
|
|
|
6d0b66 |
- 'GOST_YESCRYPT',
|
|
|
6d0b66 |
))
|
|
|
6d0b66 |
def test_pwd_algo_test(topology_st, algo):
|
|
|
6d0b66 |
"""Assert that all of our password algorithms correctly PASS and FAIL varying
|
|
|
6d0b66 |
diff --git a/ldap/ldif/template-dse-minimal.ldif.in b/ldap/ldif/template-dse-minimal.ldif.in
|
|
|
6d0b66 |
index 2eccae9b2..1a05f4a67 100644
|
|
|
6d0b66 |
--- a/ldap/ldif/template-dse-minimal.ldif.in
|
|
|
6d0b66 |
+++ b/ldap/ldif/template-dse-minimal.ldif.in
|
|
|
6d0b66 |
@@ -194,15 +194,6 @@ nsslapd-pluginarg1: nsds5ReplicaCredentials
|
|
|
6d0b66 |
nsslapd-pluginid: aes-storage-scheme
|
|
|
6d0b66 |
nsslapd-pluginprecedence: 1
|
|
|
6d0b66 |
|
|
|
6d0b66 |
-dn: cn=GOST_YESCRYPT,cn=Password Storage Schemes,cn=plugins,cn=config
|
|
|
6d0b66 |
-objectclass: top
|
|
|
6d0b66 |
-objectclass: nsSlapdPlugin
|
|
|
6d0b66 |
-cn: GOST_YESCRYPT
|
|
|
6d0b66 |
-nsslapd-pluginpath: libpwdstorage-plugin
|
|
|
6d0b66 |
-nsslapd-plugininitfunc: gost_yescrypt_pwd_storage_scheme_init
|
|
|
6d0b66 |
-nsslapd-plugintype: pwdstoragescheme
|
|
|
6d0b66 |
-nsslapd-pluginenabled: on
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
dn: cn=Syntax Validation Task,cn=plugins,cn=config
|
|
|
6d0b66 |
objectclass: top
|
|
|
6d0b66 |
objectclass: nsSlapdPlugin
|
|
|
6d0b66 |
diff --git a/ldap/ldif/template-dse.ldif.in b/ldap/ldif/template-dse.ldif.in
|
|
|
6d0b66 |
index 7e7480cba..f30531bec 100644
|
|
|
6d0b66 |
--- a/ldap/ldif/template-dse.ldif.in
|
|
|
6d0b66 |
+++ b/ldap/ldif/template-dse.ldif.in
|
|
|
6d0b66 |
@@ -242,15 +242,6 @@ nsslapd-pluginarg2: nsds5ReplicaBootstrapCredentials
|
|
|
6d0b66 |
nsslapd-pluginid: aes-storage-scheme
|
|
|
6d0b66 |
nsslapd-pluginprecedence: 1
|
|
|
6d0b66 |
|
|
|
6d0b66 |
-dn: cn=GOST_YESCRYPT,cn=Password Storage Schemes,cn=plugins,cn=config
|
|
|
6d0b66 |
-objectclass: top
|
|
|
6d0b66 |
-objectclass: nsSlapdPlugin
|
|
|
6d0b66 |
-cn: GOST_YESCRYPT
|
|
|
6d0b66 |
-nsslapd-pluginpath: libpwdstorage-plugin
|
|
|
6d0b66 |
-nsslapd-plugininitfunc: gost_yescrypt_pwd_storage_scheme_init
|
|
|
6d0b66 |
-nsslapd-plugintype: pwdstoragescheme
|
|
|
6d0b66 |
-nsslapd-pluginenabled: on
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
dn: cn=Syntax Validation Task,cn=plugins,cn=config
|
|
|
6d0b66 |
objectclass: top
|
|
|
6d0b66 |
objectclass: nsSlapdPlugin
|
|
|
6d0b66 |
diff --git a/ldap/servers/plugins/pwdstorage/pwd_init.c b/ldap/servers/plugins/pwdstorage/pwd_init.c
|
|
|
6d0b66 |
index 606e63404..59cfc4684 100644
|
|
|
6d0b66 |
--- a/ldap/servers/plugins/pwdstorage/pwd_init.c
|
|
|
6d0b66 |
+++ b/ldap/servers/plugins/pwdstorage/pwd_init.c
|
|
|
6d0b66 |
@@ -52,8 +52,6 @@ static Slapi_PluginDesc smd5_pdesc = {"smd5-password-storage-scheme", VENDOR, DS
|
|
|
6d0b66 |
|
|
|
6d0b66 |
static Slapi_PluginDesc pbkdf2_sha256_pdesc = {"pbkdf2-sha256-password-storage-scheme", VENDOR, DS_PACKAGE_VERSION, "Salted PBKDF2 SHA256 hash algorithm (PBKDF2_SHA256)"};
|
|
|
6d0b66 |
|
|
|
6d0b66 |
-static Slapi_PluginDesc gost_yescrypt_pdesc = {"gost-yescrypt-password-storage-scheme", VENDOR, DS_PACKAGE_VERSION, "Yescrypt KDF algorithm (Streebog256)"};
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
static char *plugin_name = "NSPwdStoragePlugin";
|
|
|
6d0b66 |
|
|
|
6d0b66 |
int
|
|
|
6d0b66 |
@@ -431,19 +429,3 @@ pbkdf2_sha256_pwd_storage_scheme_init(Slapi_PBlock *pb)
|
|
|
6d0b66 |
return rc;
|
|
|
6d0b66 |
}
|
|
|
6d0b66 |
|
|
|
6d0b66 |
-int
|
|
|
6d0b66 |
-gost_yescrypt_pwd_storage_scheme_init(Slapi_PBlock *pb)
|
|
|
6d0b66 |
-{
|
|
|
6d0b66 |
- int rc;
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
- slapi_log_err(SLAPI_LOG_PLUGIN, plugin_name, "=> gost_yescrypt_pwd_storage_scheme_init\n");
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
- rc = slapi_pblock_set(pb, SLAPI_PLUGIN_VERSION, (void *)SLAPI_PLUGIN_VERSION_01);
|
|
|
6d0b66 |
- rc |= slapi_pblock_set(pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&gost_yescrypt_pdesc);
|
|
|
6d0b66 |
- rc |= slapi_pblock_set(pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_ENC_FN, (void *)gost_yescrypt_pw_enc);
|
|
|
6d0b66 |
- rc |= slapi_pblock_set(pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_CMP_FN, (void *)gost_yescrypt_pw_cmp);
|
|
|
6d0b66 |
- rc |= slapi_pblock_set(pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_NAME, GOST_YESCRYPT_SCHEME_NAME);
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
- slapi_log_err(SLAPI_LOG_PLUGIN, plugin_name, "<= gost_yescrypt_pwd_storage_scheme_init %d\n", rc);
|
|
|
6d0b66 |
- return rc;
|
|
|
6d0b66 |
-}
|
|
|
6d0b66 |
diff --git a/ldap/servers/slapd/fedse.c b/ldap/servers/slapd/fedse.c
|
|
|
6d0b66 |
index 44159c991..24b7ed11c 100644
|
|
|
6d0b66 |
--- a/ldap/servers/slapd/fedse.c
|
|
|
6d0b66 |
+++ b/ldap/servers/slapd/fedse.c
|
|
|
6d0b66 |
@@ -203,19 +203,6 @@ static const char *internal_entries[] =
|
|
|
6d0b66 |
"nsslapd-pluginVersion: none\n"
|
|
|
6d0b66 |
"nsslapd-pluginVendor: 389 Project\n"
|
|
|
6d0b66 |
"nsslapd-pluginDescription: CRYPT-SHA512\n",
|
|
|
6d0b66 |
-
|
|
|
6d0b66 |
- "dn: cn=GOST_YESCRYPT,cn=Password Storage Schemes,cn=plugins,cn=config\n"
|
|
|
6d0b66 |
- "objectclass: top\n"
|
|
|
6d0b66 |
- "objectclass: nsSlapdPlugin\n"
|
|
|
6d0b66 |
- "cn: GOST_YESCRYPT\n"
|
|
|
6d0b66 |
- "nsslapd-pluginpath: libpwdstorage-plugin\n"
|
|
|
6d0b66 |
- "nsslapd-plugininitfunc: gost_yescrypt_pwd_storage_scheme_init\n"
|
|
|
6d0b66 |
- "nsslapd-plugintype: pwdstoragescheme\n"
|
|
|
6d0b66 |
- "nsslapd-pluginenabled: on\n"
|
|
|
6d0b66 |
- "nsslapd-pluginId: GOST_YESCRYPT\n"
|
|
|
6d0b66 |
- "nsslapd-pluginVersion: none\n"
|
|
|
6d0b66 |
- "nsslapd-pluginVendor: 389 Project\n"
|
|
|
6d0b66 |
- "nsslapd-pluginDescription: GOST_YESCRYPT\n",
|
|
|
6d0b66 |
};
|
|
|
6d0b66 |
|
|
|
6d0b66 |
static int NUM_INTERNAL_ENTRIES = sizeof(internal_entries) / sizeof(internal_entries[0]);
|
|
|
6d0b66 |
--
|
|
|
6d0b66 |
2.31.1
|
|
|
6d0b66 |
|