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 /include | |
| parent | 70bf33d1821baf44764555be6a63488798c4d086 (diff) | |
| download | openssl-b799aef863a81c9a9d5dbffae12cca912ae348b2.tar.gz | |
crypto/pkcs12: default to UTF-8.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/pkcs12.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index f324bc1996..37e2847b3f 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -40,8 +40,8 @@ extern "C" { # define PKCS12_key_gen PKCS12_key_gen_uni # define PKCS12_add_friendlyname PKCS12_add_friendlyname_uni # else -# define PKCS12_key_gen PKCS12_key_gen_asc -# define PKCS12_add_friendlyname PKCS12_add_friendlyname_asc +# define PKCS12_key_gen PKCS12_key_gen_utf8 +# define PKCS12_add_friendlyname PKCS12_add_friendlyname_utf8 # endif /* MS key usage constants */ @@ -141,6 +141,8 @@ int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen); int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen); +int PKCS12_add_friendlyname_utf8(PKCS12_SAFEBAG *bag, const char *name, + int namelen); int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen); int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, |