diff options
| author | Ben Laurie <ben@openssl.org> | 2003-09-12 01:37:01 +0400 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2003-09-12 01:37:01 +0400 |
| commit | 52fc641da0bf6673aaef827141de959f9ecccf62 (patch) | |
| tree | bf76207bb882c47fd57fddaddf62a0b8d68a7f56 /crypto | |
| parent | f29f610bf5fe70a4392362cf8219d36ca771728a (diff) | |
Add RSA to FIPS.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rsa/rsa_eay.c | 2 | ||||
| -rw-r--r-- | crypto/rsa/rsa_gen.c | 3 | ||||
| -rw-r--r-- | crypto/sha/Makefile.ssl | 9 |
3 files changed, 5 insertions, 9 deletions
diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c index e0d286266e..d4caab3f95 100644 --- a/crypto/rsa/rsa_eay.c +++ b/crypto/rsa/rsa_eay.c @@ -62,7 +62,7 @@ #include <openssl/rsa.h> #include <openssl/rand.h> -#ifndef RSA_NULL +#if !defined(RSA_NULL) && !defined(OPENSSL_FIPS) static int RSA_eay_public_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa,int padding); diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c index 00c25adbc5..adb5e34da5 100644 --- a/crypto/rsa/rsa_gen.c +++ b/crypto/rsa/rsa_gen.c @@ -62,6 +62,8 @@ #include <openssl/bn.h> #include <openssl/rsa.h> +#ifndef OPENSSL_FIPS + RSA *RSA_generate_key(int bits, unsigned long e_value, void (*callback)(int,int,void *), void *cb_arg) { @@ -195,3 +197,4 @@ err: return(rsa); } +#endif diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl index 37555715fd..a197893e92 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile.ssl @@ -102,14 +102,7 @@ sha1_one.o: ../../include/openssl/opensslconf.h sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h sha1_one.o: ../../include/openssl/sha.h ../../include/openssl/stack.h sha1_one.o: ../../include/openssl/symhacks.h sha1_one.c -sha1dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -sha1dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h -sha1dgst.o: ../../include/openssl/opensslconf.h -sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -sha1dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -sha1dgst.o: ../../include/openssl/symhacks.h ../md32_common.h sha1dgst.c -sha1dgst.o: sha_locl.h +sha1dgst.o: ../../include/openssl/opensslv.h sha1dgst.c sha_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h sha_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h |