diff options
Diffstat (limited to 'src/lib/libssl/src/crypto/pkcs7/pk7_doit.c')
-rw-r--r-- | src/lib/libssl/src/crypto/pkcs7/pk7_doit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c index 2c69edf499..24bcebef61 100644 --- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c +++ b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_doit.c,v 1.35 2015/07/19 18:25:59 miod Exp $ */ | 1 | /* $OpenBSD: pk7_doit.c,v 1.36 2015/07/29 14:58:34 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -417,7 +417,7 @@ pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert) | |||
417 | pcert->cert_info->issuer); | 417 | pcert->cert_info->issuer); |
418 | if (ret) | 418 | if (ret) |
419 | return ret; | 419 | return ret; |
420 | return M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber, | 420 | return ASN1_STRING_cmp(pcert->cert_info->serialNumber, |
421 | ri->issuer_and_serial->serial); | 421 | ri->issuer_and_serial->serial); |
422 | } | 422 | } |
423 | 423 | ||
@@ -856,7 +856,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio) | |||
856 | goto err; | 856 | goto err; |
857 | if (!EVP_DigestFinal_ex(mdc, md_data, &md_len)) | 857 | if (!EVP_DigestFinal_ex(mdc, md_data, &md_len)) |
858 | goto err; | 858 | goto err; |
859 | if (M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, | 859 | if (ASN1_STRING_set(p7->d.digest->digest, md_data, |
860 | md_len) == 0) | 860 | md_len) == 0) |
861 | goto err; | 861 | goto err; |
862 | } | 862 | } |