devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Check return values of libgcrypt initialisation.

Browse Source 
Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel
2025-03-17 17:00:17 +01:00
parent 6bdc557e40
commit 59aa9d64df
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/omemo/crypto.c
View File

@@ -49,16 +49,25 @@ int
omemo_crypto_init(void) omemo_crypto_init(void)
{ {
if (!gcry_check_version(GCRYPT_VERSION)) { if (!gcry_check_version(GCRYPT_VERSION)) {
return -1; return GPG_ERR_UNKNOWN_VERSION;
} }
gcry_control(GCRYCTL_SUSPEND_SECMEM_WARN); gcry_error_t ret;
ret = gcry_control(GCRYCTL_SUSPEND_SECMEM_WARN);
if (ret != 0)
return ret;
gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0); ret = gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0);
if (ret != 0)
return ret;
gcry_control(GCRYCTL_RESUME_SECMEM_WARN); ret = gcry_control(GCRYCTL_RESUME_SECMEM_WARN);
if (ret != 0)
return ret;
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); ret = gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
if (ret != 0)
return ret;
/* Ask for a first random buffer to ensure CSPRNG is initialized. /* Ask for a first random buffer to ensure CSPRNG is initialized.
* Thus we control the memleak produced by gcrypt initialization and we can * Thus we control the memleak produced by gcrypt initialization and we can

5
src/omemo/omemo.c
View File

@@ -133,8 +133,9 @@ omemo_init(void)
prof_add_shutdown_routine(_omemo_close); prof_add_shutdown_routine(_omemo_close);
if (omemo_crypto_init() != 0) { gcry_error_t crypt_res = omemo_crypto_init();
cons_show("Error initializing OMEMO crypto: gcry_check_version() failed"); if (crypt_res != 0) {
cons_show("Error initializing OMEMO crypto: %s", gcry_strerror(crypt_res));
} }
pthread_mutexattr_init(&omemo_static_data.attr); pthread_mutexattr_init(&omemo_static_data.attr);