diff options
author | Richard Levitte <levitte@openssl.org> | 2002-08-13 07:32:58 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2002-08-13 07:32:58 +0000 |
commit | e4d420de25c46d585b55f0c9feab71400a5a0c0d (patch) | |
tree | 1e61f44d245643097c5087ac26213cc4b1f2fbdd /crypto/pkcs7/pk7_doit.c | |
parent | 4545ec355a596b7a6079c3f69d12b7f4659d9f75 (diff) | |
download | openssl-new-e4d420de25c46d585b55f0c9feab71400a5a0c0d.tar.gz |
Merge in all the changes from HEAD.
Diffstat (limited to 'crypto/pkcs7/pk7_doit.c')
-rw-r--r-- | crypto/pkcs7/pk7_doit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index f589508fdd..1c0a9c9edf 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -629,7 +629,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) ctx_tmp.digest=EVP_dss1(); #endif #ifndef OPENSSL_NO_ECDSA - if (si->pkey->type == EVP_PKEY_ECDSA) + if (si->pkey->type == EVP_PKEY_EC) ctx_tmp.digest=EVP_ecdsa(); #endif @@ -830,7 +830,7 @@ for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1(); #endif #ifndef OPENSSL_NO_ECDSA - if (pkey->type == EVP_PKEY_ECDSA) mdc_tmp.digest=EVP_ecdsa(); + if (pkey->type == EVP_PKEY_EC) mdc_tmp.digest=EVP_ecdsa(); #endif i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey); |