Don't free up key in priv_decode.

[openssl.git] / crypto / dsa / dsa_ameth.c

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 4940bfa0b937b2c1f48d4aeba86e5bcca9204d5c..73fba106020094361643ada20ae7e5192568fd14 100644 (file)
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -60,6 +60,7 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/dsa.h>
+#include "asn1_locl.h"
 
 static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
        {
@@ -107,7 +108,7 @@ static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
                }
 
        ASN1_INTEGER_free(public_key);
-
+       EVP_PKEY_assign_DSA(pkey, dsa);
        return 1;
 
        err:
@@ -122,7 +123,7 @@ static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
        {
        DSA *dsa;
-       void *pval;
+       void *pval = NULL;
        int ptype;
        unsigned char *penc = NULL;
        int penclen;
@@ -138,13 +139,11 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
                        DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
                        goto err;
                        }
+               pval = str;
                ptype = V_ASN1_SEQUENCE;
                }
        else
-               {
                ptype = V_ASN1_UNDEF;
-               pval = NULL;
-               }
        dsa->write_params=0;
 
        penclen = i2d_DSAPublicKey(dsa, &penc);
@@ -282,7 +281,6 @@ static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
        BN_CTX_free (ctx);
        sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
        DSA_free(dsa);
-       EVP_PKEY_free(pkey);
        return 0;
        }
 
@@ -396,6 +394,136 @@ static void int_dsa_free(EVP_PKEY *pkey)
        DSA_free(pkey->pkey.dsa);
        }
 
+static void update_buflen(const BIGNUM *b, size_t *pbuflen)
+       {
+       int i;
+       if (!b)
+               return;
+       if (*pbuflen < (i = (size_t)BN_num_bytes(b)))
+                       *pbuflen = i;
+       }
+
+int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
+       {
+       unsigned char *m=NULL;
+       int ret=0;
+       size_t buf_len=0;
+       const char *ktype = NULL;
+
+       const BIGNUM *priv_key, *pub_key;
+
+       if (ptype == 2)
+               priv_key = x->priv_key;
+       else
+               priv_key = NULL;
+
+       if (ptype > 0)
+               pub_key = x->pub_key;
+       else
+               pub_key = NULL;
+
+       if (ptype == 2)
+               ktype = "Private-Key";
+       else if (ptype == 1)
+               ktype = "Public-Key";
+       else
+               ktype = "DSA-Parameters";
+
+       if (x->p == NULL)
+               {
+               DSAerr(DSA_F_DSA_PRINT,DSA_R_MISSING_PARAMETERS);
+               goto err;
+               }
+
+       update_buflen(x->p, &buf_len);
+       update_buflen(x->q, &buf_len);
+       update_buflen(x->g, &buf_len);
+       update_buflen(priv_key, &buf_len);
+       update_buflen(pub_key, &buf_len);
+
+       m=(unsigned char *)OPENSSL_malloc(buf_len+10);
+       if (m == NULL)
+               {
+               DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+
+       if (priv_key)
+               {
+               if(!BIO_indent(bp,off,128))
+                  goto err;
+               if (BIO_printf(bp,"%s: (%d bit)\n",ktype, BN_num_bits(x->p))
+                       <= 0) goto err;
+               }
+
+       if (!ASN1_bn_print(bp,"priv:",priv_key,m,off))
+               goto err;
+       if (!ASN1_bn_print(bp,"pub: ",pub_key,m,off))
+               goto err;
+       if (!ASN1_bn_print(bp,"P:   ",x->p,m,off)) goto err;
+       if (!ASN1_bn_print(bp,"Q:   ",x->q,m,off)) goto err;
+       if (!ASN1_bn_print(bp,"G:   ",x->g,m,off)) goto err;
+       ret=1;
+err:
+       if (m != NULL) OPENSSL_free(m);
+       return(ret);
+       }
+
+static int dsa_param_decode(EVP_PKEY *pkey,
+                                       const unsigned char **pder, int derlen)
+       {
+       DSA *dsa;
+       if (!(dsa = d2i_DSAparams(NULL, pder, derlen)))
+               {
+               DSAerr(DSA_F_DSA_PARAM_DECODE, ERR_R_DSA_LIB);
+               return 0;
+               }
+       EVP_PKEY_assign_DSA(pkey, dsa);
+       return 1;
+       }
+
+static int dsa_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
+       {
+       return i2d_DSAparams(pkey->pkey.dsa, pder);
+       }
+
+static int dsa_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
+                                                       ASN1_PCTX *ctx)
+       {
+       return do_dsa_print(bp, pkey->pkey.dsa, indent, 0);
+       }
+
+static int dsa_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
+                                                       ASN1_PCTX *ctx)
+       {
+       return do_dsa_print(bp, pkey->pkey.dsa, indent, 1);
+       }
+
+
+static int dsa_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
+                                                       ASN1_PCTX *ctx)
+       {
+       return do_dsa_print(bp, pkey->pkey.dsa, indent, 2);
+       }
+
+static int old_dsa_priv_decode(EVP_PKEY *pkey,
+                                       const unsigned char **pder, int derlen)
+       {
+       DSA *dsa;
+       if (!(dsa = d2i_DSAPrivateKey (NULL, pder, derlen)))
+               {
+               DSAerr(DSA_F_DSA_PRIV_DECODE, ERR_R_DSA_LIB);
+               return 0;
+               }
+       EVP_PKEY_assign_DSA(pkey, dsa);
+       return 1;
+       }
+
+static int old_dsa_priv_encode(const EVP_PKEY *pkey, unsigned char **pder)
+       {
+       return i2d_DSAPrivateKey(pkey->pkey.dsa, pder);
+       }
+
 /* NB these are sorted in pkey_id order, lowest first */
 
 const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] = 
@@ -430,26 +558,32 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
                EVP_PKEY_DSA,
                0,
 
+               "DSA",
+               "OpenSSL DSA method",
+
                dsa_pub_decode,
                dsa_pub_encode,
                dsa_pub_cmp,
-               0,
+               dsa_pub_print,
 
                dsa_priv_decode,
                dsa_priv_encode,
-               0,
+               dsa_priv_print,
 
                int_dsa_size,
                dsa_bits,
 
-               0,0,
+               dsa_param_decode,
+               dsa_param_encode,
                dsa_missing_parameters,
                dsa_copy_parameters,
                dsa_cmp_parameters,
-               0,
+               dsa_param_print,
 
                int_dsa_free,
-               0
+               0,
+               old_dsa_priv_decode,
+               old_dsa_priv_encode
                }
        };