diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-02-22 02:59:26 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-02-22 02:59:26 +0000 |
| commit | 72b60351f17f26568e3af698fab4abd043b3fa29 (patch) | |
| tree | e3aee906dafb7a38a275c590a49ff93ccfec6cd5 /crypto/pkcs7 | |
| parent | 1b8a8088a5d55d5474fd7f89bc991326cc0430d7 (diff) | |
| download | openssl-72b60351f17f26568e3af698fab4abd043b3fa29.tar.gz | |
Change EVP_MD_CTX_type so it is more logical and add EVP_MD_CTX_md for
the old functionality.
Various warning fixes.
Initial EVP symmetric cipher docs.
Diffstat (limited to 'crypto/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 1403ff591d..80ac5e34b4 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -554,7 +554,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_INTERNAL_ERROR); goto err; } - if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == j) + if (EVP_MD_CTX_type(mdc) == j) break; else btmp=btmp->next_bio; @@ -588,7 +588,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) V_ASN1_UTCTIME,sign_time); /* Add digest */ - md_tmp=EVP_MD_CTX_type(&ctx_tmp); + md_tmp=EVP_MD_CTX_md(&ctx_tmp); EVP_DigestFinal(&ctx_tmp,md_data,&md_len); digest=M_ASN1_OCTET_STRING_new(); M_ASN1_OCTET_STRING_set(digest,md_data,md_len); @@ -746,7 +746,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, PKCS7_R_INTERNAL_ERROR); goto err; } - if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == md_type) + if (EVP_MD_CTX_type(mdc) == md_type) break; btmp=btmp->next_bio; } |