diff options
| author | simon <simon@FreeBSD.org> | 2010-02-28 18:49:43 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2010-02-28 18:49:43 +0000 |
| commit | cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385 (patch) | |
| tree | 21770f10e7f26d05fc9b0fa96a7b6d7b107552c5 /crypto/pkcs12/p12_key.c | |
| parent | 3bc8c7595d6f805f614ed860868465e3c1d3ee2b (diff) | |
| download | FreeBSD-src-cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385.zip FreeBSD-src-cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385.tar.gz | |
Import OpenSSL 0.9.8m.
Diffstat (limited to 'crypto/pkcs12/p12_key.c')
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 9e57eee..5cfe727 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -69,6 +69,12 @@ extern BIO *bio_err; void h__dump (unsigned char *p, int len); #endif +#ifdef OPENSSL_SYS_NETWARE +/* Rename these functions to avoid name clashes on NetWare OS */ +#define uni2asc OPENSSL_uni2asc +#define asc2uni OPENSSL_asc2uni +#endif + /* PKCS12 compatible key/IV generation */ #ifndef min #define min(a,b) ((a) < (b) ? (a) : (b)) |
