Synchronised line endinge with release branch

4 files changed, 2716 insertions, 2716 deletions

diff --git a/openssl/crypto/asn1/a_strex.c b/openssl/crypto/asn1/a_strex.c
index d9172e055..264ebf239 100644
--- a/openssl/crypto/asn1/a_strex.c
+++ b/openssl/crypto/asn1/a_strex.c
@@ -1,574 +1,574 @@
-/* a_strex.c */

-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

- * project 2000.

- */

-/* ====================================================================

- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- *

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer. 

- *

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in

- *    the documentation and/or other materials provided with the

- *    distribution.

- *

- * 3. All advertising materials mentioning features or use of this

- *    software must display the following acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

- *

- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

- *    endorse or promote products derived from this software without

- *    prior written permission. For written permission, please contact

- *    licensing@OpenSSL.org.

- *

- * 5. Products derived from this software may not be called "OpenSSL"

- *    nor may "OpenSSL" appear in their names without prior written

- *    permission of the OpenSSL Project.

- *

- * 6. Redistributions of any form whatsoever must retain the following

- *    acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

- *

- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

- * OF THE POSSIBILITY OF SUCH DAMAGE.

- * ====================================================================

- *

- * This product includes cryptographic software written by Eric Young

- * (eay@cryptsoft.com).  This product includes software written by Tim

- * Hudson (tjh@cryptsoft.com).

- *

- */

-

-#include <stdio.h>

-#include <string.h>

-#include "cryptlib.h"

-#include <openssl/crypto.h>

-#include <openssl/x509.h>

-#include <openssl/asn1.h>

-

-#include "charmap.h"

-

-/* ASN1_STRING_print_ex() and X509_NAME_print_ex().

- * Enhanced string and name printing routines handling

- * multibyte characters, RFC2253 and a host of other

- * options.

- */

-

-

-#define CHARTYPE_BS_ESC		(ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)

-

-#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \

-		  ASN1_STRFLGS_ESC_QUOTE | \

-		  ASN1_STRFLGS_ESC_CTRL | \

-		  ASN1_STRFLGS_ESC_MSB)

-

-

-/* Three IO functions for sending data to memory, a BIO and

- * and a FILE pointer.

- */

-#if 0				/* never used */

-static int send_mem_chars(void *arg, const void *buf, int len)

-{

-	unsigned char **out = arg;

-	if(!out) return 1;

-	memcpy(*out, buf, len);

-	*out += len;

-	return 1;

-}

-#endif

-

-static int send_bio_chars(void *arg, const void *buf, int len)

-{

-	if(!arg) return 1;

-	if(BIO_write(arg, buf, len) != len) return 0;

-	return 1;

-}

-

-static int send_fp_chars(void *arg, const void *buf, int len)

-{

-	if(!arg) return 1;

-	if(fwrite(buf, 1, len, arg) != (unsigned int)len) return 0;

-	return 1;

-}

-

-typedef int char_io(void *arg, const void *buf, int len);

-

-/* This function handles display of

- * strings, one character at a time.

- * It is passed an unsigned long for each

- * character because it could come from 2 or even

- * 4 byte forms.

- */

-

-static int do_esc_char(unsigned long c, unsigned char flags, char *do_quotes, char_io *io_ch, void *arg)

-{

-	unsigned char chflgs, chtmp;

-	char tmphex[HEX_SIZE(long)+3];

-

-	if(c > 0xffffffffL)

-		return -1;

-	if(c > 0xffff) {

-		BIO_snprintf(tmphex, sizeof tmphex, "\\W%08lX", c);

-		if(!io_ch(arg, tmphex, 10)) return -1;

-		return 10;

-	}

-	if(c > 0xff) {

-		BIO_snprintf(tmphex, sizeof tmphex, "\\U%04lX", c);

-		if(!io_ch(arg, tmphex, 6)) return -1;

-		return 6;

-	}

-	chtmp = (unsigned char)c;

-	if(chtmp > 0x7f) chflgs = flags & ASN1_STRFLGS_ESC_MSB;

-	else chflgs = char_type[chtmp] & flags;

-	if(chflgs & CHARTYPE_BS_ESC) {

-		/* If we don't escape with quotes, signal we need quotes */

-		if(chflgs & ASN1_STRFLGS_ESC_QUOTE) {

-			if(do_quotes) *do_quotes = 1;

-			if(!io_ch(arg, &chtmp, 1)) return -1;

-			return 1;

-		}

-		if(!io_ch(arg, "\\", 1)) return -1;

-		if(!io_ch(arg, &chtmp, 1)) return -1;

-		return 2;

-	}

-	if(chflgs & (ASN1_STRFLGS_ESC_CTRL|ASN1_STRFLGS_ESC_MSB)) {

-		BIO_snprintf(tmphex, 11, "\\%02X", chtmp);

-		if(!io_ch(arg, tmphex, 3)) return -1;

-		return 3;

-	}

-	/* If we get this far and do any escaping at all must escape 

-	 * the escape character itself: backslash.

-	 */

-	if (chtmp == '\\' && flags & ESC_FLAGS) {

-		if(!io_ch(arg, "\\\\", 2)) return -1;

-		return 2;

-	}

-	if(!io_ch(arg, &chtmp, 1)) return -1;

-	return 1;

-}

-

-#define BUF_TYPE_WIDTH_MASK	0x7

-#define BUF_TYPE_CONVUTF8	0x8

-

-/* This function sends each character in a buffer to

- * do_esc_char(). It interprets the content formats

- * and converts to or from UTF8 as appropriate.

- */

-

-static int do_buf(unsigned char *buf, int buflen,

-			int type, unsigned char flags, char *quotes, char_io *io_ch, void *arg)

-{

-	int i, outlen, len;

-	unsigned char orflags, *p, *q;

-	unsigned long c;

-	p = buf;

-	q = buf + buflen;

-	outlen = 0;

-	while(p != q) {

-		if(p == buf && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_FIRST_ESC_2253;

-		else orflags = 0;

-		switch(type & BUF_TYPE_WIDTH_MASK) {

-			case 4:

-			c = ((unsigned long)*p++) << 24;

-			c |= ((unsigned long)*p++) << 16;

-			c |= ((unsigned long)*p++) << 8;

-			c |= *p++;

-			break;

-

-			case 2:

-			c = ((unsigned long)*p++) << 8;

-			c |= *p++;

-			break;

-

-			case 1:

-			c = *p++;

-			break;

-			

-			case 0:

-			i = UTF8_getc(p, buflen, &c);

-			if(i < 0) return -1;	/* Invalid UTF8String */

-			p += i;

-			break;

-			default:

-			return -1;	/* invalid width */

-		}

-		if (p == q && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_LAST_ESC_2253;

-		if(type & BUF_TYPE_CONVUTF8) {

-			unsigned char utfbuf[6];

-			int utflen;

-			utflen = UTF8_putc(utfbuf, sizeof utfbuf, c);

-			for(i = 0; i < utflen; i++) {

-				/* We don't need to worry about setting orflags correctly

-				 * because if utflen==1 its value will be correct anyway 

-				 * otherwise each character will be > 0x7f and so the 

-				 * character will never be escaped on first and last.

-				 */

-				len = do_esc_char(utfbuf[i], (unsigned char)(flags | orflags), quotes, io_ch, arg);

-				if(len < 0) return -1;

-				outlen += len;

-			}

-		} else {

-			len = do_esc_char(c, (unsigned char)(flags | orflags), quotes, io_ch, arg);

-			if(len < 0) return -1;

-			outlen += len;

-		}

-	}

-	return outlen;

-}

-

-/* This function hex dumps a buffer of characters */

-

-static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf, int buflen)

-{

-	static const char hexdig[] = "0123456789ABCDEF";

-	unsigned char *p, *q;

-	char hextmp[2];

-	if(arg) {

-		p = buf;

-		q = buf + buflen;

-		while(p != q) {

-			hextmp[0] = hexdig[*p >> 4];

-			hextmp[1] = hexdig[*p & 0xf];

-			if(!io_ch(arg, hextmp, 2)) return -1;

-			p++;

-		}

-	}

-	return buflen << 1;

-}

-

-/* "dump" a string. This is done when the type is unknown,

- * or the flags request it. We can either dump the content

- * octets or the entire DER encoding. This uses the RFC2253

- * #01234 format.

- */

-

-static int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str)

-{

-	/* Placing the ASN1_STRING in a temp ASN1_TYPE allows

-	 * the DER encoding to readily obtained

-	 */

-	ASN1_TYPE t;

-	unsigned char *der_buf, *p;

-	int outlen, der_len;

-

-	if(!io_ch(arg, "#", 1)) return -1;

-	/* If we don't dump DER encoding just dump content octets */

-	if(!(lflags & ASN1_STRFLGS_DUMP_DER)) {

-		outlen = do_hex_dump(io_ch, arg, str->data, str->length);

-		if(outlen < 0) return -1;

-		return outlen + 1;

-	}

-	t.type = str->type;

-	t.value.ptr = (char *)str;

-	der_len = i2d_ASN1_TYPE(&t, NULL);

-	der_buf = OPENSSL_malloc(der_len);

-	if(!der_buf) return -1;

-	p = der_buf;

-	i2d_ASN1_TYPE(&t, &p);

-	outlen = do_hex_dump(io_ch, arg, der_buf, der_len);

-	OPENSSL_free(der_buf);

-	if(outlen < 0) return -1;

-	return outlen + 1;

-}

-

-/* Lookup table to convert tags to character widths,

- * 0 = UTF8 encoded, -1 is used for non string types

- * otherwise it is the number of bytes per character

- */

-

-static const signed char tag2nbyte[] = {

-	-1, -1, -1, -1, -1,	/* 0-4 */

-	-1, -1, -1, -1, -1,	/* 5-9 */

-	-1, -1, 0, -1,		/* 10-13 */

-	-1, -1, -1, -1,		/* 15-17 */

-	-1, 1, 1,		/* 18-20 */

-	-1, 1, 1, 1,		/* 21-24 */

-	-1, 1, -1,		/* 25-27 */

-	4, -1, 2		/* 28-30 */

-};

-

-/* This is the main function, print out an

- * ASN1_STRING taking note of various escape

- * and display options. Returns number of

- * characters written or -1 if an error

- * occurred.

- */

-

-static int do_print_ex(char_io *io_ch, void *arg, unsigned long lflags, ASN1_STRING *str)

-{

-	int outlen, len;

-	int type;

-	char quotes;

-	unsigned char flags;

-	quotes = 0;

-	/* Keep a copy of escape flags */

-	flags = (unsigned char)(lflags & ESC_FLAGS);

-

-	type = str->type;

-

-	outlen = 0;

-

-

-	if(lflags & ASN1_STRFLGS_SHOW_TYPE) {

-		const char *tagname;

-		tagname = ASN1_tag2str(type);

-		outlen += strlen(tagname);

-		if(!io_ch(arg, tagname, outlen) || !io_ch(arg, ":", 1)) return -1; 

-		outlen++;

-	}

-

-	/* Decide what to do with type, either dump content or display it */

-

-	/* Dump everything */

-	if(lflags & ASN1_STRFLGS_DUMP_ALL) type = -1;

-	/* Ignore the string type */

-	else if(lflags & ASN1_STRFLGS_IGNORE_TYPE) type = 1;

-	else {

-		/* Else determine width based on type */

-		if((type > 0) && (type < 31)) type = tag2nbyte[type];

-		else type = -1;

-		if((type == -1) && !(lflags & ASN1_STRFLGS_DUMP_UNKNOWN)) type = 1;

-	}

-

-	if(type == -1) {

-		len = do_dump(lflags, io_ch, arg, str);

-		if(len < 0) return -1;

-		outlen += len;

-		return outlen;

-	}

-

-	if(lflags & ASN1_STRFLGS_UTF8_CONVERT) {

-		/* Note: if string is UTF8 and we want

-		 * to convert to UTF8 then we just interpret

-		 * it as 1 byte per character to avoid converting

-		 * twice.

-		 */

-		if(!type) type = 1;

-		else type |= BUF_TYPE_CONVUTF8;

-	}

-

-	len = do_buf(str->data, str->length, type, flags, &quotes, io_ch, NULL);

-	if(len < 0) return -1;

-	outlen += len;

-	if(quotes) outlen += 2;

-	if(!arg) return outlen;

-	if(quotes && !io_ch(arg, "\"", 1)) return -1;

-	if(do_buf(str->data, str->length, type, flags, NULL, io_ch, arg) < 0)

-		return -1;

-	if(quotes && !io_ch(arg, "\"", 1)) return -1;

-	return outlen;

-}

-

-/* Used for line indenting: print 'indent' spaces */

-

-static int do_indent(char_io *io_ch, void *arg, int indent)

-{

-	int i;

-	for(i = 0; i < indent; i++)

-			if(!io_ch(arg, " ", 1)) return 0;

-	return 1;

-}

-

-#define FN_WIDTH_LN	25

-#define FN_WIDTH_SN	10

-

-static int do_name_ex(char_io *io_ch, void *arg, X509_NAME *n,

-				int indent, unsigned long flags)

-{

-	int i, prev = -1, orflags, cnt;

-	int fn_opt, fn_nid;

-	ASN1_OBJECT *fn;

-	ASN1_STRING *val;

-	X509_NAME_ENTRY *ent;

-	char objtmp[80];

-	const char *objbuf;

-	int outlen, len;

-	char *sep_dn, *sep_mv, *sep_eq;

-	int sep_dn_len, sep_mv_len, sep_eq_len;

-	if(indent < 0) indent = 0;

-	outlen = indent;

-	if(!do_indent(io_ch, arg, indent)) return -1;

-	switch (flags & XN_FLAG_SEP_MASK)

-	{

-		case XN_FLAG_SEP_MULTILINE:

-		sep_dn = "\n";

-		sep_dn_len = 1;

-		sep_mv = " + ";

-		sep_mv_len = 3;

-		break;

-

-		case XN_FLAG_SEP_COMMA_PLUS:

-		sep_dn = ",";

-		sep_dn_len = 1;

-		sep_mv = "+";

-		sep_mv_len = 1;

-		indent = 0;

-		break;

-

-		case XN_FLAG_SEP_CPLUS_SPC:

-		sep_dn = ", ";

-		sep_dn_len = 2;

-		sep_mv = " + ";

-		sep_mv_len = 3;

-		indent = 0;

-		break;

-

-		case XN_FLAG_SEP_SPLUS_SPC:

-		sep_dn = "; ";

-		sep_dn_len = 2;

-		sep_mv = " + ";

-		sep_mv_len = 3;

-		indent = 0;

-		break;

-

-		default:

-		return -1;

-	}

-

-	if(flags & XN_FLAG_SPC_EQ) {

-		sep_eq = " = ";

-		sep_eq_len = 3;

-	} else {

-		sep_eq = "=";

-		sep_eq_len = 1;

-	}

-

-	fn_opt = flags & XN_FLAG_FN_MASK;

-

-	cnt = X509_NAME_entry_count(n);	

-	for(i = 0; i < cnt; i++) {

-		if(flags & XN_FLAG_DN_REV)

-				ent = X509_NAME_get_entry(n, cnt - i - 1);

-		else ent = X509_NAME_get_entry(n, i);

-		if(prev != -1) {

-			if(prev == ent->set) {

-				if(!io_ch(arg, sep_mv, sep_mv_len)) return -1;

-				outlen += sep_mv_len;

-			} else {

-				if(!io_ch(arg, sep_dn, sep_dn_len)) return -1;

-				outlen += sep_dn_len;

-				if(!do_indent(io_ch, arg, indent)) return -1;

-				outlen += indent;

-			}

-		}

-		prev = ent->set;

-		fn = X509_NAME_ENTRY_get_object(ent);

-		val = X509_NAME_ENTRY_get_data(ent);

-		fn_nid = OBJ_obj2nid(fn);

-		if(fn_opt != XN_FLAG_FN_NONE) {

-			int objlen, fld_len;

-			if((fn_opt == XN_FLAG_FN_OID) || (fn_nid==NID_undef) ) {

-				OBJ_obj2txt(objtmp, sizeof objtmp, fn, 1);

-				fld_len = 0; /* XXX: what should this be? */

-				objbuf = objtmp;

-			} else {

-				if(fn_opt == XN_FLAG_FN_SN) {

-					fld_len = FN_WIDTH_SN;

-					objbuf = OBJ_nid2sn(fn_nid);

-				} else if(fn_opt == XN_FLAG_FN_LN) {

-					fld_len = FN_WIDTH_LN;

-					objbuf = OBJ_nid2ln(fn_nid);

-				} else {

-					fld_len = 0; /* XXX: what should this be? */

-					objbuf = "";

-				}

-			}

-			objlen = strlen(objbuf);

-			if(!io_ch(arg, objbuf, objlen)) return -1;

-			if ((objlen < fld_len) && (flags & XN_FLAG_FN_ALIGN)) {

-				if (!do_indent(io_ch, arg, fld_len - objlen)) return -1;

-				outlen += fld_len - objlen;

-			}

-			if(!io_ch(arg, sep_eq, sep_eq_len)) return -1;

-			outlen += objlen + sep_eq_len;

-		}

-		/* If the field name is unknown then fix up the DER dump

-		 * flag. We might want to limit this further so it will

- 		 * DER dump on anything other than a few 'standard' fields.

-		 */

-		if((fn_nid == NID_undef) && (flags & XN_FLAG_DUMP_UNKNOWN_FIELDS)) 

-					orflags = ASN1_STRFLGS_DUMP_ALL;

-		else orflags = 0;

-     

-		len = do_print_ex(io_ch, arg, flags | orflags, val);

-		if(len < 0) return -1;

-		outlen += len;

-	}

-	return outlen;

-}

-

-/* Wrappers round the main functions */

-

-int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags)

-{

-	if(flags == XN_FLAG_COMPAT)

-		return X509_NAME_print(out, nm, indent);

-	return do_name_ex(send_bio_chars, out, nm, indent, flags);

-}

-

-#ifndef OPENSSL_NO_FP_API

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

-{

-	if(flags == XN_FLAG_COMPAT)

-		{

-		BIO *btmp;

-		int ret;

-		btmp = BIO_new_fp(fp, BIO_NOCLOSE);

-		if(!btmp) return -1;

-		ret = X509_NAME_print(btmp, nm, indent);

-		BIO_free(btmp);

-		return ret;

-		}

-	return do_name_ex(send_fp_chars, fp, nm, indent, flags);

-}

-#endif

-

-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

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

-{

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

-}

-#endif

-

-/* Utility function: convert any string type to UTF8, returns number of bytes

- * in output string or a negative error code

- */

-

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

-{

-	ASN1_STRING stmp, *str = &stmp;

-	int mbflag, type, ret;

-	if(!in) return -1;

-	type = in->type;

-	if((type < 0) || (type > 30)) return -1;

-	mbflag = tag2nbyte[type];

-	if(mbflag == -1) return -1;

-	mbflag |= MBSTRING_FLAG;

-	stmp.data = NULL;

-	ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag, B_ASN1_UTF8STRING);

-	if(ret < 0) return ret;

-	*out = stmp.data;

-	return stmp.length;

-}

+/* a_strex.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project 2000.
+ */
+/* ====================================================================
+ * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "cryptlib.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/asn1.h>
+
+#include "charmap.h"
+
+/* ASN1_STRING_print_ex() and X509_NAME_print_ex().
+ * Enhanced string and name printing routines handling
+ * multibyte characters, RFC2253 and a host of other
+ * options.
+ */
+
+
+#define CHARTYPE_BS_ESC		(ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)
+
+#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
+		  ASN1_STRFLGS_ESC_QUOTE | \
+		  ASN1_STRFLGS_ESC_CTRL | \
+		  ASN1_STRFLGS_ESC_MSB)
+
+
+/* Three IO functions for sending data to memory, a BIO and
+ * and a FILE pointer.
+ */
+#if 0				/* never used */
+static int send_mem_chars(void *arg, const void *buf, int len)
+{
+	unsigned char **out = arg;
+	if(!out) return 1;
+	memcpy(*out, buf, len);
+	*out += len;
+	return 1;
+}
+#endif
+
+static int send_bio_chars(void *arg, const void *buf, int len)
+{
+	if(!arg) return 1;
+	if(BIO_write(arg, buf, len) != len) return 0;
+	return 1;
+}
+
+static int send_fp_chars(void *arg, const void *buf, int len)
+{
+	if(!arg) return 1;
+	if(fwrite(buf, 1, len, arg) != (unsigned int)len) return 0;
+	return 1;
+}
+
+typedef int char_io(void *arg, const void *buf, int len);
+
+/* This function handles display of
+ * strings, one character at a time.
+ * It is passed an unsigned long for each
+ * character because it could come from 2 or even
+ * 4 byte forms.
+ */
+
+static int do_esc_char(unsigned long c, unsigned char flags, char *do_quotes, char_io *io_ch, void *arg)
+{
+	unsigned char chflgs, chtmp;
+	char tmphex[HEX_SIZE(long)+3];
+
+	if(c > 0xffffffffL)
+		return -1;
+	if(c > 0xffff) {
+		BIO_snprintf(tmphex, sizeof tmphex, "\\W%08lX", c);
+		if(!io_ch(arg, tmphex, 10)) return -1;
+		return 10;
+	}
+	if(c > 0xff) {
+		BIO_snprintf(tmphex, sizeof tmphex, "\\U%04lX", c);
+		if(!io_ch(arg, tmphex, 6)) return -1;
+		return 6;
+	}
+	chtmp = (unsigned char)c;
+	if(chtmp > 0x7f) chflgs = flags & ASN1_STRFLGS_ESC_MSB;
+	else chflgs = char_type[chtmp] & flags;
+	if(chflgs & CHARTYPE_BS_ESC) {
+		/* If we don't escape with quotes, signal we need quotes */
+		if(chflgs & ASN1_STRFLGS_ESC_QUOTE) {
+			if(do_quotes) *do_quotes = 1;
+			if(!io_ch(arg, &chtmp, 1)) return -1;
+			return 1;
+		}
+		if(!io_ch(arg, "\\", 1)) return -1;
+		if(!io_ch(arg, &chtmp, 1)) return -1;
+		return 2;
+	}
+	if(chflgs & (ASN1_STRFLGS_ESC_CTRL|ASN1_STRFLGS_ESC_MSB)) {
+		BIO_snprintf(tmphex, 11, "\\%02X", chtmp);
+		if(!io_ch(arg, tmphex, 3)) return -1;
+		return 3;
+	}
+	/* If we get this far and do any escaping at all must escape 
+	 * the escape character itself: backslash.
+	 */
+	if (chtmp == '\\' && flags & ESC_FLAGS) {
+		if(!io_ch(arg, "\\\\", 2)) return -1;
+		return 2;
+	}
+	if(!io_ch(arg, &chtmp, 1)) return -1;
+	return 1;
+}
+
+#define BUF_TYPE_WIDTH_MASK	0x7
+#define BUF_TYPE_CONVUTF8	0x8
+
+/* This function sends each character in a buffer to
+ * do_esc_char(). It interprets the content formats
+ * and converts to or from UTF8 as appropriate.
+ */
+
+static int do_buf(unsigned char *buf, int buflen,
+			int type, unsigned char flags, char *quotes, char_io *io_ch, void *arg)
+{
+	int i, outlen, len;
+	unsigned char orflags, *p, *q;
+	unsigned long c;
+	p = buf;
+	q = buf + buflen;
+	outlen = 0;
+	while(p != q) {
+		if(p == buf && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_FIRST_ESC_2253;
+		else orflags = 0;
+		switch(type & BUF_TYPE_WIDTH_MASK) {
+			case 4:
+			c = ((unsigned long)*p++) << 24;
+			c |= ((unsigned long)*p++) << 16;
+			c |= ((unsigned long)*p++) << 8;
+			c |= *p++;
+			break;
+
+			case 2:
+			c = ((unsigned long)*p++) << 8;
+			c |= *p++;
+			break;
+
+			case 1:
+			c = *p++;
+			break;
+			
+			case 0:
+			i = UTF8_getc(p, buflen, &c);
+			if(i < 0) return -1;	/* Invalid UTF8String */
+			p += i;
+			break;
+			default:
+			return -1;	/* invalid width */
+		}
+		if (p == q && flags & ASN1_STRFLGS_ESC_2253) orflags = CHARTYPE_LAST_ESC_2253;
+		if(type & BUF_TYPE_CONVUTF8) {
+			unsigned char utfbuf[6];
+			int utflen;
+			utflen = UTF8_putc(utfbuf, sizeof utfbuf, c);
+			for(i = 0; i < utflen; i++) {
+				/* We don't need to worry about setting orflags correctly
+				 * because if utflen==1 its value will be correct anyway 
+				 * otherwise each character will be > 0x7f and so the 
+				 * character will never be escaped on first and last.
+				 */
+				len = do_esc_char(utfbuf[i], (unsigned char)(flags | orflags), quotes, io_ch, arg);
+				if(len < 0) return -1;
+				outlen += len;
+			}
+		} else {
+			len = do_esc_char(c, (unsigned char)(flags | orflags), quotes, io_ch, arg);
+			if(len < 0) return -1;
+			outlen += len;
+		}
+	}
+	return outlen;
+}
+
+/* This function hex dumps a buffer of characters */
+
+static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf, int buflen)
+{
+	static const char hexdig[] = "0123456789ABCDEF";
+	unsigned char *p, *q;
+	char hextmp[2];
+	if(arg) {
+		p = buf;
+		q = buf + buflen;
+		while(p != q) {
+			hextmp[0] = hexdig[*p >> 4];
+			hextmp[1] = hexdig[*p & 0xf];
+			if(!io_ch(arg, hextmp, 2)) return -1;
+			p++;
+		}
+	}
+	return buflen << 1;
+}
+
+/* "dump" a string. This is done when the type is unknown,
+ * or the flags request it. We can either dump the content
+ * octets or the entire DER encoding. This uses the RFC2253
+ * #01234 format.
+ */
+
+static int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str)
+{
+	/* Placing the ASN1_STRING in a temp ASN1_TYPE allows
+	 * the DER encoding to readily obtained
+	 */
+	ASN1_TYPE t;
+	unsigned char *der_buf, *p;
+	int outlen, der_len;
+
+	if(!io_ch(arg, "#", 1)) return -1;
+	/* If we don't dump DER encoding just dump content octets */
+	if(!(lflags & ASN1_STRFLGS_DUMP_DER)) {
+		outlen = do_hex_dump(io_ch, arg, str->data, str->length);
+		if(outlen < 0) return -1;
+		return outlen + 1;
+	}
+	t.type = str->type;
+	t.value.ptr = (char *)str;
+	der_len = i2d_ASN1_TYPE(&t, NULL);
+	der_buf = OPENSSL_malloc(der_len);
+	if(!der_buf) return -1;
+	p = der_buf;
+	i2d_ASN1_TYPE(&t, &p);
+	outlen = do_hex_dump(io_ch, arg, der_buf, der_len);
+	OPENSSL_free(der_buf);
+	if(outlen < 0) return -1;
+	return outlen + 1;
+}
+
+/* Lookup table to convert tags to character widths,
+ * 0 = UTF8 encoded, -1 is used for non string types
+ * otherwise it is the number of bytes per character
+ */
+
+static const signed char tag2nbyte[] = {
+	-1, -1, -1, -1, -1,	/* 0-4 */
+	-1, -1, -1, -1, -1,	/* 5-9 */
+	-1, -1, 0, -1,		/* 10-13 */
+	-1, -1, -1, -1,		/* 15-17 */
+	-1, 1, 1,		/* 18-20 */
+	-1, 1, 1, 1,		/* 21-24 */
+	-1, 1, -1,		/* 25-27 */
+	4, -1, 2		/* 28-30 */
+};
+
+/* This is the main function, print out an
+ * ASN1_STRING taking note of various escape
+ * and display options. Returns number of
+ * characters written or -1 if an error
+ * occurred.
+ */
+
+static int do_print_ex(char_io *io_ch, void *arg, unsigned long lflags, ASN1_STRING *str)
+{
+	int outlen, len;
+	int type;
+	char quotes;
+	unsigned char flags;
+	quotes = 0;
+	/* Keep a copy of escape flags */
+	flags = (unsigned char)(lflags & ESC_FLAGS);
+
+	type = str->type;
+
+	outlen = 0;
+
+
+	if(lflags & ASN1_STRFLGS_SHOW_TYPE) {
+		const char *tagname;
+		tagname = ASN1_tag2str(type);
+		outlen += strlen(tagname);
+		if(!io_ch(arg, tagname, outlen) || !io_ch(arg, ":", 1)) return -1; 
+		outlen++;
+	}
+
+	/* Decide what to do with type, either dump content or display it */
+
+	/* Dump everything */
+	if(lflags & ASN1_STRFLGS_DUMP_ALL) type = -1;
+	/* Ignore the string type */
+	else if(lflags & ASN1_STRFLGS_IGNORE_TYPE) type = 1;
+	else {
+		/* Else determine width based on type */
+		if((type > 0) && (type < 31)) type = tag2nbyte[type];
+		else type = -1;
+		if((type == -1) && !(lflags & ASN1_STRFLGS_DUMP_UNKNOWN)) type = 1;
+	}
+
+	if(type == -1) {
+		len = do_dump(lflags, io_ch, arg, str);
+		if(len < 0) return -1;
+		outlen += len;
+		return outlen;
+	}
+
+	if(lflags & ASN1_STRFLGS_UTF8_CONVERT) {
+		/* Note: if string is UTF8 and we want
+		 * to convert to UTF8 then we just interpret
+		 * it as 1 byte per character to avoid converting
+		 * twice.
+		 */
+		if(!type) type = 1;
+		else type |= BUF_TYPE_CONVUTF8;
+	}
+
+	len = do_buf(str->data, str->length, type, flags, &quotes, io_ch, NULL);
+	if(len < 0) return -1;
+	outlen += len;
+	if(quotes) outlen += 2;
+	if(!arg) return outlen;
+	if(quotes && !io_ch(arg, "\"", 1)) return -1;
+	if(do_buf(str->data, str->length, type, flags, NULL, io_ch, arg) < 0)
+		return -1;
+	if(quotes && !io_ch(arg, "\"", 1)) return -1;
+	return outlen;
+}
+
+/* Used for line indenting: print 'indent' spaces */
+
+static int do_indent(char_io *io_ch, void *arg, int indent)
+{
+	int i;
+	for(i = 0; i < indent; i++)
+			if(!io_ch(arg, " ", 1)) return 0;
+	return 1;
+}
+
+#define FN_WIDTH_LN	25
+#define FN_WIDTH_SN	10
+
+static int do_name_ex(char_io *io_ch, void *arg, X509_NAME *n,
+				int indent, unsigned long flags)
+{
+	int i, prev = -1, orflags, cnt;
+	int fn_opt, fn_nid;
+	ASN1_OBJECT *fn;
+	ASN1_STRING *val;
+	X509_NAME_ENTRY *ent;
+	char objtmp[80];
+	const char *objbuf;
+	int outlen, len;
+	char *sep_dn, *sep_mv, *sep_eq;
+	int sep_dn_len, sep_mv_len, sep_eq_len;
+	if(indent < 0) indent = 0;
+	outlen = indent;
+	if(!do_indent(io_ch, arg, indent)) return -1;
+	switch (flags & XN_FLAG_SEP_MASK)
+	{
+		case XN_FLAG_SEP_MULTILINE:
+		sep_dn = "\n";
+		sep_dn_len = 1;
+		sep_mv = " + ";
+		sep_mv_len = 3;
+		break;
+
+		case XN_FLAG_SEP_COMMA_PLUS:
+		sep_dn = ",";
+		sep_dn_len = 1;
+		sep_mv = "+";
+		sep_mv_len = 1;
+		indent = 0;
+		break;
+
+		case XN_FLAG_SEP_CPLUS_SPC:
+		sep_dn = ", ";
+		sep_dn_len = 2;
+		sep_mv = " + ";
+		sep_mv_len = 3;
+		indent = 0;
+		break;
+
+		case XN_FLAG_SEP_SPLUS_SPC:
+		sep_dn = "; ";
+		sep_dn_len = 2;
+		sep_mv = " + ";
+		sep_mv_len = 3;
+		indent = 0;
+		break;
+
+		default:
+		return -1;
+	}
+
+	if(flags & XN_FLAG_SPC_EQ) {
+		sep_eq = " = ";
+		sep_eq_len = 3;
+	} else {
+		sep_eq = "=";
+		sep_eq_len = 1;
+	}
+
+	fn_opt = flags & XN_FLAG_FN_MASK;
+
+	cnt = X509_NAME_entry_count(n);	
+	for(i = 0; i < cnt; i++) {
+		if(flags & XN_FLAG_DN_REV)
+				ent = X509_NAME_get_entry(n, cnt - i - 1);
+		else ent = X509_NAME_get_entry(n, i);
+		if(prev != -1) {
+			if(prev == ent->set) {
+				if(!io_ch(arg, sep_mv, sep_mv_len)) return -1;
+				outlen += sep_mv_len;
+			} else {
+				if(!io_ch(arg, sep_dn, sep_dn_len)) return -1;
+				outlen += sep_dn_len;
+				if(!do_indent(io_ch, arg, indent)) return -1;
+				outlen += indent;
+			}
+		}
+		prev = ent->set;
+		fn = X509_NAME_ENTRY_get_object(ent);
+		val = X509_NAME_ENTRY_get_data(ent);
+		fn_nid = OBJ_obj2nid(fn);
+		if(fn_opt != XN_FLAG_FN_NONE) {
+			int objlen, fld_len;
+			if((fn_opt == XN_FLAG_FN_OID) || (fn_nid==NID_undef) ) {
+				OBJ_obj2txt(objtmp, sizeof objtmp, fn, 1);
+				fld_len = 0; /* XXX: what should this be? */
+				objbuf = objtmp;
+			} else {
+				if(fn_opt == XN_FLAG_FN_SN) {
+					fld_len = FN_WIDTH_SN;
+					objbuf = OBJ_nid2sn(fn_nid);
+				} else if(fn_opt == XN_FLAG_FN_LN) {
+					fld_len = FN_WIDTH_LN;
+					objbuf = OBJ_nid2ln(fn_nid);
+				} else {
+					fld_len = 0; /* XXX: what should this be? */
+					objbuf = "";
+				}
+			}
+			objlen = strlen(objbuf);
+			if(!io_ch(arg, objbuf, objlen)) return -1;
+			if ((objlen < fld_len) && (flags & XN_FLAG_FN_ALIGN)) {
+				if (!do_indent(io_ch, arg, fld_len - objlen)) return -1;
+				outlen += fld_len - objlen;
+			}
+			if(!io_ch(arg, sep_eq, sep_eq_len)) return -1;
+			outlen += objlen + sep_eq_len;
+		}
+		/* If the field name is unknown then fix up the DER dump
+		 * flag. We might want to limit this further so it will
+ 		 * DER dump on anything other than a few 'standard' fields.
+		 */
+		if((fn_nid == NID_undef) && (flags & XN_FLAG_DUMP_UNKNOWN_FIELDS)) 
+					orflags = ASN1_STRFLGS_DUMP_ALL;
+		else orflags = 0;
+     
+		len = do_print_ex(io_ch, arg, flags | orflags, val);
+		if(len < 0) return -1;
+		outlen += len;
+	}
+	return outlen;
+}
+
+/* Wrappers round the main functions */
+
+int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags)
+{
+	if(flags == XN_FLAG_COMPAT)
+		return X509_NAME_print(out, nm, indent);
+	return do_name_ex(send_bio_chars, out, nm, indent, flags);
+}
+
+#ifndef OPENSSL_NO_FP_API
+int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags)
+{
+	if(flags == XN_FLAG_COMPAT)
+		{
+		BIO *btmp;
+		int ret;
+		btmp = BIO_new_fp(fp, BIO_NOCLOSE);
+		if(!btmp) return -1;
+		ret = X509_NAME_print(btmp, nm, indent);
+		BIO_free(btmp);
+		return ret;
+		}
+	return do_name_ex(send_fp_chars, fp, nm, indent, flags);
+}
+#endif
+
+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
+int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags)
+{
+	return do_print_ex(send_fp_chars, fp, flags, str);
+}
+#endif
+
+/* Utility function: convert any string type to UTF8, returns number of bytes
+ * in output string or a negative error code
+ */
+
+int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in)
+{
+	ASN1_STRING stmp, *str = &stmp;
+	int mbflag, type, ret;
+	if(!in) return -1;
+	type = in->type;
+	if((type < 0) || (type > 30)) return -1;
+	mbflag = tag2nbyte[type];
+	if(mbflag == -1) return -1;
+	mbflag |= MBSTRING_FLAG;
+	stmp.data = NULL;
+	ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag, B_ASN1_UTF8STRING);
+	if(ret < 0) return ret;
+	*out = stmp.data;
+	return stmp.length;
+}
diff --git a/openssl/crypto/asn1/a_strnid.c b/openssl/crypto/asn1/a_strnid.c
index 0a2f13c29..2fc48c155 100644
--- a/openssl/crypto/asn1/a_strnid.c
+++ b/openssl/crypto/asn1/a_strnid.c
@@ -1,290 +1,290 @@
-/* a_strnid.c */

-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

- * project 1999.

- */

-/* ====================================================================

- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- *

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer. 

- *

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in

- *    the documentation and/or other materials provided with the

- *    distribution.

- *

- * 3. All advertising materials mentioning features or use of this

- *    software must display the following acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

- *

- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

- *    endorse or promote products derived from this software without

- *    prior written permission. For written permission, please contact

- *    licensing@OpenSSL.org.

- *

- * 5. Products derived from this software may not be called "OpenSSL"

- *    nor may "OpenSSL" appear in their names without prior written

- *    permission of the OpenSSL Project.

- *

- * 6. Redistributions of any form whatsoever must retain the following

- *    acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

- *

- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

- * OF THE POSSIBILITY OF SUCH DAMAGE.

- * ====================================================================

- *

- * This product includes cryptographic software written by Eric Young

- * (eay@cryptsoft.com).  This product includes software written by Tim

- * Hudson (tjh@cryptsoft.com).

- *

- */

-

-#include <stdio.h>

-#include <ctype.h>

-#include "cryptlib.h"

-#include <openssl/asn1.h>

-#include <openssl/objects.h>

-

-

-static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;

-static void st_free(ASN1_STRING_TABLE *tbl);

-static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,

-			const ASN1_STRING_TABLE * const *b);

-

-

-/* This is the global mask for the mbstring functions: this is use to

- * mask out certain types (such as BMPString and UTF8String) because

- * certain software (e.g. Netscape) has problems with them.

- */

-

-static unsigned long global_mask = 0xFFFFFFFFL;

-

-void ASN1_STRING_set_default_mask(unsigned long mask)

-{

-	global_mask = mask;

-}

-

-unsigned long ASN1_STRING_get_default_mask(void)

-{

-	return global_mask;

-}

-

-/* This function sets the default to various "flavours" of configuration.

- * based on an ASCII string. Currently this is:

- * MASK:XXXX : a numerical mask value.

- * nobmp : Don't use BMPStrings (just Printable, T61).

- * pkix : PKIX recommendation in RFC2459.

- * utf8only : only use UTF8Strings (RFC2459 recommendation for 2004).

- * default:   the default value, Printable, T61, BMP.

- */

-

-int ASN1_STRING_set_default_mask_asc(const char *p)

-{

-	unsigned long mask;

-	char *end;

-	if(!strncmp(p, "MASK:", 5)) {

-		if(!p[5]) return 0;

-		mask = strtoul(p + 5, &end, 0);

-		if(*end) return 0;

-	} else if(!strcmp(p, "nombstr"))

-			 mask = ~((unsigned long)(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING));

-	else if(!strcmp(p, "pkix"))

-			mask = ~((unsigned long)B_ASN1_T61STRING);

-	else if(!strcmp(p, "utf8only")) mask = B_ASN1_UTF8STRING;

-	else if(!strcmp(p, "default"))

-	    mask = 0xFFFFFFFFL;

-	else return 0;

-	ASN1_STRING_set_default_mask(mask);

-	return 1;

-}

-

-/* The following function generates an ASN1_STRING based on limits in a table.

- * Frequently the types and length of an ASN1_STRING are restricted by a 

- * corresponding OID. For example certificates and certificate requests.

- */

-

-ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,

-					int inlen, int inform, int nid)

-{

-	ASN1_STRING_TABLE *tbl;

-	ASN1_STRING *str = NULL;

-	unsigned long mask;

-	int ret;

-	if(!out) out = &str;

-	tbl = ASN1_STRING_TABLE_get(nid);

-	if(tbl) {

-		mask = tbl->mask;

-		if(!(tbl->flags & STABLE_NO_MASK)) mask &= global_mask;

-		ret = ASN1_mbstring_ncopy(out, in, inlen, inform, mask,

-					tbl->minsize, tbl->maxsize);

-	} else ret = ASN1_mbstring_copy(out, in, inlen, inform, DIRSTRING_TYPE & global_mask);

-	if(ret <= 0) return NULL;

-	return *out;

-}

-

-/* Now the tables and helper functions for the string table:

- */

-

-/* size limits: this stuff is taken straight from RFC3280 */

-

-#define ub_name				32768

-#define ub_common_name			64

-#define ub_locality_name		128

-#define ub_state_name			128

-#define ub_organization_name		64

-#define ub_organization_unit_name	64

-#define ub_title			64

-#define ub_email_address		128

-#define ub_serial_number		64

-

-

-/* This table must be kept in NID order */

-

-static const ASN1_STRING_TABLE tbl_standard[] = {

-{NID_commonName,		1, ub_common_name, DIRSTRING_TYPE, 0},

-{NID_countryName,		2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},

-{NID_localityName,		1, ub_locality_name, DIRSTRING_TYPE, 0},

-{NID_stateOrProvinceName,	1, ub_state_name, DIRSTRING_TYPE, 0},

-{NID_organizationName,		1, ub_organization_name, DIRSTRING_TYPE, 0},

-{NID_organizationalUnitName,	1, ub_organization_unit_name, DIRSTRING_TYPE, 0},

-{NID_pkcs9_emailAddress,	1, ub_email_address, B_ASN1_IA5STRING, STABLE_NO_MASK},

-{NID_pkcs9_unstructuredName,	1, -1, PKCS9STRING_TYPE, 0},

-{NID_pkcs9_challengePassword,	1, -1, PKCS9STRING_TYPE, 0},

-{NID_pkcs9_unstructuredAddress,	1, -1, DIRSTRING_TYPE, 0},

-{NID_givenName,			1, ub_name, DIRSTRING_TYPE, 0},

-{NID_surname,			1, ub_name, DIRSTRING_TYPE, 0},

-{NID_initials,			1, ub_name, DIRSTRING_TYPE, 0},

-{NID_serialNumber,		1, ub_serial_number, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},

-{NID_friendlyName,		-1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},

-{NID_name,			1, ub_name, DIRSTRING_TYPE, 0},

-{NID_dnQualifier,		-1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},

-{NID_domainComponent,		1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},

-{NID_ms_csp_name,		-1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}

-};

-

-static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,

-			const ASN1_STRING_TABLE * const *b)

-{

-	return (*a)->nid - (*b)->nid;

-}

-

-DECLARE_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);

-

-static int table_cmp(const ASN1_STRING_TABLE *a, const ASN1_STRING_TABLE *b)

-{

-	return a->nid - b->nid;

-}

-

-IMPLEMENT_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);

-

-ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)

-{

-	int idx;

-	ASN1_STRING_TABLE *ttmp;

-	ASN1_STRING_TABLE fnd;

-	fnd.nid = nid;

-	ttmp = OBJ_bsearch_table(&fnd, tbl_standard, 

-			   sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE));

-	if(ttmp) return ttmp;

-	if(!stable) return NULL;

-	idx = sk_ASN1_STRING_TABLE_find(stable, &fnd);

-	if(idx < 0) return NULL;

-	return sk_ASN1_STRING_TABLE_value(stable, idx);

-}

-	

-int ASN1_STRING_TABLE_add(int nid,

-		 long minsize, long maxsize, unsigned long mask,

-				unsigned long flags)

-{

-	ASN1_STRING_TABLE *tmp;

-	char new_nid = 0;

-	flags &= ~STABLE_FLAGS_MALLOC;

-	if(!stable) stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp);

-	if(!stable) {

-		ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, ERR_R_MALLOC_FAILURE);

-		return 0;

-	}

-	if(!(tmp = ASN1_STRING_TABLE_get(nid))) {

-		tmp = OPENSSL_malloc(sizeof(ASN1_STRING_TABLE));

-		if(!tmp) {

-			ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD,

-							ERR_R_MALLOC_FAILURE);

-			return 0;

-		}

-		tmp->flags = flags | STABLE_FLAGS_MALLOC;

-		tmp->nid = nid;

-		new_nid = 1;

-	} else tmp->flags = (tmp->flags & STABLE_FLAGS_MALLOC) | flags;

-	if(minsize != -1) tmp->minsize = minsize;

-	if(maxsize != -1) tmp->maxsize = maxsize;

-	tmp->mask = mask;

-	if(new_nid) sk_ASN1_STRING_TABLE_push(stable, tmp);

-	return 1;

-}

-

-void ASN1_STRING_TABLE_cleanup(void)

-{

-	STACK_OF(ASN1_STRING_TABLE) *tmp;

-	tmp = stable;

-	if(!tmp) return;

-	stable = NULL;

-	sk_ASN1_STRING_TABLE_pop_free(tmp, st_free);

-}

-

-static void st_free(ASN1_STRING_TABLE *tbl)

-{

-	if(tbl->flags & STABLE_FLAGS_MALLOC) OPENSSL_free(tbl);

-}

-

-

-IMPLEMENT_STACK_OF(ASN1_STRING_TABLE)

-

-#ifdef STRING_TABLE_TEST

-

-main()

-{

-	ASN1_STRING_TABLE *tmp;

-	int i, last_nid = -1;

-

-	for (tmp = tbl_standard, i = 0;

-		i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++)

-		{

-			if (tmp->nid < last_nid)

-				{

-				last_nid = 0;

-				break;

-				}

-			last_nid = tmp->nid;

-		}

-

-	if (last_nid != 0)

-		{

-		printf("Table order OK\n");

-		exit(0);

-		}

-

-	for (tmp = tbl_standard, i = 0;

-		i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++)

-			printf("Index %d, NID %d, Name=%s\n", i, tmp->nid,

-							OBJ_nid2ln(tmp->nid));

-

-}

-

-#endif

+/* a_strnid.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project 1999.
+ */
+/* ====================================================================
+ * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+#include "cryptlib.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+
+
+static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
+static void st_free(ASN1_STRING_TABLE *tbl);
+static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
+			const ASN1_STRING_TABLE * const *b);
+
+
+/* This is the global mask for the mbstring functions: this is use to
+ * mask out certain types (such as BMPString and UTF8String) because
+ * certain software (e.g. Netscape) has problems with them.
+ */
+
+static unsigned long global_mask = 0xFFFFFFFFL;
+
+void ASN1_STRING_set_default_mask(unsigned long mask)
+{
+	global_mask = mask;
+}
+
+unsigned long ASN1_STRING_get_default_mask(void)
+{
+	return global_mask;
+}
+
+/* This function sets the default to various "flavours" of configuration.
+ * based on an ASCII string. Currently this is:
+ * MASK:XXXX : a numerical mask value.
+ * nobmp : Don't use BMPStrings (just Printable, T61).
+ * pkix : PKIX recommendation in RFC2459.
+ * utf8only : only use UTF8Strings (RFC2459 recommendation for 2004).
+ * default:   the default value, Printable, T61, BMP.
+ */
+
+int ASN1_STRING_set_default_mask_asc(const char *p)
+{
+	unsigned long mask;
+	char *end;
+	if(!strncmp(p, "MASK:", 5)) {
+		if(!p[5]) return 0;
+		mask = strtoul(p + 5, &end, 0);
+		if(*end) return 0;
+	} else if(!strcmp(p, "nombstr"))
+			 mask = ~((unsigned long)(B_ASN1_BMPSTRING|B_ASN1_UTF8STRING));
+	else if(!strcmp(p, "pkix"))
+			mask = ~((unsigned long)B_ASN1_T61STRING);
+	else if(!strcmp(p, "utf8only")) mask = B_ASN1_UTF8STRING;
+	else if(!strcmp(p, "default"))
+	    mask = 0xFFFFFFFFL;
+	else return 0;
+	ASN1_STRING_set_default_mask(mask);
+	return 1;
+}
+
+/* The following function generates an ASN1_STRING based on limits in a table.
+ * Frequently the types and length of an ASN1_STRING are restricted by a 
+ * corresponding OID. For example certificates and certificate requests.
+ */
+
+ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, const unsigned char *in,
+					int inlen, int inform, int nid)
+{
+	ASN1_STRING_TABLE *tbl;
+	ASN1_STRING *str = NULL;
+	unsigned long mask;
+	int ret;
+	if(!out) out = &str;
+	tbl = ASN1_STRING_TABLE_get(nid);
+	if(tbl) {
+		mask = tbl->mask;
+		if(!(tbl->flags & STABLE_NO_MASK)) mask &= global_mask;
+		ret = ASN1_mbstring_ncopy(out, in, inlen, inform, mask,
+					tbl->minsize, tbl->maxsize);
+	} else ret = ASN1_mbstring_copy(out, in, inlen, inform, DIRSTRING_TYPE & global_mask);
+	if(ret <= 0) return NULL;
+	return *out;
+}
+
+/* Now the tables and helper functions for the string table:
+ */
+
+/* size limits: this stuff is taken straight from RFC3280 */
+
+#define ub_name				32768
+#define ub_common_name			64
+#define ub_locality_name		128
+#define ub_state_name			128
+#define ub_organization_name		64
+#define ub_organization_unit_name	64
+#define ub_title			64
+#define ub_email_address		128
+#define ub_serial_number		64
+
+
+/* This table must be kept in NID order */
+
+static const ASN1_STRING_TABLE tbl_standard[] = {
+{NID_commonName,		1, ub_common_name, DIRSTRING_TYPE, 0},
+{NID_countryName,		2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+{NID_localityName,		1, ub_locality_name, DIRSTRING_TYPE, 0},
+{NID_stateOrProvinceName,	1, ub_state_name, DIRSTRING_TYPE, 0},
+{NID_organizationName,		1, ub_organization_name, DIRSTRING_TYPE, 0},
+{NID_organizationalUnitName,	1, ub_organization_unit_name, DIRSTRING_TYPE, 0},
+{NID_pkcs9_emailAddress,	1, ub_email_address, B_ASN1_IA5STRING, STABLE_NO_MASK},
+{NID_pkcs9_unstructuredName,	1, -1, PKCS9STRING_TYPE, 0},
+{NID_pkcs9_challengePassword,	1, -1, PKCS9STRING_TYPE, 0},
+{NID_pkcs9_unstructuredAddress,	1, -1, DIRSTRING_TYPE, 0},
+{NID_givenName,			1, ub_name, DIRSTRING_TYPE, 0},
+{NID_surname,			1, ub_name, DIRSTRING_TYPE, 0},
+{NID_initials,			1, ub_name, DIRSTRING_TYPE, 0},
+{NID_serialNumber,		1, ub_serial_number, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+{NID_friendlyName,		-1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
+{NID_name,			1, ub_name, DIRSTRING_TYPE, 0},
+{NID_dnQualifier,		-1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
+{NID_domainComponent,		1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
+{NID_ms_csp_name,		-1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}
+};
+
+static int sk_table_cmp(const ASN1_STRING_TABLE * const *a,
+			const ASN1_STRING_TABLE * const *b)
+{
+	return (*a)->nid - (*b)->nid;
+}
+
+DECLARE_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);
+
+static int table_cmp(const ASN1_STRING_TABLE *a, const ASN1_STRING_TABLE *b)
+{
+	return a->nid - b->nid;
+}
+
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(ASN1_STRING_TABLE, ASN1_STRING_TABLE, table);
+
+ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid)
+{
+	int idx;
+	ASN1_STRING_TABLE *ttmp;
+	ASN1_STRING_TABLE fnd;
+	fnd.nid = nid;
+	ttmp = OBJ_bsearch_table(&fnd, tbl_standard, 
+			   sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE));
+	if(ttmp) return ttmp;
+	if(!stable) return NULL;
+	idx = sk_ASN1_STRING_TABLE_find(stable, &fnd);
+	if(idx < 0) return NULL;
+	return sk_ASN1_STRING_TABLE_value(stable, idx);
+}
+	
+int ASN1_STRING_TABLE_add(int nid,
+		 long minsize, long maxsize, unsigned long mask,
+				unsigned long flags)
+{
+	ASN1_STRING_TABLE *tmp;
+	char new_nid = 0;
+	flags &= ~STABLE_FLAGS_MALLOC;
+	if(!stable) stable = sk_ASN1_STRING_TABLE_new(sk_table_cmp);
+	if(!stable) {
+		ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD, ERR_R_MALLOC_FAILURE);
+		return 0;
+	}
+	if(!(tmp = ASN1_STRING_TABLE_get(nid))) {
+		tmp = OPENSSL_malloc(sizeof(ASN1_STRING_TABLE));
+		if(!tmp) {
+			ASN1err(ASN1_F_ASN1_STRING_TABLE_ADD,
+							ERR_R_MALLOC_FAILURE);
+			return 0;
+		}
+		tmp->flags = flags | STABLE_FLAGS_MALLOC;
+		tmp->nid = nid;
+		new_nid = 1;
+	} else tmp->flags = (tmp->flags & STABLE_FLAGS_MALLOC) | flags;
+	if(minsize != -1) tmp->minsize = minsize;
+	if(maxsize != -1) tmp->maxsize = maxsize;
+	tmp->mask = mask;
+	if(new_nid) sk_ASN1_STRING_TABLE_push(stable, tmp);
+	return 1;
+}
+
+void ASN1_STRING_TABLE_cleanup(void)
+{
+	STACK_OF(ASN1_STRING_TABLE) *tmp;
+	tmp = stable;
+	if(!tmp) return;
+	stable = NULL;
+	sk_ASN1_STRING_TABLE_pop_free(tmp, st_free);
+}
+
+static void st_free(ASN1_STRING_TABLE *tbl)
+{
+	if(tbl->flags & STABLE_FLAGS_MALLOC) OPENSSL_free(tbl);
+}
+
+
+IMPLEMENT_STACK_OF(ASN1_STRING_TABLE)
+
+#ifdef STRING_TABLE_TEST
+
+main()
+{
+	ASN1_STRING_TABLE *tmp;
+	int i, last_nid = -1;
+
+	for (tmp = tbl_standard, i = 0;
+		i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++)
+		{
+			if (tmp->nid < last_nid)
+				{
+				last_nid = 0;
+				break;
+				}
+			last_nid = tmp->nid;
+		}
+
+	if (last_nid != 0)
+		{
+		printf("Table order OK\n");
+		exit(0);
+		}
+
+	for (tmp = tbl_standard, i = 0;
+		i < sizeof(tbl_standard)/sizeof(ASN1_STRING_TABLE); i++, tmp++)
+			printf("Index %d, NID %d, Name=%s\n", i, tmp->nid,
+							OBJ_nid2ln(tmp->nid));
+
+}
+
+#endif
diff --git a/openssl/crypto/asn1/ameth_lib.c b/openssl/crypto/asn1/ameth_lib.c
index 5e26a14b8..5a581b90e 100644
--- a/openssl/crypto/asn1/ameth_lib.c
+++ b/openssl/crypto/asn1/ameth_lib.c
@@ -1,450 +1,450 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

- * project 2006.

- */

-/* ====================================================================

- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- *

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer. 

- *

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in

- *    the documentation and/or other materials provided with the

- *    distribution.

- *

- * 3. All advertising materials mentioning features or use of this

- *    software must display the following acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

- *

- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

- *    endorse or promote products derived from this software without

- *    prior written permission. For written permission, please contact

- *    licensing@OpenSSL.org.

- *

- * 5. Products derived from this software may not be called "OpenSSL"

- *    nor may "OpenSSL" appear in their names without prior written

- *    permission of the OpenSSL Project.

- *

- * 6. Redistributions of any form whatsoever must retain the following

- *    acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

- *

- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

- * OF THE POSSIBILITY OF SUCH DAMAGE.

- * ====================================================================

- *

- * This product includes cryptographic software written by Eric Young

- * (eay@cryptsoft.com).  This product includes software written by Tim

- * Hudson (tjh@cryptsoft.com).

- *

- */

-

-#include <stdio.h>

-#include "cryptlib.h"

-#include <openssl/asn1t.h>

-#include <openssl/x509.h>

-#ifndef OPENSSL_NO_ENGINE

-#include <openssl/engine.h>

-#endif

-#include "asn1_locl.h"

-

-extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[];

-extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[];

-extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth;

-extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;

-extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;

-

-/* Keep this sorted in type order !! */

-static const EVP_PKEY_ASN1_METHOD *standard_methods[] = 

-	{

-#ifndef OPENSSL_NO_RSA

-	&rsa_asn1_meths[0],

-	&rsa_asn1_meths[1],

-#endif

-#ifndef OPENSSL_NO_DH

-	&dh_asn1_meth,

-#endif

-#ifndef OPENSSL_NO_DSA

-	&dsa_asn1_meths[0],

-	&dsa_asn1_meths[1],

-	&dsa_asn1_meths[2],

-	&dsa_asn1_meths[3],

-	&dsa_asn1_meths[4],

-#endif

-#ifndef OPENSSL_NO_EC

-	&eckey_asn1_meth,

-#endif

-	&hmac_asn1_meth

-	};

-

-typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);

-DECLARE_STACK_OF(EVP_PKEY_ASN1_METHOD)

-static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;

-

-

-

-#ifdef TEST

-void main()

-	{

-	int i;

-	for (i = 0;

-		i < sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);

-		i++)

-		fprintf(stderr, "Number %d id=%d (%s)\n", i,

-			standard_methods[i]->pkey_id,

-			OBJ_nid2sn(standard_methods[i]->pkey_id));

-	}

-#endif

-

-DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,

-			   const EVP_PKEY_ASN1_METHOD *, ameth);

-

-static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,

-		     const EVP_PKEY_ASN1_METHOD * const *b)

-	{

-        return ((*a)->pkey_id - (*b)->pkey_id);

-	}

-

-IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,

-			     const EVP_PKEY_ASN1_METHOD *, ameth);

-

-int EVP_PKEY_asn1_get_count(void)

-	{

-	int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);

-	if (app_methods)

-		num += sk_EVP_PKEY_ASN1_METHOD_num(app_methods);

-	return num;

-	}

-

-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx)

-	{

-	int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);

-	if (idx < 0)

-		return NULL; 

-	if (idx < num)

-		return standard_methods[idx];

-	idx -= num;

-	return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);

-	}

-

-static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)

-	{

-	EVP_PKEY_ASN1_METHOD tmp;

-	const EVP_PKEY_ASN1_METHOD *t = &tmp, **ret;

-	tmp.pkey_id = type;

-	if (app_methods)

-		{

-		int idx;

-		idx = sk_EVP_PKEY_ASN1_METHOD_find(app_methods, &tmp);

-		if (idx >= 0)

-			return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);

-		}

-	ret = OBJ_bsearch_ameth(&t, standard_methods,

-			  sizeof(standard_methods)

-			  /sizeof(EVP_PKEY_ASN1_METHOD *));

-	if (!ret || !*ret)

-		return NULL;

-	return *ret;

-	}

-

-/* Find an implementation of an ASN1 algorithm. If 'pe' is not NULL

- * also search through engines and set *pe to a functional reference

- * to the engine implementing 'type' or NULL if no engine implements 

- * it.

- */

-

-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)

-	{

-	const EVP_PKEY_ASN1_METHOD *t;

-

-	for (;;)

-		{

-		t = pkey_asn1_find(type);

-		if (!t || !(t->pkey_flags & ASN1_PKEY_ALIAS))

-			break;

-		type = t->pkey_base_id;

-		}

-	if (pe)

-		{

-#ifndef OPENSSL_NO_ENGINE

-		ENGINE *e;

-		/* type will contain the final unaliased type */

-		e = ENGINE_get_pkey_asn1_meth_engine(type);

-		if (e)

-			{

-			*pe = e;

-			return ENGINE_get_pkey_asn1_meth(e, type);

-			}

-#endif

-		*pe = NULL;

-		}

-	return t;

-	}

-

-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,

-					const char *str, int len)

-	{

-	int i;

-	const EVP_PKEY_ASN1_METHOD *ameth;

-	if (len == -1)

-		len = strlen(str);

-	if (pe)

-		{

-#ifndef OPENSSL_NO_ENGINE

-		ENGINE *e;

-		ameth = ENGINE_pkey_asn1_find_str(&e, str, len);

-		if (ameth)

-			{

-			/* Convert structural into

-			 * functional reference

-			 */

-			if (!ENGINE_init(e))

-				ameth = NULL;

-			ENGINE_free(e);

-			*pe = e;

-			return ameth;

-			}

-#endif

-		*pe = NULL;

-		}

-	for (i = 0; i < EVP_PKEY_asn1_get_count(); i++)

-		{

-		ameth = EVP_PKEY_asn1_get0(i);

-		if (ameth->pkey_flags & ASN1_PKEY_ALIAS)

-			continue;

-		if (((int)strlen(ameth->pem_str) == len) && 

-			!strncasecmp(ameth->pem_str, str, len))

-			return ameth;

-		}

-	return NULL;

-	}

-

-int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)

-	{

-	if (app_methods == NULL)

-		{

-		app_methods = sk_EVP_PKEY_ASN1_METHOD_new(ameth_cmp);

-		if (!app_methods)

-			return 0;

-		}

-	if (!sk_EVP_PKEY_ASN1_METHOD_push(app_methods, ameth))

-		return 0;

-	sk_EVP_PKEY_ASN1_METHOD_sort(app_methods);

-	return 1;

-	}

-

-int EVP_PKEY_asn1_add_alias(int to, int from)

-	{

-	EVP_PKEY_ASN1_METHOD *ameth;

-	ameth = EVP_PKEY_asn1_new(from, ASN1_PKEY_ALIAS, NULL, NULL);

-	if (!ameth)

-		return 0;

-	ameth->pkey_base_id = to;

-	return EVP_PKEY_asn1_add0(ameth);

-	}

-

-int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,

-				const char **pinfo, const char **ppem_str,

-					const EVP_PKEY_ASN1_METHOD *ameth)

-	{

-	if (!ameth)

-		return 0;

-	if (ppkey_id)

-		*ppkey_id = ameth->pkey_id;

-	if (ppkey_base_id)

-		*ppkey_base_id = ameth->pkey_base_id;

-	if (ppkey_flags)

-		*ppkey_flags = ameth->pkey_flags;

-	if (pinfo)

-		*pinfo = ameth->info;

-	if (ppem_str)

-		*ppem_str = ameth->pem_str;

-	return 1;

-	}

-

-const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(EVP_PKEY *pkey)

-	{

-	return pkey->ameth;

-	}

-

-EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,

-					const char *pem_str, const char *info)

-	{

-	EVP_PKEY_ASN1_METHOD *ameth;

-	ameth = OPENSSL_malloc(sizeof(EVP_PKEY_ASN1_METHOD));

-	if (!ameth)

-		return NULL;

-

-	ameth->pkey_id = id;

-	ameth->pkey_base_id = id;

-	ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC;

-

-	if (info)

-		{

-		ameth->info = BUF_strdup(info);

-		if (!ameth->info)

-			goto err;

-		}

-	else

-		ameth->info = NULL;

-

-	if (pem_str)

-		{

-		ameth->pem_str = BUF_strdup(pem_str);

-		if (!ameth->pem_str)

-			goto err;

-		}

-	else

-		ameth->pem_str = NULL;

-

-	ameth->pub_decode = 0;

-	ameth->pub_encode = 0;

-	ameth->pub_cmp = 0;

-	ameth->pub_print = 0;

-

-	ameth->priv_decode = 0;

-	ameth->priv_encode = 0;

-	ameth->priv_print = 0;

-

-	ameth->old_priv_encode = 0;

-	ameth->old_priv_decode = 0;

-

-	ameth->pkey_size = 0;

-	ameth->pkey_bits = 0;

-

-	ameth->param_decode = 0;

-	ameth->param_encode = 0;

-	ameth->param_missing = 0;

-	ameth->param_copy = 0;

-	ameth->param_cmp = 0;

-	ameth->param_print = 0;

-

-	ameth->pkey_free = 0;

-	ameth->pkey_ctrl = 0;

-

-	return ameth;

-

-	err:

-

-	EVP_PKEY_asn1_free(ameth);

-	return NULL;

-

-	}

-

-void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, 

-			const EVP_PKEY_ASN1_METHOD *src)

-	{

-

-	dst->pub_decode = src->pub_decode;

-	dst->pub_encode = src->pub_encode;

-	dst->pub_cmp = src->pub_cmp;

-	dst->pub_print = src->pub_print;

-

-	dst->priv_decode = src->priv_decode;

-	dst->priv_encode = src->priv_encode;

-	dst->priv_print = src->priv_print;

-

-	dst->old_priv_encode = src->old_priv_encode;

-	dst->old_priv_decode = src->old_priv_decode;

-

-	dst->pkey_size = src->pkey_size;

-	dst->pkey_bits = src->pkey_bits;

-

-	dst->param_decode = src->param_decode;

-	dst->param_encode = src->param_encode;

-	dst->param_missing = src->param_missing;

-	dst->param_copy = src->param_copy;

-	dst->param_cmp = src->param_cmp;

-	dst->param_print = src->param_print;

-

-	dst->pkey_free = src->pkey_free;

-	dst->pkey_ctrl = src->pkey_ctrl;

-

-	}

-

-void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)

-	{

-	if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC))

-		{

-		if (ameth->pem_str)

-			OPENSSL_free(ameth->pem_str);

-		if (ameth->info)

-			OPENSSL_free(ameth->info);

-		OPENSSL_free(ameth);

-		}

-	}

-

-void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,

-		int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub),

-		int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),

-		int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),

-		int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,

-							ASN1_PCTX *pctx),

-		int (*pkey_size)(const EVP_PKEY *pk),

-		int (*pkey_bits)(const EVP_PKEY *pk))

-	{

-	ameth->pub_decode = pub_decode;

-	ameth->pub_encode = pub_encode;

-	ameth->pub_cmp = pub_cmp;

-	ameth->pub_print = pub_print;

-	ameth->pkey_size = pkey_size;

-	ameth->pkey_bits = pkey_bits;

-	}

-

-void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,

-		int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf),

-		int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk),

-		int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,

-							ASN1_PCTX *pctx))

-	{

-	ameth->priv_decode = priv_decode;

-	ameth->priv_encode = priv_encode;

-	ameth->priv_print = priv_print;

-	}

-

-void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,

-		int (*param_decode)(EVP_PKEY *pkey,

-				const unsigned char **pder, int derlen),

-		int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder),

-		int (*param_missing)(const EVP_PKEY *pk),

-		int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),

-		int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),

-		int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,

-							ASN1_PCTX *pctx))

-	{

-	ameth->param_decode = param_decode;

-	ameth->param_encode = param_encode;

-	ameth->param_missing = param_missing;

-	ameth->param_copy = param_copy;

-	ameth->param_cmp = param_cmp;

-	ameth->param_print = param_print;

-	}

-

-void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,

-		void (*pkey_free)(EVP_PKEY *pkey))

-	{

-	ameth->pkey_free = pkey_free;

-	}

-

-void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,

-		int (*pkey_ctrl)(EVP_PKEY *pkey, int op,

-							long arg1, void *arg2))

-	{

-	ameth->pkey_ctrl = pkey_ctrl;

-	}

+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project 2006.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/x509.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include "asn1_locl.h"
+
+extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[];
+extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[];
+extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth;
+extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
+extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;
+
+/* Keep this sorted in type order !! */
+static const EVP_PKEY_ASN1_METHOD *standard_methods[] = 
+	{
+#ifndef OPENSSL_NO_RSA
+	&rsa_asn1_meths[0],
+	&rsa_asn1_meths[1],
+#endif
+#ifndef OPENSSL_NO_DH
+	&dh_asn1_meth,
+#endif
+#ifndef OPENSSL_NO_DSA
+	&dsa_asn1_meths[0],
+	&dsa_asn1_meths[1],
+	&dsa_asn1_meths[2],
+	&dsa_asn1_meths[3],
+	&dsa_asn1_meths[4],
+#endif
+#ifndef OPENSSL_NO_EC
+	&eckey_asn1_meth,
+#endif
+	&hmac_asn1_meth
+	};
+
+typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
+DECLARE_STACK_OF(EVP_PKEY_ASN1_METHOD)
+static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
+
+
+
+#ifdef TEST
+void main()
+	{
+	int i;
+	for (i = 0;
+		i < sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
+		i++)
+		fprintf(stderr, "Number %d id=%d (%s)\n", i,
+			standard_methods[i]->pkey_id,
+			OBJ_nid2sn(standard_methods[i]->pkey_id));
+	}
+#endif
+
+DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
+			   const EVP_PKEY_ASN1_METHOD *, ameth);
+
+static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,
+		     const EVP_PKEY_ASN1_METHOD * const *b)
+	{
+        return ((*a)->pkey_id - (*b)->pkey_id);
+	}
+
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
+			     const EVP_PKEY_ASN1_METHOD *, ameth);
+
+int EVP_PKEY_asn1_get_count(void)
+	{
+	int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
+	if (app_methods)
+		num += sk_EVP_PKEY_ASN1_METHOD_num(app_methods);
+	return num;
+	}
+
+const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx)
+	{
+	int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
+	if (idx < 0)
+		return NULL; 
+	if (idx < num)
+		return standard_methods[idx];
+	idx -= num;
+	return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
+	}
+
+static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
+	{
+	EVP_PKEY_ASN1_METHOD tmp;
+	const EVP_PKEY_ASN1_METHOD *t = &tmp, **ret;
+	tmp.pkey_id = type;
+	if (app_methods)
+		{
+		int idx;
+		idx = sk_EVP_PKEY_ASN1_METHOD_find(app_methods, &tmp);
+		if (idx >= 0)
+			return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
+		}
+	ret = OBJ_bsearch_ameth(&t, standard_methods,
+			  sizeof(standard_methods)
+			  /sizeof(EVP_PKEY_ASN1_METHOD *));
+	if (!ret || !*ret)
+		return NULL;
+	return *ret;
+	}
+
+/* Find an implementation of an ASN1 algorithm. If 'pe' is not NULL
+ * also search through engines and set *pe to a functional reference
+ * to the engine implementing 'type' or NULL if no engine implements 
+ * it.
+ */
+
+const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)
+	{
+	const EVP_PKEY_ASN1_METHOD *t;
+
+	for (;;)
+		{
+		t = pkey_asn1_find(type);
+		if (!t || !(t->pkey_flags & ASN1_PKEY_ALIAS))
+			break;
+		type = t->pkey_base_id;
+		}
+	if (pe)
+		{
+#ifndef OPENSSL_NO_ENGINE
+		ENGINE *e;
+		/* type will contain the final unaliased type */
+		e = ENGINE_get_pkey_asn1_meth_engine(type);
+		if (e)
+			{
+			*pe = e;
+			return ENGINE_get_pkey_asn1_meth(e, type);
+			}
+#endif
+		*pe = NULL;
+		}
+	return t;
+	}
+
+const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
+					const char *str, int len)
+	{
+	int i;
+	const EVP_PKEY_ASN1_METHOD *ameth;
+	if (len == -1)
+		len = strlen(str);
+	if (pe)
+		{
+#ifndef OPENSSL_NO_ENGINE
+		ENGINE *e;
+		ameth = ENGINE_pkey_asn1_find_str(&e, str, len);
+		if (ameth)
+			{
+			/* Convert structural into
+			 * functional reference
+			 */
+			if (!ENGINE_init(e))
+				ameth = NULL;
+			ENGINE_free(e);
+			*pe = e;
+			return ameth;
+			}
+#endif
+		*pe = NULL;
+		}
+	for (i = 0; i < EVP_PKEY_asn1_get_count(); i++)
+		{
+		ameth = EVP_PKEY_asn1_get0(i);
+		if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
+			continue;
+		if (((int)strlen(ameth->pem_str) == len) && 
+			!strncasecmp(ameth->pem_str, str, len))
+			return ameth;
+		}
+	return NULL;
+	}
+
+int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
+	{
+	if (app_methods == NULL)
+		{
+		app_methods = sk_EVP_PKEY_ASN1_METHOD_new(ameth_cmp);
+		if (!app_methods)
+			return 0;
+		}
+	if (!sk_EVP_PKEY_ASN1_METHOD_push(app_methods, ameth))
+		return 0;
+	sk_EVP_PKEY_ASN1_METHOD_sort(app_methods);
+	return 1;
+	}
+
+int EVP_PKEY_asn1_add_alias(int to, int from)
+	{
+	EVP_PKEY_ASN1_METHOD *ameth;
+	ameth = EVP_PKEY_asn1_new(from, ASN1_PKEY_ALIAS, NULL, NULL);
+	if (!ameth)
+		return 0;
+	ameth->pkey_base_id = to;
+	return EVP_PKEY_asn1_add0(ameth);
+	}
+
+int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
+				const char **pinfo, const char **ppem_str,
+					const EVP_PKEY_ASN1_METHOD *ameth)
+	{
+	if (!ameth)
+		return 0;
+	if (ppkey_id)
+		*ppkey_id = ameth->pkey_id;
+	if (ppkey_base_id)
+		*ppkey_base_id = ameth->pkey_base_id;
+	if (ppkey_flags)
+		*ppkey_flags = ameth->pkey_flags;
+	if (pinfo)
+		*pinfo = ameth->info;
+	if (ppem_str)
+		*ppem_str = ameth->pem_str;
+	return 1;
+	}
+
+const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(EVP_PKEY *pkey)
+	{
+	return pkey->ameth;
+	}
+
+EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
+					const char *pem_str, const char *info)
+	{
+	EVP_PKEY_ASN1_METHOD *ameth;
+	ameth = OPENSSL_malloc(sizeof(EVP_PKEY_ASN1_METHOD));
+	if (!ameth)
+		return NULL;
+
+	ameth->pkey_id = id;
+	ameth->pkey_base_id = id;
+	ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC;
+
+	if (info)
+		{
+		ameth->info = BUF_strdup(info);
+		if (!ameth->info)
+			goto err;
+		}
+	else
+		ameth->info = NULL;
+
+	if (pem_str)
+		{
+		ameth->pem_str = BUF_strdup(pem_str);
+		if (!ameth->pem_str)
+			goto err;
+		}
+	else
+		ameth->pem_str = NULL;
+
+	ameth->pub_decode = 0;
+	ameth->pub_encode = 0;
+	ameth->pub_cmp = 0;
+	ameth->pub_print = 0;
+
+	ameth->priv_decode = 0;
+	ameth->priv_encode = 0;
+	ameth->priv_print = 0;
+
+	ameth->old_priv_encode = 0;
+	ameth->old_priv_decode = 0;
+
+	ameth->pkey_size = 0;
+	ameth->pkey_bits = 0;
+
+	ameth->param_decode = 0;
+	ameth->param_encode = 0;
+	ameth->param_missing = 0;
+	ameth->param_copy = 0;
+	ameth->param_cmp = 0;
+	ameth->param_print = 0;
+
+	ameth->pkey_free = 0;
+	ameth->pkey_ctrl = 0;
+
+	return ameth;
+
+	err:
+
+	EVP_PKEY_asn1_free(ameth);
+	return NULL;
+
+	}
+
+void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst, 
+			const EVP_PKEY_ASN1_METHOD *src)
+	{
+
+	dst->pub_decode = src->pub_decode;
+	dst->pub_encode = src->pub_encode;
+	dst->pub_cmp = src->pub_cmp;
+	dst->pub_print = src->pub_print;
+
+	dst->priv_decode = src->priv_decode;
+	dst->priv_encode = src->priv_encode;
+	dst->priv_print = src->priv_print;
+
+	dst->old_priv_encode = src->old_priv_encode;
+	dst->old_priv_decode = src->old_priv_decode;
+
+	dst->pkey_size = src->pkey_size;
+	dst->pkey_bits = src->pkey_bits;
+
+	dst->param_decode = src->param_decode;
+	dst->param_encode = src->param_encode;
+	dst->param_missing = src->param_missing;
+	dst->param_copy = src->param_copy;
+	dst->param_cmp = src->param_cmp;
+	dst->param_print = src->param_print;
+
+	dst->pkey_free = src->pkey_free;
+	dst->pkey_ctrl = src->pkey_ctrl;
+
+	}
+
+void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
+	{
+	if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC))
+		{
+		if (ameth->pem_str)
+			OPENSSL_free(ameth->pem_str);
+		if (ameth->info)
+			OPENSSL_free(ameth->info);
+		OPENSSL_free(ameth);
+		}
+	}
+
+void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
+		int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub),
+		int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),
+		int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
+		int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+							ASN1_PCTX *pctx),
+		int (*pkey_size)(const EVP_PKEY *pk),
+		int (*pkey_bits)(const EVP_PKEY *pk))
+	{
+	ameth->pub_decode = pub_decode;
+	ameth->pub_encode = pub_encode;
+	ameth->pub_cmp = pub_cmp;
+	ameth->pub_print = pub_print;
+	ameth->pkey_size = pkey_size;
+	ameth->pkey_bits = pkey_bits;
+	}
+
+void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
+		int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf),
+		int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk),
+		int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+							ASN1_PCTX *pctx))
+	{
+	ameth->priv_decode = priv_decode;
+	ameth->priv_encode = priv_encode;
+	ameth->priv_print = priv_print;
+	}
+
+void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
+		int (*param_decode)(EVP_PKEY *pkey,
+				const unsigned char **pder, int derlen),
+		int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder),
+		int (*param_missing)(const EVP_PKEY *pk),
+		int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),
+		int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),
+		int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+							ASN1_PCTX *pctx))
+	{
+	ameth->param_decode = param_decode;
+	ameth->param_encode = param_encode;
+	ameth->param_missing = param_missing;
+	ameth->param_copy = param_copy;
+	ameth->param_cmp = param_cmp;
+	ameth->param_print = param_print;
+	}
+
+void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
+		void (*pkey_free)(EVP_PKEY *pkey))
+	{
+	ameth->pkey_free = pkey_free;
+	}
+
+void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
+		int (*pkey_ctrl)(EVP_PKEY *pkey, int op,
+							long arg1, void *arg2))
+	{
+	ameth->pkey_ctrl = pkey_ctrl;
+	}
diff --git a/openssl/crypto/asn1/asn1.h b/openssl/crypto/asn1/asn1.h
index 1a5123216..59540e4e7 100644
--- a/openssl/crypto/asn1/asn1.h
+++ b/openssl/crypto/asn1/asn1.h
@@ -1,1402 +1,1402 @@
-/* crypto/asn1/asn1.h */

-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

- * All rights reserved.

- *

- * This package is an SSL implementation written

- * by Eric Young (eay@cryptsoft.com).

- * The implementation was written so as to conform with Netscapes SSL.

- * 

- * This library is free for commercial and non-commercial use as long as

- * the following conditions are aheared to.  The following conditions

- * apply to all code found in this distribution, be it the RC4, RSA,

- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

- * included with this distribution is covered by the same copyright terms

- * except that the holder is Tim Hudson (tjh@cryptsoft.com).

- * 

- * Copyright remains Eric Young's, and as such any Copyright notices in

- * the code are not to be removed.

- * If this package is used in a product, Eric Young should be given attribution

- * as the author of the parts of the library used.

- * This can be in the form of a textual message at program startup or

- * in documentation (online or textual) provided with the package.

- * 

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the copyright

- *    notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in the

- *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software

- *    must display the following acknowledgement:

- *    "This product includes cryptographic software written by

- *     Eric Young (eay@cryptsoft.com)"

- *    The word 'cryptographic' can be left out if the rouines from the library

- *    being used are not cryptographic related :-).

- * 4. If you include any Windows specific code (or a derivative thereof) from 

- *    the apps directory (application code) you must include an acknowledgement:

- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

- * 

- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- * 

- * The licence and distribution terms for any publically available version or

- * derivative of this code cannot be changed.  i.e. this code cannot simply be

- * copied and put under another distribution licence

- * [including the GNU Public Licence.]

- */

-

-#ifndef HEADER_ASN1_H

-#define HEADER_ASN1_H

-

-#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>

-

-#include <openssl/symhacks.h>

-

-#include <openssl/ossl_typ.h>

-#ifndef OPENSSL_NO_DEPRECATED

-#include <openssl/bn.h>

-#endif

-

-#ifdef OPENSSL_BUILD_SHLIBCRYPTO

-# undef OPENSSL_EXTERN

-# define OPENSSL_EXTERN OPENSSL_EXPORT

-#endif

-

-#ifdef  __cplusplus

-extern "C" {

-#endif

-

-#define V_ASN1_UNIVERSAL		0x00

-#define	V_ASN1_APPLICATION		0x40

-#define V_ASN1_CONTEXT_SPECIFIC		0x80

-#define V_ASN1_PRIVATE			0xc0

-

-#define V_ASN1_CONSTRUCTED		0x20

-#define V_ASN1_PRIMITIVE_TAG		0x1f

-#define V_ASN1_PRIMATIVE_TAG		0x1f

-

-#define V_ASN1_APP_CHOOSE		-2	/* let the recipient choose */

-#define V_ASN1_OTHER			-3	/* used in ASN1_TYPE */

-#define V_ASN1_ANY			-4	/* used in ASN1 template code */

-

-#define V_ASN1_NEG			0x100	/* negative flag */

-

-#define V_ASN1_UNDEF			-1

-#define V_ASN1_EOC			0

-#define V_ASN1_BOOLEAN			1	/**/

-#define V_ASN1_INTEGER			2

-#define V_ASN1_NEG_INTEGER		(2 | V_ASN1_NEG)

-#define V_ASN1_BIT_STRING		3

-#define V_ASN1_OCTET_STRING		4

-#define V_ASN1_NULL			5

-#define V_ASN1_OBJECT			6

-#define V_ASN1_OBJECT_DESCRIPTOR	7

-#define V_ASN1_EXTERNAL			8

-#define V_ASN1_REAL			9

-#define V_ASN1_ENUMERATED		10

-#define V_ASN1_NEG_ENUMERATED		(10 | V_ASN1_NEG)

-#define V_ASN1_UTF8STRING		12

-#define V_ASN1_SEQUENCE			16

-#define V_ASN1_SET			17

-#define V_ASN1_NUMERICSTRING		18	/**/

-#define V_ASN1_PRINTABLESTRING		19

-#define V_ASN1_T61STRING		20

-#define V_ASN1_TELETEXSTRING		20	/* alias */

-#define V_ASN1_VIDEOTEXSTRING		21	/**/

-#define V_ASN1_IA5STRING		22

-#define V_ASN1_UTCTIME			23

-#define V_ASN1_GENERALIZEDTIME		24	/**/

-#define V_ASN1_GRAPHICSTRING		25	/**/

-#define V_ASN1_ISO64STRING		26	/**/

-#define V_ASN1_VISIBLESTRING		26	/* alias */

-#define V_ASN1_GENERALSTRING		27	/**/

-#define V_ASN1_UNIVERSALSTRING		28	/**/

-#define V_ASN1_BMPSTRING		30

-

-/* For use with d2i_ASN1_type_bytes() */

-#define B_ASN1_NUMERICSTRING	0x0001

-#define B_ASN1_PRINTABLESTRING	0x0002

-#define B_ASN1_T61STRING	0x0004

-#define B_ASN1_TELETEXSTRING	0x0004

-#define B_ASN1_VIDEOTEXSTRING	0x0008

-#define B_ASN1_IA5STRING	0x0010

-#define B_ASN1_GRAPHICSTRING	0x0020

-#define B_ASN1_ISO64STRING	0x0040

-#define B_ASN1_VISIBLESTRING	0x0040

-#define B_ASN1_GENERALSTRING	0x0080

-#define B_ASN1_UNIVERSALSTRING	0x0100

-#define B_ASN1_OCTET_STRING	0x0200

-#define B_ASN1_BIT_STRING	0x0400

-#define B_ASN1_BMPSTRING	0x0800

-#define B_ASN1_UNKNOWN		0x1000

-#define B_ASN1_UTF8STRING	0x2000

-#define B_ASN1_UTCTIME		0x4000

-#define B_ASN1_GENERALIZEDTIME	0x8000

-#define B_ASN1_SEQUENCE		0x10000

-

-/* For use with ASN1_mbstring_copy() */

-#define MBSTRING_FLAG		0x1000

-#define MBSTRING_UTF8		(MBSTRING_FLAG)

-#define MBSTRING_ASC		(MBSTRING_FLAG|1)

-#define MBSTRING_BMP		(MBSTRING_FLAG|2)

-#define MBSTRING_UNIV		(MBSTRING_FLAG|4)

-

-#define SMIME_OLDMIME		0x400

-#define SMIME_CRLFEOL		0x800

-#define SMIME_STREAM		0x1000

-

-struct X509_algor_st;

-DECLARE_STACK_OF(X509_ALGOR)

-

-#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */

-#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */

-

-/* We MUST make sure that, except for constness, asn1_ctx_st and

-   asn1_const_ctx are exactly the same.  Fortunately, as soon as

-   the old ASN1 parsing macros are gone, we can throw this away

-   as well... */

-typedef struct asn1_ctx_st

-	{

-	unsigned char *p;/* work char pointer */

-	int eos;	/* end of sequence read for indefinite encoding */

-	int error;	/* error code to use when returning an error */

-	int inf;	/* constructed if 0x20, indefinite is 0x21 */

-	int tag;	/* tag from last 'get object' */

-	int xclass;	/* class from last 'get object' */

-	long slen;	/* length of last 'get object' */

-	unsigned char *max; /* largest value of p allowed */

-	unsigned char *q;/* temporary variable */

-	unsigned char **pp;/* variable */

-	int line;	/* used in error processing */

-	} ASN1_CTX;

-

-typedef struct asn1_const_ctx_st

-	{

-	const unsigned char *p;/* work char pointer */

-	int eos;	/* end of sequence read for indefinite encoding */

-	int error;	/* error code to use when returning an error */

-	int inf;	/* constructed if 0x20, indefinite is 0x21 */

-	int tag;	/* tag from last 'get object' */

-	int xclass;	/* class from last 'get object' */

-	long slen;	/* length of last 'get object' */

-	const unsigned char *max; /* largest value of p allowed */

-	const unsigned char *q;/* temporary variable */

-	const unsigned char **pp;/* variable */

-	int line;	/* used in error processing */

-	} ASN1_const_CTX;

-

-/* These are used internally in the ASN1_OBJECT to keep track of

- * whether the names and data need to be free()ed */

-#define ASN1_OBJECT_FLAG_DYNAMIC	 0x01	/* internal use */

-#define ASN1_OBJECT_FLAG_CRITICAL	 0x02	/* critical x509v3 object id */

-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04	/* internal use */

-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA 	 0x08	/* internal use */

-typedef struct asn1_object_st

-	{

-	const char *sn,*ln;

-	int nid;

-	int length;

-	const unsigned char *data;	/* data remains const after init */

-	int flags;	/* Should we free this one */

-	} ASN1_OBJECT;

-

-#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */

-/* This indicates that the ASN1_STRING is not a real value but just a place

- * holder for the location where indefinite length constructed data should

- * be inserted in the memory buffer 

- */

-#define ASN1_STRING_FLAG_NDEF 0x010 

-

-/* This flag is used by the CMS code to indicate that a string is not

- * complete and is a place holder for content when it had all been 

- * accessed. The flag will be reset when content has been written to it.

- */

-

-#define ASN1_STRING_FLAG_CONT 0x020 

-/* This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING

- * type.

- */

-#define ASN1_STRING_FLAG_MSTRING 0x040 

-/* This is the base type that holds just about everything :-) */

-typedef struct asn1_string_st

-	{

-	int length;

-	int type;

-	unsigned char *data;

-	/* The value of the following field depends on the type being

-	 * held.  It is mostly being used for BIT_STRING so if the

-	 * input data has a non-zero 'unused bits' value, it will be

-	 * handled correctly */

-	long flags;

-	} ASN1_STRING;

-

-/* ASN1_ENCODING structure: this is used to save the received

- * encoding of an ASN1 type. This is useful to get round

- * problems with invalid encodings which can break signatures.

- */

-

-typedef struct ASN1_ENCODING_st

-	{

-	unsigned char *enc;	/* DER encoding */

-	long len;		/* Length of encoding */

-	int modified;		 /* set to 1 if 'enc' is invalid */

-	} ASN1_ENCODING;

-

-/* Used with ASN1 LONG type: if a long is set to this it is omitted */

-#define ASN1_LONG_UNDEF	0x7fffffffL

-

-#define STABLE_FLAGS_MALLOC	0x01

-#define STABLE_NO_MASK		0x02

-#define DIRSTRING_TYPE	\

- (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)

-#define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)

-

-typedef struct asn1_string_table_st {

-	int nid;

-	long minsize;

-	long maxsize;

-	unsigned long mask;

-	unsigned long flags;

-} ASN1_STRING_TABLE;

-

-DECLARE_STACK_OF(ASN1_STRING_TABLE)

-

-/* size limits: this stuff is taken straight from RFC2459 */

-

-#define ub_name				32768

-#define ub_common_name			64

-#define ub_locality_name		128

-#define ub_state_name			128

-#define ub_organization_name		64

-#define ub_organization_unit_name	64

-#define ub_title			64

-#define ub_email_address		128

-

-/* Declarations for template structures: for full definitions

- * see asn1t.h

- */

-typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;

-typedef struct ASN1_ITEM_st ASN1_ITEM;

-typedef struct ASN1_TLC_st ASN1_TLC;

-/* This is just an opaque pointer */

-typedef struct ASN1_VALUE_st ASN1_VALUE;

-

-/* Declare ASN1 functions: the implement macro in in asn1t.h */

-

-#define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)

-

-#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \

-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)

-

-#define DECLARE_ASN1_FUNCTIONS_name(type, name) \

-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \

-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)

-

-#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \

-	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \

-	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)

-

-#define	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \

-	type *d2i_##name(type **a, const unsigned char **in, long len); \

-	int i2d_##name(type *a, unsigned char **out); \

-	DECLARE_ASN1_ITEM(itname)

-

-#define	DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \

-	type *d2i_##name(type **a, const unsigned char **in, long len); \

-	int i2d_##name(const type *a, unsigned char **out); \

-	DECLARE_ASN1_ITEM(name)

-

-#define	DECLARE_ASN1_NDEF_FUNCTION(name) \

-	int i2d_##name##_NDEF(name *a, unsigned char **out);

-

-#define DECLARE_ASN1_FUNCTIONS_const(name) \

-	DECLARE_ASN1_ALLOC_FUNCTIONS(name) \

-	DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)

-

-#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \

-	type *name##_new(void); \

-	void name##_free(type *a);

-

-#define DECLARE_ASN1_PRINT_FUNCTION(stname) \

-	DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)

-

-#define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \

-	int fname##_print_ctx(BIO *out, stname *x, int indent, \

-					 const ASN1_PCTX *pctx);

-

-#define D2I_OF(type) type *(*)(type **,const unsigned char **,long)

-#define I2D_OF(type) int (*)(type *,unsigned char **)

-#define I2D_OF_const(type) int (*)(const type *,unsigned char **)

-

-#define CHECKED_D2I_OF(type, d2i) \

-    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))

-#define CHECKED_I2D_OF(type, i2d) \

-    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))

-#define CHECKED_NEW_OF(type, xnew) \

-    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))

-#define CHECKED_PTR_OF(type, p) \

-    ((void*) (1 ? p : (type*)0))

-#define CHECKED_PPTR_OF(type, p) \

-    ((void**) (1 ? p : (type**)0))

-

-#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)

-#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)

-#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)

-

-TYPEDEF_D2I2D_OF(void);

-

-/* The following macros and typedefs allow an ASN1_ITEM

- * to be embedded in a structure and referenced. Since

- * the ASN1_ITEM pointers need to be globally accessible

- * (possibly from shared libraries) they may exist in

- * different forms. On platforms that support it the

- * ASN1_ITEM structure itself will be globally exported.

- * Other platforms will export a function that returns

- * an ASN1_ITEM pointer.

- *

- * To handle both cases transparently the macros below

- * should be used instead of hard coding an ASN1_ITEM

- * pointer in a structure.

- *

- * The structure will look like this:

- *

- * typedef struct SOMETHING_st {

- *      ...

- *      ASN1_ITEM_EXP *iptr;

- *      ...

- * } SOMETHING; 

- *

- * It would be initialised as e.g.:

- *

- * SOMETHING somevar = {...,ASN1_ITEM_ref(X509),...};

- *

- * and the actual pointer extracted with:

- *

- * const ASN1_ITEM *it = ASN1_ITEM_ptr(somevar.iptr);

- *

- * Finally an ASN1_ITEM pointer can be extracted from an

- * appropriate reference with: ASN1_ITEM_rptr(X509). This

- * would be used when a function takes an ASN1_ITEM * argument.

- *

- */

-

-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION

-

-/* ASN1_ITEM pointer exported type */

-typedef const ASN1_ITEM ASN1_ITEM_EXP;

-

-/* Macro to obtain ASN1_ITEM pointer from exported type */

-#define ASN1_ITEM_ptr(iptr) (iptr)

-

-/* Macro to include ASN1_ITEM pointer from base type */

-#define ASN1_ITEM_ref(iptr) (&(iptr##_it))

-

-#define ASN1_ITEM_rptr(ref) (&(ref##_it))

-

-#define DECLARE_ASN1_ITEM(name) \

-	OPENSSL_EXTERN const ASN1_ITEM name##_it;

-

-#else

-

-/* Platforms that can't easily handle shared global variables are declared

- * as functions returning ASN1_ITEM pointers.

- */

-

-/* ASN1_ITEM pointer exported type */

-typedef const ASN1_ITEM * ASN1_ITEM_EXP(void);

-

-/* Macro to obtain ASN1_ITEM pointer from exported type */

-#define ASN1_ITEM_ptr(iptr) (iptr())

-

-/* Macro to include ASN1_ITEM pointer from base type */

-#define ASN1_ITEM_ref(iptr) (iptr##_it)

-

-#define ASN1_ITEM_rptr(ref) (ref##_it())

-

-#define DECLARE_ASN1_ITEM(name) \

-	const ASN1_ITEM * name##_it(void);

-

-#endif

-

-/* Parameters used by ASN1_STRING_print_ex() */

-

-/* These determine which characters to escape:

- * RFC2253 special characters, control characters and

- * MSB set characters

- */

-

-#define ASN1_STRFLGS_ESC_2253		1

-#define ASN1_STRFLGS_ESC_CTRL		2

-#define ASN1_STRFLGS_ESC_MSB		4

-

-

-/* This flag determines how we do escaping: normally

- * RC2253 backslash only, set this to use backslash and

- * quote.

- */

-

-#define ASN1_STRFLGS_ESC_QUOTE		8

-

-

-/* These three flags are internal use only. */

-

-/* Character is a valid PrintableString character */

-#define CHARTYPE_PRINTABLESTRING	0x10

-/* Character needs escaping if it is the first character */

-#define CHARTYPE_FIRST_ESC_2253		0x20

-/* Character needs escaping if it is the last character */

-#define CHARTYPE_LAST_ESC_2253		0x40

-

-/* NB the internal flags are safely reused below by flags

- * handled at the top level.

- */

-

-/* If this is set we convert all character strings

- * to UTF8 first 

- */

-

-#define ASN1_STRFLGS_UTF8_CONVERT	0x10

-

-/* If this is set we don't attempt to interpret content:

- * just assume all strings are 1 byte per character. This

- * will produce some pretty odd looking output!

- */

-

-#define ASN1_STRFLGS_IGNORE_TYPE	0x20

-

-/* If this is set we include the string type in the output */

-#define ASN1_STRFLGS_SHOW_TYPE		0x40

-

-/* This determines which strings to display and which to

- * 'dump' (hex dump of content octets or DER encoding). We can

- * only dump non character strings or everything. If we

- * don't dump 'unknown' they are interpreted as character

- * strings with 1 octet per character and are subject to

- * the usual escaping options.

- */

-

-#define ASN1_STRFLGS_DUMP_ALL		0x80

-#define ASN1_STRFLGS_DUMP_UNKNOWN	0x100

-

-/* These determine what 'dumping' does, we can dump the

- * content octets or the DER encoding: both use the

- * RFC2253 #XXXXX notation.

- */

-

-#define ASN1_STRFLGS_DUMP_DER		0x200

-

-/* All the string flags consistent with RFC2253,

- * escaping control characters isn't essential in

- * RFC2253 but it is advisable anyway.

- */

-

-#define ASN1_STRFLGS_RFC2253	(ASN1_STRFLGS_ESC_2253 | \

-				ASN1_STRFLGS_ESC_CTRL | \

-				ASN1_STRFLGS_ESC_MSB | \

-				ASN1_STRFLGS_UTF8_CONVERT | \

-				ASN1_STRFLGS_DUMP_UNKNOWN | \

-				ASN1_STRFLGS_DUMP_DER)

-

-DECLARE_STACK_OF(ASN1_INTEGER)

-DECLARE_ASN1_SET_OF(ASN1_INTEGER)

-

-DECLARE_STACK_OF(ASN1_GENERALSTRING)

-

-typedef struct asn1_type_st

-	{

-	int type;

-	union	{

-		char *ptr;

-		ASN1_BOOLEAN		boolean;

-		ASN1_STRING *		asn1_string;

-		ASN1_OBJECT *		object;

-		ASN1_INTEGER *		integer;

-		ASN1_ENUMERATED *	enumerated;

-		ASN1_BIT_STRING *	bit_string;

-		ASN1_OCTET_STRING *	octet_string;

-		ASN1_PRINTABLESTRING *	printablestring;

-		ASN1_T61STRING *	t61string;

-		ASN1_IA5STRING *	ia5string;

-		ASN1_GENERALSTRING *	generalstring;

-		ASN1_BMPSTRING *	bmpstring;

-		ASN1_UNIVERSALSTRING *	universalstring;

-		ASN1_UTCTIME *		utctime;

-		ASN1_GENERALIZEDTIME *	generalizedtime;

-		ASN1_VISIBLESTRING *	visiblestring;

-		ASN1_UTF8STRING *	utf8string;

-		/* set and sequence are left complete and still

-		 * contain the set or sequence bytes */

-		ASN1_STRING *		set;

-		ASN1_STRING *		sequence;

-		ASN1_VALUE *		asn1_value;

-		} value;

-	} ASN1_TYPE;

-

-DECLARE_STACK_OF(ASN1_TYPE)

-DECLARE_ASN1_SET_OF(ASN1_TYPE)

-

-typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;

-

-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)

-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)

-

-typedef struct NETSCAPE_X509_st

-	{

-	ASN1_OCTET_STRING *header;

-	X509 *cert;

-	} NETSCAPE_X509;

-

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

-typedef struct BIT_STRING_BITNAME_st {

-	int bitnum;

-	const char *lname;

-	const char *sname;

-} BIT_STRING_BITNAME;

-

-

-#define M_ASN1_STRING_length(x)	((x)->length)

-#define M_ASN1_STRING_length_set(x, n)	((x)->length = (n))

-#define M_ASN1_STRING_type(x)	((x)->type)

-#define M_ASN1_STRING_data(x)	((x)->data)

-

-/* Macros for string operations */

-#define M_ASN1_BIT_STRING_new()	(ASN1_BIT_STRING *)\

-		ASN1_STRING_type_new(V_ASN1_BIT_STRING)

-#define M_ASN1_BIT_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\

-		ASN1_STRING_dup((const ASN1_STRING *)a)

-#define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\

-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)

-#define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)

-

-#define M_ASN1_INTEGER_new()	(ASN1_INTEGER *)\

-		ASN1_STRING_type_new(V_ASN1_INTEGER)

-#define M_ASN1_INTEGER_free(a)		ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\

-		ASN1_STRING_dup((const ASN1_STRING *)a)

-#define M_ASN1_INTEGER_cmp(a,b)	ASN1_STRING_cmp(\

-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)

-

-#define M_ASN1_ENUMERATED_new()	(ASN1_ENUMERATED *)\

-		ASN1_STRING_type_new(V_ASN1_ENUMERATED)

-#define M_ASN1_ENUMERATED_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\

-		ASN1_STRING_dup((const ASN1_STRING *)a)

-#define M_ASN1_ENUMERATED_cmp(a,b)	ASN1_STRING_cmp(\

-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)

-

-#define M_ASN1_OCTET_STRING_new()	(ASN1_OCTET_STRING *)\

-		ASN1_STRING_type_new(V_ASN1_OCTET_STRING)

-#define M_ASN1_OCTET_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\

-		ASN1_STRING_dup((const ASN1_STRING *)a)

-#define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\

-		(const ASN1_STRING *)a,(const ASN1_STRING *)b)

-#define M_ASN1_OCTET_STRING_set(a,b,c)	ASN1_STRING_set((ASN1_STRING *)a,b,c)

-#define M_ASN1_OCTET_STRING_print(a,b)	ASN1_STRING_print(a,(ASN1_STRING *)b)

-#define M_i2d_ASN1_OCTET_STRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\

-		V_ASN1_UNIVERSAL)

-

-#define B_ASN1_TIME \

-			B_ASN1_UTCTIME | \

-			B_ASN1_GENERALIZEDTIME

-

-#define B_ASN1_PRINTABLE \

-			B_ASN1_NUMERICSTRING| \

-			B_ASN1_PRINTABLESTRING| \

-			B_ASN1_T61STRING| \

-			B_ASN1_IA5STRING| \

-			B_ASN1_BIT_STRING| \

-			B_ASN1_UNIVERSALSTRING|\

-			B_ASN1_BMPSTRING|\

-			B_ASN1_UTF8STRING|\

-			B_ASN1_SEQUENCE|\

-			B_ASN1_UNKNOWN

-

-#define B_ASN1_DIRECTORYSTRING \

-			B_ASN1_PRINTABLESTRING| \

-			B_ASN1_TELETEXSTRING|\

-			B_ASN1_BMPSTRING|\

-			B_ASN1_UNIVERSALSTRING|\

-			B_ASN1_UTF8STRING

-

-#define B_ASN1_DISPLAYTEXT \

-			B_ASN1_IA5STRING| \

-			B_ASN1_VISIBLESTRING| \

-			B_ASN1_BMPSTRING|\

-			B_ASN1_UTF8STRING

-

-#define M_ASN1_PRINTABLE_new()	ASN1_STRING_type_new(V_ASN1_T61STRING)

-#define M_ASN1_PRINTABLE_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\

-		pp,a->type,V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_PRINTABLE(a,pp,l) \

-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \

-			B_ASN1_PRINTABLE)

-

-#define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)

-#define M_DIRECTORYSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\

-						pp,a->type,V_ASN1_UNIVERSAL)

-#define M_d2i_DIRECTORYSTRING(a,pp,l) \

-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \

-			B_ASN1_DIRECTORYSTRING)

-

-#define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)

-#define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\

-						pp,a->type,V_ASN1_UNIVERSAL)

-#define M_d2i_DISPLAYTEXT(a,pp,l) \

-		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \

-			B_ASN1_DISPLAYTEXT)

-

-#define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\

-		ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)

-#define M_ASN1_PRINTABLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_PRINTABLESTRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\

-		V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \

-		(ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\

-		((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)

-

-#define M_ASN1_T61STRING_new()	(ASN1_T61STRING *)\

-		ASN1_STRING_type_new(V_ASN1_T61STRING)

-#define M_ASN1_T61STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_T61STRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\

-		V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_T61STRING(a,pp,l) \

-		(ASN1_T61STRING *)d2i_ASN1_type_bytes\

-		((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)

-

-#define M_ASN1_IA5STRING_new()	(ASN1_IA5STRING *)\

-		ASN1_STRING_type_new(V_ASN1_IA5STRING)

-#define M_ASN1_IA5STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_IA5STRING_dup(a)	\

-		(ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)

-#define M_i2d_ASN1_IA5STRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\

-			V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_IA5STRING(a,pp,l) \

-		(ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\

-			B_ASN1_IA5STRING)

-

-#define M_ASN1_UTCTIME_new()	(ASN1_UTCTIME *)\

-		ASN1_STRING_type_new(V_ASN1_UTCTIME)

-#define M_ASN1_UTCTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\

-		ASN1_STRING_dup((const ASN1_STRING *)a)

-

-#define M_ASN1_GENERALIZEDTIME_new()	(ASN1_GENERALIZEDTIME *)\

-		ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)

-#define M_ASN1_GENERALIZEDTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\

-	(const ASN1_STRING *)a)

-

-#define M_ASN1_TIME_new()	(ASN1_TIME *)\

-		ASN1_STRING_type_new(V_ASN1_UTCTIME)

-#define M_ASN1_TIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_ASN1_TIME_dup(a) (ASN1_TIME *)\

-	ASN1_STRING_dup((const ASN1_STRING *)a)

-

-#define M_ASN1_GENERALSTRING_new()	(ASN1_GENERALSTRING *)\

-		ASN1_STRING_type_new(V_ASN1_GENERALSTRING)

-#define M_ASN1_GENERALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_GENERALSTRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\

-			V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_GENERALSTRING(a,pp,l) \

-		(ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\

-		((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)

-

-#define M_ASN1_UNIVERSALSTRING_new()	(ASN1_UNIVERSALSTRING *)\

-		ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)

-#define M_ASN1_UNIVERSALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\

-			V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \

-		(ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\

-		((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)

-

-#define M_ASN1_BMPSTRING_new()	(ASN1_BMPSTRING *)\

-		ASN1_STRING_type_new(V_ASN1_BMPSTRING)

-#define M_ASN1_BMPSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_BMPSTRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\

-			V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_BMPSTRING(a,pp,l) \

-		(ASN1_BMPSTRING *)d2i_ASN1_type_bytes\

-		((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)

-

-#define M_ASN1_VISIBLESTRING_new()	(ASN1_VISIBLESTRING *)\

-		ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)

-#define M_ASN1_VISIBLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_VISIBLESTRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\

-			V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \

-		(ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\

-		((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)

-

-#define M_ASN1_UTF8STRING_new()	(ASN1_UTF8STRING *)\

-		ASN1_STRING_type_new(V_ASN1_UTF8STRING)

-#define M_ASN1_UTF8STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)

-#define M_i2d_ASN1_UTF8STRING(a,pp) \

-		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\

-			V_ASN1_UNIVERSAL)

-#define M_d2i_ASN1_UTF8STRING(a,pp,l) \

-		(ASN1_UTF8STRING *)d2i_ASN1_type_bytes\

-		((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)

-

-  /* for the is_set parameter to i2d_ASN1_SET */

-#define IS_SEQUENCE	0

-#define IS_SET		1

-

-DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)

-

-int ASN1_TYPE_get(ASN1_TYPE *a);

-void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);

-int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);

-int            ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b);

-

-ASN1_OBJECT *	ASN1_OBJECT_new(void );

-void		ASN1_OBJECT_free(ASN1_OBJECT *a);

-int		i2d_ASN1_OBJECT(ASN1_OBJECT *a,unsigned char **pp);

-ASN1_OBJECT *	c2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,

-			long length);

-ASN1_OBJECT *	d2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,

-			long length);

-

-DECLARE_ASN1_ITEM(ASN1_OBJECT)

-

-DECLARE_STACK_OF(ASN1_OBJECT)

-DECLARE_ASN1_SET_OF(ASN1_OBJECT)

-

-ASN1_STRING *	ASN1_STRING_new(void);

-void		ASN1_STRING_free(ASN1_STRING *a);

-int		ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);

-ASN1_STRING *	ASN1_STRING_dup(const ASN1_STRING *a);

-ASN1_STRING *	ASN1_STRING_type_new(int type );

-int 		ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);

-  /* Since this is used to store all sorts of things, via macros, for now, make

-     its data void * */

-int 		ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);

-void		ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);

-int ASN1_STRING_length(const ASN1_STRING *x);

-void ASN1_STRING_length_set(ASN1_STRING *x, int n);

-int ASN1_STRING_type(ASN1_STRING *x);

-unsigned char * ASN1_STRING_data(ASN1_STRING *x);

-

-DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)

-int		i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a,unsigned char **pp);

-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,const unsigned char **pp,

-			long length);

-int		ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d,

-			int length );

-int		ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);

-int		ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);

-int            ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,

-                                     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);

-

-int		i2d_ASN1_BOOLEAN(int a,unsigned char **pp);

-int 		d2i_ASN1_BOOLEAN(int *a,const unsigned char **pp,long length);

-

-DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)

-int		i2c_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);

-ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a,const unsigned char **pp,

-			long length);

-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a,const unsigned char **pp,

-			long length);

-ASN1_INTEGER *	ASN1_INTEGER_dup(const ASN1_INTEGER *x);

-int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);

-

-DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)

-

-int ASN1_UTCTIME_check(ASN1_UTCTIME *a);

-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);

-ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,

-				int offset_day, long offset_sec);

-int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);

-int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);

-#if 0

-time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);

-#endif

-

-int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);

-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);

-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,

-	     time_t t, int offset_day, long offset_sec);

-int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);

-

-DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)

-ASN1_OCTET_STRING *	ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);

-int 	ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b);

-int 	ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data, int len);

-

-DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)

-DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)

-DECLARE_ASN1_FUNCTIONS(ASN1_UTF8STRING)

-DECLARE_ASN1_FUNCTIONS(ASN1_NULL)

-DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)

-

-int UTF8_getc(const unsigned char *str, int len, unsigned long *val);

-int UTF8_putc(unsigned char *str, int len, unsigned long value);

-

-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, ASN1_PRINTABLE)

-

-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DIRECTORYSTRING)

-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DISPLAYTEXT)

-DECLARE_ASN1_FUNCTIONS(ASN1_PRINTABLESTRING)

-DECLARE_ASN1_FUNCTIONS(ASN1_T61STRING)

-DECLARE_ASN1_FUNCTIONS(ASN1_IA5STRING)

-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALSTRING)

-DECLARE_ASN1_FUNCTIONS(ASN1_UTCTIME)

-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALIZEDTIME)

-DECLARE_ASN1_FUNCTIONS(ASN1_TIME)

-

-DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)

-

-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s,time_t t);

-ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s,time_t t,

-				int offset_day, long offset_sec);

-int ASN1_TIME_check(ASN1_TIME *t);

-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);

-int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);

-

-int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,

-		 i2d_of_void *i2d, int ex_tag, int ex_class,

-		 int is_set);

-STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,

-			      const unsigned char **pp,

-			      long length, d2i_of_void *d2i,

-			      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);

-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);

-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data,int len,

-	const char *sn, const char *ln);

-

-int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);

-long ASN1_INTEGER_get(const ASN1_INTEGER *a);

-ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai);

-BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai,BIGNUM *bn);

-

-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);

-long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);

-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);

-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai,BIGNUM *bn);

-

-/* General */

-/* given a string, return the correct type, max is the maximum length */

-int ASN1_PRINTABLE_type(const unsigned char *s, int max);

-

-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);

-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,

-	long length, int Ptag, int Pclass);

-unsigned long ASN1_tag2bit(int tag);

-/* type is one or more of the B_ASN1_ values. */

-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a,const unsigned char **pp,

-		long length,int type);

-

-/* PARSING */

-int asn1_Finish(ASN1_CTX *c);

-int asn1_const_Finish(ASN1_const_CTX *c);

-

-/* SPECIALS */

-int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,

-	int *pclass, long omax);

-int ASN1_check_infinite_end(unsigned char **p,long len);

-int ASN1_const_check_infinite_end(const unsigned char **p,long len);

-void ASN1_put_object(unsigned char **pp, int constructed, int length,

-	int tag, int xclass);

-int ASN1_put_eoc(unsigned char **pp);

-int ASN1_object_size(int constructed, int length, int tag);

-

-/* Used to implement other functions */

-void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);

-

-#define ASN1_dup_of(type,i2d,d2i,x) \

-    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \

-		     CHECKED_D2I_OF(type, d2i), \

-		     CHECKED_PTR_OF(type, x)))

-

-#define ASN1_dup_of_const(type,i2d,d2i,x) \

-    ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \

-		     CHECKED_D2I_OF(type, d2i), \

-		     CHECKED_PTR_OF(const type, x)))

-

-void *ASN1_item_dup(const ASN1_ITEM *it, void *x);

-

-/* ASN1 alloc/free macros for when a type is only used internally */

-

-#define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))

-#define M_ASN1_free_of(x, type) \

-		ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))

-

-#ifndef OPENSSL_NO_FP_API

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

-

-#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \

-    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \

-			CHECKED_D2I_OF(type, d2i), \

-			in, \

-			CHECKED_PPTR_OF(type, x)))

-

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

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

-

-#define ASN1_i2d_fp_of(type,i2d,out,x) \

-    (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \

-		 out, \

-		 CHECKED_PTR_OF(type, x)))

-

-#define ASN1_i2d_fp_of_const(type,i2d,out,x) \

-    (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \

-		 out, \

-		 CHECKED_PTR_OF(const type, x)))

-

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

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

-#endif

-

-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) \

-    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \

-			  CHECKED_D2I_OF(type, d2i), \

-			  in, \

-			  CHECKED_PPTR_OF(type, x)))

-

-void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);

-int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);

-

-#define ASN1_i2d_bio_of(type,i2d,out,x) \

-    (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \

-		  out, \

-		  CHECKED_PTR_OF(type, x)))

-

-#define ASN1_i2d_bio_of_const(type,i2d,out,x) \

-    (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \

-		  out, \

-		  CHECKED_PTR_OF(const type, x)))

-

-int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);

-int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);

-int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);

-int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);

-int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);

-int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags);

-int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,

-				unsigned char *buf, int off);

-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 */

-

-DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)

-

-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);

-

-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a,

-	unsigned char *data, int len);

-int ASN1_TYPE_get_octetstring(ASN1_TYPE *a,

-	unsigned char *data, int max_len);

-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,

-	unsigned char *data, int len);

-int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,

-	unsigned char *data, int max_len);

-

-STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,

-				 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK));

-unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,

-			     unsigned char **buf, int *len );

-void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);

-void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);

-ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,

-			      ASN1_OCTET_STRING **oct);

-

-#define ASN1_pack_string_of(type,obj,i2d,oct) \

-    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \

-		      CHECKED_I2D_OF(type, i2d), \

-		      oct))

-

-ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);

-

-void ASN1_STRING_set_default_mask(unsigned long mask);

-int ASN1_STRING_set_default_mask_asc(const char *p);

-unsigned long ASN1_STRING_get_default_mask(void);

-int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,

-					int inform, unsigned long mask);

-int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,

-					int inform, unsigned long mask, 

-					long minsize, long maxsize);

-

-ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, 

-		const unsigned char *in, int inlen, int inform, int nid);

-ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);

-int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);

-void ASN1_STRING_TABLE_cleanup(void);

-

-/* ASN1 template functions */

-

-/* Old API compatible functions */

-ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);

-void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);

-ASN1_VALUE * ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in, long len, const ASN1_ITEM *it);

-int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);

-int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);

-

-void ASN1_add_oid_module(void);

-

-ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);

-ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);

-

-/* ASN1 Print flags */

-

-/* Indicate missing OPTIONAL fields */

-#define ASN1_PCTX_FLAGS_SHOW_ABSENT		0x001	

-/* Mark start and end of SEQUENCE */

-#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE		0x002

-/* Mark start and end of SEQUENCE/SET OF */

-#define ASN1_PCTX_FLAGS_SHOW_SSOF		0x004

-/* Show the ASN1 type of primitives */

-#define ASN1_PCTX_FLAGS_SHOW_TYPE		0x008

-/* Don't show ASN1 type of ANY */

-#define ASN1_PCTX_FLAGS_NO_ANY_TYPE		0x010

-/* Don't show ASN1 type of MSTRINGs */

-#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE		0x020

-/* Don't show field names in SEQUENCE */

-#define ASN1_PCTX_FLAGS_NO_FIELD_NAME		0x040

-/* Show structure names of each SEQUENCE field */

-#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME	0x080

-/* Don't show structure name even at top level */

-#define ASN1_PCTX_FLAGS_NO_STRUCT_NAME		0x100

-

-int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,

-				const ASN1_ITEM *it, const ASN1_PCTX *pctx);

-ASN1_PCTX *ASN1_PCTX_new(void);

-void ASN1_PCTX_free(ASN1_PCTX *p);

-unsigned long ASN1_PCTX_get_flags(ASN1_PCTX *p);

-void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);

-unsigned long ASN1_PCTX_get_nm_flags(ASN1_PCTX *p);

-void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);

-unsigned long ASN1_PCTX_get_cert_flags(ASN1_PCTX *p);

-void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);

-unsigned long ASN1_PCTX_get_oid_flags(ASN1_PCTX *p);

-void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);

-unsigned long ASN1_PCTX_get_str_flags(ASN1_PCTX *p);

-void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);

-

-BIO_METHOD *BIO_f_asn1(void);

-

-BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);

-

-int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,

-				const ASN1_ITEM *it);

-int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,

-				const char *hdr,

-				const ASN1_ITEM *it);

-int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,

-				int ctype_nid, int econt_nid,

-				STACK_OF(X509_ALGOR) *mdalgs,

-				const ASN1_ITEM *it);

-ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);

-int SMIME_crlf_copy(BIO *in, BIO *out, int flags);

-int SMIME_text(BIO *in, BIO *out);

-

-/* BEGIN ERROR CODES */

-/* The following lines are auto generated by the script mkerr.pl. Any changes

- * made after this point may be overwritten when the script is next run.

- */

-void ERR_load_ASN1_strings(void);

-

-/* Error codes for the ASN1 functions. */

-

-/* Function codes. */

-#define ASN1_F_A2D_ASN1_OBJECT				 100

-#define ASN1_F_A2I_ASN1_ENUMERATED			 101

-#define ASN1_F_A2I_ASN1_INTEGER				 102

-#define ASN1_F_A2I_ASN1_STRING				 103

-#define ASN1_F_APPEND_EXP				 176

-#define ASN1_F_ASN1_BIT_STRING_SET_BIT			 183

-#define ASN1_F_ASN1_CB					 177

-#define ASN1_F_ASN1_CHECK_TLEN				 104

-#define ASN1_F_ASN1_COLLATE_PRIMITIVE			 105

-#define ASN1_F_ASN1_COLLECT				 106

-#define ASN1_F_ASN1_D2I_EX_PRIMITIVE			 108

-#define ASN1_F_ASN1_D2I_FP				 109

-#define ASN1_F_ASN1_D2I_READ_BIO			 107

-#define ASN1_F_ASN1_DIGEST				 184

-#define ASN1_F_ASN1_DO_ADB				 110

-#define ASN1_F_ASN1_DUP					 111

-#define ASN1_F_ASN1_ENUMERATED_SET			 112

-#define ASN1_F_ASN1_ENUMERATED_TO_BN			 113

-#define ASN1_F_ASN1_EX_C2I				 204

-#define ASN1_F_ASN1_FIND_END				 190

-#define ASN1_F_ASN1_GENERALIZEDTIME_ADJ			 216

-#define ASN1_F_ASN1_GENERALIZEDTIME_SET			 185

-#define ASN1_F_ASN1_GENERATE_V3				 178

-#define ASN1_F_ASN1_GET_OBJECT				 114

-#define ASN1_F_ASN1_HEADER_NEW				 115

-#define ASN1_F_ASN1_I2D_BIO				 116

-#define ASN1_F_ASN1_I2D_FP				 117

-#define ASN1_F_ASN1_INTEGER_SET				 118

-#define ASN1_F_ASN1_INTEGER_TO_BN			 119

-#define ASN1_F_ASN1_ITEM_D2I_FP				 206

-#define ASN1_F_ASN1_ITEM_DUP				 191

-#define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW			 121

-#define ASN1_F_ASN1_ITEM_EX_D2I				 120

-#define ASN1_F_ASN1_ITEM_I2D_BIO			 192

-#define ASN1_F_ASN1_ITEM_I2D_FP				 193

-#define ASN1_F_ASN1_ITEM_PACK				 198

-#define ASN1_F_ASN1_ITEM_SIGN				 195

-#define ASN1_F_ASN1_ITEM_UNPACK				 199

-#define ASN1_F_ASN1_ITEM_VERIFY				 197

-#define ASN1_F_ASN1_MBSTRING_NCOPY			 122

-#define ASN1_F_ASN1_OBJECT_NEW				 123

-#define ASN1_F_ASN1_OUTPUT_DATA				 214

-#define ASN1_F_ASN1_PACK_STRING				 124

-#define ASN1_F_ASN1_PCTX_NEW				 205

-#define ASN1_F_ASN1_PKCS5_PBE_SET			 125

-#define ASN1_F_ASN1_SEQ_PACK				 126

-#define ASN1_F_ASN1_SEQ_UNPACK				 127

-#define ASN1_F_ASN1_SIGN				 128

-#define ASN1_F_ASN1_STR2TYPE				 179

-#define ASN1_F_ASN1_STRING_SET				 186

-#define ASN1_F_ASN1_STRING_TABLE_ADD			 129

-#define ASN1_F_ASN1_STRING_TYPE_NEW			 130

-#define ASN1_F_ASN1_TEMPLATE_EX_D2I			 132

-#define ASN1_F_ASN1_TEMPLATE_NEW			 133

-#define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I			 131

-#define ASN1_F_ASN1_TIME_ADJ				 217

-#define ASN1_F_ASN1_TIME_SET				 175

-#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING		 134

-#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING		 135

-#define ASN1_F_ASN1_UNPACK_STRING			 136

-#define ASN1_F_ASN1_UTCTIME_ADJ				 218

-#define ASN1_F_ASN1_UTCTIME_SET				 187

-#define ASN1_F_ASN1_VERIFY				 137

-#define ASN1_F_B64_READ_ASN1				 209

-#define ASN1_F_B64_WRITE_ASN1				 210

-#define ASN1_F_BIO_NEW_NDEF				 208

-#define ASN1_F_BITSTR_CB				 180

-#define ASN1_F_BN_TO_ASN1_ENUMERATED			 138

-#define ASN1_F_BN_TO_ASN1_INTEGER			 139

-#define ASN1_F_C2I_ASN1_BIT_STRING			 189

-#define ASN1_F_C2I_ASN1_INTEGER				 194

-#define ASN1_F_C2I_ASN1_OBJECT				 196

-#define ASN1_F_COLLECT_DATA				 140

-#define ASN1_F_D2I_ASN1_BIT_STRING			 141

-#define ASN1_F_D2I_ASN1_BOOLEAN				 142

-#define ASN1_F_D2I_ASN1_BYTES				 143

-#define ASN1_F_D2I_ASN1_GENERALIZEDTIME			 144

-#define ASN1_F_D2I_ASN1_HEADER				 145

-#define ASN1_F_D2I_ASN1_INTEGER				 146

-#define ASN1_F_D2I_ASN1_OBJECT				 147

-#define ASN1_F_D2I_ASN1_SET				 148

-#define ASN1_F_D2I_ASN1_TYPE_BYTES			 149

-#define ASN1_F_D2I_ASN1_UINTEGER			 150

-#define ASN1_F_D2I_ASN1_UTCTIME				 151

-#define ASN1_F_D2I_AUTOPRIVATEKEY			 207

-#define ASN1_F_D2I_NETSCAPE_RSA				 152

-#define ASN1_F_D2I_NETSCAPE_RSA_2			 153

-#define ASN1_F_D2I_PRIVATEKEY				 154

-#define ASN1_F_D2I_PUBLICKEY				 155

-#define ASN1_F_D2I_RSA_NET				 200

-#define ASN1_F_D2I_RSA_NET_2				 201

-#define ASN1_F_D2I_X509					 156

-#define ASN1_F_D2I_X509_CINF				 157

-#define ASN1_F_D2I_X509_PKEY				 159

-#define ASN1_F_I2D_ASN1_BIO_STREAM			 211

-#define ASN1_F_I2D_ASN1_SET				 188

-#define ASN1_F_I2D_ASN1_TIME				 160

-#define ASN1_F_I2D_DSA_PUBKEY				 161

-#define ASN1_F_I2D_EC_PUBKEY				 181

-#define ASN1_F_I2D_PRIVATEKEY				 163

-#define ASN1_F_I2D_PUBLICKEY				 164

-#define ASN1_F_I2D_RSA_NET				 162

-#define ASN1_F_I2D_RSA_PUBKEY				 165

-#define ASN1_F_LONG_C2I					 166

-#define ASN1_F_OID_MODULE_INIT				 174

-#define ASN1_F_PARSE_TAGGING				 182

-#define ASN1_F_PKCS5_PBE2_SET_IV			 167

-#define ASN1_F_PKCS5_PBE_SET				 202

-#define ASN1_F_PKCS5_PBE_SET0_ALGOR			 215

-#define ASN1_F_SMIME_READ_ASN1				 212

-#define ASN1_F_SMIME_TEXT				 213

-#define ASN1_F_X509_CINF_NEW				 168

-#define ASN1_F_X509_CRL_ADD0_REVOKED			 169

-#define ASN1_F_X509_INFO_NEW				 170

-#define ASN1_F_X509_NAME_ENCODE				 203

-#define ASN1_F_X509_NAME_EX_D2I				 158

-#define ASN1_F_X509_NAME_EX_NEW				 171

-#define ASN1_F_X509_NEW					 172

-#define ASN1_F_X509_PKEY_NEW				 173

-

-/* Reason codes. */

-#define ASN1_R_ADDING_OBJECT				 171

-#define ASN1_R_ASN1_PARSE_ERROR				 203

-#define ASN1_R_ASN1_SIG_PARSE_ERROR			 204

-#define ASN1_R_AUX_ERROR				 100

-#define ASN1_R_BAD_CLASS				 101

-#define ASN1_R_BAD_OBJECT_HEADER			 102

-#define ASN1_R_BAD_PASSWORD_READ			 103

-#define ASN1_R_BAD_TAG					 104

-#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 214

-#define ASN1_R_BN_LIB					 105

-#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106

-#define ASN1_R_BUFFER_TOO_SMALL				 107

-#define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER		 108

-#define ASN1_R_DATA_IS_WRONG				 109

-#define ASN1_R_DECODE_ERROR				 110

-#define ASN1_R_DECODING_ERROR				 111

-#define ASN1_R_DEPTH_EXCEEDED				 174

-#define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED	 198

-#define ASN1_R_ENCODE_ERROR				 112

-#define ASN1_R_ERROR_GETTING_TIME			 173

-#define ASN1_R_ERROR_LOADING_SECTION			 172

-#define ASN1_R_ERROR_PARSING_SET_ELEMENT		 113

-#define ASN1_R_ERROR_SETTING_CIPHER_PARAMS		 114

-#define ASN1_R_EXPECTING_AN_INTEGER			 115

-#define ASN1_R_EXPECTING_AN_OBJECT			 116

-#define ASN1_R_EXPECTING_A_BOOLEAN			 117

-#define ASN1_R_EXPECTING_A_TIME				 118

-#define ASN1_R_EXPLICIT_LENGTH_MISMATCH			 119

-#define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED		 120

-#define ASN1_R_FIELD_MISSING				 121

-#define ASN1_R_FIRST_NUM_TOO_LARGE			 122

-#define ASN1_R_HEADER_TOO_LONG				 123

-#define ASN1_R_ILLEGAL_BITSTRING_FORMAT			 175

-#define ASN1_R_ILLEGAL_BOOLEAN				 176

-#define ASN1_R_ILLEGAL_CHARACTERS			 124

-#define ASN1_R_ILLEGAL_FORMAT				 177

-#define ASN1_R_ILLEGAL_HEX				 178

-#define ASN1_R_ILLEGAL_IMPLICIT_TAG			 179

-#define ASN1_R_ILLEGAL_INTEGER				 180

-#define ASN1_R_ILLEGAL_NESTED_TAGGING			 181

-#define ASN1_R_ILLEGAL_NULL				 125

-#define ASN1_R_ILLEGAL_NULL_VALUE			 182

-#define ASN1_R_ILLEGAL_OBJECT				 183

-#define ASN1_R_ILLEGAL_OPTIONAL_ANY			 126

-#define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE		 170

-#define ASN1_R_ILLEGAL_TAGGED_ANY			 127

-#define ASN1_R_ILLEGAL_TIME_VALUE			 184

-#define ASN1_R_INTEGER_NOT_ASCII_FORMAT			 185

-#define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG		 128

-#define ASN1_R_INVALID_BMPSTRING_LENGTH			 129

-#define ASN1_R_INVALID_DIGIT				 130

-#define ASN1_R_INVALID_MIME_TYPE			 205

-#define ASN1_R_INVALID_MODIFIER				 186

-#define ASN1_R_INVALID_NUMBER				 187

-#define ASN1_R_INVALID_OBJECT_ENCODING			 216

-#define ASN1_R_INVALID_SEPARATOR			 131

-#define ASN1_R_INVALID_TIME_FORMAT			 132

-#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH		 133

-#define ASN1_R_INVALID_UTF8STRING			 134

-#define ASN1_R_IV_TOO_LARGE				 135

-#define ASN1_R_LENGTH_ERROR				 136

-#define ASN1_R_LIST_ERROR				 188

-#define ASN1_R_MIME_NO_CONTENT_TYPE			 206

-#define ASN1_R_MIME_PARSE_ERROR				 207

-#define ASN1_R_MIME_SIG_PARSE_ERROR			 208

-#define ASN1_R_MISSING_EOC				 137

-#define ASN1_R_MISSING_SECOND_NUMBER			 138

-#define ASN1_R_MISSING_VALUE				 189

-#define ASN1_R_MSTRING_NOT_UNIVERSAL			 139

-#define ASN1_R_MSTRING_WRONG_TAG			 140

-#define ASN1_R_NESTED_ASN1_STRING			 197

-#define ASN1_R_NON_HEX_CHARACTERS			 141

-#define ASN1_R_NOT_ASCII_FORMAT				 190

-#define ASN1_R_NOT_ENOUGH_DATA				 142

-#define ASN1_R_NO_CONTENT_TYPE				 209

-#define ASN1_R_NO_DEFAULT_DIGEST			 201

-#define ASN1_R_NO_MATCHING_CHOICE_TYPE			 143

-#define ASN1_R_NO_MULTIPART_BODY_FAILURE		 210

-#define ASN1_R_NO_MULTIPART_BOUNDARY			 211

-#define ASN1_R_NO_SIG_CONTENT_TYPE			 212

-#define ASN1_R_NULL_IS_WRONG_LENGTH			 144

-#define ASN1_R_OBJECT_NOT_ASCII_FORMAT			 191

-#define ASN1_R_ODD_NUMBER_OF_CHARS			 145

-#define ASN1_R_PRIVATE_KEY_HEADER_MISSING		 146

-#define ASN1_R_SECOND_NUMBER_TOO_LARGE			 147

-#define ASN1_R_SEQUENCE_LENGTH_MISMATCH			 148

-#define ASN1_R_SEQUENCE_NOT_CONSTRUCTED			 149

-#define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG		 192

-#define ASN1_R_SHORT_LINE				 150

-#define ASN1_R_SIG_INVALID_MIME_TYPE			 213

-#define ASN1_R_STREAMING_NOT_SUPPORTED			 202

-#define ASN1_R_STRING_TOO_LONG				 151

-#define ASN1_R_STRING_TOO_SHORT				 152

-#define ASN1_R_TAG_VALUE_TOO_HIGH			 153

-#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154

-#define ASN1_R_TIME_NOT_ASCII_FORMAT			 193

-#define ASN1_R_TOO_LONG					 155

-#define ASN1_R_TYPE_NOT_CONSTRUCTED			 156

-#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157

-#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158

-#define ASN1_R_UNEXPECTED_EOC				 159

-#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 215

-#define ASN1_R_UNKNOWN_FORMAT				 160

-#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161

-#define ASN1_R_UNKNOWN_OBJECT_TYPE			 162

-#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE			 163

-#define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM		 199

-#define ASN1_R_UNKNOWN_TAG				 194

-#define ASN1_R_UNKOWN_FORMAT				 195

-#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE		 164

-#define ASN1_R_UNSUPPORTED_CIPHER			 165

-#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM		 166

-#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE		 167

-#define ASN1_R_UNSUPPORTED_TYPE				 196

-#define ASN1_R_WRONG_PUBLIC_KEY_TYPE			 200

-#define ASN1_R_WRONG_TAG				 168

-#define ASN1_R_WRONG_TYPE				 169

-

-#ifdef  __cplusplus

-}

-#endif

-#endif

+/* crypto/asn1/asn1.h */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef HEADER_ASN1_H
+#define HEADER_ASN1_H
+
+#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>
+
+#include <openssl/symhacks.h>
+
+#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
+
+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+# undef OPENSSL_EXTERN
+# define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define V_ASN1_UNIVERSAL		0x00
+#define	V_ASN1_APPLICATION		0x40
+#define V_ASN1_CONTEXT_SPECIFIC		0x80
+#define V_ASN1_PRIVATE			0xc0
+
+#define V_ASN1_CONSTRUCTED		0x20
+#define V_ASN1_PRIMITIVE_TAG		0x1f
+#define V_ASN1_PRIMATIVE_TAG		0x1f
+
+#define V_ASN1_APP_CHOOSE		-2	/* let the recipient choose */
+#define V_ASN1_OTHER			-3	/* used in ASN1_TYPE */
+#define V_ASN1_ANY			-4	/* used in ASN1 template code */
+
+#define V_ASN1_NEG			0x100	/* negative flag */
+
+#define V_ASN1_UNDEF			-1
+#define V_ASN1_EOC			0
+#define V_ASN1_BOOLEAN			1	/**/
+#define V_ASN1_INTEGER			2
+#define V_ASN1_NEG_INTEGER		(2 | V_ASN1_NEG)
+#define V_ASN1_BIT_STRING		3
+#define V_ASN1_OCTET_STRING		4
+#define V_ASN1_NULL			5
+#define V_ASN1_OBJECT			6
+#define V_ASN1_OBJECT_DESCRIPTOR	7
+#define V_ASN1_EXTERNAL			8
+#define V_ASN1_REAL			9
+#define V_ASN1_ENUMERATED		10
+#define V_ASN1_NEG_ENUMERATED		(10 | V_ASN1_NEG)
+#define V_ASN1_UTF8STRING		12
+#define V_ASN1_SEQUENCE			16
+#define V_ASN1_SET			17
+#define V_ASN1_NUMERICSTRING		18	/**/
+#define V_ASN1_PRINTABLESTRING		19
+#define V_ASN1_T61STRING		20
+#define V_ASN1_TELETEXSTRING		20	/* alias */
+#define V_ASN1_VIDEOTEXSTRING		21	/**/
+#define V_ASN1_IA5STRING		22
+#define V_ASN1_UTCTIME			23
+#define V_ASN1_GENERALIZEDTIME		24	/**/
+#define V_ASN1_GRAPHICSTRING		25	/**/
+#define V_ASN1_ISO64STRING		26	/**/
+#define V_ASN1_VISIBLESTRING		26	/* alias */
+#define V_ASN1_GENERALSTRING		27	/**/
+#define V_ASN1_UNIVERSALSTRING		28	/**/
+#define V_ASN1_BMPSTRING		30
+
+/* For use with d2i_ASN1_type_bytes() */
+#define B_ASN1_NUMERICSTRING	0x0001
+#define B_ASN1_PRINTABLESTRING	0x0002
+#define B_ASN1_T61STRING	0x0004
+#define B_ASN1_TELETEXSTRING	0x0004
+#define B_ASN1_VIDEOTEXSTRING	0x0008
+#define B_ASN1_IA5STRING	0x0010
+#define B_ASN1_GRAPHICSTRING	0x0020
+#define B_ASN1_ISO64STRING	0x0040
+#define B_ASN1_VISIBLESTRING	0x0040
+#define B_ASN1_GENERALSTRING	0x0080
+#define B_ASN1_UNIVERSALSTRING	0x0100
+#define B_ASN1_OCTET_STRING	0x0200
+#define B_ASN1_BIT_STRING	0x0400
+#define B_ASN1_BMPSTRING	0x0800
+#define B_ASN1_UNKNOWN		0x1000
+#define B_ASN1_UTF8STRING	0x2000
+#define B_ASN1_UTCTIME		0x4000
+#define B_ASN1_GENERALIZEDTIME	0x8000
+#define B_ASN1_SEQUENCE		0x10000
+
+/* For use with ASN1_mbstring_copy() */
+#define MBSTRING_FLAG		0x1000
+#define MBSTRING_UTF8		(MBSTRING_FLAG)
+#define MBSTRING_ASC		(MBSTRING_FLAG|1)
+#define MBSTRING_BMP		(MBSTRING_FLAG|2)
+#define MBSTRING_UNIV		(MBSTRING_FLAG|4)
+
+#define SMIME_OLDMIME		0x400
+#define SMIME_CRLFEOL		0x800
+#define SMIME_STREAM		0x1000
+
+struct X509_algor_st;
+DECLARE_STACK_OF(X509_ALGOR)
+
+#define DECLARE_ASN1_SET_OF(type) /* filled in by mkstack.pl */
+#define IMPLEMENT_ASN1_SET_OF(type) /* nothing, no longer needed */
+
+/* We MUST make sure that, except for constness, asn1_ctx_st and
+   asn1_const_ctx are exactly the same.  Fortunately, as soon as
+   the old ASN1 parsing macros are gone, we can throw this away
+   as well... */
+typedef struct asn1_ctx_st
+	{
+	unsigned char *p;/* work char pointer */
+	int eos;	/* end of sequence read for indefinite encoding */
+	int error;	/* error code to use when returning an error */
+	int inf;	/* constructed if 0x20, indefinite is 0x21 */
+	int tag;	/* tag from last 'get object' */
+	int xclass;	/* class from last 'get object' */
+	long slen;	/* length of last 'get object' */
+	unsigned char *max; /* largest value of p allowed */
+	unsigned char *q;/* temporary variable */
+	unsigned char **pp;/* variable */
+	int line;	/* used in error processing */
+	} ASN1_CTX;
+
+typedef struct asn1_const_ctx_st
+	{
+	const unsigned char *p;/* work char pointer */
+	int eos;	/* end of sequence read for indefinite encoding */
+	int error;	/* error code to use when returning an error */
+	int inf;	/* constructed if 0x20, indefinite is 0x21 */
+	int tag;	/* tag from last 'get object' */
+	int xclass;	/* class from last 'get object' */
+	long slen;	/* length of last 'get object' */
+	const unsigned char *max; /* largest value of p allowed */
+	const unsigned char *q;/* temporary variable */
+	const unsigned char **pp;/* variable */
+	int line;	/* used in error processing */
+	} ASN1_const_CTX;
+
+/* These are used internally in the ASN1_OBJECT to keep track of
+ * whether the names and data need to be free()ed */
+#define ASN1_OBJECT_FLAG_DYNAMIC	 0x01	/* internal use */
+#define ASN1_OBJECT_FLAG_CRITICAL	 0x02	/* critical x509v3 object id */
+#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04	/* internal use */
+#define ASN1_OBJECT_FLAG_DYNAMIC_DATA 	 0x08	/* internal use */
+typedef struct asn1_object_st
+	{
+	const char *sn,*ln;
+	int nid;
+	int length;
+	const unsigned char *data;	/* data remains const after init */
+	int flags;	/* Should we free this one */
+	} ASN1_OBJECT;
+
+#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
+/* This indicates that the ASN1_STRING is not a real value but just a place
+ * holder for the location where indefinite length constructed data should
+ * be inserted in the memory buffer 
+ */
+#define ASN1_STRING_FLAG_NDEF 0x010 
+
+/* This flag is used by the CMS code to indicate that a string is not
+ * complete and is a place holder for content when it had all been 
+ * accessed. The flag will be reset when content has been written to it.
+ */
+
+#define ASN1_STRING_FLAG_CONT 0x020 
+/* This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING
+ * type.
+ */
+#define ASN1_STRING_FLAG_MSTRING 0x040 
+/* This is the base type that holds just about everything :-) */
+typedef struct asn1_string_st
+	{
+	int length;
+	int type;
+	unsigned char *data;
+	/* The value of the following field depends on the type being
+	 * held.  It is mostly being used for BIT_STRING so if the
+	 * input data has a non-zero 'unused bits' value, it will be
+	 * handled correctly */
+	long flags;
+	} ASN1_STRING;
+
+/* ASN1_ENCODING structure: this is used to save the received
+ * encoding of an ASN1 type. This is useful to get round
+ * problems with invalid encodings which can break signatures.
+ */
+
+typedef struct ASN1_ENCODING_st
+	{
+	unsigned char *enc;	/* DER encoding */
+	long len;		/* Length of encoding */
+	int modified;		 /* set to 1 if 'enc' is invalid */
+	} ASN1_ENCODING;
+
+/* Used with ASN1 LONG type: if a long is set to this it is omitted */
+#define ASN1_LONG_UNDEF	0x7fffffffL
+
+#define STABLE_FLAGS_MALLOC	0x01
+#define STABLE_NO_MASK		0x02
+#define DIRSTRING_TYPE	\
+ (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)
+#define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)
+
+typedef struct asn1_string_table_st {
+	int nid;
+	long minsize;
+	long maxsize;
+	unsigned long mask;
+	unsigned long flags;
+} ASN1_STRING_TABLE;
+
+DECLARE_STACK_OF(ASN1_STRING_TABLE)
+
+/* size limits: this stuff is taken straight from RFC2459 */
+
+#define ub_name				32768
+#define ub_common_name			64
+#define ub_locality_name		128
+#define ub_state_name			128
+#define ub_organization_name		64
+#define ub_organization_unit_name	64
+#define ub_title			64
+#define ub_email_address		128
+
+/* Declarations for template structures: for full definitions
+ * see asn1t.h
+ */
+typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
+typedef struct ASN1_ITEM_st ASN1_ITEM;
+typedef struct ASN1_TLC_st ASN1_TLC;
+/* This is just an opaque pointer */
+typedef struct ASN1_VALUE_st ASN1_VALUE;
+
+/* Declare ASN1 functions: the implement macro in in asn1t.h */
+
+#define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
+
+#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
+	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)
+
+#define DECLARE_ASN1_FUNCTIONS_name(type, name) \
+	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
+	DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)
+
+#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
+	DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
+	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
+
+#define	DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
+	type *d2i_##name(type **a, const unsigned char **in, long len); \
+	int i2d_##name(type *a, unsigned char **out); \
+	DECLARE_ASN1_ITEM(itname)
+
+#define	DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
+	type *d2i_##name(type **a, const unsigned char **in, long len); \
+	int i2d_##name(const type *a, unsigned char **out); \
+	DECLARE_ASN1_ITEM(name)
+
+#define	DECLARE_ASN1_NDEF_FUNCTION(name) \
+	int i2d_##name##_NDEF(name *a, unsigned char **out);
+
+#define DECLARE_ASN1_FUNCTIONS_const(name) \
+	DECLARE_ASN1_ALLOC_FUNCTIONS(name) \
+	DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)
+
+#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
+	type *name##_new(void); \
+	void name##_free(type *a);
+
+#define DECLARE_ASN1_PRINT_FUNCTION(stname) \
+	DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)
+
+#define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
+	int fname##_print_ctx(BIO *out, stname *x, int indent, \
+					 const ASN1_PCTX *pctx);
+
+#define D2I_OF(type) type *(*)(type **,const unsigned char **,long)
+#define I2D_OF(type) int (*)(type *,unsigned char **)
+#define I2D_OF_const(type) int (*)(const type *,unsigned char **)
+
+#define CHECKED_D2I_OF(type, d2i) \
+    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))
+#define CHECKED_I2D_OF(type, i2d) \
+    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))
+#define CHECKED_NEW_OF(type, xnew) \
+    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))
+#define CHECKED_PTR_OF(type, p) \
+    ((void*) (1 ? p : (type*)0))
+#define CHECKED_PPTR_OF(type, p) \
+    ((void**) (1 ? p : (type**)0))
+
+#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)
+#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)
+#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
+
+TYPEDEF_D2I2D_OF(void);
+
+/* The following macros and typedefs allow an ASN1_ITEM
+ * to be embedded in a structure and referenced. Since
+ * the ASN1_ITEM pointers need to be globally accessible
+ * (possibly from shared libraries) they may exist in
+ * different forms. On platforms that support it the
+ * ASN1_ITEM structure itself will be globally exported.
+ * Other platforms will export a function that returns
+ * an ASN1_ITEM pointer.
+ *
+ * To handle both cases transparently the macros below
+ * should be used instead of hard coding an ASN1_ITEM
+ * pointer in a structure.
+ *
+ * The structure will look like this:
+ *
+ * typedef struct SOMETHING_st {
+ *      ...
+ *      ASN1_ITEM_EXP *iptr;
+ *      ...
+ * } SOMETHING; 
+ *
+ * It would be initialised as e.g.:
+ *
+ * SOMETHING somevar = {...,ASN1_ITEM_ref(X509),...};
+ *
+ * and the actual pointer extracted with:
+ *
+ * const ASN1_ITEM *it = ASN1_ITEM_ptr(somevar.iptr);
+ *
+ * Finally an ASN1_ITEM pointer can be extracted from an
+ * appropriate reference with: ASN1_ITEM_rptr(X509). This
+ * would be used when a function takes an ASN1_ITEM * argument.
+ *
+ */
+
+#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
+
+/* ASN1_ITEM pointer exported type */
+typedef const ASN1_ITEM ASN1_ITEM_EXP;
+
+/* Macro to obtain ASN1_ITEM pointer from exported type */
+#define ASN1_ITEM_ptr(iptr) (iptr)
+
+/* Macro to include ASN1_ITEM pointer from base type */
+#define ASN1_ITEM_ref(iptr) (&(iptr##_it))
+
+#define ASN1_ITEM_rptr(ref) (&(ref##_it))
+
+#define DECLARE_ASN1_ITEM(name) \
+	OPENSSL_EXTERN const ASN1_ITEM name##_it;
+
+#else
+
+/* Platforms that can't easily handle shared global variables are declared
+ * as functions returning ASN1_ITEM pointers.
+ */
+
+/* ASN1_ITEM pointer exported type */
+typedef const ASN1_ITEM * ASN1_ITEM_EXP(void);
+
+/* Macro to obtain ASN1_ITEM pointer from exported type */
+#define ASN1_ITEM_ptr(iptr) (iptr())
+
+/* Macro to include ASN1_ITEM pointer from base type */
+#define ASN1_ITEM_ref(iptr) (iptr##_it)
+
+#define ASN1_ITEM_rptr(ref) (ref##_it())
+
+#define DECLARE_ASN1_ITEM(name) \
+	const ASN1_ITEM * name##_it(void);
+
+#endif
+
+/* Parameters used by ASN1_STRING_print_ex() */
+
+/* These determine which characters to escape:
+ * RFC2253 special characters, control characters and
+ * MSB set characters
+ */
+
+#define ASN1_STRFLGS_ESC_2253		1
+#define ASN1_STRFLGS_ESC_CTRL		2
+#define ASN1_STRFLGS_ESC_MSB		4
+
+
+/* This flag determines how we do escaping: normally
+ * RC2253 backslash only, set this to use backslash and
+ * quote.
+ */
+
+#define ASN1_STRFLGS_ESC_QUOTE		8
+
+
+/* These three flags are internal use only. */
+
+/* Character is a valid PrintableString character */
+#define CHARTYPE_PRINTABLESTRING	0x10
+/* Character needs escaping if it is the first character */
+#define CHARTYPE_FIRST_ESC_2253		0x20
+/* Character needs escaping if it is the last character */
+#define CHARTYPE_LAST_ESC_2253		0x40
+
+/* NB the internal flags are safely reused below by flags
+ * handled at the top level.
+ */
+
+/* If this is set we convert all character strings
+ * to UTF8 first 
+ */
+
+#define ASN1_STRFLGS_UTF8_CONVERT	0x10
+
+/* If this is set we don't attempt to interpret content:
+ * just assume all strings are 1 byte per character. This
+ * will produce some pretty odd looking output!
+ */
+
+#define ASN1_STRFLGS_IGNORE_TYPE	0x20
+
+/* If this is set we include the string type in the output */
+#define ASN1_STRFLGS_SHOW_TYPE		0x40
+
+/* This determines which strings to display and which to
+ * 'dump' (hex dump of content octets or DER encoding). We can
+ * only dump non character strings or everything. If we
+ * don't dump 'unknown' they are interpreted as character
+ * strings with 1 octet per character and are subject to
+ * the usual escaping options.
+ */
+
+#define ASN1_STRFLGS_DUMP_ALL		0x80
+#define ASN1_STRFLGS_DUMP_UNKNOWN	0x100
+
+/* These determine what 'dumping' does, we can dump the
+ * content octets or the DER encoding: both use the
+ * RFC2253 #XXXXX notation.
+ */
+
+#define ASN1_STRFLGS_DUMP_DER		0x200
+
+/* All the string flags consistent with RFC2253,
+ * escaping control characters isn't essential in
+ * RFC2253 but it is advisable anyway.
+ */
+
+#define ASN1_STRFLGS_RFC2253	(ASN1_STRFLGS_ESC_2253 | \
+				ASN1_STRFLGS_ESC_CTRL | \
+				ASN1_STRFLGS_ESC_MSB | \
+				ASN1_STRFLGS_UTF8_CONVERT | \
+				ASN1_STRFLGS_DUMP_UNKNOWN | \
+				ASN1_STRFLGS_DUMP_DER)
+
+DECLARE_STACK_OF(ASN1_INTEGER)
+DECLARE_ASN1_SET_OF(ASN1_INTEGER)
+
+DECLARE_STACK_OF(ASN1_GENERALSTRING)
+
+typedef struct asn1_type_st
+	{
+	int type;
+	union	{
+		char *ptr;
+		ASN1_BOOLEAN		boolean;
+		ASN1_STRING *		asn1_string;
+		ASN1_OBJECT *		object;
+		ASN1_INTEGER *		integer;
+		ASN1_ENUMERATED *	enumerated;
+		ASN1_BIT_STRING *	bit_string;
+		ASN1_OCTET_STRING *	octet_string;
+		ASN1_PRINTABLESTRING *	printablestring;
+		ASN1_T61STRING *	t61string;
+		ASN1_IA5STRING *	ia5string;
+		ASN1_GENERALSTRING *	generalstring;
+		ASN1_BMPSTRING *	bmpstring;
+		ASN1_UNIVERSALSTRING *	universalstring;
+		ASN1_UTCTIME *		utctime;
+		ASN1_GENERALIZEDTIME *	generalizedtime;
+		ASN1_VISIBLESTRING *	visiblestring;
+		ASN1_UTF8STRING *	utf8string;
+		/* set and sequence are left complete and still
+		 * contain the set or sequence bytes */
+		ASN1_STRING *		set;
+		ASN1_STRING *		sequence;
+		ASN1_VALUE *		asn1_value;
+		} value;
+	} ASN1_TYPE;
+
+DECLARE_STACK_OF(ASN1_TYPE)
+DECLARE_ASN1_SET_OF(ASN1_TYPE)
+
+typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
+
+DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
+DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)
+
+typedef struct NETSCAPE_X509_st
+	{
+	ASN1_OCTET_STRING *header;
+	X509 *cert;
+	} NETSCAPE_X509;
+
+/* This is used to contain a list of bit names */
+typedef struct BIT_STRING_BITNAME_st {
+	int bitnum;
+	const char *lname;
+	const char *sname;
+} BIT_STRING_BITNAME;
+
+
+#define M_ASN1_STRING_length(x)	((x)->length)
+#define M_ASN1_STRING_length_set(x, n)	((x)->length = (n))
+#define M_ASN1_STRING_type(x)	((x)->type)
+#define M_ASN1_STRING_data(x)	((x)->data)
+
+/* Macros for string operations */
+#define M_ASN1_BIT_STRING_new()	(ASN1_BIT_STRING *)\
+		ASN1_STRING_type_new(V_ASN1_BIT_STRING)
+#define M_ASN1_BIT_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\
+		ASN1_STRING_dup((const ASN1_STRING *)a)
+#define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\
+		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
+#define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)
+
+#define M_ASN1_INTEGER_new()	(ASN1_INTEGER *)\
+		ASN1_STRING_type_new(V_ASN1_INTEGER)
+#define M_ASN1_INTEGER_free(a)		ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\
+		ASN1_STRING_dup((const ASN1_STRING *)a)
+#define M_ASN1_INTEGER_cmp(a,b)	ASN1_STRING_cmp(\
+		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
+
+#define M_ASN1_ENUMERATED_new()	(ASN1_ENUMERATED *)\
+		ASN1_STRING_type_new(V_ASN1_ENUMERATED)
+#define M_ASN1_ENUMERATED_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\
+		ASN1_STRING_dup((const ASN1_STRING *)a)
+#define M_ASN1_ENUMERATED_cmp(a,b)	ASN1_STRING_cmp(\
+		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
+
+#define M_ASN1_OCTET_STRING_new()	(ASN1_OCTET_STRING *)\
+		ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
+#define M_ASN1_OCTET_STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\
+		ASN1_STRING_dup((const ASN1_STRING *)a)
+#define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\
+		(const ASN1_STRING *)a,(const ASN1_STRING *)b)
+#define M_ASN1_OCTET_STRING_set(a,b,c)	ASN1_STRING_set((ASN1_STRING *)a,b,c)
+#define M_ASN1_OCTET_STRING_print(a,b)	ASN1_STRING_print(a,(ASN1_STRING *)b)
+#define M_i2d_ASN1_OCTET_STRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\
+		V_ASN1_UNIVERSAL)
+
+#define B_ASN1_TIME \
+			B_ASN1_UTCTIME | \
+			B_ASN1_GENERALIZEDTIME
+
+#define B_ASN1_PRINTABLE \
+			B_ASN1_NUMERICSTRING| \
+			B_ASN1_PRINTABLESTRING| \
+			B_ASN1_T61STRING| \
+			B_ASN1_IA5STRING| \
+			B_ASN1_BIT_STRING| \
+			B_ASN1_UNIVERSALSTRING|\
+			B_ASN1_BMPSTRING|\
+			B_ASN1_UTF8STRING|\
+			B_ASN1_SEQUENCE|\
+			B_ASN1_UNKNOWN
+
+#define B_ASN1_DIRECTORYSTRING \
+			B_ASN1_PRINTABLESTRING| \
+			B_ASN1_TELETEXSTRING|\
+			B_ASN1_BMPSTRING|\
+			B_ASN1_UNIVERSALSTRING|\
+			B_ASN1_UTF8STRING
+
+#define B_ASN1_DISPLAYTEXT \
+			B_ASN1_IA5STRING| \
+			B_ASN1_VISIBLESTRING| \
+			B_ASN1_BMPSTRING|\
+			B_ASN1_UTF8STRING
+
+#define M_ASN1_PRINTABLE_new()	ASN1_STRING_type_new(V_ASN1_T61STRING)
+#define M_ASN1_PRINTABLE_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
+		pp,a->type,V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_PRINTABLE(a,pp,l) \
+		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
+			B_ASN1_PRINTABLE)
+
+#define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
+#define M_DIRECTORYSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
+						pp,a->type,V_ASN1_UNIVERSAL)
+#define M_d2i_DIRECTORYSTRING(a,pp,l) \
+		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
+			B_ASN1_DIRECTORYSTRING)
+
+#define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
+#define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
+						pp,a->type,V_ASN1_UNIVERSAL)
+#define M_d2i_DISPLAYTEXT(a,pp,l) \
+		d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
+			B_ASN1_DISPLAYTEXT)
+
+#define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
+		ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
+#define M_ASN1_PRINTABLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\
+		V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \
+		(ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\
+		((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)
+
+#define M_ASN1_T61STRING_new()	(ASN1_T61STRING *)\
+		ASN1_STRING_type_new(V_ASN1_T61STRING)
+#define M_ASN1_T61STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_T61STRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\
+		V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_T61STRING(a,pp,l) \
+		(ASN1_T61STRING *)d2i_ASN1_type_bytes\
+		((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)
+
+#define M_ASN1_IA5STRING_new()	(ASN1_IA5STRING *)\
+		ASN1_STRING_type_new(V_ASN1_IA5STRING)
+#define M_ASN1_IA5STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_IA5STRING_dup(a)	\
+		(ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)
+#define M_i2d_ASN1_IA5STRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
+			V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_IA5STRING(a,pp,l) \
+		(ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\
+			B_ASN1_IA5STRING)
+
+#define M_ASN1_UTCTIME_new()	(ASN1_UTCTIME *)\
+		ASN1_STRING_type_new(V_ASN1_UTCTIME)
+#define M_ASN1_UTCTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\
+		ASN1_STRING_dup((const ASN1_STRING *)a)
+
+#define M_ASN1_GENERALIZEDTIME_new()	(ASN1_GENERALIZEDTIME *)\
+		ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
+#define M_ASN1_GENERALIZEDTIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
+	(const ASN1_STRING *)a)
+
+#define M_ASN1_TIME_new()	(ASN1_TIME *)\
+		ASN1_STRING_type_new(V_ASN1_UTCTIME)
+#define M_ASN1_TIME_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_ASN1_TIME_dup(a) (ASN1_TIME *)\
+	ASN1_STRING_dup((const ASN1_STRING *)a)
+
+#define M_ASN1_GENERALSTRING_new()	(ASN1_GENERALSTRING *)\
+		ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
+#define M_ASN1_GENERALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_GENERALSTRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\
+			V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_GENERALSTRING(a,pp,l) \
+		(ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\
+		((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)
+
+#define M_ASN1_UNIVERSALSTRING_new()	(ASN1_UNIVERSALSTRING *)\
+		ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)
+#define M_ASN1_UNIVERSALSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\
+			V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \
+		(ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\
+		((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)
+
+#define M_ASN1_BMPSTRING_new()	(ASN1_BMPSTRING *)\
+		ASN1_STRING_type_new(V_ASN1_BMPSTRING)
+#define M_ASN1_BMPSTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_BMPSTRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\
+			V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_BMPSTRING(a,pp,l) \
+		(ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
+		((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
+
+#define M_ASN1_VISIBLESTRING_new()	(ASN1_VISIBLESTRING *)\
+		ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
+#define M_ASN1_VISIBLESTRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_VISIBLESTRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
+			V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
+		(ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
+		((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
+
+#define M_ASN1_UTF8STRING_new()	(ASN1_UTF8STRING *)\
+		ASN1_STRING_type_new(V_ASN1_UTF8STRING)
+#define M_ASN1_UTF8STRING_free(a)	ASN1_STRING_free((ASN1_STRING *)a)
+#define M_i2d_ASN1_UTF8STRING(a,pp) \
+		i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
+			V_ASN1_UNIVERSAL)
+#define M_d2i_ASN1_UTF8STRING(a,pp,l) \
+		(ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
+		((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
+
+  /* for the is_set parameter to i2d_ASN1_SET */
+#define IS_SEQUENCE	0
+#define IS_SET		1
+
+DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)
+
+int ASN1_TYPE_get(ASN1_TYPE *a);
+void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
+int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
+int            ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b);
+
+ASN1_OBJECT *	ASN1_OBJECT_new(void );
+void		ASN1_OBJECT_free(ASN1_OBJECT *a);
+int		i2d_ASN1_OBJECT(ASN1_OBJECT *a,unsigned char **pp);
+ASN1_OBJECT *	c2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,
+			long length);
+ASN1_OBJECT *	d2i_ASN1_OBJECT(ASN1_OBJECT **a,const unsigned char **pp,
+			long length);
+
+DECLARE_ASN1_ITEM(ASN1_OBJECT)
+
+DECLARE_STACK_OF(ASN1_OBJECT)
+DECLARE_ASN1_SET_OF(ASN1_OBJECT)
+
+ASN1_STRING *	ASN1_STRING_new(void);
+void		ASN1_STRING_free(ASN1_STRING *a);
+int		ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
+ASN1_STRING *	ASN1_STRING_dup(const ASN1_STRING *a);
+ASN1_STRING *	ASN1_STRING_type_new(int type );
+int 		ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
+  /* Since this is used to store all sorts of things, via macros, for now, make
+     its data void * */
+int 		ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
+void		ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
+int ASN1_STRING_length(const ASN1_STRING *x);
+void ASN1_STRING_length_set(ASN1_STRING *x, int n);
+int ASN1_STRING_type(ASN1_STRING *x);
+unsigned char * ASN1_STRING_data(ASN1_STRING *x);
+
+DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
+int		i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a,unsigned char **pp);
+ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,const unsigned char **pp,
+			long length);
+int		ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d,
+			int length );
+int		ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
+int		ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
+int            ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
+                                     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);
+
+int		i2d_ASN1_BOOLEAN(int a,unsigned char **pp);
+int 		d2i_ASN1_BOOLEAN(int *a,const unsigned char **pp,long length);
+
+DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
+int		i2c_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);
+ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a,const unsigned char **pp,
+			long length);
+ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a,const unsigned char **pp,
+			long length);
+ASN1_INTEGER *	ASN1_INTEGER_dup(const ASN1_INTEGER *x);
+int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);
+
+DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)
+
+int ASN1_UTCTIME_check(ASN1_UTCTIME *a);
+ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);
+ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
+				int offset_day, long offset_sec);
+int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
+int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
+#if 0
+time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
+#endif
+
+int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
+ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);
+ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
+	     time_t t, int offset_day, long offset_sec);
+int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);
+
+DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)
+ASN1_OCTET_STRING *	ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);
+int 	ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b);
+int 	ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data, int len);
+
+DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_UTF8STRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_NULL)
+DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)
+
+int UTF8_getc(const unsigned char *str, int len, unsigned long *val);
+int UTF8_putc(unsigned char *str, int len, unsigned long value);
+
+DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, ASN1_PRINTABLE)
+
+DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DIRECTORYSTRING)
+DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DISPLAYTEXT)
+DECLARE_ASN1_FUNCTIONS(ASN1_PRINTABLESTRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_T61STRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_IA5STRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_GENERALSTRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_UTCTIME)
+DECLARE_ASN1_FUNCTIONS(ASN1_GENERALIZEDTIME)
+DECLARE_ASN1_FUNCTIONS(ASN1_TIME)
+
+DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)
+
+ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s,time_t t);
+ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s,time_t t,
+				int offset_day, long offset_sec);
+int ASN1_TIME_check(ASN1_TIME *t);
+ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out);
+int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
+
+int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
+		 i2d_of_void *i2d, int ex_tag, int ex_class,
+		 int is_set);
+STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
+			      const unsigned char **pp,
+			      long length, d2i_of_void *d2i,
+			      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);
+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);
+ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data,int len,
+	const char *sn, const char *ln);
+
+int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);
+long ASN1_INTEGER_get(const ASN1_INTEGER *a);
+ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai);
+BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai,BIGNUM *bn);
+
+int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
+long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);
+ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);
+BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai,BIGNUM *bn);
+
+/* General */
+/* given a string, return the correct type, max is the maximum length */
+int ASN1_PRINTABLE_type(const unsigned char *s, int max);
+
+int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);
+ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
+	long length, int Ptag, int Pclass);
+unsigned long ASN1_tag2bit(int tag);
+/* type is one or more of the B_ASN1_ values. */
+ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a,const unsigned char **pp,
+		long length,int type);
+
+/* PARSING */
+int asn1_Finish(ASN1_CTX *c);
+int asn1_const_Finish(ASN1_const_CTX *c);
+
+/* SPECIALS */
+int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
+	int *pclass, long omax);
+int ASN1_check_infinite_end(unsigned char **p,long len);
+int ASN1_const_check_infinite_end(const unsigned char **p,long len);
+void ASN1_put_object(unsigned char **pp, int constructed, int length,
+	int tag, int xclass);
+int ASN1_put_eoc(unsigned char **pp);
+int ASN1_object_size(int constructed, int length, int tag);
+
+/* Used to implement other functions */
+void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);
+
+#define ASN1_dup_of(type,i2d,d2i,x) \
+    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
+		     CHECKED_D2I_OF(type, d2i), \
+		     CHECKED_PTR_OF(type, x)))
+
+#define ASN1_dup_of_const(type,i2d,d2i,x) \
+    ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \
+		     CHECKED_D2I_OF(type, d2i), \
+		     CHECKED_PTR_OF(const type, x)))
+
+void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
+
+/* ASN1 alloc/free macros for when a type is only used internally */
+
+#define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))
+#define M_ASN1_free_of(x, type) \
+		ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
+
+#ifndef OPENSSL_NO_FP_API
+void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
+
+#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
+    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \
+			CHECKED_D2I_OF(type, d2i), \
+			in, \
+			CHECKED_PPTR_OF(type, x)))
+
+void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
+int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
+
+#define ASN1_i2d_fp_of(type,i2d,out,x) \
+    (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \
+		 out, \
+		 CHECKED_PTR_OF(type, x)))
+
+#define ASN1_i2d_fp_of_const(type,i2d,out,x) \
+    (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \
+		 out, \
+		 CHECKED_PTR_OF(const type, x)))
+
+int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
+int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
+#endif
+
+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) \
+    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \
+			  CHECKED_D2I_OF(type, d2i), \
+			  in, \
+			  CHECKED_PPTR_OF(type, x)))
+
+void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
+int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
+
+#define ASN1_i2d_bio_of(type,i2d,out,x) \
+    (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \
+		  out, \
+		  CHECKED_PTR_OF(type, x)))
+
+#define ASN1_i2d_bio_of_const(type,i2d,out,x) \
+    (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \
+		  out, \
+		  CHECKED_PTR_OF(const type, x)))
+
+int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
+int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);
+int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
+int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
+int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
+int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags);
+int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
+				unsigned char *buf, int off);
+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 */
+
+DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)
+
+int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
+
+int ASN1_TYPE_set_octetstring(ASN1_TYPE *a,
+	unsigned char *data, int len);
+int ASN1_TYPE_get_octetstring(ASN1_TYPE *a,
+	unsigned char *data, int max_len);
+int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
+	unsigned char *data, int len);
+int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,
+	unsigned char *data, int max_len);
+
+STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
+				 d2i_of_void *d2i, void (*free_func)(OPENSSL_BLOCK));
+unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
+			     unsigned char **buf, int *len );
+void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
+void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
+ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
+			      ASN1_OCTET_STRING **oct);
+
+#define ASN1_pack_string_of(type,obj,i2d,oct) \
+    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \
+		      CHECKED_I2D_OF(type, i2d), \
+		      oct))
+
+ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
+
+void ASN1_STRING_set_default_mask(unsigned long mask);
+int ASN1_STRING_set_default_mask_asc(const char *p);
+unsigned long ASN1_STRING_get_default_mask(void);
+int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
+					int inform, unsigned long mask);
+int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
+					int inform, unsigned long mask, 
+					long minsize, long maxsize);
+
+ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out, 
+		const unsigned char *in, int inlen, int inform, int nid);
+ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
+int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
+void ASN1_STRING_TABLE_cleanup(void);
+
+/* ASN1 template functions */
+
+/* Old API compatible functions */
+ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);
+void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);
+ASN1_VALUE * ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in, long len, const ASN1_ITEM *it);
+int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
+int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
+
+void ASN1_add_oid_module(void);
+
+ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);
+ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
+
+/* ASN1 Print flags */
+
+/* Indicate missing OPTIONAL fields */
+#define ASN1_PCTX_FLAGS_SHOW_ABSENT		0x001	
+/* Mark start and end of SEQUENCE */
+#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE		0x002
+/* Mark start and end of SEQUENCE/SET OF */
+#define ASN1_PCTX_FLAGS_SHOW_SSOF		0x004
+/* Show the ASN1 type of primitives */
+#define ASN1_PCTX_FLAGS_SHOW_TYPE		0x008
+/* Don't show ASN1 type of ANY */
+#define ASN1_PCTX_FLAGS_NO_ANY_TYPE		0x010
+/* Don't show ASN1 type of MSTRINGs */
+#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE		0x020
+/* Don't show field names in SEQUENCE */
+#define ASN1_PCTX_FLAGS_NO_FIELD_NAME		0x040
+/* Show structure names of each SEQUENCE field */
+#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME	0x080
+/* Don't show structure name even at top level */
+#define ASN1_PCTX_FLAGS_NO_STRUCT_NAME		0x100
+
+int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,
+				const ASN1_ITEM *it, const ASN1_PCTX *pctx);
+ASN1_PCTX *ASN1_PCTX_new(void);
+void ASN1_PCTX_free(ASN1_PCTX *p);
+unsigned long ASN1_PCTX_get_flags(ASN1_PCTX *p);
+void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);
+unsigned long ASN1_PCTX_get_nm_flags(ASN1_PCTX *p);
+void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);
+unsigned long ASN1_PCTX_get_cert_flags(ASN1_PCTX *p);
+void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);
+unsigned long ASN1_PCTX_get_oid_flags(ASN1_PCTX *p);
+void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
+unsigned long ASN1_PCTX_get_str_flags(ASN1_PCTX *p);
+void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
+
+BIO_METHOD *BIO_f_asn1(void);
+
+BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);
+
+int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
+				const ASN1_ITEM *it);
+int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
+				const char *hdr,
+				const ASN1_ITEM *it);
+int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
+				int ctype_nid, int econt_nid,
+				STACK_OF(X509_ALGOR) *mdalgs,
+				const ASN1_ITEM *it);
+ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
+int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
+int SMIME_text(BIO *in, BIO *out);
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+void ERR_load_ASN1_strings(void);
+
+/* Error codes for the ASN1 functions. */
+
+/* Function codes. */
+#define ASN1_F_A2D_ASN1_OBJECT				 100
+#define ASN1_F_A2I_ASN1_ENUMERATED			 101
+#define ASN1_F_A2I_ASN1_INTEGER				 102
+#define ASN1_F_A2I_ASN1_STRING				 103
+#define ASN1_F_APPEND_EXP				 176
+#define ASN1_F_ASN1_BIT_STRING_SET_BIT			 183
+#define ASN1_F_ASN1_CB					 177
+#define ASN1_F_ASN1_CHECK_TLEN				 104
+#define ASN1_F_ASN1_COLLATE_PRIMITIVE			 105
+#define ASN1_F_ASN1_COLLECT				 106
+#define ASN1_F_ASN1_D2I_EX_PRIMITIVE			 108
+#define ASN1_F_ASN1_D2I_FP				 109
+#define ASN1_F_ASN1_D2I_READ_BIO			 107
+#define ASN1_F_ASN1_DIGEST				 184
+#define ASN1_F_ASN1_DO_ADB				 110
+#define ASN1_F_ASN1_DUP					 111
+#define ASN1_F_ASN1_ENUMERATED_SET			 112
+#define ASN1_F_ASN1_ENUMERATED_TO_BN			 113
+#define ASN1_F_ASN1_EX_C2I				 204
+#define ASN1_F_ASN1_FIND_END				 190
+#define ASN1_F_ASN1_GENERALIZEDTIME_ADJ			 216
+#define ASN1_F_ASN1_GENERALIZEDTIME_SET			 185
+#define ASN1_F_ASN1_GENERATE_V3				 178
+#define ASN1_F_ASN1_GET_OBJECT				 114
+#define ASN1_F_ASN1_HEADER_NEW				 115
+#define ASN1_F_ASN1_I2D_BIO				 116
+#define ASN1_F_ASN1_I2D_FP				 117
+#define ASN1_F_ASN1_INTEGER_SET				 118
+#define ASN1_F_ASN1_INTEGER_TO_BN			 119
+#define ASN1_F_ASN1_ITEM_D2I_FP				 206
+#define ASN1_F_ASN1_ITEM_DUP				 191
+#define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW			 121
+#define ASN1_F_ASN1_ITEM_EX_D2I				 120
+#define ASN1_F_ASN1_ITEM_I2D_BIO			 192
+#define ASN1_F_ASN1_ITEM_I2D_FP				 193
+#define ASN1_F_ASN1_ITEM_PACK				 198
+#define ASN1_F_ASN1_ITEM_SIGN				 195
+#define ASN1_F_ASN1_ITEM_UNPACK				 199
+#define ASN1_F_ASN1_ITEM_VERIFY				 197
+#define ASN1_F_ASN1_MBSTRING_NCOPY			 122
+#define ASN1_F_ASN1_OBJECT_NEW				 123
+#define ASN1_F_ASN1_OUTPUT_DATA				 214
+#define ASN1_F_ASN1_PACK_STRING				 124
+#define ASN1_F_ASN1_PCTX_NEW				 205
+#define ASN1_F_ASN1_PKCS5_PBE_SET			 125
+#define ASN1_F_ASN1_SEQ_PACK				 126
+#define ASN1_F_ASN1_SEQ_UNPACK				 127
+#define ASN1_F_ASN1_SIGN				 128
+#define ASN1_F_ASN1_STR2TYPE				 179
+#define ASN1_F_ASN1_STRING_SET				 186
+#define ASN1_F_ASN1_STRING_TABLE_ADD			 129
+#define ASN1_F_ASN1_STRING_TYPE_NEW			 130
+#define ASN1_F_ASN1_TEMPLATE_EX_D2I			 132
+#define ASN1_F_ASN1_TEMPLATE_NEW			 133
+#define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I			 131
+#define ASN1_F_ASN1_TIME_ADJ				 217
+#define ASN1_F_ASN1_TIME_SET				 175
+#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING		 134
+#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING		 135
+#define ASN1_F_ASN1_UNPACK_STRING			 136
+#define ASN1_F_ASN1_UTCTIME_ADJ				 218
+#define ASN1_F_ASN1_UTCTIME_SET				 187
+#define ASN1_F_ASN1_VERIFY				 137
+#define ASN1_F_B64_READ_ASN1				 209
+#define ASN1_F_B64_WRITE_ASN1				 210
+#define ASN1_F_BIO_NEW_NDEF				 208
+#define ASN1_F_BITSTR_CB				 180
+#define ASN1_F_BN_TO_ASN1_ENUMERATED			 138
+#define ASN1_F_BN_TO_ASN1_INTEGER			 139
+#define ASN1_F_C2I_ASN1_BIT_STRING			 189
+#define ASN1_F_C2I_ASN1_INTEGER				 194
+#define ASN1_F_C2I_ASN1_OBJECT				 196
+#define ASN1_F_COLLECT_DATA				 140
+#define ASN1_F_D2I_ASN1_BIT_STRING			 141
+#define ASN1_F_D2I_ASN1_BOOLEAN				 142
+#define ASN1_F_D2I_ASN1_BYTES				 143
+#define ASN1_F_D2I_ASN1_GENERALIZEDTIME			 144
+#define ASN1_F_D2I_ASN1_HEADER				 145
+#define ASN1_F_D2I_ASN1_INTEGER				 146
+#define ASN1_F_D2I_ASN1_OBJECT				 147
+#define ASN1_F_D2I_ASN1_SET				 148
+#define ASN1_F_D2I_ASN1_TYPE_BYTES			 149
+#define ASN1_F_D2I_ASN1_UINTEGER			 150
+#define ASN1_F_D2I_ASN1_UTCTIME				 151
+#define ASN1_F_D2I_AUTOPRIVATEKEY			 207
+#define ASN1_F_D2I_NETSCAPE_RSA				 152
+#define ASN1_F_D2I_NETSCAPE_RSA_2			 153
+#define ASN1_F_D2I_PRIVATEKEY				 154
+#define ASN1_F_D2I_PUBLICKEY				 155
+#define ASN1_F_D2I_RSA_NET				 200
+#define ASN1_F_D2I_RSA_NET_2				 201
+#define ASN1_F_D2I_X509					 156
+#define ASN1_F_D2I_X509_CINF				 157
+#define ASN1_F_D2I_X509_PKEY				 159
+#define ASN1_F_I2D_ASN1_BIO_STREAM			 211
+#define ASN1_F_I2D_ASN1_SET				 188
+#define ASN1_F_I2D_ASN1_TIME				 160
+#define ASN1_F_I2D_DSA_PUBKEY				 161
+#define ASN1_F_I2D_EC_PUBKEY				 181
+#define ASN1_F_I2D_PRIVATEKEY				 163
+#define ASN1_F_I2D_PUBLICKEY				 164
+#define ASN1_F_I2D_RSA_NET				 162
+#define ASN1_F_I2D_RSA_PUBKEY				 165
+#define ASN1_F_LONG_C2I					 166
+#define ASN1_F_OID_MODULE_INIT				 174
+#define ASN1_F_PARSE_TAGGING				 182
+#define ASN1_F_PKCS5_PBE2_SET_IV			 167
+#define ASN1_F_PKCS5_PBE_SET				 202
+#define ASN1_F_PKCS5_PBE_SET0_ALGOR			 215
+#define ASN1_F_SMIME_READ_ASN1				 212
+#define ASN1_F_SMIME_TEXT				 213
+#define ASN1_F_X509_CINF_NEW				 168
+#define ASN1_F_X509_CRL_ADD0_REVOKED			 169
+#define ASN1_F_X509_INFO_NEW				 170
+#define ASN1_F_X509_NAME_ENCODE				 203
+#define ASN1_F_X509_NAME_EX_D2I				 158
+#define ASN1_F_X509_NAME_EX_NEW				 171
+#define ASN1_F_X509_NEW					 172
+#define ASN1_F_X509_PKEY_NEW				 173
+
+/* Reason codes. */
+#define ASN1_R_ADDING_OBJECT				 171
+#define ASN1_R_ASN1_PARSE_ERROR				 203
+#define ASN1_R_ASN1_SIG_PARSE_ERROR			 204
+#define ASN1_R_AUX_ERROR				 100
+#define ASN1_R_BAD_CLASS				 101
+#define ASN1_R_BAD_OBJECT_HEADER			 102
+#define ASN1_R_BAD_PASSWORD_READ			 103
+#define ASN1_R_BAD_TAG					 104
+#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 214
+#define ASN1_R_BN_LIB					 105
+#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106
+#define ASN1_R_BUFFER_TOO_SMALL				 107
+#define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER		 108
+#define ASN1_R_DATA_IS_WRONG				 109
+#define ASN1_R_DECODE_ERROR				 110
+#define ASN1_R_DECODING_ERROR				 111
+#define ASN1_R_DEPTH_EXCEEDED				 174
+#define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED	 198
+#define ASN1_R_ENCODE_ERROR				 112
+#define ASN1_R_ERROR_GETTING_TIME			 173
+#define ASN1_R_ERROR_LOADING_SECTION			 172
+#define ASN1_R_ERROR_PARSING_SET_ELEMENT		 113
+#define ASN1_R_ERROR_SETTING_CIPHER_PARAMS		 114
+#define ASN1_R_EXPECTING_AN_INTEGER			 115
+#define ASN1_R_EXPECTING_AN_OBJECT			 116
+#define ASN1_R_EXPECTING_A_BOOLEAN			 117
+#define ASN1_R_EXPECTING_A_TIME				 118
+#define ASN1_R_EXPLICIT_LENGTH_MISMATCH			 119
+#define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED		 120
+#define ASN1_R_FIELD_MISSING				 121
+#define ASN1_R_FIRST_NUM_TOO_LARGE			 122
+#define ASN1_R_HEADER_TOO_LONG				 123
+#define ASN1_R_ILLEGAL_BITSTRING_FORMAT			 175
+#define ASN1_R_ILLEGAL_BOOLEAN				 176
+#define ASN1_R_ILLEGAL_CHARACTERS			 124
+#define ASN1_R_ILLEGAL_FORMAT				 177
+#define ASN1_R_ILLEGAL_HEX				 178
+#define ASN1_R_ILLEGAL_IMPLICIT_TAG			 179
+#define ASN1_R_ILLEGAL_INTEGER				 180
+#define ASN1_R_ILLEGAL_NESTED_TAGGING			 181
+#define ASN1_R_ILLEGAL_NULL				 125
+#define ASN1_R_ILLEGAL_NULL_VALUE			 182
+#define ASN1_R_ILLEGAL_OBJECT				 183
+#define ASN1_R_ILLEGAL_OPTIONAL_ANY			 126
+#define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE		 170
+#define ASN1_R_ILLEGAL_TAGGED_ANY			 127
+#define ASN1_R_ILLEGAL_TIME_VALUE			 184
+#define ASN1_R_INTEGER_NOT_ASCII_FORMAT			 185
+#define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG		 128
+#define ASN1_R_INVALID_BMPSTRING_LENGTH			 129
+#define ASN1_R_INVALID_DIGIT				 130
+#define ASN1_R_INVALID_MIME_TYPE			 205
+#define ASN1_R_INVALID_MODIFIER				 186
+#define ASN1_R_INVALID_NUMBER				 187
+#define ASN1_R_INVALID_OBJECT_ENCODING			 216
+#define ASN1_R_INVALID_SEPARATOR			 131
+#define ASN1_R_INVALID_TIME_FORMAT			 132
+#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH		 133
+#define ASN1_R_INVALID_UTF8STRING			 134
+#define ASN1_R_IV_TOO_LARGE				 135
+#define ASN1_R_LENGTH_ERROR				 136
+#define ASN1_R_LIST_ERROR				 188
+#define ASN1_R_MIME_NO_CONTENT_TYPE			 206
+#define ASN1_R_MIME_PARSE_ERROR				 207
+#define ASN1_R_MIME_SIG_PARSE_ERROR			 208
+#define ASN1_R_MISSING_EOC				 137
+#define ASN1_R_MISSING_SECOND_NUMBER			 138
+#define ASN1_R_MISSING_VALUE				 189
+#define ASN1_R_MSTRING_NOT_UNIVERSAL			 139
+#define ASN1_R_MSTRING_WRONG_TAG			 140
+#define ASN1_R_NESTED_ASN1_STRING			 197
+#define ASN1_R_NON_HEX_CHARACTERS			 141
+#define ASN1_R_NOT_ASCII_FORMAT				 190
+#define ASN1_R_NOT_ENOUGH_DATA				 142
+#define ASN1_R_NO_CONTENT_TYPE				 209
+#define ASN1_R_NO_DEFAULT_DIGEST			 201
+#define ASN1_R_NO_MATCHING_CHOICE_TYPE			 143
+#define ASN1_R_NO_MULTIPART_BODY_FAILURE		 210
+#define ASN1_R_NO_MULTIPART_BOUNDARY			 211
+#define ASN1_R_NO_SIG_CONTENT_TYPE			 212
+#define ASN1_R_NULL_IS_WRONG_LENGTH			 144
+#define ASN1_R_OBJECT_NOT_ASCII_FORMAT			 191
+#define ASN1_R_ODD_NUMBER_OF_CHARS			 145
+#define ASN1_R_PRIVATE_KEY_HEADER_MISSING		 146
+#define ASN1_R_SECOND_NUMBER_TOO_LARGE			 147
+#define ASN1_R_SEQUENCE_LENGTH_MISMATCH			 148
+#define ASN1_R_SEQUENCE_NOT_CONSTRUCTED			 149
+#define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG		 192
+#define ASN1_R_SHORT_LINE				 150
+#define ASN1_R_SIG_INVALID_MIME_TYPE			 213
+#define ASN1_R_STREAMING_NOT_SUPPORTED			 202
+#define ASN1_R_STRING_TOO_LONG				 151
+#define ASN1_R_STRING_TOO_SHORT				 152
+#define ASN1_R_TAG_VALUE_TOO_HIGH			 153
+#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
+#define ASN1_R_TIME_NOT_ASCII_FORMAT			 193
+#define ASN1_R_TOO_LONG					 155
+#define ASN1_R_TYPE_NOT_CONSTRUCTED			 156
+#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157
+#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158
+#define ASN1_R_UNEXPECTED_EOC				 159
+#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 215
+#define ASN1_R_UNKNOWN_FORMAT				 160
+#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161
+#define ASN1_R_UNKNOWN_OBJECT_TYPE			 162
+#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE			 163
+#define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM		 199
+#define ASN1_R_UNKNOWN_TAG				 194
+#define ASN1_R_UNKOWN_FORMAT				 195
+#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE		 164
+#define ASN1_R_UNSUPPORTED_CIPHER			 165
+#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM		 166
+#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE		 167
+#define ASN1_R_UNSUPPORTED_TYPE				 196
+#define ASN1_R_WRONG_PUBLIC_KEY_TYPE			 200
+#define ASN1_R_WRONG_TAG				 168
+#define ASN1_R_WRONG_TYPE				 169
+
+#ifdef  __cplusplus
+}
+#endif
+#endif