diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-10-16 01:24:29 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-10-16 01:24:29 +0000 |
| commit | 20d2186c87dabec56c6da48961a779843724a019 (patch) | |
| tree | 4c5c2ba2e12a851c48726b6e5cc83a006f8291f1 /crypto/x509 | |
| parent | 9ba3ec91766e559f96248fe10c77551a4e017ec3 (diff) | |
Retain compatibility of EVP_DigestInit() and EVP_DigestFinal()
with existing code.
Modify library to use digest *_ex() functions.
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_cmp.c | 6 | ||||
| -rw-r--r-- | crypto/x509/x_all.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index e711de228c..cd20b6d66f 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -86,11 +86,11 @@ unsigned long X509_issuer_and_serial_hash(X509 *a) EVP_MD_CTX_init(&ctx); X509_NAME_oneline(a->cert_info->issuer,str,256); ret=strlen(str); - EVP_DigestInit(&ctx,EVP_md5()); + EVP_DigestInit_ex(&ctx, EVP_md5(), NULL); EVP_DigestUpdate(&ctx,(unsigned char *)str,ret); EVP_DigestUpdate(&ctx,(unsigned char *)a->cert_info->serialNumber->data, (unsigned long)a->cert_info->serialNumber->length); - EVP_DigestFinal(&ctx,&(md[0]),NULL); + EVP_DigestFinal_ex(&ctx,&(md[0]),NULL); ret=( ((unsigned long)md[0] )|((unsigned long)md[1]<<8L)| ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L) )&0xffffffffL; @@ -204,7 +204,7 @@ unsigned long X509_NAME_hash(X509_NAME *x) /* Make sure X509_NAME structure contains valid cached encoding */ i2d_X509_NAME(x,NULL); - EVP_Digest(x->bytes->data, x->bytes->length, md, NULL, EVP_md5()); + EVP_Digest(x->bytes->data, x->bytes->length, md, NULL, EVP_md5(), NULL); ret=( ((unsigned long)md[0] )|((unsigned long)md[1]<<8L)| ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L) diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index 69920e6d03..fb5015cd4d 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -331,7 +331,7 @@ int X509_pubkey_digest(const X509 *data, const EVP_MD *type, unsigned char *md, ASN1_BIT_STRING *key; key = X509_get0_pubkey_bitstr(data); if(!key) return 0; - return EVP_Digest(key->data, key->length, md, len, type); + return EVP_Digest(key->data, key->length, md, len, type, NULL); } int X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md, |