summaryrefslogtreecommitdiffstats
path: root/engines/e_padlock.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-03-07 11:17:27 +0100
committerMatt Caswell <matt@openssl.org>2016-03-07 22:42:09 +0100
commit44ab2dfdf9dc519e6d081646119bdda3ddfd9e85 (patch)
tree095745778b1f9d426d382e8ee7e0633613a0a273 /engines/e_padlock.c
parentFix s_server/s_client handling of the split_send_frag argument (diff)
downloadopenssl-44ab2dfdf9dc519e6d081646119bdda3ddfd9e85.tar.xz
openssl-44ab2dfdf9dc519e6d081646119bdda3ddfd9e85.zip
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 'engines/e_padlock.c')
-rw-r--r--engines/e_padlock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index 00732edb98..99ac05981a 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -361,7 +361,7 @@ static int padlock_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
# define NEAREST_ALIGNED(ptr) ( (unsigned char *)(ptr) + \
( (0x10 - ((size_t)(ptr) & 0x0F)) & 0x0F ) )
# define ALIGNED_CIPHER_DATA(ctx) ((struct padlock_cipher_data *)\
- NEAREST_ALIGNED(EVP_CIPHER_CTX_cipher_data(ctx)))
+ NEAREST_ALIGNED(EVP_CIPHER_CTX_get_cipher_data(ctx)))
static int
padlock_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,