{
if (_hidden_Gost28147_89_cipher == NULL
&& ((_hidden_Gost28147_89_cipher =
- EVP_CIPHER_meth_new(NID_id_Gost28147_89,
- 1 /* block_size */,
- 32 /* key_size */)) == NULL
+ EVP_CIPHER_meth_new(NID_id_Gost28147_89, 1 /* block_size */ ,
+ 32 /* key_size */ )) == NULL
|| !EVP_CIPHER_meth_set_iv_length(_hidden_Gost28147_89_cipher, 8)
|| !EVP_CIPHER_meth_set_flags(_hidden_Gost28147_89_cipher,
EVP_CIPH_CFB_MODE |
|| !EVP_CIPHER_meth_set_cleanup(_hidden_Gost28147_89_cipher,
gost_cipher_cleanup)
|| !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_Gost28147_89_cipher,
- sizeof(struct ossl_gost_cipher_ctx))
- || !EVP_CIPHER_meth_set_set_asn1_params(_hidden_Gost28147_89_cipher,
- gost89_set_asn1_parameters)
- || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_Gost28147_89_cipher,
- gost89_get_asn1_parameters)
+ sizeof(struct
+ ossl_gost_cipher_ctx))
+ ||
+ !EVP_CIPHER_meth_set_set_asn1_params(_hidden_Gost28147_89_cipher,
+ gost89_set_asn1_parameters)
+ ||
+ !EVP_CIPHER_meth_set_get_asn1_params(_hidden_Gost28147_89_cipher,
+ gost89_get_asn1_parameters)
|| !EVP_CIPHER_meth_set_ctrl(_hidden_Gost28147_89_cipher,
gost_cipher_ctl))) {
EVP_CIPHER_meth_free(_hidden_Gost28147_89_cipher);
}
return _hidden_Gost28147_89_cipher;
}
-
+
static EVP_CIPHER *_hidden_Gost28147_89_cbc = NULL;
const EVP_CIPHER *cipher_gost_cbc(void)
{
if (_hidden_Gost28147_89_cbc == NULL
&& ((_hidden_Gost28147_89_cbc =
- EVP_CIPHER_meth_new(NID_gost89_cbc,
- 8 /* block_size */,
- 32 /* key_size */)) == NULL
+ EVP_CIPHER_meth_new(NID_gost89_cbc, 8 /* block_size */ ,
+ 32 /* key_size */ )) == NULL
|| !EVP_CIPHER_meth_set_iv_length(_hidden_Gost28147_89_cbc, 8)
|| !EVP_CIPHER_meth_set_flags(_hidden_Gost28147_89_cbc,
- EVP_CIPH_CBC_MODE |
- EVP_CIPH_CUSTOM_IV |
- EVP_CIPH_RAND_KEY |
- EVP_CIPH_ALWAYS_CALL_INIT)
+ EVP_CIPH_CBC_MODE |
+ EVP_CIPH_CUSTOM_IV |
+ EVP_CIPH_RAND_KEY |
+ EVP_CIPH_ALWAYS_CALL_INIT)
|| !EVP_CIPHER_meth_set_init(_hidden_Gost28147_89_cbc,
gost_cipher_init_cbc)
|| !EVP_CIPHER_meth_set_do_cipher(_hidden_Gost28147_89_cbc,
|| !EVP_CIPHER_meth_set_cleanup(_hidden_Gost28147_89_cbc,
gost_cipher_cleanup)
|| !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_Gost28147_89_cbc,
- sizeof(struct ossl_gost_cipher_ctx))
+ sizeof(struct
+ ossl_gost_cipher_ctx))
|| !EVP_CIPHER_meth_set_set_asn1_params(_hidden_Gost28147_89_cbc,
gost89_set_asn1_parameters)
|| !EVP_CIPHER_meth_set_get_asn1_params(_hidden_Gost28147_89_cbc,
}
return _hidden_Gost28147_89_cbc;
}
+
static EVP_CIPHER *_hidden_gost89_cnt = NULL;
const EVP_CIPHER *cipher_gost_cpacnt(void)
{
if (_hidden_gost89_cnt == NULL
&& ((_hidden_gost89_cnt =
- EVP_CIPHER_meth_new(NID_gost89_cnt,
- 1 /* block_size */,
- 32 /* key_size */)) == NULL
+ EVP_CIPHER_meth_new(NID_gost89_cnt, 1 /* block_size */ ,
+ 32 /* key_size */ )) == NULL
|| !EVP_CIPHER_meth_set_iv_length(_hidden_gost89_cnt, 8)
|| !EVP_CIPHER_meth_set_flags(_hidden_gost89_cnt,
EVP_CIPH_OFB_MODE |
|| !EVP_CIPHER_meth_set_cleanup(_hidden_gost89_cnt,
gost_cipher_cleanup)
|| !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_gost89_cnt,
- sizeof(struct ossl_gost_cipher_ctx))
+ sizeof(struct
+ ossl_gost_cipher_ctx))
|| !EVP_CIPHER_meth_set_set_asn1_params(_hidden_gost89_cnt,
gost89_set_asn1_parameters)
|| !EVP_CIPHER_meth_set_get_asn1_params(_hidden_gost89_cnt,
{
if (_hidden_gost89_cnt_12 == NULL
&& ((_hidden_gost89_cnt_12 =
- EVP_CIPHER_meth_new(NID_gost89_cnt_12,
- 1 /* block_size */,
- 32 /* key_size */)) == NULL
+ EVP_CIPHER_meth_new(NID_gost89_cnt_12, 1 /* block_size */ ,
+ 32 /* key_size */ )) == NULL
|| !EVP_CIPHER_meth_set_iv_length(_hidden_gost89_cnt_12, 8)
|| !EVP_CIPHER_meth_set_flags(_hidden_gost89_cnt_12,
EVP_CIPH_OFB_MODE |
|| !EVP_CIPHER_meth_set_cleanup(_hidden_gost89_cnt_12,
gost_cipher_cleanup)
|| !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_gost89_cnt_12,
- sizeof(struct ossl_gost_cipher_ctx))
+ sizeof(struct
+ ossl_gost_cipher_ctx))
|| !EVP_CIPHER_meth_set_set_asn1_params(_hidden_gost89_cnt_12,
gost89_set_asn1_parameters)
|| !EVP_CIPHER_meth_set_get_asn1_params(_hidden_gost89_cnt_12,
_hidden_gost89_cnt_12 = NULL;
}
-
/* Implementation of GOST 28147-89 in MAC (imitovstavka) mode */
/* Init functions which set specific parameters */
static int gost_imit_init_cpa(EVP_MD_CTX *ctx);
|| !EVP_MD_meth_set_result_size(md, 4)
|| !EVP_MD_meth_set_input_blocksize(md, 8)
|| !EVP_MD_meth_set_app_datasize(md,
- sizeof(struct ossl_gost_imit_ctx))
+ sizeof(struct
+ ossl_gost_imit_ctx))
|| !EVP_MD_meth_set_flags(md, 0)
|| !EVP_MD_meth_set_init(md, gost_imit_init_cpa)
|| !EVP_MD_meth_set_update(md, gost_imit_update)
|| !EVP_MD_meth_set_result_size(md, 4)
|| !EVP_MD_meth_set_input_blocksize(md, 8)
|| !EVP_MD_meth_set_app_datasize(md,
- sizeof(struct ossl_gost_imit_ctx))
+ sizeof(struct
+ ossl_gost_imit_ctx))
|| !EVP_MD_meth_set_flags(md, 0)
|| !EVP_MD_meth_set_init(md, gost_imit_init_cp_12)
|| !EVP_MD_meth_set_update(md, gost_imit_update)
const unsigned char *iv, int enc,
int paramNID, int mode)
{
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
if (EVP_CIPHER_CTX_get_app_data(ctx) == NULL) {
if (!gost_cipher_set_param(c, paramNID))
return 0;
- EVP_CIPHER_CTX_set_app_data(ctx, EVP_CIPHER_CTX_cipher_data(ctx));
+ EVP_CIPHER_CTX_set_app_data(ctx, EVP_CIPHER_CTX_get_cipher_data(ctx));
}
if (key)
gost_key(&(c->cctx), key);
EVP_CIPHER_CTX_iv_length(ctx));
}
memcpy(EVP_CIPHER_CTX_iv_noconst(ctx),
- EVP_CIPHER_CTX_original_iv(ctx),
- EVP_CIPHER_CTX_iv_length(ctx));
+ EVP_CIPHER_CTX_original_iv(ctx), EVP_CIPHER_CTX_iv_length(ctx));
return 1;
}
const unsigned char *iv,
gost_subst_block * block)
{
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
gost_init(&(c->cctx), block);
c->key_meshing = 1;
c->count = 0;
EVP_CIPHER_CTX_iv_length(ctx));
}
memcpy(EVP_CIPHER_CTX_iv_noconst(ctx),
- EVP_CIPHER_CTX_original_iv(ctx),
- EVP_CIPHER_CTX_iv_length(ctx));
+ EVP_CIPHER_CTX_original_iv(ctx), EVP_CIPHER_CTX_iv_length(ctx));
return 1;
}
int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl)
{
- OPENSSL_assert(inl % 8 == 0);
unsigned char b[8];
const unsigned char *in_ptr = in;
unsigned char *out_ptr = out;
int i;
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+ OPENSSL_assert(inl % 8 == 0);
if (EVP_CIPHER_CTX_encrypting(ctx)) {
while (inl > 0) {
-
+
for (i = 0; i < 8; i++) {
b[i] = iv[i] ^ in_ptr[i];
}
size_t i = 0;
size_t j = 0;
unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
- unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+ unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
/* process partial block if any */
if (EVP_CIPHER_CTX_num(ctx)) {
for (j = EVP_CIPHER_CTX_num(ctx), i = 0; j < 8 && i < inl;
/*
* block cipher current iv
*/
- gost_crypt_mesh(EVP_CIPHER_CTX_cipher_data(ctx), iv, buf);
+ gost_crypt_mesh(EVP_CIPHER_CTX_get_cipher_data(ctx), iv, buf);
/*
* xor next block of input text with it and output it
*/
}
/* Process rest of buffer */
if (i < inl) {
- gost_crypt_mesh(EVP_CIPHER_CTX_cipher_data(ctx), iv, buf);
+ gost_crypt_mesh(EVP_CIPHER_CTX_get_cipher_data(ctx), iv, buf);
if (!EVP_CIPHER_CTX_encrypting(ctx))
memcpy(buf + 8, in_ptr, inl - i);
for (j = 0; i < inl; j++, i++) {
size_t i = 0;
size_t j;
unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
- unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+ unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
/* process partial block if any */
if (EVP_CIPHER_CTX_num(ctx)) {
for (j = EVP_CIPHER_CTX_num(ctx), i = 0; j < 8 && i < inl;
* block cipher current iv
*/
/* Encrypt */
- gost_cnt_next(EVP_CIPHER_CTX_cipher_data(ctx), iv, buf);
+ gost_cnt_next(EVP_CIPHER_CTX_get_cipher_data(ctx), iv, buf);
/*
* xor next block of input text with it and output it
*/
}
/* Process rest of buffer */
if (i < inl) {
- gost_cnt_next(EVP_CIPHER_CTX_cipher_data(ctx), iv, buf);
+ gost_cnt_next(EVP_CIPHER_CTX_get_cipher_data(ctx), iv, buf);
for (j = 0; i < inl; j++, i++) {
out_ptr[j] = buf[j] ^ in_ptr[j];
}
/* Cleaning up of EVP_CIPHER_CTX */
int gost_cipher_cleanup(EVP_CIPHER_CTX *ctx)
{
- gost_destroy(&((struct ossl_gost_cipher_ctx *)EVP_CIPHER_CTX_cipher_data(ctx))->cctx);
+ gost_destroy(&
+ ((struct ossl_gost_cipher_ctx *)
+ EVP_CIPHER_CTX_get_cipher_data(ctx))->cctx);
EVP_CIPHER_CTX_set_app_data(ctx, NULL);
return 1;
}
#if 0
case EVP_CTRL_INIT:
{
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c =
+ EVP_CIPHER_CTX_get_cipher_data(ctx);
if (c == NULL) {
return -1;
}
#endif
case EVP_CTRL_RAND_KEY:
{
- if (RAND_bytes((unsigned char *)ptr, EVP_CIPHER_CTX_key_length(ctx)) <= 0) {
+ if (RAND_bytes
+ ((unsigned char *)ptr, EVP_CIPHER_CTX_key_length(ctx)) <= 0) {
GOSTerr(GOST_F_GOST_CIPHER_CTL, GOST_R_RNG_ERROR);
return -1;
}
case EVP_CTRL_SET_SBOX:
if (ptr) {
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c =
+ EVP_CIPHER_CTX_get_cipher_data(ctx);
int nid;
int cur_meshing;
int ret;
c->key_meshing = cur_meshing;
return ret;
} else {
- return 0;
+ return 0;
}
case EVP_CTRL_KEY_MESH:
{
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c =
+ EVP_CIPHER_CTX_get_cipher_data(ctx);
if (c == NULL) {
return -1;
int len = 0;
unsigned char *buf = NULL;
unsigned char *p = NULL;
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
GOST_CIPHER_PARAMS *gcp = GOST_CIPHER_PARAMS_new();
ASN1_OCTET_STRING *os = NULL;
if (!gcp) {
GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE);
return 0;
}
- if (!ASN1_OCTET_STRING_set(gcp->iv, EVP_CIPHER_CTX_iv(ctx), EVP_CIPHER_CTX_iv_length(ctx))) {
+ if (!ASN1_OCTET_STRING_set
+ (gcp->iv, EVP_CIPHER_CTX_iv(ctx), EVP_CIPHER_CTX_iv_length(ctx))) {
GOST_CIPHER_PARAMS_free(gcp);
GOSTerr(GOST_F_GOST89_SET_ASN1_PARAMETERS, ERR_R_MALLOC_FAILURE);
return 0;
int len;
GOST_CIPHER_PARAMS *gcp = NULL;
unsigned char *p;
- struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+ struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
int nid;
if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE) {
GOST_CIPHER_PARAMS_free(gcp);
return -1;
}
- /*XXX missing non-const accessor*/
+ /*XXX missing non-const accessor */
memcpy((unsigned char *)EVP_CIPHER_CTX_original_iv(ctx), gcp->iv->data,
- EVP_CIPHER_CTX_iv_length(ctx));
+ EVP_CIPHER_CTX_iv_length(ctx));
GOST_CIPHER_PARAMS_free(gcp);
return 1;
case EVP_MD_CTRL_SET_KEY:
{
- struct ossl_gost_imit_ctx *gost_imit_ctx = EVP_MD_CTX_md_data(ctx);
+ struct ossl_gost_imit_ctx *gost_imit_ctx =
+ EVP_MD_CTX_md_data(ctx);
- if (EVP_MD_meth_get_init(EVP_MD_CTX_md(ctx))(ctx) <= 0) {
+ if (EVP_MD_meth_get_init(EVP_MD_CTX_md(ctx)) (ctx) <= 0) {
GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET);
return 0;
}
gost_grasshopper_cipher_do_ctr,
gost_grasshopper_cipher_destroy_ctr,
1,
- sizeof(gost_grasshopper_cipher_ctx),
+ sizeof(gost_grasshopper_cipher_ctx_ctr),
8,
false
},
/* Set 256 bit key into context */
static GRASSHOPPER_INLINE void gost_grasshopper_cipher_key(gost_grasshopper_cipher_ctx* c, const uint8_t* k) {
- for (int i = 0; i < 2; i++) {
+ int i;
+ for (i = 0; i < 2; i++) {
grasshopper_copy128(&c->key.k.k[i], (const grasshopper_w128_t*) (k + i * 16));
}
grasshopper_set_encrypt_key(&c->encrypt_round_keys, &c->key);
/* Cleans up key from context */
static GRASSHOPPER_INLINE void gost_grasshopper_cipher_destroy(gost_grasshopper_cipher_ctx* c) {
- for (int i = 0; i < 2; i++) {
+ int i;
+ for (i = 0; i < 2; i++) {
grasshopper_zero128(&c->key.k.k[i]);
}
- for (int i = 0; i < GRASSHOPPER_ROUND_KEYS_COUNT; i++) {
+ for (i = 0; i < GRASSHOPPER_ROUND_KEYS_COUNT; i++) {
grasshopper_zero128(&c->encrypt_round_keys.k[i]);
}
- for (int i = 0; i < GRASSHOPPER_ROUND_KEYS_COUNT; i++) {
+ for (i = 0; i < GRASSHOPPER_ROUND_KEYS_COUNT; i++) {
grasshopper_zero128(&c->decrypt_round_keys.k[i]);
}
grasshopper_zero128(&c->buffer);
static int gost_grasshopper_cipher_init(EVP_CIPHER_CTX* ctx, const unsigned char* key,
const unsigned char* iv, int enc) {
- gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx);
if (EVP_CIPHER_CTX_get_app_data(ctx) == NULL) {
- EVP_CIPHER_CTX_set_app_data(ctx, EVP_CIPHER_CTX_cipher_data(ctx));
+ EVP_CIPHER_CTX_set_app_data(ctx, EVP_CIPHER_CTX_get_cipher_data(ctx));
}
if (key != NULL) {
static GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ecb(EVP_CIPHER_CTX* ctx, const unsigned char* key,
const unsigned char* iv,
int enc) {
- gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx);
c->type = GRASSHOPPER_CIPHER_ECB;
return gost_grasshopper_cipher_init(ctx, key, iv, enc);
}
static GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_cbc(EVP_CIPHER_CTX* ctx, const unsigned char* key,
const unsigned char* iv,
int enc) {
- gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx);
c->type = GRASSHOPPER_CIPHER_CBC;
return gost_grasshopper_cipher_init(ctx, key, iv, enc);
}
static GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ofb(EVP_CIPHER_CTX* ctx, const unsigned char* key,
const unsigned char* iv,
int enc) {
- gost_grasshopper_cipher_ctx_ofb* c = EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx_ofb* c = EVP_CIPHER_CTX_get_cipher_data(ctx);
c->c.type = GRASSHOPPER_CIPHER_OFB;
static GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_cfb(EVP_CIPHER_CTX* ctx, const unsigned char* key,
const unsigned char* iv,
int enc) {
- gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = EVP_CIPHER_CTX_get_cipher_data(ctx);
c->type = GRASSHOPPER_CIPHER_CFB;
return gost_grasshopper_cipher_init(ctx, key, iv, enc);
}
static GRASSHOPPER_INLINE int gost_grasshopper_cipher_init_ctr(EVP_CIPHER_CTX* ctx, const unsigned char* key,
const unsigned char* iv,
int enc) {
- gost_grasshopper_cipher_ctx_ctr* c = EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx_ctr* c = EVP_CIPHER_CTX_get_cipher_data(ctx);
c->c.type = GRASSHOPPER_CIPHER_CTR;
static GRASSHOPPER_INLINE int gost_grasshopper_cipher_do(EVP_CIPHER_CTX* ctx, unsigned char* out,
const unsigned char* in, size_t inl) {
- gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx);
struct GRASSHOPPER_CIPHER_PARAMS* params = &gost_cipher_params[c->type];
return params->do_cipher(ctx, out, in, inl);
static int gost_grasshopper_cipher_do_ecb(EVP_CIPHER_CTX* ctx, unsigned char* out,
const unsigned char* in, size_t inl) {
- gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx);
bool encrypting = (bool) EVP_CIPHER_CTX_encrypting(ctx);
const unsigned char* current_in = in;
unsigned char* current_out = out;
static int gost_grasshopper_cipher_do_cbc(EVP_CIPHER_CTX* ctx, unsigned char* out,
const unsigned char* in, size_t inl) {
- gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx);
unsigned char* iv = EVP_CIPHER_CTX_iv_noconst(ctx);
bool encrypting = (bool) EVP_CIPHER_CTX_encrypting(ctx);
const unsigned char* current_in = in;
static int gost_grasshopper_cipher_do_ctr(EVP_CIPHER_CTX* ctx, unsigned char* out,
const unsigned char* in, size_t inl) {
- gost_grasshopper_cipher_ctx_ctr* c = (gost_grasshopper_cipher_ctx_ctr*) EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx_ctr* c = (gost_grasshopper_cipher_ctx_ctr*) EVP_CIPHER_CTX_get_cipher_data(ctx);
unsigned char* iv = EVP_CIPHER_CTX_iv_noconst(ctx);
const unsigned char* current_in = in;
unsigned char* current_out = out;
grasshopper_w128_t* currentInputBlock;
grasshopper_w128_t* currentOutputBlock;
size_t lasted;
- size_t i;
+ size_t i;
memcpy(&c->iv_buffer, iv, 8);
// full parts
- for (i = 0; i < blocks; i++, current_in += GRASSHOPPER_BLOCK_SIZE, current_out += GRASSHOPPER_BLOCK_SIZE) {
+ for (i = 0; i < blocks; i++) {
currentInputBlock = (grasshopper_w128_t*) current_in;
currentOutputBlock = (grasshopper_w128_t*) current_out;
memcpy(c->iv_buffer.b + 8, &c->counter, 8);
grasshopper_encrypt_block(&c->c.encrypt_round_keys, &c->iv_buffer, currentOutputBlock, &c->c.buffer);
grasshopper_append128(currentOutputBlock, currentInputBlock);
c->counter += 1;
+ current_in += GRASSHOPPER_BLOCK_SIZE;
+ current_out += GRASSHOPPER_BLOCK_SIZE;
}
// last part
static int gost_grasshopper_cipher_do_ofb(EVP_CIPHER_CTX* ctx, unsigned char* out,
const unsigned char* in, size_t inl) {
- gost_grasshopper_cipher_ctx_ofb* c = (gost_grasshopper_cipher_ctx_ofb*) EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx_ofb* c = (gost_grasshopper_cipher_ctx_ofb*) EVP_CIPHER_CTX_get_cipher_data(ctx);
const unsigned char* in_ptr = in;
unsigned char* out_ptr = out;
unsigned char* buf = EVP_CIPHER_CTX_buf_noconst(ctx);
static int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX* ctx, unsigned char* out,
const unsigned char* in, size_t inl) {
- gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx);
const unsigned char* in_ptr = in;
unsigned char* out_ptr = out;
unsigned char* buf = EVP_CIPHER_CTX_buf_noconst(ctx);
}
static int gost_grasshopper_cipher_cleanup(EVP_CIPHER_CTX* ctx) {
- gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_cipher_data(ctx);
+ gost_grasshopper_cipher_ctx* c = (gost_grasshopper_cipher_ctx*) EVP_CIPHER_CTX_get_cipher_data(ctx);
struct GRASSHOPPER_CIPHER_PARAMS* params = &gost_cipher_params[c->type];
gost_grasshopper_cipher_destroy(c);
projects / openssl-gost / engine.git / commitdiff