diff options
| author | Ben Laurie <ben@openssl.org> | 2003-07-27 17:00:51 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2003-07-27 17:00:51 +0000 |
| commit | 75622f1ece530cab5ee1864c8d1e3d2dec5d6913 (patch) | |
| tree | 6d4c63b1c0c66f76236f4985722c5e3a548175b7 /crypto/aes | |
| parent | a052dd6532321ebb01936d1dcdb99481f741ad6a (diff) | |
Unfinished FIPS stuff for review/improvement.
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/Makefile.ssl | 3 | ||||
| -rw-r--r-- | crypto/aes/aes_core.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/crypto/aes/Makefile.ssl b/crypto/aes/Makefile.ssl index 364d05bbfe..a39bc9065e 100644 --- a/crypto/aes/Makefile.ssl +++ b/crypto/aes/Makefile.ssl @@ -91,7 +91,8 @@ aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c aes_locl.h aes_cfb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h aes_cfb.o: ../../include/openssl/opensslconf.h aes_cfb.c aes_locl.h aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h -aes_core.o: ../../include/openssl/opensslconf.h aes_core.c aes_locl.h +aes_core.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h +aes_core.o: aes_core.c aes_locl.h aes_ctr.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h aes_ctr.o: ../../include/openssl/opensslconf.h aes_ctr.c aes_locl.h aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c index 2f41a825f8..0b925a8566 100644 --- a/crypto/aes/aes_core.c +++ b/crypto/aes/aes_core.c @@ -37,8 +37,11 @@ #include <stdlib.h> #include <openssl/aes.h> +#include <openssl/fips.h> #include "aes_locl.h" +#ifndef FIPS + /* Te0[x] = S [x].[02, 01, 01, 03]; Te1[x] = S [x].[03, 02, 01, 01]; @@ -1255,3 +1258,4 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, PUTU32(out + 12, s3); } +#endif /* ndef FIPS */ |