Commit 83b06347 authored by Richard Levitte's avatar Richard Levitte
Browse files

Add accessors and writers for EVP_CIPHER_CTX 



New functions:

- EVP_CIPHER_CTX_encrypting()
- EVP_CIPHER_CTX_iv()
- EVP_CIPHER_CTX_iv_noconst()
- EVP_CIPHER_CTX_original_iv()
- EVP_CIPHER_CTX_buf_noconst()
- EVP_CIPHER_CTX_num()
- EVP_CIPHER_CTX_set_num()
- EVP_CIPHER_CTX_cipher_data()
- EVP_CIPHER_CTX_new_cipher_data()

Note that the accessors / writers for iv, buf and num may go away, as
those rather belong in the implementation's own structure (cipher_data)
when the implementation would affect them (that would be the case when
they are flagged EVP_CIPH_CUSTOM_IV or EVP_CIPH_FLAG_CUSTOM_CIPHER).

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

crypto/evp/evp_lib.c

+47 −0
Original line number Diff line number Diff line
@@ -232,6 +232,11 @@ const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx) 
    return ctx->cipher;

}



int EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx)

{

    return ctx->encrypt;

}



unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher)

{

    return cipher->flags;
@@ -252,6 +257,18 @@ void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data) 
    ctx->app_data = data;

}



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;
@@ -262,6 +279,36 @@ int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx) 
    return ctx->cipher->iv_len;

}



const unsigned char *EVP_CIPHER_CTX_original_iv(const EVP_CIPHER_CTX *ctx)

{

    return ctx->oiv;

}



const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx)

{

    return ctx->iv;

}



unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx)

{

    return ctx->iv;

}



unsigned char *EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx)

{

    return ctx->buf;

}



int EVP_CIPHER_CTX_num(const EVP_CIPHER_CTX *ctx)

{

    return ctx->num;

}



void EVP_CIPHER_CTX_set_num(EVP_CIPHER_CTX *ctx, int num)

{

    ctx->num = num;

}



int EVP_CIPHER_key_length(const EVP_CIPHER *cipher)

{

    return cipher->key_len;

include/openssl/evp.h

+9 −0
Original line number Diff line number Diff line
@@ -509,13 +509,22 @@ unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher); 
# define EVP_CIPHER_mode(e)              (EVP_CIPHER_flags(e) & EVP_CIPH_MODE)



const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);

int EVP_CIPHER_CTX_encrypting(const EVP_CIPHER_CTX *ctx);

int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);

int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);

int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);

int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);

const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx);

const unsigned char *EVP_CIPHER_CTX_original_iv(const EVP_CIPHER_CTX *ctx);

unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx);

unsigned char *EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx);

int EVP_CIPHER_CTX_num(const EVP_CIPHER_CTX *ctx);

void EVP_CIPHER_CTX_set_num(EVP_CIPHER_CTX *ctx, int num);

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))

unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);

# define EVP_CIPHER_CTX_mode(e)          (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)