Commit 200de404 authored by Pavel Kopyl's avatar Pavel Kopyl Committed by Bernd Edlinger
Browse files

Check return value of OBJ_nid2obj in dsa_pub_encode. 



CLA: trivial

Reviewed-by: default avatarKurt Roeckx <kurt@roeckx.be>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/4600)

(cherry picked from commit 7760384b)
parent 98fe34c3

crypto/dsa/dsa_ameth.c

+6 −2
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) 
    unsigned char *penc = NULL;

    int penclen;

    ASN1_STRING *str = NULL;

    ASN1_OBJECT *aobj;



    dsa = pkey->pkey.dsa;

    if (pkey->save_parameters && dsa->p && dsa->q && dsa->g) {
@@ -159,8 +160,11 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) 
        goto err;

    }



    if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DSA),

                               ptype, str, penc, penclen))

    aobj = OBJ_nid2obj(EVP_PKEY_DSA);

    if (aobj == NULL)

        goto err;



    if (X509_PUBKEY_set0_param(pk, aobj, ptype, str, penc, penclen))

        return 1;



 err: