Hi Steve,
Guenter schrieb:
Sure, we can do the renaming of the functions #ifdef'd for
OPENSSL_SYS_NETWARE, no prob.
find attached a new patch for 0.9.8-stable which renames conditionally
for NetWare only.
diff -ur openssl-0_9_8/apps/pkcs12.c openssl-0_9_8-patched/apps/pkcs12.c
--- openssl-0_9_8/apps/pkcs12.c Wed Nov 05 19:36:35 2008
+++ openssl-0_9_8-patched/apps/pkcs12.c Mon Jun 15 01:42:13 2009
@@ -68,6 +68,12 @@
#include openssl/pem.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
+
#define PROG pkcs12_main
const EVP_CIPHER *enc;
diff -ur openssl-0_9_8/crypto/pkcs12/p12_attr.c openssl-0_9_8-patched/crypto/pkcs12/p12_attr.c
--- openssl-0_9_8/crypto/pkcs12/p12_attr.c Wed Nov 05 19:36:46 2008
+++ openssl-0_9_8-patched/crypto/pkcs12/p12_attr.c Mon Jun 15 01:44:07 2009
@@ -60,6 +60,12 @@
#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
+
/* Add a local keyid to a safebag */
int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
diff -ur openssl-0_9_8/crypto/pkcs12/p12_key.c openssl-0_9_8-patched/crypto/pkcs12/p12_key.c
--- openssl-0_9_8/crypto/pkcs12/p12_key.c Wed Nov 05 19:36:46 2008
+++ openssl-0_9_8-patched/crypto/pkcs12/p12_key.c Mon Jun 15 01:45:14 2009
@@ -69,6 +69,12 @@
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))
diff -ur openssl-0_9_8/crypto/pkcs12/p12_utl.c openssl-0_9_8-patched/crypto/pkcs12/p12_utl.c
--- openssl-0_9_8/crypto/pkcs12/p12_utl.c Wed Nov 05 19:36:47 2008
+++ openssl-0_9_8-patched/crypto/pkcs12/p12_utl.c Mon Jun 15 01:46:07 2009
@@ -60,6 +60,12 @@
#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)
diff -ur openssl-0_9_8/crypto/pkcs12/pkcs12.h openssl-0_9_8-patched/crypto/pkcs12/pkcs12.h
--- openssl-0_9_8/crypto/pkcs12/pkcs12.h Wed Nov 05 19:36:47 2008
+++ openssl-0_9_8-patched/crypto/pkcs12/pkcs12.h Mon Jun 15 02:22:56 2009
@@ -232,9 +232,14 @@
const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type);
+#if defined(NETWARE) || defined(OPENSSL_SYS_NETWARE)
+/* Rename these functions to avoid name clashes on NetWare OS */
+unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
+char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
+#else
unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
char *uni2asc(unsigned char *uni, int unilen);
-
+#endif
DECLARE_ASN1_FUNCTIONS(PKCS12)
DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)