From 4b2596fb0f28cb59c8918b16cdae591454312175 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Wed, 29 Jul 2015 14:58:34 +0000 Subject: Expand obsolete M_ASN1.*(cmp|dup|print|set) macros - no change in generated assembly. ok bcook@ --- src/lib/libcrypto/pkcs7/pk7_doit.c | 6 +++--- src/lib/libcrypto/pkcs7/pk7_lib.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/libcrypto/pkcs7') diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index 2c69edf499..24bcebef61 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_doit.c,v 1.35 2015/07/19 18:25:59 miod Exp $ */ +/* $OpenBSD: pk7_doit.c,v 1.36 2015/07/29 14:58:34 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -417,7 +417,7 @@ pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert) pcert->cert_info->issuer); if (ret) return ret; - return M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber, + return ASN1_STRING_cmp(pcert->cert_info->serialNumber, ri->issuer_and_serial->serial); } @@ -856,7 +856,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio) goto err; if (!EVP_DigestFinal_ex(mdc, md_data, &md_len)) goto err; - if (M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, + if (ASN1_STRING_set(p7->d.digest->digest, md_data, md_len) == 0) goto err; } diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c index 3eec92e29b..9f7e4f2dd3 100644 --- a/src/lib/libcrypto/pkcs7/pk7_lib.c +++ b/src/lib/libcrypto/pkcs7/pk7_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_lib.c,v 1.15 2015/03/19 14:00:22 tedu Exp $ */ +/* $OpenBSD: pk7_lib.c,v 1.16 2015/07/29 14:58:34 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -380,7 +380,7 @@ PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey, * things the ugly way. */ M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial); if (!(p7i->issuer_and_serial->serial = - M_ASN1_INTEGER_dup(X509_get_serialNumber(x509)))) + ASN1_STRING_dup(X509_get_serialNumber(x509)))) goto err; /* lets keep the pkey around for a while */ @@ -545,7 +545,7 @@ PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509) M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial); if (!(p7i->issuer_and_serial->serial = - M_ASN1_INTEGER_dup(X509_get_serialNumber(x509)))) + ASN1_STRING_dup(X509_get_serialNumber(x509)))) return 0; pkey = X509_get_pubkey(x509); -- cgit v1.2.3-55-g6feb