Browse Source

Use new names

Reviewed-by: Rich Salz <rsalz@openssl.org>
master
Dr. Stephen Henson 7 years ago
parent
commit
762ee38d55
5 changed files with 12 additions and 12 deletions
  1. +4
    -4
      apps/pkcs12.c
  2. +1
    -1
      crypto/pkcs12/p12_attr.c
  3. +1
    -1
      crypto/pkcs12/p12_crt.c
  4. +5
    -5
      crypto/pkcs12/p12_kiss.c
  5. +1
    -1
      crypto/pkcs12/p12_npas.c

+ 4
- 4
apps/pkcs12.c View File

@ -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);


+ 1
- 1
crypto/pkcs12/p12_attr.c View File

@ -130,7 +130,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
{
ASN1_TYPE *atype;
if ((atype = PKCS12_get_attr(bag, NID_friendlyName)) == NULL)
if ((atype = PKCS12_SAFEBAG_get0_attr(bag, NID_friendlyName)) == NULL)
return NULL;
if (atype->type != V_ASN1_BMPSTRING)
return NULL;


+ 1
- 1
crypto/pkcs12/p12_crt.c View File

@ -189,7 +189,7 @@ PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
int keyidlen = -1;
/* Add user certificate */
if ((bag = PKCS12_x5092certbag(cert)) == NULL)
if ((bag = PKCS12_SAFEBAG_new_cert(cert)) == NULL)
goto err;
/*


+ 5
- 5
crypto/pkcs12/p12_kiss.c View File

@ -227,13 +227,13 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
ASN1_BMPSTRING *fname = NULL;
ASN1_OCTET_STRING *lkid = NULL;
if ((attrib = PKCS12_get_attr(bag, NID_friendlyName)))
if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_friendlyName)))
fname = attrib->value.bmpstring;
if ((attrib = PKCS12_get_attr(bag, NID_localKeyID)))
if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID)))
lkid = attrib->value.octet_string;
switch (PKCS12_bag_type(bag)) {
switch (PKCS12_SAFEBAG_get_nid(bag)) {
case NID_keyBag:
if (!pkey || *pkey)
return 1;
@ -254,9 +254,9 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
break;
case NID_certBag:
if (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;
if (lkid && !X509_keyid_set1(x509, lkid->data, lkid->length)) {
X509_free(x509);


+ 1
- 1
crypto/pkcs12/p12_npas.c View File

@ -203,7 +203,7 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, char *oldpass, char *newpass)
X509_SIG *p8new;
int p8_nid, p8_saltlen, p8_iter;
if (PKCS12_bag_type(bag) != NID_pkcs8ShroudedKeyBag)
if (PKCS12_SAFEBAG_get_nid(bag) != NID_pkcs8ShroudedKeyBag)
return 1;
if ((p8 = PKCS8_decrypt(bag->value.shkeybag, oldpass, -1)) == NULL)


Loading…
Cancel
Save