Commit efaa569c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1943 

Submitted by: Guenter <lists@gknw.net>
Approved by: steve@openssl.org

Rename uni2asc and asc2uni on Netware to avoid a name clash.
parent 15684f58

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.8k and 0.9.8l  [xx XXX xxxx]



  *) Rename uni2asc and asc2uni functions to OPENSSL_uni2asc and

     OPENSSL_asc2uni conditionally on Netware platforms to avoid a name

     clash.

     [Steve Henson]



  *) Don't check self signed certificate signatures in X509_verify_cert():

     it just wastes time without adding any security. As a useful side effect

     self signed root CAs with non-FIPS digests are now usable in FIPS mode.

apps/pkcs12.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

crypto/pkcs12/p12_attr.c

+6 −0
Original line number Diff line number Diff line
@@ -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,

crypto/pkcs12/p12_key.c

+6 −0
Original line number Diff line number Diff line
@@ -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))

crypto/pkcs12/p12_utl.c

+6 −0
Original line number Diff line number Diff line
@@ -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)