Commit 3dcb9e4e authored by Richard Levitte's avatar Richard Levitte
Browse files

EVP_CIPHER_CTX_new_cipher_data was a temporary measure, not needed any more 



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

crypto/evp/evp_lib.c

+0 −7
Original line number Diff line number Diff line
@@ -262,13 +262,6 @@ void *EVP_CIPHER_CTX_cipher_data(const EVP_CIPHER_CTX *ctx) 
    return ctx->cipher_data;

}



/* FIXME: temporary until EVP_CIPHER goes opaque */

void EVP_CIPHER_CTX_new_cipher_data(EVP_CIPHER_CTX *ctx, size_t size)

{

    if (ctx->cipher_data == NULL && ctx->cipher->ctx_size == 0)

        ctx->cipher_data = OPENSSL_zalloc(size);

}



int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher)

{

    return cipher->iv_len;

include/openssl/evp.h

+0 −1
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in); 
void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);

void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);

void *EVP_CIPHER_CTX_cipher_data(const EVP_CIPHER_CTX *ctx);

void EVP_CIPHER_CTX_new_cipher_data(EVP_CIPHER_CTX *ctx, size_t size);

# define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))

# define EVP_CIPHER_CTX_mode(c)         EVP_CIPHER_mode(EVP_CIPHER_CTX_cipher(c))