diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
| commit | 367b2622e0527401666a65476f4111fdda2e3c12 (patch) | |
| tree | dc507d2394eb3b616bd9eae56d17671899a24a05 /lib/libcrypto/pkcs12/p12_attr.c | |
| parent | ae9cbeba0dc25f0e95e6a0e50b6c161bf6384e17 (diff) | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/pkcs12/p12_attr.c')
| -rw-r--r-- | lib/libcrypto/pkcs12/p12_attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/pkcs12/p12_attr.c b/lib/libcrypto/pkcs12/p12_attr.c index 68d6c5ad159..e4d9c256470 100644 --- a/lib/libcrypto/pkcs12/p12_attr.c +++ b/lib/libcrypto/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); } |