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

Some more ifdefs for no-xxx options.

Browse Source
This commit is contained in:
Ulf Möller 2000-01-21 00:03:51 +00:00
parent 4699af98e6
commit 731d9c5fb5
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/mdc2/mdc2test.c
View File

@ -60,7 +60,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef NO_DES #if defined(NO_DES) && !defined(NO_MDC2)
#define NO_MDC2 #define NO_MDC2
#endif #endif

2
crypto/x509/x509.h
View File

@ -260,7 +260,9 @@ typedef struct x509_st
unsigned long ex_kusage; unsigned long ex_kusage;
unsigned long ex_xkusage; unsigned long ex_xkusage;
unsigned long ex_nscert; unsigned long ex_nscert;
#ifndef NO_SHA
unsigned char sha1_hash[SHA_DIGEST_LENGTH]; unsigned char sha1_hash[SHA_DIGEST_LENGTH];
#endif
X509_CERT_AUX *aux; X509_CERT_AUX *aux;
} X509; } X509;

4
crypto/x509/x509_cmp.c
View File

@ -136,6 +136,8 @@ unsigned long X509_subject_name_hash(X509 *x)
{ {
return(X509_NAME_hash(x->cert_info->subject)); return(X509_NAME_hash(x->cert_info->subject));
} }
#ifndef NO_SHA
/* Compare two certificates: they must be identical for /* Compare two certificates: they must be identical for
* this to work. * this to work.
*/ */
@ -144,8 +146,10 @@ int X509_cmp(X509 *a, X509 *b)
/* ensure hash is valid */ /* ensure hash is valid */
X509_check_purpose(a, -1, 0); X509_check_purpose(a, -1, 0);
X509_check_purpose(b, -1, 0); X509_check_purpose(b, -1, 0);
return memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH); return memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
} }
#endif
int X509_NAME_cmp(X509_NAME *a, X509_NAME *b) int X509_NAME_cmp(X509_NAME *a, X509_NAME *b)
{ {

2
crypto/x509v3/v3_purp.c
View File

@ -247,6 +247,7 @@ int X509_PURPOSE_get_trust(X509_PURPOSE *xp)
return xp->trust; return xp->trust;
} }
#ifndef NO_SHA
static void x509v3_cache_extensions(X509 *x) static void x509v3_cache_extensions(X509 *x)
{ {
BASIC_CONSTRAINTS *bs; BASIC_CONSTRAINTS *bs;
@ -321,6 +322,7 @@ static void x509v3_cache_extensions(X509 *x)
} }
x->ex_flags |= EXFLAG_SET; x->ex_flags |= EXFLAG_SET;
} }
#endif
/* CA checks common to all purposes /* CA checks common to all purposes
* return codes: * return codes:

2
ssl/ssl.h
View File

@ -151,7 +151,7 @@ extern "C" {
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#if defined(NO_RSA) && !defined(NO_SSL2) #if (defined(NO_RSA) || defined(NO_MD5)) && !defined(NO_SSL2)
#define NO_SSL2 #define NO_SSL2
#endif #endif