diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-27 12:41:53 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-08 18:43:48 +0000 |
| commit | 762ee38d55b0d0ca2a2e744b8e59dbc9f39c68a0 (patch) | |
| tree | 3462904d259c073af0f05db08d4354105627e8a2 /apps | |
| parent | e8503762da9df43a414fc5d6c2d0399779f0ff33 (diff) | |
| download | openssl-762ee38d55b0d0ca2a2e744b8e59dbc9f39c68a0.tar.gz | |
Use new names
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index e44a999be4..8c0e7f15fa 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -647,7 +647,7 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass, attrs = PKCS12_SAFEBAG_get0_attrs(bag); - switch (M_PKCS12_bag_type(bag)) { + switch (PKCS12_SAFEBAG_get_nid(bag)) { case NID_keyBag: if (options & INFO) BIO_printf(bio_err, "Key bag\n"); @@ -689,15 +689,15 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass, BIO_printf(bio_err, "Certificate bag\n"); if (options & NOCERTS) return 1; - if (PKCS12_get_attr(bag, NID_localKeyID)) { + if (PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID)) { if (options & CACERTS) return 1; } else if (options & CLCERTS) return 1; print_attribs(out, attrs, "Bag Attributes"); - if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate) + if (PKCS12_SAFEBAG_get_bag_nid(bag) != NID_x509Certificate) return 1; - if ((x509 = PKCS12_certbag2x509(bag)) == NULL) + if ((x509 = PKCS12_SAFEBAG_get1_cert(bag)) == NULL) return 0; dump_cert_text(out, x509); PEM_write_bio_X509(out, x509); |