Merge remote-tracking branch 'origin/openssl_1_1_0'

Conflicts:
	gost_asn1.c
	gost_crypt.c

diff --cc gost_ameth.c
Simple merge

diff --cc gost_asn1.c
index bcfe73fa84cc344434b3f36f7501d4c7fab4599f,3a106c2fc675409e7d5939a34ca30d956e4b2a24..0a1c05a8afd0dd11fdf073d458e43d8c3bba66aa
--- 1/gost_asn1.c
--- 2/gost_asn1.c
+++ b/gost_asn1.c
@@@ -13,57 -13,51 +13,49 @@@
  
  ASN1_NDEF_SEQUENCE(GOST_KEY_TRANSPORT) = {
      ASN1_SIMPLE(GOST_KEY_TRANSPORT, key_info, GOST_KEY_INFO),
 -        ASN1_IMP(GOST_KEY_TRANSPORT, key_agreement_info,
 -                 GOST_KEY_AGREEMENT_INFO, 0)
 +    ASN1_IMP(GOST_KEY_TRANSPORT, key_agreement_info,
 +             GOST_KEY_AGREEMENT_INFO, 0)
  }
 -
  ASN1_NDEF_SEQUENCE_END(GOST_KEY_TRANSPORT)
 +IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT)
  
 -    IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT)
 -
 -    ASN1_NDEF_SEQUENCE(GOST_KEY_INFO) =
 +ASN1_NDEF_SEQUENCE(GOST_KEY_INFO) =
  {
      ASN1_SIMPLE(GOST_KEY_INFO, encrypted_key, ASN1_OCTET_STRING),
-     ASN1_SIMPLE(GOST_KEY_INFO, imit, ASN1_OCTET_STRING)
- }
- ASN1_NDEF_SEQUENCE_END(GOST_KEY_INFO)
+         ASN1_SIMPLE(GOST_KEY_INFO, imit, ASN1_OCTET_STRING)
+ } ASN1_NDEF_SEQUENCE_END(GOST_KEY_INFO)
  IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_INFO)
- 
  ASN1_NDEF_SEQUENCE(GOST_KEY_AGREEMENT_INFO) =
  {
      ASN1_SIMPLE(GOST_KEY_AGREEMENT_INFO, cipher, ASN1_OBJECT),
-     ASN1_IMP_OPT(GOST_KEY_AGREEMENT_INFO, ephem_key, X509_PUBKEY, 0),
-     ASN1_SIMPLE(GOST_KEY_AGREEMENT_INFO, eph_iv, ASN1_OCTET_STRING)
- }
- ASN1_NDEF_SEQUENCE_END(GOST_KEY_AGREEMENT_INFO)
+         ASN1_IMP_OPT(GOST_KEY_AGREEMENT_INFO, ephem_key, X509_PUBKEY, 0),
+         ASN1_SIMPLE(GOST_KEY_AGREEMENT_INFO, eph_iv, ASN1_OCTET_STRING)
+ } ASN1_NDEF_SEQUENCE_END(GOST_KEY_AGREEMENT_INFO)
  IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_AGREEMENT_INFO)
- 
  ASN1_NDEF_SEQUENCE(GOST_KEY_PARAMS) =
  {
-     ASN1_SIMPLE(GOST_KEY_PARAMS, key_params, ASN1_OBJECT),
-     ASN1_SIMPLE(GOST_KEY_PARAMS, hash_params, ASN1_OBJECT),
-     ASN1_OPT(GOST_KEY_PARAMS, cipher_params, ASN1_OBJECT),
- }
- ASN1_NDEF_SEQUENCE_END(GOST_KEY_PARAMS)
+ ASN1_SIMPLE(GOST_KEY_PARAMS, key_params, ASN1_OBJECT),
+         ASN1_SIMPLE(GOST_KEY_PARAMS, hash_params, ASN1_OBJECT),
+         ASN1_OPT(GOST_KEY_PARAMS, cipher_params,
+                      ASN1_OBJECT),} ASN1_NDEF_SEQUENCE_END(GOST_KEY_PARAMS)
  IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_PARAMS)
- 
  ASN1_NDEF_SEQUENCE(GOST_CIPHER_PARAMS) =
  {
 -ASN1_SIMPLE(GOST_CIPHER_PARAMS, iv, ASN1_OCTET_STRING),
 -        ASN1_SIMPLE(GOST_CIPHER_PARAMS, enc_param_set,
 -                        ASN1_OBJECT),}
 +    ASN1_SIMPLE(GOST_CIPHER_PARAMS, iv, ASN1_OCTET_STRING),
 +    ASN1_SIMPLE(GOST_CIPHER_PARAMS, enc_param_set, ASN1_OBJECT),
 +}
  ASN1_NDEF_SEQUENCE_END(GOST_CIPHER_PARAMS)
  IMPLEMENT_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS)
- 
  ASN1_NDEF_SEQUENCE(GOST_CLIENT_KEY_EXCHANGE_PARAMS) =
  {                               /* FIXME incomplete */
      ASN1_SIMPLE(GOST_CLIENT_KEY_EXCHANGE_PARAMS, gkt, GOST_KEY_TRANSPORT)
 -} ASN1_NDEF_SEQUENCE_END(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 -
 -    IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 +}
 +ASN1_NDEF_SEQUENCE_END(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 +IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
  
 -    ASN1_NDEF_SEQUENCE(MASKED_GOST_KEY) =
 +ASN1_NDEF_SEQUENCE(MASKED_GOST_KEY) =
  {
      ASN1_SIMPLE(MASKED_GOST_KEY, masked_priv_key, ASN1_OCTET_STRING),
-     ASN1_SIMPLE(MASKED_GOST_KEY, public_key, ASN1_OCTET_STRING)
- }
- ASN1_NDEF_SEQUENCE_END(MASKED_GOST_KEY)
+         ASN1_SIMPLE(MASKED_GOST_KEY, public_key, ASN1_OCTET_STRING)
+ } ASN1_NDEF_SEQUENCE_END(MASKED_GOST_KEY)
  IMPLEMENT_ASN1_FUNCTIONS(MASKED_GOST_KEY)

diff --cc gost_crypt.c
index 59d75d788a5493fb1c9d2c6d624f8085d2691a0b,f9ed2cf22b0c8125252ef354b653e096476b0251..a15317127f94acab9b852fcc927b5642876ebba3
--- 1/gost_crypt.c
--- 2/gost_crypt.c
+++ b/gost_crypt.c
@@@ -558,14 -692,15 +691,21 @@@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx
          } else {
              return 0;
          }
- #ifdef EVP_CTRL_SET_SBOX
 +    case EVP_CTRL_SET_SBOX:
 +        if (ptr) {
 +            struct ossl_gost_cipher_ctx *c = ctx->cipher_data;
 +            int nid;
 +            int cur_meshing;
 +            int ret;
  
+     case EVP_CTRL_SET_SBOX:
+         if (ptr) {
+             struct ossl_gost_cipher_ctx *c =
+                 EVP_CIPHER_CTX_get_cipher_data(ctx);
+             int nid;
+             int cur_meshing;
+             int ret;
+ 
              if (c == NULL) {
                  return -1;
              }

diff --cc gost_eng.c
Simple merge

diff --cc gost_pmeth.c
Simple merge