diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-06-17 11:33:16 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-06-17 11:33:16 +1000 |
| commit | 4f2271d58a36b2aee125062ffb9626c6208fa394 (patch) | |
| tree | 122e6de930647c37a35b5f457448a031e51969b8 /include/crypto/rsa.h | |
| parent | 5a147abd790075cdc97b36ff5084e2eb1d779b95 (diff) | |
Add ACVP fips module tests
For FIPS validation purposes - Automated Cryptographic Validation Protocol (ACVP) tests need to be
performed. (See https://github.com/usnistgov/ACVP). These tests are very similiar to the old CAVS tests.
This PR uses a hardwired subset of these test vectors to perform similiar operations,
to show the usage and prove that the API's are able to perform the required operations.
It may also help with communication with the lab (i.e- The lab could add a test here to show
a unworking use case - which we can then address).
The EVP layer performs these tests instead of calling lower level API's
as was done in the old FOM.
Some of these tests require access to internals that are not normally allowed/required.
The config option 'acvp_tests' (enabled by default) has been added so that this
access may be removed.
The mechanism has been implemented as additional OSSL_PARAM values that can be set and get.
A callback mechanism did not seem to add any additional benefit.
These params will not be added to the gettables lists.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11572)
Diffstat (limited to 'include/crypto/rsa.h')
| -rw-r--r-- | include/crypto/rsa.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/crypto/rsa.h b/include/crypto/rsa.h index 5d7a6e515d..9469ec9233 100644 --- a/include/crypto/rsa.h +++ b/include/crypto/rsa.h @@ -10,8 +10,8 @@ #ifndef OSSL_INTERNAL_RSA_H # define OSSL_INTERNAL_RSA_H -#include <openssl/core.h> -#include <openssl/rsa.h> +# include <openssl/core.h> +# include <openssl/rsa.h> typedef struct rsa_pss_params_30_st { int hash_algorithm_nid; @@ -93,4 +93,16 @@ extern const char *rsa_mp_factor_names[]; extern const char *rsa_mp_exp_names[]; extern const char *rsa_mp_coeff_names[]; +# if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) +int rsa_acvp_test_gen_params_new(OSSL_PARAM **dst, const OSSL_PARAM src[]); +void rsa_acvp_test_gen_params_free(OSSL_PARAM *dst); + +int rsa_acvp_test_set_params(RSA *r, const OSSL_PARAM params[]); +int rsa_acvp_test_get_params(RSA *r, OSSL_PARAM params[]); +typedef struct rsa_acvp_test_st RSA_ACVP_TEST; +void rsa_acvp_test_free(RSA_ACVP_TEST *t); +# else +# define RSA_ACVP_TEST void +# endif + #endif |