diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2018-07-24 11:16:38 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-09-28 07:22:13 +1000 |
| commit | 8bf366519661e12fd894dc5420f5b64dccfd7ecd (patch) | |
| tree | 2dbd982aa266dcc238ac4e973694110974c35b79 /test/drbg_cavs_data.h | |
| parent | 1362190b1b786a87378e55e9a1c20c46b6b6a286 (diff) | |
Added DRBG_HMAC & DRBG_HASH + Added defaults for setting DRBG for master/public/private + renamed generate_counter back to reseed_counter + generated new cavs data tests
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/6779)
Diffstat (limited to 'test/drbg_cavs_data.h')
| -rw-r--r-- | test/drbg_cavs_data.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/test/drbg_cavs_data.h b/test/drbg_cavs_data.h index d673375619..4f2d067df8 100644 --- a/test/drbg_cavs_data.h +++ b/test/drbg_cavs_data.h @@ -22,10 +22,11 @@ enum drbg_kat_type { PR_TRUE }; -enum drbg_df { - USE_DF, - NO_DF, - NA +enum drbg_flags { + NA = 0, + USE_DF = 1<<0, + NO_DF = 1<<1, + USE_HMAC = 1<<2 }; struct drbg_kat_no_reseed { @@ -64,7 +65,7 @@ struct drbg_kat_pr_true { struct drbg_kat { enum drbg_kat_type type; - enum drbg_df df; + enum drbg_flags flags; int nid; size_t entropyinlen; @@ -76,7 +77,12 @@ struct drbg_kat { const void *t; }; -extern const struct drbg_kat *drbg_test[]; -extern const size_t drbg_test_nelem; +extern const struct drbg_kat *drbg_ctr_test[]; +extern const struct drbg_kat *drbg_hmac_test[]; +extern const struct drbg_kat *drbg_hash_test[]; + +extern const size_t drbg_ctr_nelem; +extern const size_t drbg_hmac_nelem; +extern const size_t drbg_hash_nelem; #endif |