Commit 4b618848 authored by Rich Salz's avatar Rich Salz
Browse files

Cleanup OPENSSL_NO_xxx, part 1 



OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160
OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO
Two typo's on #endif comments fixed:
	OPENSSL_NO_ECB fixed to OPENSSL_NO_OCB
	OPENSSL_NO_HW_SureWare fixed to OPENSSL_NO_HW_SUREWARE

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent b3d72949

CHANGES

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

     [Rich Salz]



  *) Start cleaning up OPENSSL_NO_xxx #define's

	OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160

	OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO

     [Rich Salz]



  *) Experimental support for a new, fast, unbiased prime candidate generator,

     bn_probable_prime_dh_coprime(). Not currently used by any prime generator.

     [Felix Laurie von Massenbach <felix@erbridge.co.uk>]

apps/speed.c

+6 −6
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
#ifndef OPENSSL_NO_SHA

#include <openssl/sha.h>

#endif

#ifndef OPENSSL_NO_RIPEMD

#ifndef OPENSSL_NO_RMD160

#include <openssl/ripemd.h>

#endif

#ifndef OPENSSL_NO_WHIRLPOOL
@@ -392,7 +392,7 @@ int MAIN(int argc, char **argv) 
#ifndef OPENSSL_NO_WHIRLPOOL

	unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH];

#endif

#ifndef OPENSSL_NO_RIPEMD

#ifndef OPENSSL_NO_RMD160

	unsigned char rmd160[RIPEMD160_DIGEST_LENGTH];

#endif

#ifndef OPENSSL_NO_RC4
@@ -849,7 +849,7 @@ int MAIN(int argc, char **argv) 
			if (strcmp(*argv,"whirlpool") == 0) doit[D_WHIRLPOOL]=1;

		else

#endif

#ifndef OPENSSL_NO_RIPEMD

#ifndef OPENSSL_NO_RMD160

			if (strcmp(*argv,"ripemd") == 0) doit[D_RMD160]=1;

		else

			if (strcmp(*argv,"rmd160") == 0) doit[D_RMD160]=1;
@@ -1073,12 +1073,12 @@ int MAIN(int argc, char **argv) 
#ifndef OPENSSL_NO_WHIRLPOOL

			BIO_printf(bio_err,"whirlpool");

#endif

#ifndef OPENSSL_NO_RIPEMD160

#ifndef OPENSSL_NO_RMD160

			BIO_printf(bio_err,"rmd160");

#endif

#if !defined(OPENSSL_NO_MD2) || !defined(OPENSSL_NO_MDC2) || \

    !defined(OPENSSL_NO_MD4) || !defined(OPENSSL_NO_MD5) || \

    !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160) || \

    !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RMD160) || \

    !defined(OPENSSL_NO_WHIRLPOOL)

			BIO_printf(bio_err,"\n");

#endif
@@ -1690,7 +1690,7 @@ int MAIN(int argc, char **argv) 
		}

#endif



#ifndef OPENSSL_NO_RIPEMD

#ifndef OPENSSL_NO_RMD160

	if (doit[D_RMD160])

		{

		for (j=0; j<SIZE_NUM; j++)

crypto/asn1/a_d2i_fp.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);



#ifndef NO_OLD_ASN1

#ifndef OPENSSL_NO_FP_API

#ifndef OPENSSL_NO_STDIO



void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)

        {
@@ -120,7 +120,7 @@ err: 
	return(ret);

	}



#ifndef OPENSSL_NO_FP_API

#ifndef OPENSSL_NO_STDIO

void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)

        {

        BIO *b;

crypto/asn1/a_i2d_fp.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 


#ifndef NO_OLD_ASN1



#ifndef OPENSSL_NO_FP_API

#ifndef OPENSSL_NO_STDIO

int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x)

        {

        BIO *b;
@@ -116,7 +116,7 @@ int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x) 


#endif



#ifndef OPENSSL_NO_FP_API

#ifndef OPENSSL_NO_STDIO

int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x)

        {

        BIO *b;

crypto/asn1/a_strex.c

+2 −2
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags) 
	return do_name_ex(send_bio_chars, out, nm, indent, flags);

}



#ifndef OPENSSL_NO_FP_API

#ifndef OPENSSL_NO_STDIO

int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags)

{

	if(flags == XN_FLAG_COMPAT)
@@ -545,7 +545,7 @@ int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags) 
	return do_print_ex(send_bio_chars, out, flags, str);

}



#ifndef OPENSSL_NO_FP_API

#ifndef OPENSSL_NO_STDIO

int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags)

{

	return do_print_ex(send_fp_chars, fp, flags, str);