patch 8.2.3245: the crypt key may appear in a swap partition
Problem: The crypt key may appear in a swap partition.
Solution: When using xchaha20 use sodium_mlock(). (Christian Brabandt,
closes #8657)
diff --git a/src/buffer.c b/src/buffer.c
index 59397e4..628c82f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2306,6 +2306,10 @@
clear_string_option(&buf->b_p_fex);
#endif
#ifdef FEAT_CRYPT
+# ifdef FEAT_SODIUM
+ if (buf->b_p_key != NULL && (crypt_get_method_nr(buf) == CRYPT_M_SOD))
+ sodium_munlock(buf->b_p_key, STRLEN(buf->b_p_key));
+# endif
clear_string_option(&buf->b_p_key);
#endif
clear_string_option(&buf->b_p_kp);
diff --git a/src/crypt.c b/src/crypt.c
index fad6df0..f2f643f 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -12,10 +12,6 @@
*/
#include "vim.h"
-#ifdef FEAT_SODIUM
-# include <sodium.h>
-#endif
-
#if defined(FEAT_CRYPT) || defined(PROTO)
/*
* Optional encryption support.
@@ -447,6 +443,8 @@
#ifdef FEAT_SODIUM
if (state->method_nr == CRYPT_M_SOD)
{
+ sodium_munlock(((sodium_state_T *)state->method_state)->key,
+ crypto_box_SEEDBYTES);
sodium_memzero(state->method_state, sizeof(sodium_state_T));
sodium_free(state->method_state);
}
@@ -726,6 +724,7 @@
// crypto_box_SEEDBYTES == crypto_secretstream_xchacha20poly1305_KEYBYTES
unsigned char dkey[crypto_box_SEEDBYTES]; // 32
sodium_state_T *sd_state;
+ int retval = 0;
if (sodium_init() < 0)
return FAIL;
@@ -743,6 +742,16 @@
return FAIL;
}
memcpy(sd_state->key, dkey, crypto_box_SEEDBYTES);
+
+ retval += sodium_mlock(sd_state->key, crypto_box_SEEDBYTES);
+ retval += sodium_mlock(key, STRLEN(key));
+
+ if (retval < 0)
+ {
+ emsg(_(e_encryption_sodium_mlock_failed));
+ sodium_free(sd_state);
+ return FAIL;
+ }
sd_state->count = 0;
state->method_state = sd_state;
diff --git a/src/errors.h b/src/errors.h
index 40925f8..164aafd 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -641,3 +641,5 @@
INIT(= N_("E1228: List or Dictionary or Blob required for argument %d"));
EXTERN char e_expected_dictionary_for_using_key_str_but_got_str[]
INIT(= N_("E1229: Expected dictionary for using key \"%s\", but got %s"));
+EXTERN char e_encryption_sodium_mlock_failed[]
+ INIT(= N_("E1230: encryption: sodium_mlock() failed"));
diff --git a/src/fileio.c b/src/fileio.c
index bd4038c..81a7b50 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -13,10 +13,6 @@
#include "vim.h"
-#ifdef FEAT_SODIUM
-# include <sodium.h>
-#endif
-
#if defined(__TANDEM)
# include <limits.h> // for SSIZE_MAX
#endif
diff --git a/src/memline.c b/src/memline.c
index c2e1074..75c17d2 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -48,11 +48,6 @@
# include <time.h>
#endif
-// for randombytes_buf
-#ifdef FEAT_SODIUM
-# include <sodium.h>
-#endif
-
#if defined(SASC) || defined(__amigaos4__)
# include <proto/dos.h> // for Open() and Close()
#endif
diff --git a/src/version.c b/src/version.c
index b0e67ed..6b37200 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3245,
+/**/
3244,
/**/
3243,
diff --git a/src/vim.h b/src/vim.h
index e45a1de..30cf284 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -486,6 +486,10 @@
# endif
#endif
+#ifdef HAVE_SODIUM
+# include <sodium.h>
+#endif
+
// ================ end of the header file puzzle ===============
/*