summaryrefslogtreecommitdiffstats
path: root/crypto/aes
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-05-28 11:25:08 +0100
committerMatt Caswell <matt@openssl.org>2019-06-03 12:56:53 +0100
commit66ad63e80198800ad94e4e4168a6b9b6a7c0fcd4 (patch)
treeaaa621a4f3ac852a7ac2dfbde449f29746361cc7 /crypto/aes
parenta77b4dba237d001073d2d1c5d55c674a196c949f (diff)
Make basic AES ciphers available from within the FIPS providers
These ciphers were already provider aware, and were available from the default provider. We move them into the FIPS provider too. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9038)
Diffstat (limited to 'crypto/aes')
-rw-r--r--crypto/aes/build.info4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/aes/build.info b/crypto/aes/build.info
index 1aa7a18dfb..d0801de94c 100644
--- a/crypto/aes/build.info
+++ b/crypto/aes/build.info
@@ -3,6 +3,10 @@ SOURCE[../../libcrypto]=\
aes_misc.c aes_ecb.c aes_cfb.c aes_ofb.c \
aes_ige.c aes_wrap.c {- $target{aes_asm_src} -}
+SOURCE[../../providers/fips]=\
+ aes_misc.c aes_ecb.c \
+ {- $target{aes_asm_src} -}
+
GENERATE[aes-ia64.s]=asm/aes-ia64.S
GENERATE[aes-586.s]=asm/aes-586.pl \