Commit d66ace9d authored by Ben Laurie's avatar Ben Laurie
Browse files

Start to reduce some of the header bloat.

parent db753571

apps/Makefile.ssl

+122 −101

File changed.

Preview size limit exceeded, changes collapsed.

crypto/Makefile.ssl

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdi 


SRC= $(LIBSRC)



EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h

EXHEADER= crypto.h tmdiff.h opensslv.h opensslconf.h ebcdic.h symhacks.h \

	types.h

HEADER=	cryptlib.h buildinf.h md32_common.h o_time.h $(EXHEADER)



ALL=    $(GENERAL) $(SRC) $(HEADER)

crypto/asn1/Makefile.ssl

+140 −101

File changed.

Preview size limit exceeded, changes collapsed.

crypto/asn1/asn1.h

+1 −38
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#include <openssl/symhacks.h>



#include <openssl/e_os2.h>

#include <openssl/types.h>



#ifdef OPENSSL_BUILD_SHLIBCRYPTO

# undef OPENSSL_EXTERN
@@ -246,44 +247,6 @@ DECLARE_STACK_OF(ASN1_STRING_TABLE) 
#define ub_title			64

#define ub_email_address		128



#ifdef NO_ASN1_TYPEDEFS

#define ASN1_INTEGER		ASN1_STRING

#define ASN1_ENUMERATED		ASN1_STRING

#define ASN1_BIT_STRING		ASN1_STRING

#define ASN1_OCTET_STRING	ASN1_STRING

#define ASN1_PRINTABLESTRING	ASN1_STRING

#define ASN1_T61STRING		ASN1_STRING

#define ASN1_IA5STRING		ASN1_STRING

#define ASN1_UTCTIME		ASN1_STRING

#define ASN1_GENERALIZEDTIME	ASN1_STRING

#define ASN1_TIME		ASN1_STRING

#define ASN1_GENERALSTRING	ASN1_STRING

#define ASN1_UNIVERSALSTRING	ASN1_STRING

#define ASN1_BMPSTRING		ASN1_STRING

#define ASN1_VISIBLESTRING	ASN1_STRING

#define ASN1_UTF8STRING		ASN1_STRING

#define ASN1_BOOLEAN		int

#define ASN1_NULL		int

#else

typedef struct asn1_string_st ASN1_INTEGER;

typedef struct asn1_string_st ASN1_ENUMERATED;

typedef struct asn1_string_st ASN1_BIT_STRING;

typedef struct asn1_string_st ASN1_OCTET_STRING;

typedef struct asn1_string_st ASN1_PRINTABLESTRING;

typedef struct asn1_string_st ASN1_T61STRING;

typedef struct asn1_string_st ASN1_IA5STRING;

typedef struct asn1_string_st ASN1_GENERALSTRING;

typedef struct asn1_string_st ASN1_UNIVERSALSTRING;

typedef struct asn1_string_st ASN1_BMPSTRING;

typedef struct asn1_string_st ASN1_UTCTIME;

typedef struct asn1_string_st ASN1_TIME;

typedef struct asn1_string_st ASN1_GENERALIZEDTIME;

typedef struct asn1_string_st ASN1_VISIBLESTRING;

typedef struct asn1_string_st ASN1_UTF8STRING;

typedef int ASN1_BOOLEAN;

typedef int ASN1_NULL;

#endif



/* Declarations for template structures: for full definitions

 * see asn1t.h

 */

crypto/bio/Makefile.ssl

+15 −22
Original line number Diff line number Diff line
@@ -110,34 +110,27 @@ b_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 
b_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

b_sock.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

b_sock.o: ../cryptlib.h b_sock.c

bf_buff.o: ../../e_os.h ../../include/openssl/asn1.h

bf_buff.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

bf_buff.o: ../../e_os.h ../../include/openssl/bio.h

bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

bf_buff.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

bf_buff.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

bf_buff.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

bf_buff.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

bf_buff.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

bf_buff.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_buff.c

bf_nbio.o: ../../e_os.h ../../include/openssl/asn1.h

bf_nbio.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

bf_buff.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

bf_buff.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

bf_buff.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

bf_buff.o: ../cryptlib.h bf_buff.c

bf_nbio.o: ../../e_os.h ../../include/openssl/bio.h

bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

bf_nbio.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

bf_nbio.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

bf_nbio.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

bf_nbio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h

bf_nbio.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

bf_nbio.o: ../cryptlib.h bf_nbio.c

bf_null.o: ../../e_os.h ../../include/openssl/asn1.h

bf_null.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

bf_nbio.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

bf_nbio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

bf_nbio.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_nbio.c

bf_null.o: ../../e_os.h ../../include/openssl/bio.h

bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

bf_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

bf_null.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

bf_null.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

bf_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

bf_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

bf_null.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_null.c

bf_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

bf_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

bf_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

bf_null.o: ../cryptlib.h bf_null.c

bio_cb.o: ../../e_os.h ../../include/openssl/bio.h

bio_cb.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h