Make things static that should be. Declare stuff in headers that should be.

[openssl.git] / crypto / pkcs7 / pk7_doit.c

diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 157cf193bd8d0f29167cea5c34622a0407bf60ef..6577e368a86ce2583e2c87c40aa780624e652b68 100644 (file)
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -145,7 +145,7 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
        EVP_PKEY *pkey = NULL;
        unsigned char *ek = NULL;
        int ret = 0;
-       int eklen;
+       size_t eklen;
 
        pkey = X509_get_pubkey(ri->cert);
 
@@ -197,12 +197,12 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
        }
 
 
-int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
-                       PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey)
+static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
+                              PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey)
        {
        EVP_PKEY_CTX *pctx = NULL;
        unsigned char *ek = NULL;
-       int eklen;
+       size_t eklen;
 
        int ret = 0;
 
@@ -826,9 +826,10 @@ err:
 int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
        {
        EVP_MD_CTX mctx;
+       EVP_PKEY_CTX *pctx;
        unsigned char *abuf = NULL;
        int alen;
-       unsigned int siglen;
+       size_t siglen;
        const EVP_MD *md = NULL;
 
        md = EVP_get_digestbyobj(si->digest_alg->algorithm);
@@ -836,20 +837,37 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
                return 0;
 
        EVP_MD_CTX_init(&mctx);
-       if (!EVP_SignInit_ex(&mctx,md,NULL))
+       if (EVP_DigestSignInit(&mctx, &pctx, md,NULL, si->pkey) <= 0)
                goto err;
+
+       if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
+                               EVP_PKEY_CTRL_PKCS7_SIGN, 0, si) <= 0)
+               {
+               PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SIGN, PKCS7_R_CTRL_ERROR);
+               goto err;
+               }
+
        alen = ASN1_item_i2d((ASN1_VALUE *)si->auth_attr,&abuf,
                                ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
        if(!abuf)
                goto err;
-       if (!EVP_SignUpdate(&mctx,abuf,alen))
+       if (EVP_DigestSignUpdate(&mctx,abuf,alen) <= 0)
                goto err;
        OPENSSL_free(abuf);
-       abuf = OPENSSL_malloc(EVP_PKEY_size(si->pkey));
+       if (EVP_DigestSignFinal(&mctx, NULL, &siglen) <= 0)
+               goto err;
+       abuf = OPENSSL_malloc(siglen);
        if(!abuf)
                goto err;
-       if (!EVP_SignFinal(&mctx, abuf, &siglen, si->pkey))
+       if (EVP_DigestSignFinal(&mctx, abuf, &siglen) <= 0)
+               goto err;
+
+       if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
+                               EVP_PKEY_CTRL_PKCS7_SIGN, 1, si) <= 0)
+               {
+               PKCS7err(PKCS7_F_PKCS7_SIGNER_INFO_SIGN, PKCS7_R_CTRL_ERROR);
                goto err;
+               }
 
        EVP_MD_CTX_cleanup(&mctx);
 
@@ -864,10 +882,6 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
        return 0;
 
        }
-       
-
-       
-       
 
 int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
             PKCS7 *p7, PKCS7_SIGNER_INFO *si)