NULL, NULL, NULL, NULL, NULL, NULL,
};
-static GRASSHOPPER_INLINE void
-gost_grasshopper_cipher_destroy_ofb(gost_grasshopper_cipher_ctx * c);
static GRASSHOPPER_INLINE void
gost_grasshopper_cipher_destroy_ctr(gost_grasshopper_cipher_ctx * c);
NID_grasshopper_ofb,
gost_grasshopper_cipher_init_ofb,
gost_grasshopper_cipher_do_ofb,
- gost_grasshopper_cipher_destroy_ofb,
+ NULL,
1,
- sizeof(gost_grasshopper_cipher_ctx_ofb),
+ sizeof(gost_grasshopper_cipher_ctx),
16,
false}
,
grasshopper_zero128(&c->buffer);
}
-static GRASSHOPPER_INLINE void
-gost_grasshopper_cipher_destroy_ofb(gost_grasshopper_cipher_ctx * c)
-{
- gost_grasshopper_cipher_ctx_ofb *ctx =
- (gost_grasshopper_cipher_ctx_ofb *) c;
-
- grasshopper_zero128(&ctx->buffer1);
-}
-
static GRASSHOPPER_INLINE void
gost_grasshopper_cipher_destroy_ctr(gost_grasshopper_cipher_ctx * c)
{
*key, const unsigned char
*iv, int enc)
{
- gost_grasshopper_cipher_ctx_ofb *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
-
- c->c.type = GRASSHOPPER_CIPHER_OFB;
-
- grasshopper_zero128(&c->buffer1);
-
+ gost_grasshopper_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
+ c->type = GRASSHOPPER_CIPHER_OFB;
return gost_grasshopper_cipher_init(ctx, key, iv, enc);
}
bool encrypting = (bool) EVP_CIPHER_CTX_encrypting(ctx);
const unsigned char *current_in = in;
unsigned char *current_out = out;
- grasshopper_w128_t *currentInputBlock;
- grasshopper_w128_t *currentOutputBlock;
size_t blocks = inl / GRASSHOPPER_BLOCK_SIZE;
size_t i;
grasshopper_w128_t *currentBlock;
for (i = 0; i < blocks;
i++, current_in += GRASSHOPPER_BLOCK_SIZE, current_out +=
GRASSHOPPER_BLOCK_SIZE) {
- currentInputBlock = (grasshopper_w128_t *) current_in;
- currentOutputBlock = (grasshopper_w128_t *) current_out;
+ grasshopper_w128_t *currentInputBlock = (grasshopper_w128_t *) current_in;
+ grasshopper_w128_t *currentOutputBlock = (grasshopper_w128_t *) current_out;
if (encrypting) {
grasshopper_append128(currentBlock, currentInputBlock);
grasshopper_encrypt_block(&c->encrypt_round_keys, currentBlock,
void inc_counter(unsigned char *counter, size_t counter_bytes)
{
- unsigned char c;
unsigned int n = counter_bytes;
do {
+ unsigned char c;
--n;
c = counter[n];
++c;
/*
* Fixed 128-bit IV implementation make shift regiser redundant.
*/
-static void gost_grasshopper_cnt_next(gost_grasshopper_cipher_ctx_ofb * ctx,
+static void gost_grasshopper_cnt_next(gost_grasshopper_cipher_ctx * ctx,
grasshopper_w128_t * iv,
grasshopper_w128_t * buf)
{
- memcpy(&ctx->buffer1, iv, 16);
- grasshopper_encrypt_block(&ctx->c.encrypt_round_keys, &ctx->buffer1,
- buf, &ctx->c.buffer);
+ grasshopper_w128_t tmp;
+ memcpy(&tmp, iv, 16);
+ grasshopper_encrypt_block(&ctx->encrypt_round_keys, &tmp,
+ buf, &ctx->buffer);
memcpy(iv, buf, 16);
}
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 *)
+ 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;
{
int len = 0;
unsigned char *buf = NULL;
- ASN1_OCTET_STRING *os = NULL;
-
- os = ASN1_OCTET_STRING_new();
+ ASN1_OCTET_STRING *os = ASN1_OCTET_STRING_new();
if (!os || !ASN1_OCTET_STRING_set(os, buf, len)) {
+ ASN1_OCTET_STRING_free(os);
OPENSSL_free(buf);
GOSTerr(GOST_F_GOST_GRASSHOPPER_SET_ASN1_PARAMETERS,
ERR_R_MALLOC_FAILURE);
*ctx, ASN1_TYPE
*params)
{
- int ret = -1;
-
if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE) {
- return ret;
+ return -1;
}
return 1;
{
switch (type) {
case EVP_CTRL_RAND_KEY:{
- if (RAND_bytes
+ if (RAND_priv_bytes
((unsigned char *)ptr, EVP_CIPHER_CTX_key_length(ctx)) <= 0) {
GOSTerr(GOST_F_GOST_GRASSHOPPER_CIPHER_CTL, GOST_R_RNG_ERROR);
return -1;