diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-03-01 10:22:04 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2017-03-06 22:24:33 +0100 |
| commit | 49d386bc47852b55443eb74cc59e0cddf8b8962f (patch) | |
| tree | 44db566942795129dfb8e9d8cffbd5a1fca6a06f | |
| parent | 9735c552ab4496ec48518108db75eaa79479785f (diff) | |
| download | gnutls-49d386bc47852b55443eb74cc59e0cddf8b8962f.tar.gz | |
nettle/rnd-fips: combined the FIPS-compliant generators to two
This brings the FIPS generators in par with the non-FIPS chacha-based ones.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | lib/nettle/rnd-fips.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/nettle/rnd-fips.c b/lib/nettle/rnd-fips.c index 7c4bda9877..dbbb540400 100644 --- a/lib/nettle/rnd-fips.c +++ b/lib/nettle/rnd-fips.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Red Hat + * Copyright (C) 2013-2017 Red Hat * * This file is part of GnuTLS. * @@ -42,7 +42,6 @@ struct fips_ctx { struct drbg_aes_ctx nonce_context; struct drbg_aes_ctx normal_context; - struct drbg_aes_ctx strong_context; unsigned int forkid; }; @@ -115,11 +114,6 @@ static int _rngfips_ctx_init(struct fips_ctx *fctx) { int ret; - /* strong */ - ret = drbg_init(&fctx->strong_context); - if (ret < 0) - return gnutls_assert_val(ret); - /* normal */ ret = drbg_init(&fctx->normal_context); if (ret < 0) @@ -139,11 +133,6 @@ static int _rngfips_ctx_reinit(struct fips_ctx *fctx) { int ret; - /* strong */ - ret = drbg_reseed(&fctx->strong_context); - if (ret < 0) - return gnutls_assert_val(ret); - /* normal */ ret = drbg_reseed(&fctx->normal_context); if (ret < 0) @@ -189,10 +178,11 @@ static int _rngfips_rnd(void *_ctx, int level, void *buffer, size_t length) switch (level) { case GNUTLS_RND_RANDOM: - ret = get_random(&ctx->normal_context, ctx, buffer, length); - break; case GNUTLS_RND_KEY: - ret = get_random(&ctx->strong_context, ctx, buffer, length); + /* Unlike the chacha generator in rnd.c we do not need + * to explicitly protect against backtracking in GNUTLS_RND_KEY + * level. This protection is part of the DRBG generator. */ + ret = get_random(&ctx->normal_context, ctx, buffer, length); break; default: ret = get_random(&ctx->nonce_context, ctx, buffer, length); |