Commit 1241126a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files 

More linker bloat reorganisation:

Split private key PEM and normal PEM handling. Private key
handling needs to link in stuff like PKCS#8.

Relocate the ASN1 *_dup() functions, to the relevant ASN1
modules using new macro IMPLEMENT_ASN1_DUP_FUNCTION. Previously
these were all in crypto/x509/x_all.c along with every ASN1
BIO/fp function which linked in *every* ASN1 function if
a single dup was used.

Move the authority key id ASN1 structure to a separate file.
This is used in the X509 routines and its previous location
linked in all the v3 extension code.

Also move ASN1_tag2bit to avoid linking in a_bytes.c which
is now largely obsolete.

So far under Linux stripped binary with single PEM_read_X509
is now 238K compared to 380K before these changes.
parent 19da1300

crypto/asn1/a_bytes.c

+1 −19
Original line number Diff line number Diff line
@@ -60,24 +60,6 @@ 
#include "cryptlib.h"

#include <openssl/asn1.h>



static unsigned long tag2bit[32]={

0,	0,	0,	B_ASN1_BIT_STRING,	/* tags  0 -  3 */

B_ASN1_OCTET_STRING,	0,	0,		B_ASN1_UNKNOWN,/* tags  4- 7 */

B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,/* tags  8-11 */

B_ASN1_UTF8STRING,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,/* tags 12-15 */

0,	0,	B_ASN1_NUMERICSTRING,B_ASN1_PRINTABLESTRING,   /* tags 16-19 */

B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,       /* tags 20-22 */

B_ASN1_UTCTIME, B_ASN1_GENERALIZEDTIME,			       /* tags 23-24 */	

B_ASN1_GRAPHICSTRING,B_ASN1_ISO64STRING,B_ASN1_GENERALSTRING,  /* tags 25-27 */

B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN, /* tags 28-31 */

	};



unsigned long ASN1_tag2bit(int tag)

{

	if((tag < 0) || (tag > 30)) return 0;

	return tag2bit[tag];

}



static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c);

/* type is a 'bitmap' of acceptable string types.

 */
@@ -99,7 +81,7 @@ ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp, 
		i=ASN1_R_TAG_VALUE_TOO_HIGH;;

		goto err;

		}

	if (!(tag2bit[tag] & type))

	if (!(ASN1_tag2bit(tag) & type))

		{

		i=ASN1_R_WRONG_TYPE;

		goto err;

crypto/asn1/asn1t.h

+6 −0
Original line number Diff line number Diff line
@@ -780,6 +780,12 @@ typedef struct ASN1_AUX_st { 
		return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\

	} 



#define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \

	stname * stname##_dup(stname *x) \

        { \

        return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \

        }



#define IMPLEMENT_ASN1_FUNCTIONS_const(name) \

		IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)

crypto/asn1/tasn_dec.c

+19 −0
Original line number Diff line number Diff line
@@ -75,6 +75,25 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val, unsigned char **in, long le 
static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, unsigned char **in, long len,

					const ASN1_ITEM *it, int tag, int aclass, char opt, ASN1_TLC *ctx);



/* Table to convert tags to bit values, used for MSTRING type */

static unsigned long tag2bit[32]={

0,	0,	0,	B_ASN1_BIT_STRING,	/* tags  0 -  3 */

B_ASN1_OCTET_STRING,	0,	0,		B_ASN1_UNKNOWN,/* tags  4- 7 */

B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,/* tags  8-11 */

B_ASN1_UTF8STRING,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,/* tags 12-15 */

0,	0,	B_ASN1_NUMERICSTRING,B_ASN1_PRINTABLESTRING,   /* tags 16-19 */

B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,       /* tags 20-22 */

B_ASN1_UTCTIME, B_ASN1_GENERALIZEDTIME,			       /* tags 23-24 */	

B_ASN1_GRAPHICSTRING,B_ASN1_ISO64STRING,B_ASN1_GENERALSTRING,  /* tags 25-27 */

B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN, /* tags 28-31 */

	};



unsigned long ASN1_tag2bit(int tag)

{

	if((tag < 0) || (tag > 30)) return 0;

	return tag2bit[tag];

}



/* Macro to initialize and invalidate the cache */



#define asn1_tlc_clear(c)	if(c) (c)->valid = 0

crypto/asn1/x_algor.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ ASN1_SEQUENCE(X509_ALGOR) = { 
} ASN1_SEQUENCE_END(X509_ALGOR)



IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR)

IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR)



IMPLEMENT_STACK_OF(X509_ALGOR)

IMPLEMENT_ASN1_SET_OF(X509_ALGOR)

crypto/asn1/x_attrib.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ ASN1_SEQUENCE(X509_ATTRIBUTE) = { 
} ASN1_SEQUENCE_END(X509_ATTRIBUTE)



IMPLEMENT_ASN1_FUNCTIONS(X509_ATTRIBUTE)

IMPLEMENT_ASN1_DUP_FUNCTION(X509_ATTRIBUTE)



X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)

	{