From: Max <maxamar@mail.ru>
Date: Thu, 8 Sep 2016 08:49:08 +0000 (+0300)
Subject: merge upstream
X-Git-Tag: v1.1.0.2~22^2~2^2~3
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=e2d3705da37abfa9edf270b52178c8c66abc51e7;p=openssl-gost%2Fengine.git

merge upstream
---

e2d3705da37abfa9edf270b52178c8c66abc51e7
diff --cc gost_crypt.c
index 4358265,f9ed2cf..d375a3d
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@@ -489,12 -492,11 +491,12 @@@ int gost_cipher_do_cbc(EVP_CIPHER_CTX *
      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];
              }