diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-07 10:17:27 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-07 21:42:09 +0000 |
| commit | 44ab2dfdf9dc519e6d081646119bdda3ddfd9e85 (patch) | |
| tree | 095745778b1f9d426d382e8ee7e0633613a0a273 /crypto/engine | |
| parent | e2d5183d7cd5479d7c63ba524b3ddc4abd707dba (diff) | |
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: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_cryptodev.c | 6 | ||||
| -rw-r--r-- | crypto/engine/eng_openssl.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index eb25790ae0..d8ba729870 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -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) diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 7e1a58c062..914bba5b3a 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -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) { |