diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-05-10 10:27:42 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-05-13 09:49:18 +1000 |
| commit | b98f752ec330cdc81d1f27a9506e6dcc8c00af5a (patch) | |
| tree | 5cb469c545da743d0751cddf4bfce15e41e483bd /include/internal | |
| parent | 466cab4758289f91215eada905cf334d334830fa (diff) | |
Export/import flags for FFC params changed to seperate fields.
An extra field got added to the ffc flags related to FIPS-186-2 key validation, but this field was
not handled by the export/import since the flags were done as string combinations.
To keep this consistent with other object flags they are now passed as seperate OSSL_PARAM fields.
Fixes 'no-cached-fetch' build which uses export/import.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15210)
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/ffc.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/internal/ffc.h b/include/internal/ffc.h index f0ab31400b..79cb06aba3 100644 --- a/include/internal/ffc.h +++ b/include/internal/ffc.h @@ -42,7 +42,7 @@ /* Validation flags */ # define FFC_PARAM_FLAG_VALIDATE_PQ 0x01 # define FFC_PARAM_FLAG_VALIDATE_G 0x02 -# define FFC_PARAM_FLAG_VALIDATE_ALL \ +# define FFC_PARAM_FLAG_VALIDATE_PQG \ (FFC_PARAM_FLAG_VALIDATE_PQ | FFC_PARAM_FLAG_VALIDATE_G) #define FFC_PARAM_FLAG_VALIDATE_LEGACY 0x04 @@ -105,7 +105,7 @@ typedef struct ffc_params_st { int gindex; int h; /* loop counter for unverifiable g */ - unsigned int flags; /* See FFC_PARAM_FLAG_VALIDATE_ALL */ + unsigned int flags; /* * The digest to use for generation or validation. If this value is NULL, * then the digest is chosen using the value of N. @@ -209,7 +209,4 @@ const BIGNUM *ossl_ffc_named_group_get_q(const DH_NAMED_GROUP *group); int ossl_ffc_named_group_set_pqg(FFC_PARAMS *ffc, const DH_NAMED_GROUP *group); #endif -const char *ossl_ffc_params_flags_to_name(int flags); -int ossl_ffc_params_flags_from_name(const char *name); - #endif /* OSSL_INTERNAL_FFC_H */ |