isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quiet libgcrypt run-time warning about not being initialized.

Browse Source 
Fixes Debian bug #1019428 and Ubuntu bug #1397663.
This commit is contained in:
Todd C. Miller
2022-09-20 16:13:31 -06:00
parent ce387a6849
commit c823ca1e45
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/util/digest_gcrypt.c
View File

@@ -23,6 +23,11 @@
#include <config.h> #include <config.h>
#ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#else
# include "compat/stdbool.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
@@ -33,6 +38,8 @@
#include "sudo_debug.h" #include "sudo_debug.h"
#include "sudo_digest.h" #include "sudo_digest.h"
#define SUDO_LIBGCRYPT_VERSION_MIN "1.3.0"
struct sudo_digest { struct sudo_digest {
int gcry_digest_type; int gcry_digest_type;
unsigned int digest_len; unsigned int digest_len;
@@ -61,9 +68,21 @@ struct sudo_digest *
sudo_digest_alloc_v1(int digest_type) sudo_digest_alloc_v1(int digest_type)
{ {
debug_decl(sudo_digest_alloc, SUDO_DEBUG_UTIL); debug_decl(sudo_digest_alloc, SUDO_DEBUG_UTIL);
static bool initialized = false;
struct sudo_digest *dig; struct sudo_digest *dig;
int gcry_digest_type; int gcry_digest_type;
if (!initialized) {
if (!gcry_check_version(SUDO_LIBGCRYPT_VERSION_MIN)) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"libgcrypt too old (need %s, have %s)",
SUDO_LIBGCRYPT_VERSION_MIN, gcry_check_version(NULL));
debug_return_ptr(NULL);
}
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
initialized = true;
}
gcry_digest_type = sudo_digest_type_to_gcry(digest_type); gcry_digest_type = sudo_digest_type_to_gcry(digest_type);
if (gcry_digest_type == -1) { if (gcry_digest_type == -1) {
errno = EINVAL; errno = EINVAL;