Commit 135727ab authored by Richard Levitte's avatar Richard Levitte
Browse files

Adapt the internal EVP routines to opaque EVP_CIPHER 



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

crypto/evp/evp_enc.c

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

# include <openssl/engine.h>

#endif

#include "internal/evp_int.h"

#include "evp_locl.h"



int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c)

crypto/evp/evp_key.c

+3 −3
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 
    int niv, nkey, addmd = 0;

    unsigned int mds = 0, i;

    int rv = 0;

    nkey = type->key_len;

    niv = type->iv_len;

    nkey = EVP_CIPHER_key_length(type);

    niv = EVP_CIPHER_iv_length(type);

    OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH);

    OPENSSL_assert(niv <= EVP_MAX_IV_LENGTH);
@@ -189,7 +189,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 
        if ((nkey == 0) && (niv == 0))

            break;

    }

    rv = type->key_len;

    rv = EVP_CIPHER_key_length(type);

 err:

    EVP_MD_CTX_free(c);

    OPENSSL_cleanse(md_buf, sizeof(md_buf));