diff options
author | Richard Levitte <levitte@openssl.org> | 2001-03-21 14:18:06 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2001-03-21 14:18:06 +0000 |
commit | d1d86084647a973e76ee2305211750620771f2e7 (patch) | |
tree | 4cad36b49ae4fb443c734d1fc55584d863318ff9 | |
parent | 19d2a20a7f811beedcb62c91673125e8a7534fcd (diff) | |
download | openssl-d1d86084647a973e76ee2305211750620771f2e7.tar.gz |
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>
-rw-r--r-- | crypto/pkcs7/pk7_doit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 93ad9a45b8..a4e1f6c864 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -588,8 +588,10 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) pp=NULL; } +#ifndef 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)) @@ -788,7 +790,9 @@ for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); ret = -1; goto err; } +#ifndef 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); |