diff options
author | Werner Koch <wk@gnupg.org> | 2017-07-17 15:52:26 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2017-07-17 15:53:16 +0200 |
commit | a149afe338d61d86985c533cde5e7dbcd31e8698 (patch) | |
tree | c930065acfb8403fe8391dc0d93b866f599bc52e /g10/encrypt.c | |
parent | agent: New GETINFO sub-command jent_active. (diff) | |
download | gnupg2-a149afe338d61d86985c533cde5e7dbcd31e8698.tar.xz gnupg2-a149afe338d61d86985c533cde5e7dbcd31e8698.zip |
gpg,sm: Check compliance of the RNG.
* common/compliance.c (gnupg_rng_is_compliant): New.
* g10/call-agent.c (start_agent) [W32]: Check rng compliance.
* sm/call-agent.c (start_agent) [W32]: Ditto.
* g10/encrypt.c (encrypt_simple, encrypt_crypt): Check that the RNG is
compliant.
* sm/encrypt.c (gpgsm_encrypt): Ditto.
* g10/sign.c (do_sign): Ditto.
* sm/sign.c (gpgsm_sign): Ditto.
--
Under Windows we need to check that the Jitter RNG is active in de-vs
mode. Under Linux this is not necessary because /dev/random can be
scrutinized and is believed to provide enough entropy.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/encrypt.c')
-rw-r--r-- | g10/encrypt.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 4b21a6178..c63ec8838 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -185,6 +185,16 @@ encrypt_simple (const char *filename, int mode, int use_seskey) progress_filter_context_t *pfx; int do_compress = !!default_compress_algo(); + if (!gnupg_rng_is_compliant (opt.compliance)) + { + rc = gpg_error (GPG_ERR_FORBIDDEN); + log_error (_("%s is not compliant with %s mode\n"), + "RNG", + gnupg_compliance_option_string (opt.compliance)); + write_status_error ("random-compliance", rc); + return rc; + } + pfx = new_progress_context (); memset( &cfx, 0, sizeof cfx); memset( &zfx, 0, sizeof zfx); @@ -626,6 +636,16 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename, goto leave; } + if (!gnupg_rng_is_compliant (opt.compliance)) + { + rc = gpg_error (GPG_ERR_FORBIDDEN); + log_error (_("%s is not compliant with %s mode\n"), + "RNG", + gnupg_compliance_option_string (opt.compliance)); + write_status_error ("random-compliance", rc); + goto leave; + } + compliant = gnupg_cipher_is_compliant (CO_DE_VS, cfx.dek->algo, GCRY_CIPHER_MODE_CFB); |