Commit a00ae6c4 authored by Rich Salz's avatar Rich Salz
Browse files

OPENSSL_NO_xxx cleanup: many removals 



The following compile options (#ifdef's) are removed:
    OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY
    OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP
    OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK
    OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY

This diff is big because of updating the indents on preprocessor lines.

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

apps/progs.h

+0 −2
Original line number Diff line number Diff line
@@ -113,9 +113,7 @@ FUNCTION functions[] = { 
#if !defined(OPENSSL_NO_SOCK)

    {FUNC_TYPE_GENERAL, "s_client", s_client_main},

#endif

#ifndef OPENSSL_NO_SPEED

    {FUNC_TYPE_GENERAL, "speed", speed_main},

#endif

#if !defined(OPENSSL_NO_SOCK)

    {FUNC_TYPE_GENERAL, "s_time", s_time_main},

#endif

apps/progs.pl

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ foreach (@ARGV) 
	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";

	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))

		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 

	elsif ( ($_ =~ /^speed$/))

		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }

	elsif ( ($_ =~ /^engine$/))

		{ print "#ifndef OPENSSL_NO_ENGINE\n${str}#endif\n"; }

	elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/))

apps/speed.c

+593 −601
Original line number Diff line number Diff line
@@ -69,10 +69,6 @@ 
 *

 */



/* most of this code has been pilfered from my libdes speed.c program */



#ifndef OPENSSL_NO_SPEED



#undef SECONDS

#define SECONDS                 3

#define PRIME_SECONDS   10
@@ -81,9 +77,6 @@ 
#define ECDSA_SECONDS   10

#define ECDH_SECONDS    10



/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */

/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */



#undef PROG

#define PROG speed_main
@@ -2925,4 +2918,3 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher) 
    OPENSSL_free(inp);

    OPENSSL_free(out);

}
 
#endif

crypto/asn1/asn1.h

+1 −9
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ 


# include <time.h>

# include <openssl/e_os2.h>

# ifndef OPENSSL_NO_BIO

# include <openssl/bio.h>

# endif

# include <openssl/stack.h>

# include <openssl/safestack.h>
@@ -827,10 +825,8 @@ int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n); 
int ASN1_BIT_STRING_check(const ASN1_BIT_STRING *a,

                          const unsigned char *flags, int flags_len);



# ifndef OPENSSL_NO_BIO

int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,

                               BIT_STRING_BITNAME *tbl, int indent);

# endif

int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl);

int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,

                            BIT_STRING_BITNAME *tbl);
@@ -915,7 +911,6 @@ STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a, 
                                      void (*free_func) (OPENSSL_BLOCK),

                                      int ex_tag, int ex_class);



# ifndef OPENSSL_NO_BIO

int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);

int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);

int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
@@ -923,7 +918,6 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size); 
int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a);

int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size);

int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);

# endif

int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a);



int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num);
@@ -1015,7 +1009,6 @@ int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags); 


int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);



# ifndef OPENSSL_NO_BIO

void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x);



#  define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
@@ -1048,7 +1041,6 @@ int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num, 
int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent);

int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent,

                    int dump);

# endif

const char *ASN1_tag2str(int tag);



/* Used to load and write netscape format cert */

crypto/bn/bn_print.c

+0 −2
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ int BN_asc2bn(BIGNUM **bn, const char *a) 
    return 1;

}



#ifndef OPENSSL_NO_BIO

# ifndef OPENSSL_NO_STDIO

int BN_print_fp(FILE *fp, const BIGNUM *a)

{
@@ -362,7 +361,6 @@ int BN_print(BIO *bp, const BIGNUM *a) 
 end:

    return (ret);

}

#endif



char *BN_options(void)

{