generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 1943

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

Rename uni2asc and asc2uni on Netware to avoid a name clash.
This commit is contained in:
Dr. Stephen Henson
2009-06-17 11:55:51 +00:00
parent 15684f58c2
commit efaa569c3b
6 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -4,6 +4,11 @@
Changes between 0.9.8k and 0.9.8l [xx XXX xxxx] 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(): *) Don't check self signed certificate signatures in X509_verify_cert():
it just wastes time without adding any security. As a useful side effect 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. self signed root CAs with non-FIPS digests are now usable in FIPS mode.

6
apps/pkcs12.c
View File

@@ -68,6 +68,12 @@
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/pkcs12.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 #define PROG pkcs12_main
const EVP_CIPHER *enc; const EVP_CIPHER *enc;

6
crypto/pkcs12/p12_attr.c
View File

@@ -60,6 +60,12 @@
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/pkcs12.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 */ /* Add a local keyid to a safebag */
int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,

6
crypto/pkcs12/p12_key.c
View File

@@ -69,6 +69,12 @@ extern BIO *bio_err;
void h__dump (unsigned char *p, int len); void h__dump (unsigned char *p, int len);
#endif #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 */ /* PKCS12 compatible key/IV generation */
#ifndef min #ifndef min
#define min(a,b) ((a) < (b) ? (a) : (b)) #define min(a,b) ((a) < (b) ? (a) : (b))

6
crypto/pkcs12/p12_utl.c
View File

@@ -60,6 +60,12 @@
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/pkcs12.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 */ /* Cheap and nasty Unicode stuff */
unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen) unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)

7
crypto/pkcs12/pkcs12.h
View File

@@ -232,9 +232,14 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
const EVP_MD *md_type); const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type); 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); unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
char *uni2asc(unsigned char *uni, int unilen); char *uni2asc(unsigned char *uni, int unilen);
#endif
DECLARE_ASN1_FUNCTIONS(PKCS12) DECLARE_ASN1_FUNCTIONS(PKCS12)
DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA) DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG) DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)