Remove duplicates

[openssl-gost/engine.git] / gost_ameth.c

diff --git a/gost_ameth.c b/gost_ameth.c
index feec5544a3dfe986f279ea68d9b210aa215ffe44..2243a30a3cbd46f90f18bd1c1cf8cbf65bcfbcc9 100644 (file)
--- a/gost_ameth.c
+++ b/gost_ameth.c
@@ -431,10 +431,10 @@ static int priv_encode_gost(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk)
 {
     ASN1_OBJECT *algobj = OBJ_nid2obj(EVP_PKEY_base_id(pk));
     ASN1_STRING *params = encode_gost_algor_params(pk);
-    unsigned char *priv_buf = NULL, *buf = NULL;
-    int key_len = pkey_bits_gost(pk), priv_len = 0, i = 0;
+    unsigned char /**priv_buf = NULL,*/ *buf = NULL;
+    int key_len = pkey_bits_gost(pk), /*priv_len = 0,*/ i = 0;
 
-    ASN1_STRING *octet = NULL;
+    /*ASN1_STRING *octet = NULL;*/
     if (!params) {
         return 0;
     }
@@ -456,6 +456,7 @@ static int priv_encode_gost(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk)
         buf[key_len - 1 - i] = tmp;
     }
 
+/*
     octet = ASN1_STRING_new();
     ASN1_OCTET_STRING_set(octet, buf, key_len);
 
@@ -464,7 +465,9 @@ static int priv_encode_gost(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk)
     OPENSSL_free(buf);
 
     return PKCS8_pkey_set0(p8, algobj, 0, V_ASN1_SEQUENCE, params,
-                           priv_buf, priv_len);
+                           priv_buf, priv_len); */
+    return PKCS8_pkey_set0(p8, algobj, 0, V_ASN1_SEQUENCE, params,
+                           buf, key_len); 
 }
 
 /* --------- printing keys --------------------------------*/
@@ -594,7 +597,6 @@ static int param_missing_gost_ec(const EVP_PKEY *pk)
     return 0;
 }
 
-
 static int param_copy_gost_ec(EVP_PKEY *to, const EVP_PKEY *from)
 {
     EC_KEY *eto = EVP_PKEY_get0(to);
@@ -772,7 +774,7 @@ static int pub_encode_gost_ec(X509_PUBKEY *pub, const EVP_PKEY *pk)
 
     ret = i2d_ASN1_OCTET_STRING(octet, &buf);
     ASN1_BIT_STRING_free(octet);
-err:
+ err:
     if (X)
         BN_free(X);
     if (Y)
@@ -914,7 +916,7 @@ int register_ameth_gost(int nid, EVP_PKEY_ASN1_METHOD **ameth,
 
         EVP_PKEY_asn1_set_ctrl(*ameth, pkey_ctrl_gost);
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        EVP_PKEY_asn1_set_security_bits(*ameth,ce_pkey_bits_gost);
+        EVP_PKEY_asn1_set_security_bits(*ameth, pkey_bits_gost);
 #endif
         break;
     case NID_id_Gost28147_89_MAC: