X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_ameth.c;h=005fbf7257a960113fb82f8a3cdef7a42861a1d8;hb=refs%2Fheads%2Fopenssl_1_1_0_release2;hp=1a9361b5fb434ea51c761fbd06bd9e3028c42c29;hpb=849ca2fc6a06c9a9d58ea3050760610dc7fdb190;p=openssl-gost%2Fengine.git

diff --git a/gost_ameth.c b/gost_ameth.c
index 1a9361b..005fbf7 100644
--- a/gost_ameth.c
+++ b/gost_ameth.c
@@ -282,7 +282,7 @@ static int pkey_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 /* --------------------- free functions * ------------------------------*/
 static void pkey_free_gost_ec(EVP_PKEY *key)
 {
-    EC_KEY_free(EVP_PKEY_get0_EC_KEY(key));
+    EC_KEY_free((EC_KEY *)EVP_PKEY_get0(key));
 }
 
 /* ------------------ private key functions  -----------------------------*/
@@ -641,11 +641,11 @@ static int pub_decode_gost_ec(EVP_PKEY *pk, X509_PUBKEY *pub)
     const unsigned char *pubkey_buf = NULL;
     unsigned char *databuf;
     ASN1_OBJECT *palgobj = NULL;
-    int pub_len, i, j;
+    int pub_len;
     EC_POINT *pub_key;
     BIGNUM *X, *Y;
     ASN1_OCTET_STRING *octet = NULL;
-    int len;
+    size_t len;
     const EC_GROUP *group;
 
     if (!X509_PUBKEY_get0_param(&palgobj, &pubkey_buf, &pub_len, &palg, pub))
@@ -665,9 +665,8 @@ static int pub_decode_gost_ec(EVP_PKEY *pk, X509_PUBKEY *pub)
         ASN1_OCTET_STRING_free(octet);
         return 0;
     }
-    for (i = 0, j = octet->length - 1; i < octet->length; i++, j--) {
-        databuf[j] = octet->data[i];
-    }
+
+		BUF_reverse(databuf, octet->data, octet->length);
     len = octet->length / 2;
     ASN1_OCTET_STRING_free(octet);
 
@@ -699,19 +698,19 @@ static int pub_encode_gost_ec(X509_PUBKEY *pub, const EVP_PKEY *pk)
     ASN1_OBJECT *algobj = NULL;
     ASN1_OCTET_STRING *octet = NULL;
     void *pval = NULL;
-    unsigned char *buf = NULL, *databuf = NULL, *sptr;
-    int i, j, data_len, ret = -1;
+    unsigned char *buf = NULL, *databuf = NULL;
+    int data_len, ret = -1;
     const EC_POINT *pub_key;
     BIGNUM *X = NULL, *Y = NULL, *order = NULL;
     const EC_KEY *ec = EVP_PKEY_get0((EVP_PKEY *)pk);
     int ptype = V_ASN1_UNDEF;
 
     algobj = OBJ_nid2obj(EVP_PKEY_base_id(pk));
-    if (EVP_PKEY_save_parameters((EVP_PKEY *)pk, -1)) {
-        ASN1_STRING *params = encode_gost_algor_params(pk);
-        pval = params;
-        ptype = V_ASN1_SEQUENCE;
-    }
+
+		ASN1_STRING *params = encode_gost_algor_params(pk);
+		pval = params;
+		ptype = V_ASN1_SEQUENCE;
+
     order = BN_new();
     if (!order) {
         GOSTerr(GOST_F_PUB_ENCODE_GOST_EC, ERR_R_MALLOC_FAILURE);
@@ -735,12 +734,11 @@ static int pub_encode_gost_ec(X509_PUBKEY *pub, const EVP_PKEY *pk)
         goto err;
     }
     data_len = 2 * BN_num_bytes(order);
-    databuf = OPENSSL_malloc(data_len);
+    databuf = OPENSSL_zalloc(data_len);
     if (databuf == NULL) {
         GOSTerr(GOST_F_PUB_ENCODE_GOST_EC, ERR_R_MALLOC_FAILURE);
         goto err;
     }
-    memset(databuf, 0, data_len);
 
     store_bignum(X, databuf + data_len / 2, data_len / 2);
     store_bignum(Y, databuf, data_len / 2);