Rename asc2uni and uni2asc functions to avoid clashes.

[openssl.git] / crypto / pkcs12 / p12_attr.c

diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 026cf3826a7080f18c4216dd9a9fe07e53d83b9c..e4d9c256470334e5515a5256c33b010470d3c0f4 100644 (file)
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -1,5 +1,5 @@
 /* p12_attr.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
@@ -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);
 }