diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-07-26 01:48:01 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-08-22 13:52:55 +0200 |
| commit | b799aef863a81c9a9d5dbffae12cca912ae348b2 (patch) | |
| tree | 9e550a0e212f74f18303ae4154487593696a28a1 /crypto/pkcs12 | |
| parent | 70bf33d1821baf44764555be6a63488798c4d086 (diff) | |
crypto/pkcs12: default to UTF-8.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_attr.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c index a16231f074..c324f50514 100644 --- a/crypto/pkcs12/p12_attr.c +++ b/crypto/pkcs12/p12_attr.c @@ -45,6 +45,16 @@ int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name, return 0; } +int PKCS12_add_friendlyname_utf8(PKCS12_SAFEBAG *bag, const char *name, + int namelen) +{ + if (X509at_add1_attr_by_NID(&bag->attrib, NID_friendlyName, + MBSTRING_UTF8, (unsigned char *)name, namelen)) + return 1; + else + return 0; +} + int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name, int namelen) { @@ -82,8 +92,8 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag) return NULL; if (atype->type != V_ASN1_BMPSTRING) return NULL; - return OPENSSL_uni2asc(atype->value.bmpstring->data, - atype->value.bmpstring->length); + return OPENSSL_uni2utf8(atype->value.bmpstring->data, + atype->value.bmpstring->length); } const STACK_OF(X509_ATTRIBUTE) * |