diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2020-01-06 13:02:16 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2020-01-06 13:02:16 +1000 |
commit | 0d2bfe52bb7e839f7bddcdb1160c335f2994df2f (patch) | |
tree | 91d972d9aca1832ae2bdfc5ebd130e1c74dc4bc1 /crypto/aes | |
parent | 26583f6aa8dc28e3598e61db66e54e2fdf8b195f (diff) |
Add AES_CBC_HMAC_SHA ciphers to providers.
Also Add ability for providers to dynamically exclude cipher algorithms.
Cipher algorithms are only returned from providers if their capable() method is either NULL,
or the method returns 1.
This is mainly required for ciphers that only have hardware implementations.
If there is no hardware support, then the algorithm needs to be not available.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10146)
Diffstat (limited to 'crypto/aes')
-rw-r--r-- | crypto/aes/build.info | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/aes/build.info b/crypto/aes/build.info index 291bf2af9b..dc00df0cda 100644 --- a/crypto/aes/build.info +++ b/crypto/aes/build.info @@ -68,8 +68,6 @@ SOURCE[../../providers/libfips.a]=$COMMON DEFINE[../../libcrypto]=$AESDEF DEFINE[../../providers/libfips.a]=$AESDEF DEFINE[../../providers/libimplementations.a]=$AESDEF -# fipsprov.c needs access to AESNI. -DEFINE[../../providers/fips]=$AESDEF GENERATE[aes-ia64.s]=asm/aes-ia64.S |