Commit eda34e4b authored by Richard Levitte's avatar Richard Levitte
Browse files

Adapt the rest of the source to the removal of (EVP_MD_CTX|HMAC_CTX)_cleanup 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 32fd54a9

crypto/cms/cms_sd.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -728,7 +728,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) 
        goto err;

        goto err;

    }

    }





    EVP_MD_CTX_cleanup(mctx);

    EVP_MD_CTX_init(mctx);





    ASN1_STRING_set0(si->signature, abuf, siglen);

    ASN1_STRING_set0(si->signature, abuf, siglen);
@@ -736,7 +736,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si) 




 err:

 err:

    OPENSSL_free(abuf);

    OPENSSL_free(abuf);

    EVP_MD_CTX_cleanup(mctx);

    EVP_MD_CTX_init(mctx);

    return 0;

    return 0;





}

}
@@ -780,7 +780,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si) 
    if (r <= 0)

    if (r <= 0)

        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);

        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);

 err:

 err:

    EVP_MD_CTX_cleanup(mctx);

    EVP_MD_CTX_init(mctx);

    return r;

    return r;

}

}

crypto/evp/p5_crpt2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, 
            HMAC_CTX_free(hctx_tpl);

            HMAC_CTX_free(hctx_tpl);

            return 0;

            return 0;

        }

        }

        HMAC_CTX_cleanup(hctx);

        HMAC_CTX_init(hctx);

        memcpy(p, digtmp, cplen);

        memcpy(p, digtmp, cplen);

        for (j = 1; j < iter; j++) {

        for (j = 1; j < iter; j++) {

            if (!HMAC_CTX_copy(hctx, hctx_tpl)) {

            if (!HMAC_CTX_copy(hctx, hctx_tpl)) {
@@ -148,7 +148,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, 
                HMAC_CTX_free(hctx_tpl);

                HMAC_CTX_free(hctx_tpl);

                return 0;

                return 0;

            }

            }

            HMAC_CTX_cleanup(hctx);

            HMAC_CTX_init(hctx);

            for (k = 0; k < cplen; k++)

            for (k = 0; k < cplen; k++)

                p[k] ^= digtmp[k];

                p[k] ^= digtmp[k];

        }

        }

ssl/record/ssl3_record.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -875,7 +875,7 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send) 
                || EVP_DigestUpdate(md_ctx, ssl3_pad_2, npad) <= 0

                || EVP_DigestUpdate(md_ctx, ssl3_pad_2, npad) <= 0

                || EVP_DigestUpdate(md_ctx, md, md_size) <= 0

                || EVP_DigestUpdate(md_ctx, md, md_size) <= 0

                || EVP_DigestFinal_ex(md_ctx, md, &md_size_u) <= 0) {

                || EVP_DigestFinal_ex(md_ctx, md, &md_size_u) <= 0) {

            EVP_MD_CTX_cleanup(md_ctx);

            EVP_MD_CTX_init(md_ctx);

            return -1;

            return -1;

        }

        }

        md_size = md_size_u;

        md_size = md_size_u;

ssl/s3_enc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -518,7 +518,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p) 




    ret = EVP_MD_CTX_size(ctx);

    ret = EVP_MD_CTX_size(ctx);

    if (ret < 0) {

    if (ret < 0) {

        EVP_MD_CTX_cleanup(ctx);

        EVP_MD_CTX_init(ctx);

        return 0;

        return 0;

    }

    }

test/hmactest.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -193,7 +193,6 @@ int main(int argc, char *argv[]) 
    }

    }

    printf("test 4 ok\n");

    printf("test 4 ok\n");

test5:

test5:

    HMAC_CTX_cleanup(ctx);

    HMAC_CTX_init(ctx);

    HMAC_CTX_init(ctx);

    if (HMAC_Init_ex(ctx, test[4].key, test[4].key_len, NULL, NULL)) {

    if (HMAC_Init_ex(ctx, test[4].key, test[4].key_len, NULL, NULL)) {

        printf("Should fail to initialise HMAC with empty MD (test 5)\n");

        printf("Should fail to initialise HMAC with empty MD (test 5)\n");
@@ -283,7 +282,6 @@ test5: 
        printf("test 5 ok\n");

        printf("test 5 ok\n");

    }

    }

test6:

test6:

    HMAC_CTX_cleanup(ctx);

    HMAC_CTX_init(ctx);

    HMAC_CTX_init(ctx);

    ctx2 = HMAC_CTX_new();

    ctx2 = HMAC_CTX_new();

    if (ctx2 == NULL) {

    if (ctx2 == NULL) {