Update to OAEP support.

[openssl.git] / crypto / rsa / rsa.h

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 7174f9cee8a040c3b4e25b1bd688a12e858fd752..38771fbafb69940dd5991d3095e5f2656e07ec53 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -249,13 +249,31 @@ struct rsa_st
                                EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)
 
 #define         EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md)  \
-               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \
+               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
+                       EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, \
                                EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)md)
 
+#define         EVP_PKEY_CTX_set_rsa_oaep_md(ctx, md)  \
+               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
+                               EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)md)
+
 #define         EVP_PKEY_CTX_get_rsa_mgf1_md(ctx, pmd) \
-               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \
+               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
+                       EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, \
                                EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)pmd)
 
+#define         EVP_PKEY_CTX_get_rsa_oaep_md(ctx, pmd) \
+               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
+                               EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)pmd)
+
+#define         EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, l, llen) \
+               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
+                               EVP_PKEY_CTRL_RSA_OAEP_LABEL, llen, (void *)l)
+
+#define         EVP_PKEY_CTX_get0_rsa_oaep_label(ctx, l)       \
+               EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,  \
+                               EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, 0, (void *)l)
+
 #define EVP_PKEY_CTRL_RSA_PADDING      (EVP_PKEY_ALG_CTRL + 1)
 #define EVP_PKEY_CTRL_RSA_PSS_SALTLEN  (EVP_PKEY_ALG_CTRL + 2)
 
@@ -267,6 +285,12 @@ struct rsa_st
 #define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN      (EVP_PKEY_ALG_CTRL + 7)
 #define EVP_PKEY_CTRL_GET_RSA_MGF1_MD          (EVP_PKEY_ALG_CTRL + 8)
 
+#define EVP_PKEY_CTRL_RSA_OAEP_MD      (EVP_PKEY_ALG_CTRL + 9)
+#define EVP_PKEY_CTRL_RSA_OAEP_LABEL   (EVP_PKEY_ALG_CTRL + 10)
+
+#define EVP_PKEY_CTRL_GET_RSA_OAEP_MD  (EVP_PKEY_ALG_CTRL + 11)
+#define EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL (EVP_PKEY_ALG_CTRL + 12)
+
 #define RSA_PKCS1_PADDING      1
 #define RSA_SSLV23_PADDING     2
 #define RSA_NO_PADDING         3
@@ -282,7 +306,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 +339,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);
@@ -420,6 +425,14 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to,int tlen,
 int RSA_padding_check_PKCS1_OAEP(unsigned char *to,int tlen,
        const unsigned char *f,int fl,int rsa_len,
        const unsigned char *p,int pl);
+int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
+       const unsigned char *from, int flen,
+       const unsigned char *param, int plen,
+       const EVP_MD *md, const EVP_MD *mgf1md);
+int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
+       const unsigned char *from, int flen, int num,
+       const unsigned char *param, int plen,
+       const EVP_MD *md, const EVP_MD *mgf1md);
 int RSA_padding_add_SSLv23(unsigned char *to,int tlen,
        const unsigned char *f,int fl);
 int RSA_padding_check_SSLv23(unsigned char *to,int tlen,
@@ -458,7 +471,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.
  */
 
@@ -514,6 +527,7 @@ void ERR_load_RSA_strings(void);
 #define RSA_F_RSA_NULL_PUBLIC_ENCRYPT                   135
 #define RSA_F_RSA_PADDING_ADD_NONE                      107
 #define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                121
+#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1           154
 #define RSA_F_RSA_PADDING_ADD_PKCS1_PSS                         125
 #define RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1            152
 #define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1              108
@@ -522,6 +536,7 @@ void ERR_load_RSA_strings(void);
 #define RSA_F_RSA_PADDING_ADD_X931                      127
 #define RSA_F_RSA_PADDING_CHECK_NONE                    111
 #define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP              122
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1                 153
 #define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1            112
 #define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2            113
 #define RSA_F_RSA_PADDING_CHECK_SSLV23                  114
@@ -558,6 +573,7 @@ void ERR_load_RSA_strings(void);
 #define RSA_R_D_E_NOT_CONGRUENT_TO_1                    123
 #define RSA_R_FIRST_OCTET_INVALID                       133
 #define RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE       144
+#define RSA_R_INVALID_DIGEST                            157
 #define RSA_R_INVALID_DIGEST_LENGTH                     143
 #define RSA_R_INVALID_HEADER                            137
 #define RSA_R_INVALID_KEYBITS                           145