From e21cbf4d9bafebb2560d1acac1e47e879c7f7493 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Mon, 2 Jul 2012 12:33:42 -0400
Subject: Update OpenSSL

---
 Cryptlib/OpenSSL/crypto/pkcs12/p12_attr.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Cryptlib/OpenSSL/crypto/pkcs12/p12_attr.c')

diff --git a/Cryptlib/OpenSSL/crypto/pkcs12/p12_attr.c b/Cryptlib/OpenSSL/crypto/pkcs12/p12_attr.c
index 68d6c5ad..856933d9 100755
--- a/Cryptlib/OpenSSL/crypto/pkcs12/p12_attr.c
+++ b/Cryptlib/OpenSSL/crypto/pkcs12/p12_attr.c
@@ -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,
-- 
cgit v1.2.3