summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/p12_attr.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-06-17 12:04:56 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-06-17 12:04:56 +0000
commitc05353c50a438d86e030da82f024870358c95edb (patch)
tree076bb54dc44513e53bf0b66833123aa4f4d12608 /crypto/pkcs12/p12_attr.c
parent73ea41607004bd39bf56730b875549f765107e95 (diff)
Rename asc2uni and uni2asc functions to avoid clashes.
Diffstat (limited to 'crypto/pkcs12/p12_attr.c')
-rw-r--r--crypto/pkcs12/p12_attr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 68d6c5ad15..e4d9c25647 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -139,7 +139,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
ASN1_TYPE *atype;
if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL;
if (atype->type != V_ASN1_BMPSTRING) return NULL;
- return uni2asc(atype->value.bmpstring->data,
+ return OPENSSL_uni2asc(atype->value.bmpstring->data,
atype->value.bmpstring->length);
}