picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check for crypt_gensalt_ra() instead of relying on libxcrypt presence

Browse source 
Since the loop to check various xcrypt functions is already in place,
adding one more is cheap. And it is nicer to check for the function
directly. People like to backport things, so we might get lucky even
without having libxcrypt.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-09-10 18:21:41 +02:00
parent e8644a414a
commit 2b49f0ca83
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -884,7 +884,8 @@ libcrypt = cc.find_library('crypt')
crypt_header = conf.get('HAVE_CRYPT_H') == 1 ? \ crypt_header = conf.get('HAVE_CRYPT_H') == 1 ? \
'''#include <crypt.h>''' : '''#include <unistd.h>''' '''#include <crypt.h>''' : '''#include <unistd.h>'''
foreach ident : [ foreach ident : [
['crypt_ra', crypt_header]] ['crypt_ra', crypt_header],
['crypt_gensalt_ra', crypt_header]]
have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE', have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE',
dependencies : libcrypt) dependencies : libcrypt)

9
src/shared/libcrypt-util.c
View file

@ -31,12 +31,12 @@
int make_salt(char **ret) { int make_salt(char **ret) {
#ifdef XCRYPT_VERSION_MAJOR #if HAVE_CRYPT_GENSALT_RA
const char *e; const char *e;
char *salt; char *salt;
/* If we have libxcrypt we default to the "preferred method" (i.e. usually yescrypt), and generate it /* If we have crypt_gensalt_ra() we default to the "preferred method" (i.e. usually yescrypt).
* with crypt_gensalt_ra(). */ * crypt_gensalt_ra() is usually provided by libxcrypt. */
e = secure_getenv("SYSTEMD_CRYPT_PREFIX"); e = secure_getenv("SYSTEMD_CRYPT_PREFIX");
if (!e) if (!e)
@ -51,8 +51,7 @@ int make_salt(char **ret) {
*ret = salt; *ret = salt;
return 0; return 0;
#else #else
/* If libxcrypt is not used, we use SHA512 and generate the salt on our own since crypt_gensalt_ra() /* If crypt_gensalt_ra() is not available, we use SHA512 and generate the salt on our own. */
* is not available. */
static const char table[] = static const char table[] =
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"