From: Dmitry Belyavskiy <beldmit@users.noreply.github.com>
Date: Mon, 13 May 2019 20:52:39 +0000 (+0300)
Subject: Merge pull request #138 from Voev/patch-1
X-Git-Tag: v3.0.0~287
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=7556d78fd101dfb2694884784261dc6cf11ceaf4;hp=ec882cfdb956d06a78aad19bc1089203bd08812d;p=openssl-gost%2Fengine.git

Merge pull request #138 from Voev/patch-1

Не учитывается значение carry
---

diff --git a/gost_grasshopper_cipher.c b/gost_grasshopper_cipher.c
index 7ae50f5..df58097 100644
--- a/gost_grasshopper_cipher.c
+++ b/gost_grasshopper_cipher.c
@@ -771,7 +771,7 @@ int gost_grasshopper_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg,
 
           unsigned char adjusted_iv[16];
           unsigned char seq[8];
-          int j;
+          int j, carry;
           if (mode != EVP_CIPH_CTR_MODE)
             return -1;
 
@@ -799,10 +799,9 @@ int gost_grasshopper_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg,
                 (const unsigned char *)seq) > 0) {
             memset(adjusted_iv, 0, 16);
             memcpy(adjusted_iv, EVP_CIPHER_CTX_original_iv(ctx), 8);
-            for(j=7; j>=0; j--)
+            for(j=7,carry=0; j>=0; j--)
             {
-              int adj_byte, carry = 0;
-              adj_byte = adjusted_iv[j]+seq[j]+carry;
+              int adj_byte = adjusted_iv[j]+seq[j]+carry;
               carry = (adj_byte > 255) ? 1 : 0;
               adjusted_iv[j] = adj_byte & 0xFF;
             }