projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: 2295
[oweals/openssl.git]
/
crypto
/
pkcs12
/
p12_utl.c
diff --git
a/crypto/pkcs12/p12_utl.c
b/crypto/pkcs12/p12_utl.c
index 243ec76be95c7b8668be295ea095e6c5c107f921..2edbf905c58af1fdcd0d4b0f625d77a08f942957 100644
(file)
--- a/
crypto/pkcs12/p12_utl.c
+++ b/
crypto/pkcs12/p12_utl.c
@@
-1,5
+1,5
@@
/* p12_utl.c */
/* p12_utl.c */
-/* Written by Dr Stephen N Henson (s
henson@bigfoot.com
) for the OpenSSL
+/* Written by Dr Stephen N Henson (s
teve@openssl.org
) for the OpenSSL
* project 1999.
*/
/* ====================================================================
* project 1999.
*/
/* ====================================================================
@@
-60,6
+60,12
@@
#include "cryptlib.h"
#include <openssl/pkcs12.h>
#include "cryptlib.h"
#include <openssl/pkcs12.h>
+#ifdef OPENSSL_SYS_NETWARE
+/* Rename these functions to avoid name clashes on NetWare OS */
+#define uni2asc OPENSSL_uni2asc
+#define asc2uni OPENSSL_asc2uni
+#endif
+
/* Cheap and nasty Unicode stuff */
unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)
/* Cheap and nasty Unicode stuff */
unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)