#undef X509_EXTENSIONS to avoid conflict with CryptoAPI.

[oweals/openssl.git] / crypto / rsa / rsa_pmeth.c

diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 168a33ee56fd3a1e3a39bff2bbd4c4680bc6271d..de917c637ab8095d410da743188cac1637e41b31 100644 (file)
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -63,11 +63,7 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 #include "evp_locl.h"
-
-extern int int_rsa_verify(int dtype, const unsigned char *m, size_t m_len,
-               unsigned char *rm, size_t *prm_len,
-               const unsigned char *sigbuf, size_t siglen,
-               RSA *rsa);
+#include "rsa_locl.h"
 
 /* RSA pkey context structure */
 
@@ -109,6 +105,25 @@ static int pkey_rsa_init(EVP_PKEY_CTX *ctx)
        return 1;
        }
 
+static int pkey_rsa_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
+       {
+       RSA_PKEY_CTX *dctx, *sctx;
+       if (!pkey_rsa_init(dst))
+               return 0;
+               sctx = src->data;
+       dctx = dst->data;
+       dctx->nbits = sctx->nbits;
+       if (sctx->pub_exp)
+               {
+               dctx->pub_exp = BN_dup(sctx->pub_exp);
+               if (!dctx->pub_exp)
+                       return 0;
+               }
+       dctx->pad_mode = sctx->pad_mode;
+       dctx->md = sctx->md;
+       return 1;
+       }
+
 static int setup_tbuf(RSA_PKEY_CTX *ctx, EVP_PKEY_CTX *pk)
        {
        if (ctx->tbuf)
@@ -226,7 +241,7 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
                        }
                else if (rctx->pad_mode == RSA_PKCS1_PADDING)
                        {
-                       unsigned int sltmp;
+                       size_t sltmp;
                        ret = int_rsa_verify(EVP_MD_type(rctx->md),
                                                NULL, 0, rout, &sltmp,
                                        sig, siglen, ctx->pkey->pkey.rsa);
@@ -286,7 +301,7 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
                        return -1;
                rslen = RSA_public_decrypt(siglen, sig, rctx->tbuf,
                                                rsa, rctx->pad_mode);
-               if (rslen <= 0)
+               if (rslen == 0)
                        return 0;
                }
 
@@ -419,7 +434,12 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
                case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
                case EVP_PKEY_CTRL_PKCS7_DECRYPT:
+               case EVP_PKEY_CTRL_PKCS7_SIGN:
                return 1;
+               case EVP_PKEY_CTRL_PEER_KEY:
+                       RSAerr(RSA_F_PKEY_RSA_CTRL,
+                       EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+                       return -2;      
 
                default:
                return -2;
@@ -523,6 +543,7 @@ const EVP_PKEY_METHOD rsa_pkey_meth =
        EVP_PKEY_RSA,
        EVP_PKEY_FLAG_AUTOARGLEN,
        pkey_rsa_init,
+       pkey_rsa_copy,
        pkey_rsa_cleanup,
 
        0,0,