Commit 44ab2dfd authored by Matt Caswell's avatar Matt Caswell
Browse files

Rename EVP_CIPHER_CTX_cipher_data to EVP_CIPHER_CTX_get_cipher_data 



We had the function EVP_CIPHER_CTX_cipher_data which is newly added for
1.1.0. As we now also need an EVP_CIPHER_CTX_set_cipher_data it makes
more sense for the former to be called EVP_CIPHER_CTX_get_cipher_data.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent e2d5183d

crypto/engine/eng_cryptodev.c

+3 −3
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
                 const unsigned char *in, size_t inl)

{

    struct crypt_op cryp;

    struct dev_crypto_state *state = EVP_CIPHER_CTX_cipher_data(ctx);

    struct dev_crypto_state *state = EVP_CIPHER_CTX_get_cipher_data(ctx);

    struct session_op *sess = &state->d_sess;

    const void *iiv;

    unsigned char save_iv[EVP_MAX_IV_LENGTH];
@@ -469,7 +469,7 @@ static int 
cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

                   const unsigned char *iv, int enc)

{

    struct dev_crypto_state *state = EVP_CIPHER_CTX_cipher_data(ctx);

    struct dev_crypto_state *state = EVP_CIPHER_CTX_get_cipher_data(ctx);

    struct session_op *sess = &state->d_sess;

    int cipher = -1, i;
@@ -510,7 +510,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx)

{

    int ret = 0;

    struct dev_crypto_state *state = EVP_CIPHER_CTX_cipher_data(ctx);

    struct dev_crypto_state *state = EVP_CIPHER_CTX_get_cipher_data(ctx);

    struct session_op *sess = &state->d_sess;



    if (state->d_fd < 0)

crypto/engine/eng_openssl.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ typedef struct { 
    unsigned char key[TEST_RC4_KEY_SIZE];

    RC4_KEY ks;

} TEST_RC4_KEY;

# define test(ctx) ((TEST_RC4_KEY *)EVP_CIPHER_CTX_cipher_data(ctx))

# define test(ctx) ((TEST_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))

static int test_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

                             const unsigned char *iv, int enc)

{

crypto/evp/e_aes_cbc_hmac_sha1.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void aesni256_cbc_sha1_dec(const void *inp, void *out, size_t blocks, 
                           const AES_KEY *key, unsigned char iv[16],

                           SHA_CTX *ctx, const void *in0);



#  define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_cipher_data(ctx))

#  define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_get_cipher_data(ctx))



static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,

                                        const unsigned char *inkey,

crypto/evp/e_aes_cbc_hmac_sha256.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int aesni_cbc_sha256_enc(const void *inp, void *out, size_t blocks, 
                         const AES_KEY *key, unsigned char iv[16],

                         SHA256_CTX *ctx, const void *in0);



#  define data(ctx) ((EVP_AES_HMAC_SHA256 *)EVP_CIPHER_CTX_cipher_data(ctx))

#  define data(ctx) ((EVP_AES_HMAC_SHA256 *)EVP_CIPHER_CTX_get_cipher_data(ctx))



static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,

                                          const unsigned char *inkey,

crypto/evp/e_camellia.c

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
                            const unsigned char *iv, int enc)

{

    int ret, mode, bits;

    EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *) EVP_CIPHER_CTX_cipher_data(ctx);

    EVP_CAMELLIA_KEY *dat =

        (EVP_CAMELLIA_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);



    mode = EVP_CIPHER_CTX_mode(ctx);

    bits = EVP_CIPHER_CTX_key_length(ctx) * 8;