X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_asn1.c;h=57046a8117a82386df48f76502d9ca87c68717e7;hb=0fd84c8144c5291fc3b1887204e571e731959a0b;hp=0412d2c7c13cdd51325506d2961f30eaac37f4c4;hpb=02f99b2e3b46f4ff44fd5420487551d5a447c2ad;p=openssl-gost%2Fengine.git

diff --git a/gost_asn1.c b/gost_asn1.c
index 0412d2c..57046a8 100644
--- a/gost_asn1.c
+++ b/gost_asn1.c
@@ -50,23 +50,13 @@ 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)
 
-ASN1_NDEF_SEQUENCE_END(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 
-/* Convert byte buffer to bignum, skipping leading zeros*/
-BIGNUM *getbnfrombuf(const unsigned char *buf, size_t len)
-{
-    BIGNUM *b;
+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)
 
-    while (*buf == 0 && len > 0) {
-        buf++;
-        len--;
-    }
-    if (len)
-        return BN_bin2bn(buf, len, NULL);
-    b = BN_new();
-    BN_zero(b);
-    return b;
-}
+IMPLEMENT_ASN1_FUNCTIONS(MASKED_GOST_KEY)