diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-06-17 12:04:56 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-06-17 12:04:56 +0000 |
| commit | c05353c50a438d86e030da82f024870358c95edb (patch) | |
| tree | 076bb54dc44513e53bf0b66833123aa4f4d12608 /crypto/pkcs12/p12_key.c | |
| parent | 73ea41607004bd39bf56730b875549f765107e95 (diff) | |
Rename asc2uni and uni2asc functions to avoid clashes.
Diffstat (limited to 'crypto/pkcs12/p12_key.c')
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index b72cf1638b..a29794bbbc 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -85,7 +85,7 @@ int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, if(!pass) { unipass = NULL; uniplen = 0; - } else if (!asc2uni(pass, passlen, &unipass, &uniplen)) { + } else if (!OPENSSL_asc2uni(pass, passlen, &unipass, &uniplen)) { PKCS12err(PKCS12_F_PKCS12_KEY_GEN_ASC,ERR_R_MALLOC_FAILURE); return 0; } |