Commit 77a01145 authored by Richard Levitte's avatar Richard Levitte
Browse files

Have other crypto/evp files include evp_locl.h 



Note: this does not include the files in crypto/evp that are just
instanciations of EVP_MD.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 7638370c

crypto/evp/bio_md.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include "internal/cryptlib.h"

#include <openssl/buffer.h>

#include <openssl/evp.h>

#include "evp_locl.h"



/*

 * BIO_put and BIO_get both add to the digest, BIO_gets returns the digest

crypto/evp/bio_ok.c

+45 −28
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ typedef struct ok_struct { 
    size_t buf_off_save;

    int cont;                   /* <= 0 when finished */

    int finished;

    EVP_MD_CTX md;

    EVP_MD_CTX *md;

    int blockout;               /* output block is ready */

    int sigio;                  /* must process signature */

    unsigned char buf[IOBS];
@@ -182,7 +182,7 @@ static int ok_new(BIO *bi) 


    ctx->cont = 1;

    ctx->sigio = 1;

    EVP_MD_CTX_init(&ctx->md);

    ctx->md = EVP_MD_CTX_create();

    bi->init = 0;

    bi->ptr = (char *)ctx;

    bi->flags = 0;
@@ -193,7 +193,7 @@ static int ok_free(BIO *a) 
{

    if (a == NULL)

        return (0);

    EVP_MD_CTX_cleanup(&((BIO_OK_CTX *)a->ptr)->md);

    EVP_MD_CTX_destroy(((BIO_OK_CTX *)a->ptr)->md);

    OPENSSL_clear_free(a->ptr, sizeof(BIO_OK_CTX));

    a->ptr = NULL;

    a->init = 0;
@@ -412,14 +412,14 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr) 
        break;

    case BIO_C_SET_MD:

        md = ptr;

        if (!EVP_DigestInit_ex(&ctx->md, md, NULL))

        if (!EVP_DigestInit_ex(ctx->md, md, NULL))

            return 0;

        b->init = 1;

        break;

    case BIO_C_GET_MD:

        if (b->init) {

            ppmd = ptr;

            *ppmd = ctx->md.digest;

            *ppmd = EVP_MD_CTX_md(ctx->md);

        } else

            ret = 0;

        break;
@@ -468,30 +468,36 @@ static int sig_out(BIO *b) 
{

    BIO_OK_CTX *ctx;

    EVP_MD_CTX *md;

    const EVP_MD *digest;

    int md_size;

    void *md_data;



    ctx = b->ptr;

    md = &ctx->md;

    md = ctx->md;

    digest = EVP_MD_CTX_md(md);

    md_size = EVP_MD_size(digest);

    md_data = EVP_MD_CTX_md_data(md);



    if (ctx->buf_len + 2 * md->digest->md_size > OK_BLOCK_SIZE)

    if (ctx->buf_len + 2 * md_size > OK_BLOCK_SIZE)

        return 1;



    if (!EVP_DigestInit_ex(md, md->digest, NULL))

    if (!EVP_DigestInit_ex(md, digest, NULL))

        goto berr;

    /*

     * FIXME: there's absolutely no guarantee this makes any sense at all,

     * particularly now EVP_MD_CTX has been restructured.

     */

    if (RAND_bytes(md->md_data, md->digest->md_size) <= 0)

    if (RAND_bytes(md_data, md_size) <= 0)

        goto berr;

    memcpy(&(ctx->buf[ctx->buf_len]), md->md_data, md->digest->md_size);

    longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);

    ctx->buf_len += md->digest->md_size;

    memcpy(&(ctx->buf[ctx->buf_len]), md_data, md_size);

    longswap(&(ctx->buf[ctx->buf_len]), md_size);

    ctx->buf_len += md_size;



    if (!EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN)))

        goto berr;

    if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))

        goto berr;

    ctx->buf_len += md->digest->md_size;

    ctx->buf_len += md_size;

    ctx->blockout = 1;

    ctx->sigio = 0;

    return 1;
@@ -506,25 +512,31 @@ static int sig_in(BIO *b) 
    EVP_MD_CTX *md;

    unsigned char tmp[EVP_MAX_MD_SIZE];

    int ret = 0;

    const EVP_MD *digest;

    int md_size;

    void *md_data;



    ctx = b->ptr;

    md = &ctx->md;

    md = ctx->md;

    digest = EVP_MD_CTX_md(md);

    md_size = EVP_MD_size(digest);

    md_data = EVP_MD_CTX_md_data(md);



    if ((int)(ctx->buf_len - ctx->buf_off) < 2 * md->digest->md_size)

    if ((int)(ctx->buf_len - ctx->buf_off) < 2 * md_size)

        return 1;



    if (!EVP_DigestInit_ex(md, md->digest, NULL))

    if (!EVP_DigestInit_ex(md, digest, NULL))

        goto berr;

    memcpy(md->md_data, &(ctx->buf[ctx->buf_off]), md->digest->md_size);

    longswap(md->md_data, md->digest->md_size);

    ctx->buf_off += md->digest->md_size;

    memcpy(md_data, &(ctx->buf[ctx->buf_off]), md_size);

    longswap(md_data, md_size);

    ctx->buf_off += md_size;



    if (!EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN)))

        goto berr;

    if (!EVP_DigestFinal_ex(md, tmp, NULL))

        goto berr;

    ret = memcmp(&(ctx->buf[ctx->buf_off]), tmp, md->digest->md_size) == 0;

    ctx->buf_off += md->digest->md_size;

    ret = memcmp(&(ctx->buf[ctx->buf_off]), tmp, md_size) == 0;

    ctx->buf_off += md_size;

    if (ret == 1) {

        ctx->sigio = 0;

        if (ctx->buf_len != ctx->buf_off) {
@@ -547,9 +559,13 @@ static int block_out(BIO *b) 
    BIO_OK_CTX *ctx;

    EVP_MD_CTX *md;

    unsigned long tl;

    const EVP_MD *digest;

    int md_size;



    ctx = b->ptr;

    md = &ctx->md;

    md = ctx->md;

    digest = EVP_MD_CTX_md(md);

    md_size = EVP_MD_size(digest);



    tl = ctx->buf_len - OK_BLOCK_BLOCK;

    ctx->buf[0] = (unsigned char)(tl >> 24);
@@ -561,7 +577,7 @@ static int block_out(BIO *b) 
        goto berr;

    if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))

        goto berr;

    ctx->buf_len += md->digest->md_size;

    ctx->buf_len += md_size;

    ctx->blockout = 1;

    return 1;

 berr:
@@ -575,9 +591,11 @@ static int block_in(BIO *b) 
    EVP_MD_CTX *md;

    unsigned long tl = 0;

    unsigned char tmp[EVP_MAX_MD_SIZE];

    int md_size;



    ctx = b->ptr;

    md = &ctx->md;

    md = ctx->md;

    md_size = EVP_MD_size(EVP_MD_CTX_md(md));



    assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */

    tl = ctx->buf[0];
@@ -588,7 +606,7 @@ static int block_in(BIO *b) 
    tl <<= 8;

    tl |= ctx->buf[3];



    if (ctx->buf_len < tl + OK_BLOCK_BLOCK + md->digest->md_size)

    if (ctx->buf_len < tl + OK_BLOCK_BLOCK + md_size)

        return 1;



    if (!EVP_DigestUpdate(md,
@@ -596,10 +614,9 @@ static int block_in(BIO *b) 
        goto berr;

    if (!EVP_DigestFinal_ex(md, tmp, NULL))

        goto berr;

    if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, md->digest->md_size) ==

        0) {

    if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, md_size) == 0) {

        /* there might be parts from next block lurking around ! */

        ctx->buf_off_save = tl + OK_BLOCK_BLOCK + md->digest->md_size;

        ctx->buf_off_save = tl + OK_BLOCK_BLOCK + md_size;

        ctx->buf_len_save = ctx->buf_len;

        ctx->buf_off = OK_BLOCK_BLOCK;

        ctx->buf_len = tl + OK_BLOCK_BLOCK;

crypto/evp/digest.c

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
#ifndef OPENSSL_NO_ENGINE

# include <openssl/engine.h>

#endif

#include "evp_locl.h"



void EVP_MD_CTX_init(EVP_MD_CTX *ctx)

{

crypto/evp/evp_key.c

+13 −11
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 
                   int datal, int count, unsigned char *key,

                   unsigned char *iv)

{

    EVP_MD_CTX c;

    EVP_MD_CTX *c;

    unsigned char md_buf[EVP_MAX_MD_SIZE];

    int niv, nkey, addmd = 0;

    unsigned int mds = 0, i;
@@ -136,27 +136,29 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 
    if (data == NULL)

        return (nkey);



    EVP_MD_CTX_init(&c);

    c = EVP_MD_CTX_create();

    if (c == NULL)

        goto err;

    for (;;) {

        if (!EVP_DigestInit_ex(&c, md, NULL))

        if (!EVP_DigestInit_ex(c, md, NULL))

            goto err;

        if (addmd++)

            if (!EVP_DigestUpdate(&c, &(md_buf[0]), mds))

            if (!EVP_DigestUpdate(c, &(md_buf[0]), mds))

                goto err;

        if (!EVP_DigestUpdate(&c, data, datal))

        if (!EVP_DigestUpdate(c, data, datal))

            goto err;

        if (salt != NULL)

            if (!EVP_DigestUpdate(&c, salt, PKCS5_SALT_LEN))

            if (!EVP_DigestUpdate(c, salt, PKCS5_SALT_LEN))

                goto err;

        if (!EVP_DigestFinal_ex(&c, &(md_buf[0]), &mds))

        if (!EVP_DigestFinal_ex(c, &(md_buf[0]), &mds))

            goto err;



        for (i = 1; i < (unsigned int)count; i++) {

            if (!EVP_DigestInit_ex(&c, md, NULL))

            if (!EVP_DigestInit_ex(c, md, NULL))

                goto err;

            if (!EVP_DigestUpdate(&c, &(md_buf[0]), mds))

            if (!EVP_DigestUpdate(c, &(md_buf[0]), mds))

                goto err;

            if (!EVP_DigestFinal_ex(&c, &(md_buf[0]), &mds))

            if (!EVP_DigestFinal_ex(c, &(md_buf[0]), &mds))

                goto err;

        }

        i = 0;
@@ -189,7 +191,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 
    }

    rv = type->key_len;

 err:

    EVP_MD_CTX_cleanup(&c);

    EVP_MD_CTX_destroy(c);

    OPENSSL_cleanse(md_buf, sizeof(md_buf));

    return rv;

}

crypto/evp/m_sigver.c

+13 −14
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include <openssl/objects.h>

#include <openssl/x509.h>

#include "internal/evp_int.h"

#include "evp_locl.h"



static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,

                          const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey,
@@ -157,16 +158,15 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, 
            else

                r = EVP_DigestFinal_ex(ctx, md, &mdlen);

        } else {

            EVP_MD_CTX tmp_ctx;

            EVP_MD_CTX_init(&tmp_ctx);

            if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))

            EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_create();

            if (tmp_ctx == NULL || !EVP_MD_CTX_copy_ex(tmp_ctx, ctx))

                return 0;

            if (sctx)

                r = tmp_ctx.pctx->pmeth->signctx(tmp_ctx.pctx,

                                                 sigret, siglen, &tmp_ctx);

                r = tmp_ctx->pctx->pmeth->signctx(tmp_ctx->pctx,

                                                  sigret, siglen, tmp_ctx);

            else

                r = EVP_DigestFinal_ex(&tmp_ctx, md, &mdlen);

            EVP_MD_CTX_cleanup(&tmp_ctx);

                r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);

            EVP_MD_CTX_destroy(tmp_ctx);

        }

        if (sctx || !r)

            return r;
@@ -203,16 +203,15 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig, 
        } else

            r = EVP_DigestFinal_ex(ctx, md, &mdlen);

    } else {

        EVP_MD_CTX tmp_ctx;

        EVP_MD_CTX_init(&tmp_ctx);

        if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))

        EVP_MD_CTX *tmp_ctx = EVP_MD_CTX_create();

        if (tmp_ctx == NULL || !EVP_MD_CTX_copy_ex(tmp_ctx, ctx))

            return -1;

        if (vctx) {

            r = tmp_ctx.pctx->pmeth->verifyctx(tmp_ctx.pctx,

                                               sig, siglen, &tmp_ctx);

            r = tmp_ctx->pctx->pmeth->verifyctx(tmp_ctx->pctx,

                                                sig, siglen, tmp_ctx);

        } else

            r = EVP_DigestFinal_ex(&tmp_ctx, md, &mdlen);

        EVP_MD_CTX_cleanup(&tmp_ctx);

            r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);

        EVP_MD_CTX_destroy(tmp_ctx);

    }

    if (vctx || !r)

        return r;