X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Frsa%2Frsa.h;h=a3b127774461c32a3ab58bea612df26b709384cf;hp=b91501a8d01d2e587f23230480d1c4049926f9e5;hb=9945b460e2d99f5eacabeea23cf2fc2b921646b1;hpb=2440d8b1db72e2301492c836a87bfd134dc04db2

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index b91501a8d0..a3b1277744 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -282,7 +282,7 @@ struct rsa_st
 
 RSA *	RSA_new(void);
 RSA *	RSA_new_method(ENGINE *engine);
-int	RSA_size(const RSA *);
+int	RSA_size(const RSA *rsa);
 
 /* Deprecated version */
 #ifndef OPENSSL_NO_DEPRECATED
@@ -315,25 +315,6 @@ int	RSA_up_ref(RSA *r);
 
 int	RSA_flags(const RSA *r);
 
-#ifdef OPENSSL_FIPS
-RSA *FIPS_rsa_new(void);
-void FIPS_rsa_free(RSA *r);
-int FIPS_rsa_sign_ctx(RSA *rsa, EVP_MD_CTX *ctx,
-			int rsa_pad_mode, int saltlen, const EVP_MD *mgf1Hash,
-			unsigned char *sigret, unsigned int *siglen);
-int FIPS_rsa_sign_digest(RSA *rsa, const unsigned char *md, int md_len,
-			const EVP_MD *mhash, int rsa_pad_mode, int saltlen,
-			const EVP_MD *mgf1Hash,
-			unsigned char *sigret, unsigned int *siglen);
-int FIPS_rsa_verify_ctx(RSA *rsa, EVP_MD_CTX *ctx,
-			int rsa_pad_mode, int saltlen, const EVP_MD *mgf1Hash,
-			unsigned char *sigbuf, unsigned int siglen);
-int FIPS_rsa_verify_digest(RSA *rsa, const unsigned char *dig, int diglen,
-			const EVP_MD *mhash, int rsa_pad_mode, int saltlen,
-			const EVP_MD *mgf1Hash,
-			unsigned char *sigbuf, unsigned int siglen);
-#endif
-
 void RSA_set_default_method(const RSA_METHOD *meth);
 const RSA_METHOD *RSA_get_default_method(void);
 const RSA_METHOD *RSA_get_method(const RSA *rsa);
@@ -458,7 +439,7 @@ RSA *RSAPrivateKey_dup(RSA *rsa);
 
 /* If this flag is set the RSA method is FIPS compliant and can be used
  * in FIPS mode. This is set in the validated module method. If an
- * application sets this flag in its own methods it is its reposibility
+ * application sets this flag in its own methods it is its responsibility
  * to ensure the result is compliant.
  */
 
@@ -470,6 +451,10 @@ RSA *RSAPrivateKey_dup(RSA *rsa);
  */
 
 #define RSA_FLAG_NON_FIPS_ALLOW			0x0400
+/* Application has decided PRNG is good enough to generate a key: don't
+ * check.
+ */
+#define RSA_FLAG_CHECKED			0x0800
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes