generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename EVP_CIPHER_CTX_cipher_data to EVP_CIPHER_CTX_get_cipher_data

Browse Source 
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>
This commit is contained in:
Matt Caswell 2016-03-07 10:17:27 +00:00
parent e2d5183d7c
commit 44ab2dfdf9
18 changed files with 4790 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/engine/eng_cryptodev.c
View File

@ -414,7 +414,7 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
struct crypt_op cryp; 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; struct session_op *sess = &state->d_sess;
const void *iiv; const void *iiv;
unsigned char save_iv[EVP_MAX_IV_LENGTH]; 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, cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) 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; struct session_op *sess = &state->d_sess;
int cipher = -1, i; 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) static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
{ {
int ret = 0; 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; struct session_op *sess = &state->d_sess;
if (state->d_fd < 0) if (state->d_fd < 0)

2
crypto/engine/eng_openssl.c
View File

@ -245,7 +245,7 @@ typedef struct {
unsigned char key[TEST_RC4_KEY_SIZE]; unsigned char key[TEST_RC4_KEY_SIZE];
RC4_KEY ks; RC4_KEY ks;
} TEST_RC4_KEY; } 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, static int test_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {

2
crypto/evp/e_aes_cbc_hmac_sha1.c
View File

@ -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], const AES_KEY *key, unsigned char iv[16],
SHA_CTX *ctx, const void *in0); 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, static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
const unsigned char *inkey, const unsigned char *inkey,

2
crypto/evp/e_aes_cbc_hmac_sha256.c
View File

@ -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], const AES_KEY *key, unsigned char iv[16],
SHA256_CTX *ctx, const void *in0); 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, static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,
const unsigned char *inkey, const unsigned char *inkey,

3
crypto/evp/e_camellia.c
View File

@ -121,7 +121,8 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
int ret, mode, bits; 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); mode = EVP_CIPHER_CTX_mode(ctx);
bits = EVP_CIPHER_CTX_key_length(ctx) * 8; bits = EVP_CIPHER_CTX_key_length(ctx) * 8;

30
crypto/evp/e_des.c
View File

@ -105,7 +105,7 @@ static int des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
BLOCK_CIPHER_ecb_loop() BLOCK_CIPHER_ecb_loop()
DES_ecb_encrypt((DES_cblock *)(in + i), (DES_cblock *)(out + i), DES_ecb_encrypt((DES_cblock *)(in + i), (DES_cblock *)(out + i),
EVP_CIPHER_CTX_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
return 1; return 1;
} }
@ -116,7 +116,7 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_num(ctx);
DES_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num); (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
@ -125,7 +125,8 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
if (inl) { if (inl) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_num(ctx);
DES_ofb64_encrypt(in, out, (long)inl, EVP_CIPHER_CTX_cipher_data(ctx), DES_ofb64_encrypt(in, out, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num); (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num);
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
} }
@ -135,7 +136,7 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_cipher_data(ctx); EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_get_cipher_data(ctx);
if (dat->stream.cbc != NULL) { if (dat->stream.cbc != NULL) {
(*dat->stream.cbc) (in, out, inl, &dat->ks.ks, (*dat->stream.cbc) (in, out, inl, &dat->ks.ks,
@ -144,7 +145,7 @@ static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx),
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
@ -152,7 +153,8 @@ static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
} }
if (inl) if (inl)
DES_ncbc_encrypt(in, out, (long)inl, EVP_CIPHER_CTX_cipher_data(ctx), DES_ncbc_encrypt(in, out, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx),
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
return 1; return 1;
@ -164,7 +166,7 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_num(ctx);
DES_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num, (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
@ -174,7 +176,8 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
} }
if (inl) { if (inl) {
int num = EVP_CIPHER_CTX_num(ctx); int num = EVP_CIPHER_CTX_num(ctx);
DES_cfb64_encrypt(in, out, (long)inl, EVP_CIPHER_CTX_cipher_data(ctx), DES_cfb64_encrypt(in, out, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num, (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), &num,
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
EVP_CIPHER_CTX_set_num(ctx, num); EVP_CIPHER_CTX_set_num(ctx, num);
@ -198,7 +201,7 @@ static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
while (inl && inl >= chunk) { while (inl && inl >= chunk) {
for (n = 0; n < chunk * 8; ++n) { for (n = 0; n < chunk * 8; ++n) {
c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
DES_cfb_encrypt(c, d, 1, 1, EVP_CIPHER_CTX_cipher_data(ctx), DES_cfb_encrypt(c, d, 1, 1, EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx),
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
out[n / 8] = out[n / 8] =
@ -220,7 +223,7 @@ static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
{ {
while (inl >= EVP_MAXCHUNK) { while (inl >= EVP_MAXCHUNK) {
DES_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK, DES_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
EVP_CIPHER_CTX_cipher_data(ctx), EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx),
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
inl -= EVP_MAXCHUNK; inl -= EVP_MAXCHUNK;
@ -228,7 +231,8 @@ static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
out += EVP_MAXCHUNK; out += EVP_MAXCHUNK;
} }
if (inl) if (inl)
DES_cfb_encrypt(in, out, 8, (long)inl, EVP_CIPHER_CTX_cipher_data(ctx), DES_cfb_encrypt(in, out, 8, (long)inl,
EVP_CIPHER_CTX_get_cipher_data(ctx),
(DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx), (DES_cblock *)EVP_CIPHER_CTX_iv_noconst(ctx),
EVP_CIPHER_CTX_encrypting(ctx)); EVP_CIPHER_CTX_encrypting(ctx));
return 1; return 1;
@ -250,7 +254,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) const unsigned char *iv, int enc)
{ {
DES_cblock *deskey = (DES_cblock *)key; DES_cblock *deskey = (DES_cblock *)key;
EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_cipher_data(ctx); EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_get_cipher_data(ctx);
dat->stream.cbc = NULL; dat->stream.cbc = NULL;
# if defined(SPARC_DES_CAPABLE) # if defined(SPARC_DES_CAPABLE)
@ -264,7 +268,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
} }
} }
# endif # endif
DES_set_key_unchecked(deskey, EVP_CIPHER_CTX_cipher_data(ctx)); DES_set_key_unchecked(deskey, EVP_CIPHER_CTX_get_cipher_data(ctx));
return 1; return 1;
} }

2
crypto/evp/e_rc4.c
View File

@ -73,7 +73,7 @@ typedef struct {
RC4_KEY ks; /* working key */ RC4_KEY ks; /* working key */
} EVP_RC4_KEY; } EVP_RC4_KEY;
# define data(ctx) ((EVP_RC4_KEY *)EVP_CIPHER_CTX_cipher_data(ctx)) # define data(ctx) ((EVP_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc); const unsigned char *iv, int enc);

2
crypto/evp/e_rc4_hmac_md5.c
View File

@ -81,7 +81,7 @@ typedef struct {
void rc4_md5_enc(RC4_KEY *key, const void *in0, void *out, void rc4_md5_enc(RC4_KEY *key, const void *in0, void *out,
MD5_CTX *ctx, const void *inp, size_t blocks); MD5_CTX *ctx, const void *inp, size_t blocks);
# define data(ctx) ((EVP_RC4_HMAC_MD5 *)EVP_CIPHER_CTX_cipher_data(ctx)) # define data(ctx) ((EVP_RC4_HMAC_MD5 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
const unsigned char *inkey, const unsigned char *inkey,

2
crypto/evp/evp_lib.c
View File

@ -256,7 +256,7 @@ void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data)
ctx->app_data = data; ctx->app_data = data;
} }
void *EVP_CIPHER_CTX_cipher_data(const EVP_CIPHER_CTX *ctx) void *EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx)
{ {
return ctx->cipher_data; return ctx->cipher_data;
} }

3
crypto/include/internal/evp_int.h
View File

@ -181,7 +181,8 @@ struct evp_cipher_st {
/* Wrapper functions for each cipher mode */ /* Wrapper functions for each cipher mode */
#define EVP_C_DATA(kstruct, ctx) ((kstruct *)EVP_CIPHER_CTX_cipher_data(ctx)) #define EVP_C_DATA(kstruct, ctx) \
((kstruct *)EVP_CIPHER_CTX_get_cipher_data(ctx))
#define BLOCK_CIPHER_ecb_loop() \ #define BLOCK_CIPHER_ecb_loop() \
size_t i, bl; \ size_t i, bl; \

15
doc/crypto/EVP_CIPHER_CTX_cipher_data.pod → doc/crypto/EVP_CIPHER_CTX_get_cipher_data.pod
View File

@ -2,20 +2,20 @@
=head1 NAME =head1 NAME
EVP_CIPHER_CTX_cipher_data, EVP_CIPHER_CTX_set_cipher_data - Routines to inspect EVP_CIPHER_CTX_get_cipher_data, EVP_CIPHER_CTX_set_cipher_data - Routines to
and modify EVP_CIPHER_CTX objects inspect and modify EVP_CIPHER_CTX objects
=head1 SYNOPSIS =head1 SYNOPSIS
#include <openssl/evp.h> #include <openssl/evp.h>
void *EVP_CIPHER_CTX_cipher_data(const EVP_CIPHER_CTX *ctx); void *EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx);
void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data); void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data);
=head1 DESCRIPTION =head1 DESCRIPTION
The EVP_CIPHER_CTX_cipher_data() function returns a pointer to the cipher data The EVP_CIPHER_CTX_get_cipher_data() function returns a pointer to the cipher
relevant to EVP_CIPHER_CTX. The contents of this data is specific to the data relevant to EVP_CIPHER_CTX. The contents of this data is specific to the
particular implementation of the cipher. For example this data can be used by particular implementation of the cipher. For example this data can be used by
engines to store engine specific information. The data is automatically engines to store engine specific information. The data is automatically
allocated and freed by OpenSSL, so applications and engines should not normally allocated and freed by OpenSSL, so applications and engines should not normally
@ -28,7 +28,7 @@ should be freed through a call to OPENSSL_free().
=head1 RETURN VALUES =head1 RETURN VALUES
The EVP_CIPHER_CTX_cipher_data() function returns a pointer to the current The EVP_CIPHER_CTX_get_cipher_data() function returns a pointer to the current
cipher data for the EVP_CIPHER_CTX. cipher data for the EVP_CIPHER_CTX.
The EVP_CIPHER_CTX_set_cipher_data() function returns a pointer to the old The EVP_CIPHER_CTX_set_cipher_data() function returns a pointer to the old
@ -36,6 +36,7 @@ cipher data for the EVP_CIPHER_CTX.
=head1 HISTORY =head1 HISTORY
The EVP_CIPHER_CTX_set_cipher_data() function was added in OpenSSL 1.1.0. The EVP_CIPHER_CTX_get_cipher_data() and EVP_CIPHER_CTX_set_cipher_data()
functions were added in OpenSSL 1.1.0.
=cut =cut

4
doc/crypto/EVP_CIPHER_meth_new.pod
View File

@ -162,7 +162,7 @@ implementation specific data block has been copied.
The destination B<EVP_CIPHER_CTX> is passed to the control with the The destination B<EVP_CIPHER_CTX> is passed to the control with the
B<ptr> parameter. B<ptr> parameter.
The implementation specific data block is reached with The implementation specific data block is reached with
EVP_CIPHER_CTX_cipher_data(). EVP_CIPHER_CTX_get_cipher_data().
=item EVP_CIPH_FLAG_DEFAULT_ASN1 =item EVP_CIPH_FLAG_DEFAULT_ASN1
@ -228,7 +228,7 @@ extra cleanup before the method's privata data structure is cleaned
out and freed. out and freed.
Note that the cleanup function is passed a B<EVP_CIPHER_CTX *>, the Note that the cleanup function is passed a B<EVP_CIPHER_CTX *>, the
private data structure is then available with private data structure is then available with
EVP_CIPHER_CTX_cipher_data(). EVP_CIPHER_CTX_get_cipher_data().
This cleanup function is called by EVP_CIPHER_CTX_reset() and This cleanup function is called by EVP_CIPHER_CTX_reset() and
EVP_CIPHER_CTX_free(). EVP_CIPHER_CTX_free().

6
engines/afalg/e_afalg.c
View File

@ -539,7 +539,7 @@ static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
return 0; return 0;
} }
actx = EVP_CIPHER_CTX_cipher_data(ctx); actx = EVP_CIPHER_CTX_get_cipher_data(ctx);
if (actx == NULL) { if (actx == NULL) {
ALG_WARN("%s: Cipher data NULL\n", __func__); ALG_WARN("%s: Cipher data NULL\n", __func__);
return 0; return 0;
@ -602,7 +602,7 @@ static int afalg_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 0; return 0;
} }
actx = (afalg_ctx *) EVP_CIPHER_CTX_cipher_data(ctx); actx = (afalg_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx);
if (actx == NULL || actx->init_done != MAGIC_INIT_NUM) { if (actx == NULL || actx->init_done != MAGIC_INIT_NUM) {
ALG_WARN("%s afalg ctx passed\n", ALG_WARN("%s afalg ctx passed\n",
ctx == NULL ? "NULL" : "Uninitialised"); ctx == NULL ? "NULL" : "Uninitialised");
@ -649,7 +649,7 @@ static int afalg_cipher_cleanup(EVP_CIPHER_CTX *ctx)
return 0; return 0;
} }
actx = (afalg_ctx *) EVP_CIPHER_CTX_cipher_data(ctx); actx = (afalg_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx);
if (actx == NULL || actx->init_done != MAGIC_INIT_NUM) { if (actx == NULL || actx->init_done != MAGIC_INIT_NUM) {
ALG_WARN("%s afalg ctx passed\n", ALG_WARN("%s afalg ctx passed\n",
ctx == NULL ? "NULL" : "Uninitialised"); ctx == NULL ? "NULL" : "Uninitialised");

16
engines/e_dasync.c
View File

@ -573,7 +573,7 @@ static int dasync_aes128_cbc_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
void *ptr) void *ptr)
{ {
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
if (pipe_ctx == NULL) if (pipe_ctx == NULL)
return 0; return 0;
@ -606,7 +606,7 @@ static int dasync_aes128_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
{ {
int ret; int ret;
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
if (pipe_ctx->inner_cipher_data == NULL if (pipe_ctx->inner_cipher_data == NULL
&& EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc()) != 0) { && EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc()) != 0) {
@ -635,7 +635,7 @@ static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
int ret = 1; int ret = 1;
unsigned int i, pipes; unsigned int i, pipes;
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
pipes = pipe_ctx->numpipes; pipes = pipe_ctx->numpipes;
EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data); EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data);
@ -658,7 +658,7 @@ static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx) static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx)
{ {
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
OPENSSL_clear_free(pipe_ctx->inner_cipher_data, OPENSSL_clear_free(pipe_ctx->inner_cipher_data,
EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc())); EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc()));
@ -675,7 +675,7 @@ static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
int arg, void *ptr) int arg, void *ptr)
{ {
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
int ret; int ret;
if (pipe_ctx == NULL) if (pipe_ctx == NULL)
@ -748,7 +748,7 @@ static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
{ {
int ret; int ret;
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
if (pipe_ctx->inner_cipher_data == NULL if (pipe_ctx->inner_cipher_data == NULL
&& EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc_hmac_sha1()) && EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc_hmac_sha1())
@ -782,7 +782,7 @@ static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
int ret = 1; int ret = 1;
unsigned int i, pipes; unsigned int i, pipes;
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
pipes = pipe_ctx->numpipes; pipes = pipe_ctx->numpipes;
EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data); EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data);
@ -822,7 +822,7 @@ static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx) static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx)
{ {
struct aes_128_cbc_pipeline_ctx *pipe_ctx = struct aes_128_cbc_pipeline_ctx *pipe_ctx =
(struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_cipher_data(ctx); (struct aes_128_cbc_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
OPENSSL_clear_free(pipe_ctx->inner_cipher_data, OPENSSL_clear_free(pipe_ctx->inner_cipher_data,
EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc_hmac_sha1())); EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc_hmac_sha1()));

2
engines/e_padlock.c
View File

@ -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) + \ # define NEAREST_ALIGNED(ptr) ( (unsigned char *)(ptr) + \
( (0x10 - ((size_t)(ptr) & 0x0F)) & 0x0F ) ) ( (0x10 - ((size_t)(ptr) & 0x0F)) & 0x0F ) )
# define ALIGNED_CIPHER_DATA(ctx) ((struct padlock_cipher_data *)\ # 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 static int
padlock_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, padlock_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,

2
include/openssl/evp.h
View File

@ -495,7 +495,7 @@ 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); 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_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_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
void *EVP_CIPHER_CTX_cipher_data(const EVP_CIPHER_CTX *ctx); void *EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx);
void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data); void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data);
# define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c)) # define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
# if OPENSSL_API_COMPAT < 0x10100000L # if OPENSSL_API_COMPAT < 0x10100000L

3
util/libcrypto.num
View File

@ -3676,7 +3676,7 @@ SXNET_get_id_ulong 3557 1_1_0 EXIST::FUNCTION:
BIO_get_callback_arg 3558 1_1_0 EXIST::FUNCTION: BIO_get_callback_arg 3558 1_1_0 EXIST::FUNCTION:
ENGINE_register_RSA 3559 1_1_0 EXIST::FUNCTION:ENGINE ENGINE_register_RSA 3559 1_1_0 EXIST::FUNCTION:ENGINE
i2v_GENERAL_NAMES 3560 1_1_0 EXIST::FUNCTION: i2v_GENERAL_NAMES 3560 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_cipher_data 3561 1_1_0 EXIST::FUNCTION: EVP_CIPHER_CTX_cipher_data 3561 1_1_0 NOEXIST::FUNCTION:
PKCS7_decrypt 3562 1_1_0 EXIST::FUNCTION: PKCS7_decrypt 3562 1_1_0 EXIST::FUNCTION:
X509_STORE_set1_param 3563 1_1_0 EXIST::FUNCTION: X509_STORE_set1_param 3563 1_1_0 EXIST::FUNCTION:
RAND_file_name 3564 1_1_0 EXIST::FUNCTION: RAND_file_name 3564 1_1_0 EXIST::FUNCTION:
@ -4042,3 +4042,4 @@ PKCS8_pkey_get0_attrs 3907 1_1_0 EXIST::FUNCTION:
PKCS8_pkey_add1_attr_by_NID 3908 1_1_0 EXIST::FUNCTION: PKCS8_pkey_add1_attr_by_NID 3908 1_1_0 EXIST::FUNCTION:
ASYNC_is_capable 3909 1_1_0 EXIST::FUNCTION: ASYNC_is_capable 3909 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_set_cipher_data 3910 1_1_0 EXIST::FUNCTION: EVP_CIPHER_CTX_set_cipher_data 3910 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_get_cipher_data 3911 1_1_0 EXIST::FUNCTION:

4735
util/libeay.num Executable file
View File

File diff suppressed because it is too large Load Diff