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;
ptype = V_ASN1_SEQUENCE;
}
else
- {
ptype = V_ASN1_UNDEF;
- pval = NULL;
- }
dsa->write_params=0;
penclen = i2d_DSAPublicKey(dsa, &penc);
return 0;
}
-static int dsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
- {
- if (BN_cmp(b->pkey.dsa->pub_key,a->pkey.dsa->pub_key) != 0)
- return 0;
- else
- return 1;
- }
-
/* In PKCS#8 DSA: you just get a private key integer and parameters in the
* AlgorithmIdentifier the pubkey must be recalculated.
*/
DSAerr(DSA_F_DSA_PRIV_DECODE, EVP_R_DECODE_ERROR);
dsaerr:
BN_CTX_free (ctx);
+ if (privkey)
+ ASN1_INTEGER_free(privkey);
sk_ASN1_TYPE_pop_free(ndsa, ASN1_TYPE_free);
DSA_free(dsa);
- EVP_PKEY_free(pkey);
return 0;
}
return 1;
}
+static int dsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
+ {
+ if (dsa_cmp_parameters(a, b) == 0)
+ return 0;
+ if (BN_cmp(b->pkey.dsa->pub_key,a->pkey.dsa->pub_key) != 0)
+ return 0;
+ else
+ return 1;
+ }
+
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;
+ size_t i;
if (!b)
return;
if (*pbuflen < (i = (size_t)BN_num_bytes(b)))