Commit 271da5a2 authored by Richard Levitte's avatar Richard Levitte
Browse files

avoid linking problems when OpenSSL is built with no-dsa. Spotted by Hellan,Kim KHE <khe@kmd.dk>

parent 26fbabf3

crypto/pkcs7/pk7_doit.c

+4 −0
Original line number Diff line number Diff line
@@ -580,8 +580,10 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) 
				OPENSSL_free(abuf);

				}



#ifndef OPENSSL_NO_DSA

			if (si->pkey->type == EVP_PKEY_DSA)

				ctx_tmp.digest=EVP_dss1();

#endif



			if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data,

				(unsigned int *)&buf->length,si->pkey))
@@ -769,7 +771,9 @@ for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); 
		ret = -1;

		goto err;

		}

#ifndef OPENSSL_NO_DSA

	if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1();

#endif



	i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey);

	EVP_PKEY_free(pkey);