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/pkcs12.h | |
| parent | 73ea41607004bd39bf56730b875549f765107e95 (diff) | |
| download | openssl-c05353c50a438d86e030da82f024870358c95edb.tar.gz | |
Rename asc2uni and uni2asc functions to avoid clashes.
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 425274d4f7..b17eb9f42b 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -230,8 +230,8 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, const EVP_MD *md_type); int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, const EVP_MD *md_type); -unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen); -char *uni2asc(unsigned char *uni, int unilen); +unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen); +char *OPENSSL_uni2asc(unsigned char *uni, int unilen); DECLARE_ASN1_FUNCTIONS(PKCS12) DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA) |