diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-14 09:57:37 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-14 09:57:37 +0200 |
commit | 7039637e25cd70490ab4d04a7b331efc733fe6e8 (patch) | |
tree | 4631919f50b92a6eaece955640727707513cc0f8 /crypto/asymmetric_keys/x509_parser.h | |
parent | 6cc10d30a2da07223b153bd87beebd63412ff5b9 (diff) | |
parent | 922de3665750792ad48a89321d68daf5d267ef5a (diff) | |
download | linux-crypto-7039637e25cd70490ab4d04a7b331efc733fe6e8.tar.gz linux-crypto-7039637e25cd70490ab4d04a7b331efc733fe6e8.zip |
Merge drm/drm-next into drm-misc-next-fixes
Backmerging from drm/drm-next for the final fixes that will go
into v5.20.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'crypto/asymmetric_keys/x509_parser.h')
-rw-r--r-- | crypto/asymmetric_keys/x509_parser.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/x509_parser.h b/crypto/asymmetric_keys/x509_parser.h index 97a886cb..a299c9c5 100644 --- a/crypto/asymmetric_keys/x509_parser.h +++ b/crypto/asymmetric_keys/x509_parser.h @@ -41,6 +41,15 @@ struct x509_certificate { }; /* + * selftest.c + */ +#ifdef CONFIG_FIPS_SIGNATURE_SELFTEST +extern int __init fips_signature_selftest(void); +#else +static inline int fips_signature_selftest(void) { return 0; } +#endif + +/* * x509_cert_parser.c */ extern void x509_free_certificate(struct x509_certificate *cert); |