Remove ASN1_METHOD code replace with new ASN1 alternative.

 Changes between 0.9.8 and 0.9.9  [xx XXX xxxx]

  *) Remove the ancient ASN1_METHOD code. This was only ever used in one

     place for the (very old) "NETSCAPE" format certificates which are now

     handled using new ASN1 code equivalents.

  *) Let the TLSv1_method() etc. functions return a 'const' SSL_METHOD

     pointer and make the SSL_METHOD parameter in SSL_CTX_new,

     SSL_CTX_set_ssl_version and SSL_set_ssl_method 'const'.

X509 *load_cert(BIO *err, const char *file, int format,

	const char *pass, ENGINE *e, const char *cert_descrip)

	{

	ASN1_HEADER *ah=NULL;

	BUF_MEM *buf=NULL;

	X509 *x=NULL;

	BIO *cert;

		x=d2i_X509_bio(cert,NULL);

	else if (format == FORMAT_NETSCAPE)

		{

		const unsigned char *p,*op;

		int size=0,i;

		/* We sort of have to do it this way because it is sort of nice

		 * to read the header first and check it, then

		 * try to read the certificate */

		buf=BUF_MEM_new();

		for (;;)

			{

			if ((buf == NULL) || (!BUF_MEM_grow(buf,size+1024*10)))

		NETSCAPE_X509 *nx;

		nx=ASN1_item_d2i_bio(ASN1_ITEM_rptr(NETSCAPE_X509),cert,NULL);

		if (nx == NULL)

				goto end;

			i=BIO_read(cert,&(buf->data[size]),1024*10);

			size+=i;

			if (i == 0) break;

			if (i < 0)

				{

				perror("reading certificate");

				goto end;

				}

			}

		p=(unsigned char *)buf->data;

		op=p;

		/* First load the header */

		if ((ah=d2i_ASN1_HEADER(NULL,&p,(long)size)) == NULL)

			goto end;

		if ((ah->header == NULL) || (ah->header->data == NULL) ||

			(strncmp(NETSCAPE_CERT_HDR,(char *)ah->header->data,

			ah->header->length) != 0))

		if ((strncmp(NETSCAPE_CERT_HDR,(char *)nx->header->data,

			nx->header->length) != 0))

			{

			NETSCAPE_X509_free(nx);

			BIO_printf(err,"Error reading header on certificate\n");

			goto end;

			}

		/* header is ok, so now read the object */

		p=op;

		ah->meth=X509_asn1_meth();

		if ((ah=d2i_ASN1_HEADER(&ah,&p,(long)size)) == NULL)

			goto end;

		x=(X509 *)ah->data;

		ah->data=NULL;

		x=nx->cert;

		nx->cert = NULL;

		NETSCAPE_X509_free(nx);

		}

	else if (format == FORMAT_PEM)

		x=PEM_read_bio_X509_AUX(cert,NULL,

		BIO_printf(err,"unable to load certificate\n");

		ERR_print_errors(err);

		}

	if (ah != NULL) ASN1_HEADER_free(ah);

	if (cert != NULL) BIO_free(cert);

	if (buf != NULL) BUF_MEM_free(buf);

	return(x);

	}

		}

	else if (outformat == FORMAT_NETSCAPE)

		{

		ASN1_HEADER ah;

		ASN1_OCTET_STRING os;

		NETSCAPE_X509 nx;

		ASN1_OCTET_STRING hdr;

		os.data=(unsigned char *)NETSCAPE_CERT_HDR;

		os.length=strlen(NETSCAPE_CERT_HDR);

		ah.header= &os;

		ah.data=(char *)x;

		ah.meth=X509_asn1_meth();

		hdr.data=(unsigned char *)NETSCAPE_CERT_HDR;

		hdr.length=strlen(NETSCAPE_CERT_HDR);

		nx.header= &hdr;

		nx.cert=x;

		i=ASN1_i2d_bio_of(ASN1_HEADER,i2d_ASN1_HEADER,out,&ah);

		i=ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509),out,&nx);

		}

	else	{

		BIO_printf(bio_err,"bad output format specified for outfile\n");

	a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \

	x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c \

	x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \

	d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\

	x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\

	t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \

	tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \

	f_int.c f_string.c n_pkey.c \

	f_enum.c a_hdr.c x_pkey.c a_bool.c x_exten.c \

	asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_meth.c a_bytes.c a_strnid.c \

	f_enum.c x_pkey.c a_bool.c x_exten.c \

	asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c \

	evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c

LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \

	a_print.o a_type.o a_set.o a_dup.o a_d2i_fp.o a_i2d_fp.o \

	a_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \

	x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_attrib.o x_bignum.o \

	x_long.o x_name.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \

	d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \

	x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \

	t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \

	tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \

	f_int.o f_string.o n_pkey.o \

	f_enum.o a_hdr.o x_pkey.o a_bool.o x_exten.o \

	asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_meth.o a_bytes.o a_strnid.o \

	f_enum.o x_pkey.o a_bool.o x_exten.o \

	asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_bytes.o a_strnid.o \

	evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o

SRC= $(LIBSRC)

DECLARE_STACK_OF(ASN1_TYPE)

DECLARE_ASN1_SET_OF(ASN1_TYPE)

typedef struct asn1_method_st

	{

	i2d_of_void *i2d;

	d2i_of_void *d2i;

	void *(*create)(void);

	void (*destroy)(void *);

	} ASN1_METHOD;

/* This is used when parsing some Netscape objects */

typedef struct asn1_header_st

typedef struct NETSCAPE_X509_st

	{

	ASN1_OCTET_STRING *header;

	void *data;

	ASN1_METHOD *meth;

	} ASN1_HEADER;

	X509 *cert;

	} NETSCAPE_X509;

/* This is used to contain a list of bit names */

typedef struct BIT_STRING_BITNAME_st {

#endif

const char *ASN1_tag2str(int tag);

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

int i2d_ASN1_HEADER(ASN1_HEADER *a,unsigned char **pp);

ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a,const unsigned char **pp, long length);

ASN1_HEADER *ASN1_HEADER_new(void );

void ASN1_HEADER_free(ASN1_HEADER *a);

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

int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);

DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)

/* Not used that much at this point, except for the first two */

ASN1_METHOD *X509_asn1_meth(void);

ASN1_METHOD *RSAPrivateKey_asn1_meth(void);

ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void);

ASN1_METHOD *ASN1_BIT_STRING_asn1_meth(void);

int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);

int ASN1_TYPE_set_octetstring(ASN1_TYPE *a,

	unsigned char *data, int len);