Commit d1d86084 authored by Richard Levitte's avatar Richard Levitte
Browse files

Change from main development line, 2001-03-20 16:36 levitte 

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

crypto/pkcs7/pk7_doit.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -588,8 +588,10 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) 
				pp=NULL;

				pp=NULL;

				}

				}





#ifndef NO_DSA

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

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

				ctx_tmp.digest=EVP_dss1();

				ctx_tmp.digest=EVP_dss1();

#endif





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

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

				(unsigned int *)&buf->length,si->pkey))

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

		ret = -1;

		goto err;

		goto err;

		}

		}

#ifndef NO_DSA

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

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

#endif





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

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

	EVP_PKEY_free(pkey);

	EVP_PKEY_free(pkey);