diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-05-18 13:05:20 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-05-18 13:05:20 +0000 |
| commit | f2b139ed1fc3541bb17a066bba5c12b30fa989fa (patch) | |
| tree | a62f35d9ead1f82e0760283e1648774e62e7dd0f /crypto/pkcs7 | |
| parent | a6e7fcd140feb263ee0aa3e983b4689e1b6735b9 (diff) | |
Remove old digest type hacks for non RSA keys.
Diffstat (limited to 'crypto/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index a3c8baf466..60cffb0782 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -794,15 +794,6 @@ 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 -#ifndef OPENSSL_NO_ECDSA - if (si->pkey->type == EVP_PKEY_EC) - ctx_tmp.digest=EVP_ecdsa(); -#endif - if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data, (unsigned int *)&buf->length,si->pkey)) { @@ -1011,14 +1002,6 @@ for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); ret = -1; goto err; } -#if 0 -#ifndef OPENSSL_NO_DSA - if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1(); -#endif -#ifndef OPENSSL_NO_ECDSA - if (pkey->type == EVP_PKEY_EC) mdc_tmp.digest=EVP_ecdsa(); -#endif -#endif i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey); EVP_PKEY_free(pkey); |