svn merge ^/branches/released .

19 files changed, 15043 insertions, 14971 deletions

diff --git a/openssl/crypto/asn1/a_strex.c b/openssl/crypto/asn1/a_strex.c
index 7fc14d329..d9172e055 100644
--- a/openssl/crypto/asn1/a_strex.c
+++ b/openssl/crypto/asn1/a_strex.c
@@ -1,567 +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)
-
-
-/* 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(!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 */
-};
-
-#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
-		  ASN1_STRFLGS_ESC_QUOTE | \
-		  ASN1_STRFLGS_ESC_CTRL | \
-		  ASN1_STRFLGS_ESC_MSB)
-
-/* 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 753021a7a..0a2f13c29 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(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 9a8b6cc22..5e26a14b8 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;
-	ENGINE *e;
-
-	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
-		/* 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 f7718b5a9..1a5123216 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(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

diff --git a/openssl/crypto/bio/bss_dgram.c b/openssl/crypto/bio/bss_dgram.c
index eb7e36546..117ab599d 100644
--- a/openssl/crypto/bio/bss_dgram.c
+++ b/openssl/crypto/bio/bss_dgram.c
@@ -1,830 +1,830 @@
-/* crypto/bio/bio_dgram.c */
-/* 
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 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
- *    openssl-core@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).
- *
- */
-
-#ifndef OPENSSL_NO_DGRAM
-
-#include <stdio.h>
-#include <errno.h>
-#define USE_SOCKETS
-#include "cryptlib.h"
-
-#include <openssl/bio.h>
-
-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
-#include <sys/timeb.h>
-#endif
-
-#ifdef OPENSSL_SYS_LINUX
-#define IP_MTU      14 /* linux is lame */
-#endif
-
-#ifdef WATT32
-#define sock_write SockWrite  /* Watt-32 uses same names */
-#define sock_read  SockRead
-#define sock_puts  SockPuts
-#endif
-
-static int dgram_write(BIO *h, const char *buf, int num);
-static int dgram_read(BIO *h, char *buf, int size);
-static int dgram_puts(BIO *h, const char *str);
-static long dgram_ctrl(BIO *h, int cmd, long arg1, void *arg2);
-static int dgram_new(BIO *h);
-static int dgram_free(BIO *data);
-static int dgram_clear(BIO *bio);
-
-static int BIO_dgram_should_retry(int s);
-
-static void get_current_time(struct timeval *t);
-
-static BIO_METHOD methods_dgramp=
-	{
-	BIO_TYPE_DGRAM,
-	"datagram socket",
-	dgram_write,
-	dgram_read,
-	dgram_puts,
-	NULL, /* dgram_gets, */
-	dgram_ctrl,
-	dgram_new,
-	dgram_free,
-	NULL,
-	};
-
-typedef struct bio_dgram_data_st
-	{
-	union {
-		struct sockaddr sa;
-		struct sockaddr_in sa_in;
-#if OPENSSL_USE_IPV6
-		struct sockaddr_in6 sa_in6;
-#endif
-	} peer;
-	unsigned int connected;
-	unsigned int _errno;
-	unsigned int mtu;
-	struct timeval next_timeout;
-	struct timeval socket_timeout;
-	} bio_dgram_data;
-
-BIO_METHOD *BIO_s_datagram(void)
-	{
-	return(&methods_dgramp);
-	}
-
-BIO *BIO_new_dgram(int fd, int close_flag)
-	{
-	BIO *ret;
-
-	ret=BIO_new(BIO_s_datagram());
-	if (ret == NULL) return(NULL);
-	BIO_set_fd(ret,fd,close_flag);
-	return(ret);
-	}
-
-static int dgram_new(BIO *bi)
-	{
-	bio_dgram_data *data = NULL;
-
-	bi->init=0;
-	bi->num=0;
-	data = OPENSSL_malloc(sizeof(bio_dgram_data));
-	if (data == NULL)
-		return 0;
-	memset(data, 0x00, sizeof(bio_dgram_data));
-    bi->ptr = data;
-
-	bi->flags=0;
-	return(1);
-	}
-
-static int dgram_free(BIO *a)
-	{
-	bio_dgram_data *data;
-
-	if (a == NULL) return(0);
-	if ( ! dgram_clear(a))
-		return 0;
-
-	data = (bio_dgram_data *)a->ptr;
-	if(data != NULL) OPENSSL_free(data);
-
-	return(1);
-	}
-
-static int dgram_clear(BIO *a)
-	{
-	if (a == NULL) return(0);
-	if (a->shutdown)
-		{
-		if (a->init)
-			{
-			SHUTDOWN2(a->num);
-			}
-		a->init=0;
-		a->flags=0;
-		}
-	return(1);
-	}
-
-static void dgram_adjust_rcv_timeout(BIO *b)
-	{
-#if defined(SO_RCVTIMEO)
-	bio_dgram_data *data = (bio_dgram_data *)b->ptr;
-	int sz = sizeof(int);
-
-	/* Is a timer active? */
-	if (data->next_timeout.tv_sec > 0 || data->next_timeout.tv_usec > 0)
-		{
-		struct timeval timenow, timeleft;
-
-		/* Read current socket timeout */
-#ifdef OPENSSL_SYS_WINDOWS
-		int timeout;
-		if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-					   (void*)&timeout, &sz) < 0)
-			{ perror("getsockopt"); }
-		else
-			{
-			data->socket_timeout.tv_sec = timeout / 1000;
-			data->socket_timeout.tv_usec = (timeout % 1000) * 1000;
-			}
-#else
-		if ( getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, 
-						&(data->socket_timeout), (void *)&sz) < 0)
-			{ perror("getsockopt"); }
-#endif
-
-		/* Get current time */
-		get_current_time(&timenow);
-
-		/* Calculate time left until timer expires */
-		memcpy(&timeleft, &(data->next_timeout), sizeof(struct timeval));
-		timeleft.tv_sec -= timenow.tv_sec;
-		timeleft.tv_usec -= timenow.tv_usec;
-		if (timeleft.tv_usec < 0)
-			{
-			timeleft.tv_sec--;
-			timeleft.tv_usec += 1000000;
-			}
-
-		if (timeleft.tv_sec < 0)
-			{
-			timeleft.tv_sec = 0;
-			timeleft.tv_usec = 1;
-			}
-
-		/* Adjust socket timeout if next handhake message timer
-		 * will expire earlier.
-		 */
-		if ((data->socket_timeout.tv_sec == 0 && data->socket_timeout.tv_usec == 0) ||
-			(data->socket_timeout.tv_sec > timeleft.tv_sec) ||
-			(data->socket_timeout.tv_sec == timeleft.tv_sec &&
-			 data->socket_timeout.tv_usec >= timeleft.tv_usec))
-			{
-#ifdef OPENSSL_SYS_WINDOWS
-			timeout = timeleft.tv_sec * 1000 + timeleft.tv_usec / 1000;
-			if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-						   (void*)&timeout, sizeof(timeout)) < 0)
-				{ perror("setsockopt"); }
-#else
-			if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &timeleft,
-							sizeof(struct timeval)) < 0)
-				{ perror("setsockopt"); }
-#endif
-			}
-		}
-#endif
-	}
-
-static void dgram_reset_rcv_timeout(BIO *b)
-	{
-#if defined(SO_RCVTIMEO)
-	bio_dgram_data *data = (bio_dgram_data *)b->ptr;
-
-	/* Is a timer active? */
-	if (data->next_timeout.tv_sec > 0 || data->next_timeout.tv_usec > 0)
-		{
-#ifdef OPENSSL_SYS_WINDOWS
-		int timeout = data->socket_timeout.tv_sec * 1000 +
-					  data->socket_timeout.tv_usec / 1000;
-		if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-					   (void*)&timeout, sizeof(timeout)) < 0)
-			{ perror("setsockopt"); }
-#else
-		if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &(data->socket_timeout),
-						sizeof(struct timeval)) < 0)
-			{ perror("setsockopt"); }
-#endif
-		}
-#endif
-	}
-
-static int dgram_read(BIO *b, char *out, int outl)
-	{
-	int ret=0;
-	bio_dgram_data *data = (bio_dgram_data *)b->ptr;
-
-	struct	{
-	/*
-	 * See commentary in b_sock.c. <appro>
-	 */
-	union	{ size_t s; int i; } len;
-	union	{
-		struct sockaddr sa;
-		struct sockaddr_in sa_in;
-#if OPENSSL_USE_IPV6
-		struct sockaddr_in6 sa_in6;
-#endif
-		} peer;
-	} sa;
-
-	sa.len.s=0;
-	sa.len.i=sizeof(sa.peer);
-
-	if (out != NULL)
-		{
-		clear_socket_error();
-		memset(&sa.peer, 0x00, sizeof(sa.peer));
-		dgram_adjust_rcv_timeout(b);
-		ret=recvfrom(b->num,out,outl,0,&sa.peer.sa,(void *)&sa.len);
-		if (sizeof(sa.len.i)!=sizeof(sa.len.s) && sa.len.i==0)
-			{
-			OPENSSL_assert(sa.len.s<=sizeof(sa.peer));
-			sa.len.i = (int)sa.len.s;
-			}
-		dgram_reset_rcv_timeout(b);
-
-		if ( ! data->connected  && ret >= 0)
-			BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &sa.peer);
-
-		BIO_clear_retry_flags(b);
-		if (ret < 0)
-			{
-			if (BIO_dgram_should_retry(ret))
-				{
-				BIO_set_retry_read(b);
-				data->_errno = get_last_socket_error();
-				}
-			}
-		}
-	return(ret);
-	}
-
-static int dgram_write(BIO *b, const char *in, int inl)
-	{
-	int ret;
-	bio_dgram_data *data = (bio_dgram_data *)b->ptr;
-	clear_socket_error();
-
-	if ( data->connected )
-		ret=writesocket(b->num,in,inl);
-	else
-		{
-		int peerlen = sizeof(data->peer);
-
-		if (data->peer.sa.sa_family == AF_INET)
-			peerlen = sizeof(data->peer.sa_in);
-#if OPENSSL_USE_IVP6
-		else if (data->peer.sa.sa_family == AF_INET6)
-			peerlen = sizeof(data->peer.sa_in6);
-#endif
-#if defined(NETWARE_CLIB) && defined(NETWARE_BSDSOCK)
-		ret=sendto(b->num, (char *)in, inl, 0, &data->peer.sa, peerlen);
-#else
-		ret=sendto(b->num, in, inl, 0, &data->peer.sa, peerlen);
-#endif
-		}
-
-	BIO_clear_retry_flags(b);
-	if (ret <= 0)
-		{
-		if (BIO_dgram_should_retry(ret))
-			{
-			BIO_set_retry_write(b);  
-			data->_errno = get_last_socket_error();
-
-#if 0 /* higher layers are responsible for querying MTU, if necessary */
-			if ( data->_errno == EMSGSIZE)
-				/* retrieve the new MTU */
-				BIO_ctrl(b, BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
-#endif
-			}
-		}
-	return(ret);
-	}
-
-static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
-	{
-	long ret=1;
-	int *ip;
-	struct sockaddr *to = NULL;
-	bio_dgram_data *data = NULL;
-#if defined(IP_MTU_DISCOVER) || defined(IP_MTU)
-	long sockopt_val = 0;
-	unsigned int sockopt_len = 0;
-#endif
-#ifdef OPENSSL_SYS_LINUX
-	socklen_t addr_len;
-	union	{
-		struct sockaddr	sa;
-		struct sockaddr_in s4;
-#if OPENSSL_USE_IPV6
-		struct sockaddr_in6 s6;
-#endif
-		} addr;
-#endif
-
-	data = (bio_dgram_data *)b->ptr;
-
-	switch (cmd)
-		{
-	case BIO_CTRL_RESET:
-		num=0;
-	case BIO_C_FILE_SEEK:
-		ret=0;
-		break;
-	case BIO_C_FILE_TELL:
-	case BIO_CTRL_INFO:
-		ret=0;
-		break;
-	case BIO_C_SET_FD:
-		dgram_clear(b);
-		b->num= *((int *)ptr);
-		b->shutdown=(int)num;
-		b->init=1;
-		break;
-	case BIO_C_GET_FD:
-		if (b->init)
-			{
-			ip=(int *)ptr;
-			if (ip != NULL) *ip=b->num;
-			ret=b->num;
-			}
-		else
-			ret= -1;
-		break;
-	case BIO_CTRL_GET_CLOSE:
-		ret=b->shutdown;
-		break;
-	case BIO_CTRL_SET_CLOSE:
-		b->shutdown=(int)num;
-		break;
-	case BIO_CTRL_PENDING:
-	case BIO_CTRL_WPENDING:
-		ret=0;
-		break;
-	case BIO_CTRL_DUP:
-	case BIO_CTRL_FLUSH:
-		ret=1;
-		break;
-	case BIO_CTRL_DGRAM_CONNECT:
-		to = (struct sockaddr *)ptr;
-#if 0
-		if (connect(b->num, to, sizeof(struct sockaddr)) < 0)
-			{ perror("connect"); ret = 0; }
-		else
-			{
-#endif
-			switch (to->sa_family)
-				{
-				case AF_INET:
-					memcpy(&data->peer,to,sizeof(data->peer.sa_in));
-					break;
-#if OPENSSL_USE_IPV6
-				case AF_INET6:
-					memcpy(&data->peer,to,sizeof(data->peer.sa_in6));
-					break;
-#endif
-				default:
-					memcpy(&data->peer,to,sizeof(data->peer.sa));
-					break;
-				}
-#if 0
-			}
-#endif
-		break;
-		/* (Linux)kernel sets DF bit on outgoing IP packets */
-	case BIO_CTRL_DGRAM_MTU_DISCOVER:
-#ifdef OPENSSL_SYS_LINUX
-		addr_len = (socklen_t)sizeof(addr);
-		memset((void *)&addr, 0, sizeof(addr));
-		if (getsockname(b->num, &addr.sa, &addr_len) < 0)
-			{
-			ret = 0;
-			break;
-			}
-		sockopt_len = sizeof(sockopt_val);
-		switch (addr.sa.sa_family)
-			{
-		case AF_INET:
-			sockopt_val = IP_PMTUDISC_DO;
-			if ((ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
-				&sockopt_val, sizeof(sockopt_val))) < 0)
-				perror("setsockopt");
-			break;
-#if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER)
-		case AF_INET6:
-			sockopt_val = IPV6_PMTUDISC_DO;
-			if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
-				&sockopt_val, sizeof(sockopt_val))) < 0)
-				perror("setsockopt");
-			break;
-#endif
-		default:
-			ret = -1;
-			break;
-			}
-		ret = -1;
-#else
-		break;
-#endif
-	case BIO_CTRL_DGRAM_QUERY_MTU:
-#ifdef OPENSSL_SYS_LINUX
-		addr_len = (socklen_t)sizeof(addr);
-		memset((void *)&addr, 0, sizeof(addr));
-		if (getsockname(b->num, &addr.sa, &addr_len) < 0)
-			{
-			ret = 0;
-			break;
-			}
-		sockopt_len = sizeof(sockopt_val);
-		switch (addr.sa.sa_family)
-			{
-		case AF_INET:
-			if ((ret = getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,
-				&sockopt_len)) < 0 || sockopt_val < 0)
-				{
-				ret = 0;
-				}
-			else
-				{
-				/* we assume that the transport protocol is UDP and no
-				 * IP options are used.
-				 */
-				data->mtu = sockopt_val - 8 - 20;
-				ret = data->mtu;
-				}
-			break;
-#if OPENSSL_USE_IPV6 && defined(IPV6_MTU)
-		case AF_INET6:
-			if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val,
-				&sockopt_len)) < 0 || sockopt_val < 0)
-				{
-				ret = 0;
-				}
-			else
-				{
-				/* we assume that the transport protocol is UDP and no
-				 * IPV6 options are used.
-				 */
-				data->mtu = sockopt_val - 8 - 40;
-				ret = data->mtu;
-				}
-			break;
-#endif
-		default:
-			ret = 0;
-			break;
-			}
-#else
-		ret = 0;
-#endif
-		break;
-	case BIO_CTRL_DGRAM_GET_MTU:
-		return data->mtu;
-		break;
-	case BIO_CTRL_DGRAM_SET_MTU:
-		data->mtu = num;
-		ret = num;
-		break;
-	case BIO_CTRL_DGRAM_SET_CONNECTED:
-		to = (struct sockaddr *)ptr;
-
-		if ( to != NULL)
-			{
-			data->connected = 1;
-			switch (to->sa_family)
-				{
-				case AF_INET:
-					memcpy(&data->peer,to,sizeof(data->peer.sa_in));
-					break;
-#if OPENSSL_USE_IPV6
-				case AF_INET6:
-					memcpy(&data->peer,to,sizeof(data->peer.sa_in6));
-					break;
-#endif
-				default:
-					memcpy(&data->peer,to,sizeof(data->peer.sa));
-					break;
-				}
-			}
-		else
-			{
-			data->connected = 0;
-			memset(&(data->peer), 0x00, sizeof(data->peer));
-			}
-		break;
-	case BIO_CTRL_DGRAM_GET_PEER:
-		switch (data->peer.sa.sa_family)
-			{
-			case AF_INET:
-				ret=sizeof(data->peer.sa_in);
-				break;
-#if OPENSSL_USE_IPV6
-			case AF_INET6:
-				ret=sizeof(data->peer.sa_in6);
-				break;
-#endif
-			default:
-				ret=sizeof(data->peer.sa);
-				break;
-			}
-		if (num==0 || num>ret)
-			num=ret;
-		memcpy(ptr,&data->peer,(ret=num));
-		break;
-	case BIO_CTRL_DGRAM_SET_PEER:
-		to = (struct sockaddr *) ptr;
-		switch (to->sa_family)
-			{
-			case AF_INET:
-				memcpy(&data->peer,to,sizeof(data->peer.sa_in));
-				break;
-#if OPENSSL_USE_IPV6
-			case AF_INET6:
-				memcpy(&data->peer,to,sizeof(data->peer.sa_in6));
-				break;
-#endif
-			default:
-				memcpy(&data->peer,to,sizeof(data->peer.sa));
-				break;
-			}
-		break;
-	case BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT:
-		memcpy(&(data->next_timeout), ptr, sizeof(struct timeval));
-		break;
-#if defined(SO_RCVTIMEO)
-	case BIO_CTRL_DGRAM_SET_RECV_TIMEOUT:
-#ifdef OPENSSL_SYS_WINDOWS
-		{
-		struct timeval *tv = (struct timeval *)ptr;
-		int timeout = tv->tv_sec * 1000 + tv->tv_usec/1000;
-		if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-			(void*)&timeout, sizeof(timeout)) < 0)
-			{ perror("setsockopt"); ret = -1; }
-		}
-#else
-		if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, ptr,
-			sizeof(struct timeval)) < 0)
-			{ perror("setsockopt");	ret = -1; }
-#endif
-		break;
-	case BIO_CTRL_DGRAM_GET_RECV_TIMEOUT:
-#ifdef OPENSSL_SYS_WINDOWS
-		{
-		int timeout, sz = sizeof(timeout);
-		struct timeval *tv = (struct timeval *)ptr;
-		if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-			(void*)&timeout, &sz) < 0)
-			{ perror("getsockopt"); ret = -1; }
-		else
-			{
-			tv->tv_sec = timeout / 1000;
-			tv->tv_usec = (timeout % 1000) * 1000;
-			ret = sizeof(*tv);
-			}
-		}
-#else
-		if ( getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, 
-			ptr, (void *)&ret) < 0)
-			{ perror("getsockopt"); ret = -1; }
-#endif
-		break;
-#endif
-#if defined(SO_SNDTIMEO)
-	case BIO_CTRL_DGRAM_SET_SEND_TIMEOUT:
-#ifdef OPENSSL_SYS_WINDOWS
-		{
-		struct timeval *tv = (struct timeval *)ptr;
-		int timeout = tv->tv_sec * 1000 + tv->tv_usec/1000;
-		if (setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
-			(void*)&timeout, sizeof(timeout)) < 0)
-			{ perror("setsockopt"); ret = -1; }
-		}
-#else
-		if ( setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, ptr,
-			sizeof(struct timeval)) < 0)
-			{ perror("setsockopt");	ret = -1; }
-#endif
-		break;
-	case BIO_CTRL_DGRAM_GET_SEND_TIMEOUT:
-#ifdef OPENSSL_SYS_WINDOWS
-		{
-		int timeout, sz = sizeof(timeout);
-		struct timeval *tv = (struct timeval *)ptr;
-		if (getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
-			(void*)&timeout, &sz) < 0)
-			{ perror("getsockopt"); ret = -1; }
-		else
-			{
-			tv->tv_sec = timeout / 1000;
-			tv->tv_usec = (timeout % 1000) * 1000;
-			ret = sizeof(*tv);
-			}
-		}
-#else
-		if ( getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, 
-			ptr, (void *)&ret) < 0)
-			{ perror("getsockopt"); ret = -1; }
-#endif
-		break;
-#endif
-	case BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP:
-		/* fall-through */
-	case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP:
-#ifdef OPENSSL_SYS_WINDOWS
-		if ( data->_errno == WSAETIMEDOUT)
-#else
-		if ( data->_errno == EAGAIN)
-#endif
-			{
-			ret = 1;
-			data->_errno = 0;
-			}
-		else
-			ret = 0;
-		break;
-#ifdef EMSGSIZE
-	case BIO_CTRL_DGRAM_MTU_EXCEEDED:
-		if ( data->_errno == EMSGSIZE)
-			{
-			ret = 1;
-			data->_errno = 0;
-			}
-		else
-			ret = 0;
-		break;
-#endif
-	default:
-		ret=0;
-		break;
-		}
-	return(ret);
-	}
-
-static int dgram_puts(BIO *bp, const char *str)
-	{
-	int n,ret;
-
-	n=strlen(str);
-	ret=dgram_write(bp,str,n);
-	return(ret);
-	}
-
-static int BIO_dgram_should_retry(int i)
-	{
-	int err;
-
-	if ((i == 0) || (i == -1))
-		{
-		err=get_last_socket_error();
-
-#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
-		if ((i == -1) && (err == 0))
-			return(1);
-#endif
-
-		return(BIO_dgram_non_fatal_error(err));
-		}
-	return(0);
-	}
-
-int BIO_dgram_non_fatal_error(int err)
-	{
-	switch (err)
-		{
-#if defined(OPENSSL_SYS_WINDOWS)
-# if defined(WSAEWOULDBLOCK)
-	case WSAEWOULDBLOCK:
-# endif
-
-# if 0 /* This appears to always be an error */
-#  if defined(WSAENOTCONN)
-	case WSAENOTCONN:
-#  endif
-# endif
-#endif
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-	case EWOULDBLOCK:
-#  endif
-# else
-	case EWOULDBLOCK:
-# endif
-#endif
-
-#ifdef EINTR
-	case EINTR:
-#endif
-
-#ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
-	case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-	case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
-	case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
-	case EALREADY:
-#endif
-
-		return(1);
-		/* break; */
-	default:
-		break;
-		}
-	return(0);
-	}
-#endif
-
-static void get_current_time(struct timeval *t)
-	{
-#ifdef OPENSSL_SYS_WIN32
-	struct _timeb tb;
-	_ftime(&tb);
-	t->tv_sec = (long)tb.time;
-	t->tv_usec = (long)tb.millitm * 1000;
-#elif defined(OPENSSL_SYS_VMS)
-	struct timeb tb;
-	ftime(&tb);
-	t->tv_sec = (long)tb.time;
-	t->tv_usec = (long)tb.millitm * 1000;
-#else
-	gettimeofday(t, NULL);
-#endif
-	}
+/* crypto/bio/bio_dgram.c */

+/* 

+ * DTLS implementation written by Nagendra Modadugu

+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  

+ */

+/* ====================================================================

+ * Copyright (c) 1999-2005 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

+ *    openssl-core@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).

+ *

+ */

+

+#ifndef OPENSSL_NO_DGRAM

+

+#include <stdio.h>

+#include <errno.h>

+#define USE_SOCKETS

+#include "cryptlib.h"

+

+#include <openssl/bio.h>

+

+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)

+#include <sys/timeb.h>

+#endif

+

+#ifdef OPENSSL_SYS_LINUX

+#define IP_MTU      14 /* linux is lame */

+#endif

+

+#ifdef WATT32

+#define sock_write SockWrite  /* Watt-32 uses same names */

+#define sock_read  SockRead

+#define sock_puts  SockPuts

+#endif

+

+static int dgram_write(BIO *h, const char *buf, int num);

+static int dgram_read(BIO *h, char *buf, int size);

+static int dgram_puts(BIO *h, const char *str);

+static long dgram_ctrl(BIO *h, int cmd, long arg1, void *arg2);

+static int dgram_new(BIO *h);

+static int dgram_free(BIO *data);

+static int dgram_clear(BIO *bio);

+

+static int BIO_dgram_should_retry(int s);

+

+static void get_current_time(struct timeval *t);

+

+static BIO_METHOD methods_dgramp=

+	{

+	BIO_TYPE_DGRAM,

+	"datagram socket",

+	dgram_write,

+	dgram_read,

+	dgram_puts,

+	NULL, /* dgram_gets, */

+	dgram_ctrl,

+	dgram_new,

+	dgram_free,

+	NULL,

+	};

+

+typedef struct bio_dgram_data_st

+	{

+	union {

+		struct sockaddr sa;

+		struct sockaddr_in sa_in;

+#if OPENSSL_USE_IPV6

+		struct sockaddr_in6 sa_in6;

+#endif

+	} peer;

+	unsigned int connected;

+	unsigned int _errno;

+	unsigned int mtu;

+	struct timeval next_timeout;

+	struct timeval socket_timeout;

+	} bio_dgram_data;

+

+BIO_METHOD *BIO_s_datagram(void)

+	{

+	return(&methods_dgramp);

+	}

+

+BIO *BIO_new_dgram(int fd, int close_flag)

+	{

+	BIO *ret;

+

+	ret=BIO_new(BIO_s_datagram());

+	if (ret == NULL) return(NULL);

+	BIO_set_fd(ret,fd,close_flag);

+	return(ret);

+	}

+

+static int dgram_new(BIO *bi)

+	{

+	bio_dgram_data *data = NULL;

+

+	bi->init=0;

+	bi->num=0;

+	data = OPENSSL_malloc(sizeof(bio_dgram_data));

+	if (data == NULL)

+		return 0;

+	memset(data, 0x00, sizeof(bio_dgram_data));

+    bi->ptr = data;

+

+	bi->flags=0;

+	return(1);

+	}

+

+static int dgram_free(BIO *a)

+	{

+	bio_dgram_data *data;

+

+	if (a == NULL) return(0);

+	if ( ! dgram_clear(a))

+		return 0;

+

+	data = (bio_dgram_data *)a->ptr;

+	if(data != NULL) OPENSSL_free(data);

+

+	return(1);

+	}

+

+static int dgram_clear(BIO *a)

+	{

+	if (a == NULL) return(0);

+	if (a->shutdown)

+		{

+		if (a->init)

+			{

+			SHUTDOWN2(a->num);

+			}

+		a->init=0;

+		a->flags=0;

+		}

+	return(1);

+	}

+

+static void dgram_adjust_rcv_timeout(BIO *b)

+	{

+#if defined(SO_RCVTIMEO)

+	bio_dgram_data *data = (bio_dgram_data *)b->ptr;

+	int sz = sizeof(int);

+

+	/* Is a timer active? */

+	if (data->next_timeout.tv_sec > 0 || data->next_timeout.tv_usec > 0)

+		{

+		struct timeval timenow, timeleft;

+

+		/* Read current socket timeout */

+#ifdef OPENSSL_SYS_WINDOWS

+		int timeout;

+		if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,

+					   (void*)&timeout, &sz) < 0)

+			{ perror("getsockopt"); }

+		else

+			{

+			data->socket_timeout.tv_sec = timeout / 1000;

+			data->socket_timeout.tv_usec = (timeout % 1000) * 1000;

+			}

+#else

+		if ( getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, 

+						&(data->socket_timeout), (void *)&sz) < 0)

+			{ perror("getsockopt"); }

+#endif

+

+		/* Get current time */

+		get_current_time(&timenow);

+

+		/* Calculate time left until timer expires */

+		memcpy(&timeleft, &(data->next_timeout), sizeof(struct timeval));

+		timeleft.tv_sec -= timenow.tv_sec;

+		timeleft.tv_usec -= timenow.tv_usec;

+		if (timeleft.tv_usec < 0)

+			{

+			timeleft.tv_sec--;

+			timeleft.tv_usec += 1000000;

+			}

+

+		if (timeleft.tv_sec < 0)

+			{

+			timeleft.tv_sec = 0;

+			timeleft.tv_usec = 1;

+			}

+

+		/* Adjust socket timeout if next handhake message timer

+		 * will expire earlier.

+		 */

+		if ((data->socket_timeout.tv_sec == 0 && data->socket_timeout.tv_usec == 0) ||

+			(data->socket_timeout.tv_sec > timeleft.tv_sec) ||

+			(data->socket_timeout.tv_sec == timeleft.tv_sec &&

+			 data->socket_timeout.tv_usec >= timeleft.tv_usec))

+			{

+#ifdef OPENSSL_SYS_WINDOWS

+			timeout = timeleft.tv_sec * 1000 + timeleft.tv_usec / 1000;

+			if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,

+						   (void*)&timeout, sizeof(timeout)) < 0)

+				{ perror("setsockopt"); }

+#else

+			if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &timeleft,

+							sizeof(struct timeval)) < 0)

+				{ perror("setsockopt"); }

+#endif

+			}

+		}

+#endif

+	}

+

+static void dgram_reset_rcv_timeout(BIO *b)

+	{

+#if defined(SO_RCVTIMEO)

+	bio_dgram_data *data = (bio_dgram_data *)b->ptr;

+

+	/* Is a timer active? */

+	if (data->next_timeout.tv_sec > 0 || data->next_timeout.tv_usec > 0)

+		{

+#ifdef OPENSSL_SYS_WINDOWS

+		int timeout = data->socket_timeout.tv_sec * 1000 +

+					  data->socket_timeout.tv_usec / 1000;

+		if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,

+					   (void*)&timeout, sizeof(timeout)) < 0)

+			{ perror("setsockopt"); }

+#else

+		if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &(data->socket_timeout),

+						sizeof(struct timeval)) < 0)

+			{ perror("setsockopt"); }

+#endif

+		}

+#endif

+	}

+

+static int dgram_read(BIO *b, char *out, int outl)

+	{

+	int ret=0;

+	bio_dgram_data *data = (bio_dgram_data *)b->ptr;

+

+	struct	{

+	/*

+	 * See commentary in b_sock.c. <appro>

+	 */

+	union	{ size_t s; int i; } len;

+	union	{

+		struct sockaddr sa;

+		struct sockaddr_in sa_in;

+#if OPENSSL_USE_IPV6

+		struct sockaddr_in6 sa_in6;

+#endif

+		} peer;

+	} sa;

+

+	sa.len.s=0;

+	sa.len.i=sizeof(sa.peer);

+

+	if (out != NULL)

+		{

+		clear_socket_error();

+		memset(&sa.peer, 0x00, sizeof(sa.peer));

+		dgram_adjust_rcv_timeout(b);

+		ret=recvfrom(b->num,out,outl,0,&sa.peer.sa,(void *)&sa.len);

+		if (sizeof(sa.len.i)!=sizeof(sa.len.s) && sa.len.i==0)

+			{

+			OPENSSL_assert(sa.len.s<=sizeof(sa.peer));

+			sa.len.i = (int)sa.len.s;

+			}

+		dgram_reset_rcv_timeout(b);

+

+		if ( ! data->connected  && ret >= 0)

+			BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &sa.peer);

+

+		BIO_clear_retry_flags(b);

+		if (ret < 0)

+			{

+			if (BIO_dgram_should_retry(ret))

+				{

+				BIO_set_retry_read(b);

+				data->_errno = get_last_socket_error();

+				}

+			}

+		}

+	return(ret);

+	}

+

+static int dgram_write(BIO *b, const char *in, int inl)

+	{

+	int ret;

+	bio_dgram_data *data = (bio_dgram_data *)b->ptr;

+	clear_socket_error();

+

+	if ( data->connected )

+		ret=writesocket(b->num,in,inl);

+	else

+		{

+		int peerlen = sizeof(data->peer);

+

+		if (data->peer.sa.sa_family == AF_INET)

+			peerlen = sizeof(data->peer.sa_in);

+#if OPENSSL_USE_IPV6

+		else if (data->peer.sa.sa_family == AF_INET6)

+			peerlen = sizeof(data->peer.sa_in6);

+#endif

+#if defined(NETWARE_CLIB) && defined(NETWARE_BSDSOCK)

+		ret=sendto(b->num, (char *)in, inl, 0, &data->peer.sa, peerlen);

+#else

+		ret=sendto(b->num, in, inl, 0, &data->peer.sa, peerlen);

+#endif

+		}

+

+	BIO_clear_retry_flags(b);

+	if (ret <= 0)

+		{

+		if (BIO_dgram_should_retry(ret))

+			{

+			BIO_set_retry_write(b);  

+			data->_errno = get_last_socket_error();

+

+#if 0 /* higher layers are responsible for querying MTU, if necessary */

+			if ( data->_errno == EMSGSIZE)

+				/* retrieve the new MTU */

+				BIO_ctrl(b, BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);

+#endif

+			}

+		}

+	return(ret);

+	}

+

+static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)

+	{

+	long ret=1;

+	int *ip;

+	struct sockaddr *to = NULL;

+	bio_dgram_data *data = NULL;

+#if defined(IP_MTU_DISCOVER) || defined(IP_MTU)

+	long sockopt_val = 0;

+	unsigned int sockopt_len = 0;

+#endif

+#ifdef OPENSSL_SYS_LINUX

+	socklen_t addr_len;

+	union	{

+		struct sockaddr	sa;

+		struct sockaddr_in s4;

+#if OPENSSL_USE_IPV6

+		struct sockaddr_in6 s6;

+#endif

+		} addr;

+#endif

+

+	data = (bio_dgram_data *)b->ptr;

+

+	switch (cmd)

+		{

+	case BIO_CTRL_RESET:

+		num=0;

+	case BIO_C_FILE_SEEK:

+		ret=0;

+		break;

+	case BIO_C_FILE_TELL:

+	case BIO_CTRL_INFO:

+		ret=0;

+		break;

+	case BIO_C_SET_FD:

+		dgram_clear(b);

+		b->num= *((int *)ptr);

+		b->shutdown=(int)num;

+		b->init=1;

+		break;

+	case BIO_C_GET_FD:

+		if (b->init)

+			{

+			ip=(int *)ptr;

+			if (ip != NULL) *ip=b->num;

+			ret=b->num;

+			}

+		else

+			ret= -1;

+		break;

+	case BIO_CTRL_GET_CLOSE:

+		ret=b->shutdown;

+		break;

+	case BIO_CTRL_SET_CLOSE:

+		b->shutdown=(int)num;

+		break;

+	case BIO_CTRL_PENDING:

+	case BIO_CTRL_WPENDING:

+		ret=0;

+		break;

+	case BIO_CTRL_DUP:

+	case BIO_CTRL_FLUSH:

+		ret=1;

+		break;

+	case BIO_CTRL_DGRAM_CONNECT:

+		to = (struct sockaddr *)ptr;

+#if 0

+		if (connect(b->num, to, sizeof(struct sockaddr)) < 0)

+			{ perror("connect"); ret = 0; }

+		else

+			{

+#endif

+			switch (to->sa_family)

+				{

+				case AF_INET:

+					memcpy(&data->peer,to,sizeof(data->peer.sa_in));

+					break;

+#if OPENSSL_USE_IPV6

+				case AF_INET6:

+					memcpy(&data->peer,to,sizeof(data->peer.sa_in6));

+					break;

+#endif

+				default:

+					memcpy(&data->peer,to,sizeof(data->peer.sa));

+					break;

+				}

+#if 0

+			}

+#endif

+		break;

+		/* (Linux)kernel sets DF bit on outgoing IP packets */

+	case BIO_CTRL_DGRAM_MTU_DISCOVER:

+#ifdef OPENSSL_SYS_LINUX

+		addr_len = (socklen_t)sizeof(addr);

+		memset((void *)&addr, 0, sizeof(addr));

+		if (getsockname(b->num, &addr.sa, &addr_len) < 0)

+			{

+			ret = 0;

+			break;

+			}

+		sockopt_len = sizeof(sockopt_val);

+		switch (addr.sa.sa_family)

+			{

+		case AF_INET:

+			sockopt_val = IP_PMTUDISC_DO;

+			if ((ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,

+				&sockopt_val, sizeof(sockopt_val))) < 0)

+				perror("setsockopt");

+			break;

+#if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER)

+		case AF_INET6:

+			sockopt_val = IPV6_PMTUDISC_DO;

+			if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,

+				&sockopt_val, sizeof(sockopt_val))) < 0)

+				perror("setsockopt");

+			break;

+#endif

+		default:

+			ret = -1;

+			break;

+			}

+		ret = -1;

+#else

+		break;

+#endif

+	case BIO_CTRL_DGRAM_QUERY_MTU:

+#ifdef OPENSSL_SYS_LINUX

+		addr_len = (socklen_t)sizeof(addr);

+		memset((void *)&addr, 0, sizeof(addr));

+		if (getsockname(b->num, &addr.sa, &addr_len) < 0)

+			{

+			ret = 0;

+			break;

+			}

+		sockopt_len = sizeof(sockopt_val);

+		switch (addr.sa.sa_family)

+			{

+		case AF_INET:

+			if ((ret = getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,

+				&sockopt_len)) < 0 || sockopt_val < 0)

+				{

+				ret = 0;

+				}

+			else

+				{

+				/* we assume that the transport protocol is UDP and no

+				 * IP options are used.

+				 */

+				data->mtu = sockopt_val - 8 - 20;

+				ret = data->mtu;

+				}

+			break;

+#if OPENSSL_USE_IPV6 && defined(IPV6_MTU)

+		case AF_INET6:

+			if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val,

+				&sockopt_len)) < 0 || sockopt_val < 0)

+				{

+				ret = 0;

+				}

+			else

+				{

+				/* we assume that the transport protocol is UDP and no

+				 * IPV6 options are used.

+				 */

+				data->mtu = sockopt_val - 8 - 40;

+				ret = data->mtu;

+				}

+			break;

+#endif

+		default:

+			ret = 0;

+			break;

+			}

+#else

+		ret = 0;

+#endif

+		break;

+	case BIO_CTRL_DGRAM_GET_MTU:

+		return data->mtu;

+		break;

+	case BIO_CTRL_DGRAM_SET_MTU:

+		data->mtu = num;

+		ret = num;

+		break;

+	case BIO_CTRL_DGRAM_SET_CONNECTED:

+		to = (struct sockaddr *)ptr;

+

+		if ( to != NULL)

+			{

+			data->connected = 1;

+			switch (to->sa_family)

+				{

+				case AF_INET:

+					memcpy(&data->peer,to,sizeof(data->peer.sa_in));

+					break;

+#if OPENSSL_USE_IPV6

+				case AF_INET6:

+					memcpy(&data->peer,to,sizeof(data->peer.sa_in6));

+					break;

+#endif

+				default:

+					memcpy(&data->peer,to,sizeof(data->peer.sa));

+					break;

+				}

+			}

+		else

+			{

+			data->connected = 0;

+			memset(&(data->peer), 0x00, sizeof(data->peer));

+			}

+		break;

+	case BIO_CTRL_DGRAM_GET_PEER:

+		switch (data->peer.sa.sa_family)

+			{

+			case AF_INET:

+				ret=sizeof(data->peer.sa_in);

+				break;

+#if OPENSSL_USE_IPV6

+			case AF_INET6:

+				ret=sizeof(data->peer.sa_in6);

+				break;

+#endif

+			default:

+				ret=sizeof(data->peer.sa);

+				break;

+			}

+		if (num==0 || num>ret)

+			num=ret;

+		memcpy(ptr,&data->peer,(ret=num));

+		break;

+	case BIO_CTRL_DGRAM_SET_PEER:

+		to = (struct sockaddr *) ptr;

+		switch (to->sa_family)

+			{

+			case AF_INET:

+				memcpy(&data->peer,to,sizeof(data->peer.sa_in));

+				break;

+#if OPENSSL_USE_IPV6

+			case AF_INET6:

+				memcpy(&data->peer,to,sizeof(data->peer.sa_in6));

+				break;

+#endif

+			default:

+				memcpy(&data->peer,to,sizeof(data->peer.sa));

+				break;

+			}

+		break;

+	case BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT:

+		memcpy(&(data->next_timeout), ptr, sizeof(struct timeval));

+		break;

+#if defined(SO_RCVTIMEO)

+	case BIO_CTRL_DGRAM_SET_RECV_TIMEOUT:

+#ifdef OPENSSL_SYS_WINDOWS

+		{

+		struct timeval *tv = (struct timeval *)ptr;

+		int timeout = tv->tv_sec * 1000 + tv->tv_usec/1000;

+		if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,

+			(void*)&timeout, sizeof(timeout)) < 0)

+			{ perror("setsockopt"); ret = -1; }

+		}

+#else

+		if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, ptr,

+			sizeof(struct timeval)) < 0)

+			{ perror("setsockopt");	ret = -1; }

+#endif

+		break;

+	case BIO_CTRL_DGRAM_GET_RECV_TIMEOUT:

+#ifdef OPENSSL_SYS_WINDOWS

+		{

+		int timeout, sz = sizeof(timeout);

+		struct timeval *tv = (struct timeval *)ptr;

+		if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,

+			(void*)&timeout, &sz) < 0)

+			{ perror("getsockopt"); ret = -1; }

+		else

+			{

+			tv->tv_sec = timeout / 1000;

+			tv->tv_usec = (timeout % 1000) * 1000;

+			ret = sizeof(*tv);

+			}

+		}

+#else

+		if ( getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, 

+			ptr, (void *)&ret) < 0)

+			{ perror("getsockopt"); ret = -1; }

+#endif

+		break;

+#endif

+#if defined(SO_SNDTIMEO)

+	case BIO_CTRL_DGRAM_SET_SEND_TIMEOUT:

+#ifdef OPENSSL_SYS_WINDOWS

+		{

+		struct timeval *tv = (struct timeval *)ptr;

+		int timeout = tv->tv_sec * 1000 + tv->tv_usec/1000;

+		if (setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,

+			(void*)&timeout, sizeof(timeout)) < 0)

+			{ perror("setsockopt"); ret = -1; }

+		}

+#else

+		if ( setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, ptr,

+			sizeof(struct timeval)) < 0)

+			{ perror("setsockopt");	ret = -1; }

+#endif

+		break;

+	case BIO_CTRL_DGRAM_GET_SEND_TIMEOUT:

+#ifdef OPENSSL_SYS_WINDOWS

+		{

+		int timeout, sz = sizeof(timeout);

+		struct timeval *tv = (struct timeval *)ptr;

+		if (getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,

+			(void*)&timeout, &sz) < 0)

+			{ perror("getsockopt"); ret = -1; }

+		else

+			{

+			tv->tv_sec = timeout / 1000;

+			tv->tv_usec = (timeout % 1000) * 1000;

+			ret = sizeof(*tv);

+			}

+		}

+#else

+		if ( getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, 

+			ptr, (void *)&ret) < 0)

+			{ perror("getsockopt"); ret = -1; }

+#endif

+		break;

+#endif

+	case BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP:

+		/* fall-through */

+	case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP:

+#ifdef OPENSSL_SYS_WINDOWS

+		if ( data->_errno == WSAETIMEDOUT)

+#else

+		if ( data->_errno == EAGAIN)

+#endif

+			{

+			ret = 1;

+			data->_errno = 0;

+			}

+		else

+			ret = 0;

+		break;

+#ifdef EMSGSIZE

+	case BIO_CTRL_DGRAM_MTU_EXCEEDED:

+		if ( data->_errno == EMSGSIZE)

+			{

+			ret = 1;

+			data->_errno = 0;

+			}

+		else

+			ret = 0;

+		break;

+#endif

+	default:

+		ret=0;

+		break;

+		}

+	return(ret);

+	}

+

+static int dgram_puts(BIO *bp, const char *str)

+	{

+	int n,ret;

+

+	n=strlen(str);

+	ret=dgram_write(bp,str,n);

+	return(ret);

+	}

+

+static int BIO_dgram_should_retry(int i)

+	{

+	int err;

+

+	if ((i == 0) || (i == -1))

+		{

+		err=get_last_socket_error();

+

+#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */

+		if ((i == -1) && (err == 0))

+			return(1);

+#endif

+

+		return(BIO_dgram_non_fatal_error(err));

+		}

+	return(0);

+	}

+

+int BIO_dgram_non_fatal_error(int err)

+	{

+	switch (err)

+		{

+#if defined(OPENSSL_SYS_WINDOWS)

+# if defined(WSAEWOULDBLOCK)

+	case WSAEWOULDBLOCK:

+# endif

+

+# if 0 /* This appears to always be an error */

+#  if defined(WSAENOTCONN)

+	case WSAENOTCONN:

+#  endif

+# endif

+#endif

+

+#ifdef EWOULDBLOCK

+# ifdef WSAEWOULDBLOCK

+#  if WSAEWOULDBLOCK != EWOULDBLOCK

+	case EWOULDBLOCK:

+#  endif

+# else

+	case EWOULDBLOCK:

+# endif

+#endif

+

+#ifdef EINTR

+	case EINTR:

+#endif

+

+#ifdef EAGAIN

+#if EWOULDBLOCK != EAGAIN

+	case EAGAIN:

+# endif

+#endif

+

+#ifdef EPROTO

+	case EPROTO:

+#endif

+

+#ifdef EINPROGRESS

+	case EINPROGRESS:

+#endif

+

+#ifdef EALREADY

+	case EALREADY:

+#endif

+

+		return(1);

+		/* break; */

+	default:

+		break;

+		}

+	return(0);

+	}

+#endif

+

+static void get_current_time(struct timeval *t)

+	{

+#ifdef OPENSSL_SYS_WIN32

+	struct _timeb tb;

+	_ftime(&tb);

+	t->tv_sec = (long)tb.time;

+	t->tv_usec = (long)tb.millitm * 1000;

+#elif defined(OPENSSL_SYS_VMS)

+	struct timeb tb;

+	ftime(&tb);

+	t->tv_sec = (long)tb.time;

+	t->tv_usec = (long)tb.millitm * 1000;

+#else

+	gettimeofday(t, NULL);

+#endif

+	}

diff --git a/openssl/crypto/bio/bss_file.c b/openssl/crypto/bio/bss_file.c
index 8bfa0bcd9..a3d925d94 100644
--- a/openssl/crypto/bio/bss_file.c
+++ b/openssl/crypto/bio/bss_file.c
@@ -1,471 +1,477 @@
-/* crypto/bio/bss_file.c */
-/* 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.]
- */
-
-/*
- * 03-Dec-1997	rdenny@dc3.com  Fix bug preventing use of stdin/stdout
- *		with binary data (e.g. asn1parse -inform DER < xxx) under
- *		Windows
- */
-
-#ifndef HEADER_BSS_FILE_C
-#define HEADER_BSS_FILE_C
-
-#if defined(__linux) || defined(__sun) || defined(__hpux)
-/* Following definition aliases fopen to fopen64 on above mentioned
- * platforms. This makes it possible to open and sequentially access
- * files larger than 2GB from 32-bit application. It does not allow to
- * traverse them beyond 2GB with fseek/ftell, but on the other hand *no*
- * 32-bit platform permits that, not with fseek/ftell. Not to mention
- * that breaking 2GB limit for seeking would require surgery to *our*
- * API. But sequential access suffices for practical cases when you
- * can run into large files, such as fingerprinting, so we can let API
- * alone. For reference, the list of 32-bit platforms which allow for
- * sequential access of large files without extra "magic" comprise *BSD,
- * Darwin, IRIX...
- */
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include "bio_lcl.h"
-#include <openssl/err.h>
-
-#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
-#include <nwfileio.h>
-#endif
-
-#if !defined(OPENSSL_NO_STDIO)
-
-static int MS_CALLBACK file_write(BIO *h, const char *buf, int num);
-static int MS_CALLBACK file_read(BIO *h, char *buf, int size);
-static int MS_CALLBACK file_puts(BIO *h, const char *str);
-static int MS_CALLBACK file_gets(BIO *h, char *str, int size);
-static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2);
-static int MS_CALLBACK file_new(BIO *h);
-static int MS_CALLBACK file_free(BIO *data);
-static BIO_METHOD methods_filep=
-	{
-	BIO_TYPE_FILE,
-	"FILE pointer",
-	file_write,
-	file_read,
-	file_puts,
-	file_gets,
-	file_ctrl,
-	file_new,
-	file_free,
-	NULL,
-	};
-
-BIO *BIO_new_file(const char *filename, const char *mode)
-	{
-	BIO  *ret;
-	FILE *file=NULL;
-
-#if defined(_WIN32) && defined(CP_UTF8)
-	int sz, len_0 = (int)strlen(filename)+1;
-
-	/*
-	 * Basically there are three cases to cover: a) filename is
-	 * pure ASCII string; b) actual UTF-8 encoded string and
-	 * c) locale-ized string, i.e. one containing 8-bit
-	 * characters that are meaningful in current system locale.
-	 * If filename is pure ASCII or real UTF-8 encoded string,
-	 * MultiByteToWideChar succeeds and _wfopen works. If
-	 * filename is locale-ized string, chances are that
-	 * MultiByteToWideChar fails reporting
-	 * ERROR_NO_UNICODE_TRANSLATION, in which case we fall
-	 * back to fopen...
-	 */
-	if ((sz=MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
-					filename,len_0,NULL,0))>0)
-		{
-		WCHAR  wmode[8];
-		WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
-
-		if (MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
-					filename,len_0,wfilename,sz) &&
-		    MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,
-			    		wmode,sizeof(wmode)/sizeof(wmode[0])) &&
-		    (file=_wfopen(wfilename,wmode))==NULL && errno==ENOENT
-		   )	/* UTF-8 decode succeeded, but no file, filename
-			 * could still have been locale-ized... */
-			file = fopen(filename,mode);
-		}
-	else if (GetLastError()==ERROR_NO_UNICODE_TRANSLATION)
-		{
-		file = fopen(filename,mode);
-		}
-#else
-	file=fopen(filename,mode);	
-#endif
-	if (file == NULL)
-		{
-		SYSerr(SYS_F_FOPEN,get_last_sys_error());
-		ERR_add_error_data(5,"fopen('",filename,"','",mode,"')");
-		if (errno == ENOENT)
-			BIOerr(BIO_F_BIO_NEW_FILE,BIO_R_NO_SUCH_FILE);
-		else
-			BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB);
-		return(NULL);
-		}
-	if ((ret=BIO_new(BIO_s_file())) == NULL)
-		{
-		fclose(file);
-		return(NULL);
-		}
-
-	BIO_clear_flags(ret,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */
-	BIO_set_fp(ret,file,BIO_CLOSE);
-	return(ret);
-	}
-
-BIO *BIO_new_fp(FILE *stream, int close_flag)
-	{
-	BIO *ret;
-
-	if ((ret=BIO_new(BIO_s_file())) == NULL)
-		return(NULL);
-
-	BIO_set_flags(ret,BIO_FLAGS_UPLINK); /* redundant, left for documentation puposes */
-	BIO_set_fp(ret,stream,close_flag);
-	return(ret);
-	}
-
-BIO_METHOD *BIO_s_file(void)
-	{
-	return(&methods_filep);
-	}
-
-static int MS_CALLBACK file_new(BIO *bi)
-	{
-	bi->init=0;
-	bi->num=0;
-	bi->ptr=NULL;
-	bi->flags=BIO_FLAGS_UPLINK; /* default to UPLINK */
-	return(1);
-	}
-
-static int MS_CALLBACK file_free(BIO *a)
-	{
-	if (a == NULL) return(0);
-	if (a->shutdown)
-		{
-		if ((a->init) && (a->ptr != NULL))
-			{
-			if (a->flags&BIO_FLAGS_UPLINK)
-				UP_fclose (a->ptr);
-			else
-				fclose (a->ptr);
-			a->ptr=NULL;
-			a->flags=BIO_FLAGS_UPLINK;
-			}
-		a->init=0;
-		}
-	return(1);
-	}
-	
-static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
-	{
-	int ret=0;
-
-	if (b->init && (out != NULL))
-		{
-		if (b->flags&BIO_FLAGS_UPLINK)
-			ret=UP_fread(out,1,(int)outl,b->ptr);
-		else
-			ret=fread(out,1,(int)outl,(FILE *)b->ptr);
-		if(ret == 0 && (b->flags&BIO_FLAGS_UPLINK)?UP_ferror((FILE *)b->ptr):ferror((FILE *)b->ptr))
-			{
-			SYSerr(SYS_F_FREAD,get_last_sys_error());
-			BIOerr(BIO_F_FILE_READ,ERR_R_SYS_LIB);
-			ret=-1;
-			}
-		}
-	return(ret);
-	}
-
-static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
-	{
-	int ret=0;
-
-	if (b->init && (in != NULL))
-		{
-		if (b->flags&BIO_FLAGS_UPLINK)
-			ret=UP_fwrite(in,(int)inl,1,b->ptr);
-		else
-			ret=fwrite(in,(int)inl,1,(FILE *)b->ptr);
-		if (ret)
-			ret=inl;
-		/* ret=fwrite(in,1,(int)inl,(FILE *)b->ptr); */
-		/* according to Tim Hudson <tjh@cryptsoft.com>, the commented
-		 * out version above can cause 'inl' write calls under
-		 * some stupid stdio implementations (VMS) */
-		}
-	return(ret);
-	}
-
-static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
-	{
-	long ret=1;
-	FILE *fp=(FILE *)b->ptr;
-	FILE **fpp;
-	char p[4];
-
-	switch (cmd)
-		{
-	case BIO_C_FILE_SEEK:
-	case BIO_CTRL_RESET:
-		if (b->flags&BIO_FLAGS_UPLINK)
-			ret=(long)UP_fseek(b->ptr,num,0);
-		else
-			ret=(long)fseek(fp,num,0);
-		break;
-	case BIO_CTRL_EOF:
-		if (b->flags&BIO_FLAGS_UPLINK)
-			ret=(long)UP_feof(fp);
-		else
-			ret=(long)feof(fp);
-		break;
-	case BIO_C_FILE_TELL:
-	case BIO_CTRL_INFO:
-		if (b->flags&BIO_FLAGS_UPLINK)
-			ret=UP_ftell(b->ptr);
-		else
-			ret=ftell(fp);
-		break;
-	case BIO_C_SET_FILE_PTR:
-		file_free(b);
-		b->shutdown=(int)num&BIO_CLOSE;
-		b->ptr=ptr;
-		b->init=1;
-#if BIO_FLAGS_UPLINK!=0
-#if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
-#define _IOB_ENTRIES 20
-#endif
-#if defined(_IOB_ENTRIES)
-		/* Safety net to catch purely internal BIO_set_fp calls */
-		if ((size_t)ptr >= (size_t)stdin &&
-		    (size_t)ptr <  (size_t)(stdin+_IOB_ENTRIES))
-			BIO_clear_flags(b,BIO_FLAGS_UPLINK);
-#endif
-#endif
-#ifdef UP_fsetmod
-		if (b->flags&BIO_FLAGS_UPLINK)
-			UP_fsetmod(b->ptr,(char)((num&BIO_FP_TEXT)?'t':'b'));
-		else
-#endif
-		{
-#if defined(OPENSSL_SYS_WINDOWS)
-		int fd = _fileno((FILE*)ptr);
-		if (num & BIO_FP_TEXT)
-			_setmode(fd,_O_TEXT);
-		else
-			_setmode(fd,_O_BINARY);
-#elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
-		int fd = fileno((FILE*)ptr);
-		/* Under CLib there are differences in file modes */
-		if (num & BIO_FP_TEXT)
-			setmode(fd,O_TEXT);
-		else
-			setmode(fd,O_BINARY);
-#elif defined(OPENSSL_SYS_MSDOS)
-		int fd = fileno((FILE*)ptr);
-		/* Set correct text/binary mode */
-		if (num & BIO_FP_TEXT)
-			_setmode(fd,_O_TEXT);
-		/* Dangerous to set stdin/stdout to raw (unless redirected) */
-		else
-			{
-			if (fd == STDIN_FILENO || fd == STDOUT_FILENO)
-				{
-				if (isatty(fd) <= 0)
-					_setmode(fd,_O_BINARY);
-				}
-			else
-				_setmode(fd,_O_BINARY);
-			}
-#elif defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)
-		int fd = fileno((FILE*)ptr);
-		if (num & BIO_FP_TEXT)
-			setmode(fd, O_TEXT);
-		else
-			setmode(fd, O_BINARY);
-#endif
-		}
-		break;
-	case BIO_C_SET_FILENAME:
-		file_free(b);
-		b->shutdown=(int)num&BIO_CLOSE;
-		if (num & BIO_FP_APPEND)
-			{
-			if (num & BIO_FP_READ)
-				BUF_strlcpy(p,"a+",sizeof p);
-			else	BUF_strlcpy(p,"a",sizeof p);
-			}
-		else if ((num & BIO_FP_READ) && (num & BIO_FP_WRITE))
-			BUF_strlcpy(p,"r+",sizeof p);
-		else if (num & BIO_FP_WRITE)
-			BUF_strlcpy(p,"w",sizeof p);
-		else if (num & BIO_FP_READ)
-			BUF_strlcpy(p,"r",sizeof p);
-		else
-			{
-			BIOerr(BIO_F_FILE_CTRL,BIO_R_BAD_FOPEN_MODE);
-			ret=0;
-			break;
-			}
-#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)
-		if (!(num & BIO_FP_TEXT))
-			strcat(p,"b");
-		else
-			strcat(p,"t");
-#endif
-#if defined(OPENSSL_SYS_NETWARE)
-		if (!(num & BIO_FP_TEXT))
-			strcat(p,"b");
-		else
-			strcat(p,"t");
-#endif
-		fp=fopen(ptr,p);
-		if (fp == NULL)
-			{
-			SYSerr(SYS_F_FOPEN,get_last_sys_error());
-			ERR_add_error_data(5,"fopen('",ptr,"','",p,"')");
-			BIOerr(BIO_F_FILE_CTRL,ERR_R_SYS_LIB);
-			ret=0;
-			break;
-			}
-		b->ptr=fp;
-		b->init=1;
-		BIO_clear_flags(b,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */
-		break;
-	case BIO_C_GET_FILE_PTR:
-		/* the ptr parameter is actually a FILE ** in this case. */
-		if (ptr != NULL)
-			{
-			fpp=(FILE **)ptr;
-			*fpp=(FILE *)b->ptr;
-			}
-		break;
-	case BIO_CTRL_GET_CLOSE:
-		ret=(long)b->shutdown;
-		break;
-	case BIO_CTRL_SET_CLOSE:
-		b->shutdown=(int)num;
-		break;
-	case BIO_CTRL_FLUSH:
-		if (b->flags&BIO_FLAGS_UPLINK)
-			UP_fflush(b->ptr);
-		else
-			fflush((FILE *)b->ptr);
-		break;
-	case BIO_CTRL_DUP:
-		ret=1;
-		break;
-
-	case BIO_CTRL_WPENDING:
-	case BIO_CTRL_PENDING:
-	case BIO_CTRL_PUSH:
-	case BIO_CTRL_POP:
-	default:
-		ret=0;
-		break;
-		}
-	return(ret);
-	}
-
-static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
-	{
-	int ret=0;
-
-	buf[0]='\0';
-	if (bp->flags&BIO_FLAGS_UPLINK)
-		{
-		if (!UP_fgets(buf,size,bp->ptr))
-			goto err;
-		}
-	else
-		{
-		if (!fgets(buf,size,(FILE *)bp->ptr))
-			goto err;
-		}
-	if (buf[0] != '\0')
-		ret=strlen(buf);
-	err:
-	return(ret);
-	}
-
-static int MS_CALLBACK file_puts(BIO *bp, const char *str)
-	{
-	int n,ret;
-
-	n=strlen(str);
-	ret=file_write(bp,str,n);
-	return(ret);
-	}
-
-#endif /* OPENSSL_NO_STDIO */
-
-#endif /* HEADER_BSS_FILE_C */
-
-
+/* crypto/bio/bss_file.c */

+/* 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.]

+ */

+

+/*

+ * 03-Dec-1997	rdenny@dc3.com  Fix bug preventing use of stdin/stdout

+ *		with binary data (e.g. asn1parse -inform DER < xxx) under

+ *		Windows

+ */

+

+#ifndef HEADER_BSS_FILE_C

+#define HEADER_BSS_FILE_C

+

+#if defined(__linux) || defined(__sun) || defined(__hpux)

+/* Following definition aliases fopen to fopen64 on above mentioned

+ * platforms. This makes it possible to open and sequentially access

+ * files larger than 2GB from 32-bit application. It does not allow to

+ * traverse them beyond 2GB with fseek/ftell, but on the other hand *no*

+ * 32-bit platform permits that, not with fseek/ftell. Not to mention

+ * that breaking 2GB limit for seeking would require surgery to *our*

+ * API. But sequential access suffices for practical cases when you

+ * can run into large files, such as fingerprinting, so we can let API

+ * alone. For reference, the list of 32-bit platforms which allow for

+ * sequential access of large files without extra "magic" comprise *BSD,

+ * Darwin, IRIX...

+ */

+#ifndef _FILE_OFFSET_BITS

+#define _FILE_OFFSET_BITS 64

+#endif

+#endif

+

+#include <stdio.h>

+#include <errno.h>

+#include "cryptlib.h"

+#include "bio_lcl.h"

+#include <openssl/err.h>

+

+#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)

+#include <nwfileio.h>

+#endif

+

+#if !defined(OPENSSL_NO_STDIO)

+

+static int MS_CALLBACK file_write(BIO *h, const char *buf, int num);

+static int MS_CALLBACK file_read(BIO *h, char *buf, int size);

+static int MS_CALLBACK file_puts(BIO *h, const char *str);

+static int MS_CALLBACK file_gets(BIO *h, char *str, int size);

+static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2);

+static int MS_CALLBACK file_new(BIO *h);

+static int MS_CALLBACK file_free(BIO *data);

+static BIO_METHOD methods_filep=

+	{

+	BIO_TYPE_FILE,

+	"FILE pointer",

+	file_write,

+	file_read,

+	file_puts,

+	file_gets,

+	file_ctrl,

+	file_new,

+	file_free,

+	NULL,

+	};

+

+BIO *BIO_new_file(const char *filename, const char *mode)

+	{

+	BIO  *ret;

+	FILE *file=NULL;

+

+#if defined(_WIN32) && defined(CP_UTF8)

+	int sz, len_0 = (int)strlen(filename)+1;

+	DWORD flags;

+

+	/*

+	 * Basically there are three cases to cover: a) filename is

+	 * pure ASCII string; b) actual UTF-8 encoded string and

+	 * c) locale-ized string, i.e. one containing 8-bit

+	 * characters that are meaningful in current system locale.

+	 * If filename is pure ASCII or real UTF-8 encoded string,

+	 * MultiByteToWideChar succeeds and _wfopen works. If

+	 * filename is locale-ized string, chances are that

+	 * MultiByteToWideChar fails reporting

+	 * ERROR_NO_UNICODE_TRANSLATION, in which case we fall

+	 * back to fopen...

+	 */

+	if ((sz=MultiByteToWideChar(CP_UTF8,(flags=MB_ERR_INVALID_CHARS),

+					filename,len_0,NULL,0))>0 ||

+	    (GetLastError()==ERROR_INVALID_FLAGS &&

+	     (sz=MultiByteToWideChar(CP_UTF8,(flags=0),

+					filename,len_0,NULL,0))>0)

+	   )

+		{

+		WCHAR  wmode[8];

+		WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));

+

+		if (MultiByteToWideChar(CP_UTF8,flags,

+					filename,len_0,wfilename,sz) &&

+		    MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,

+			    		wmode,sizeof(wmode)/sizeof(wmode[0])) &&

+		    (file=_wfopen(wfilename,wmode))==NULL &&

+		    (errno==ENOENT || errno==EBADF)

+		   )	/* UTF-8 decode succeeded, but no file, filename

+			 * could still have been locale-ized... */

+			file = fopen(filename,mode);

+		}

+	else if (GetLastError()==ERROR_NO_UNICODE_TRANSLATION)

+		{

+		file = fopen(filename,mode);

+		}

+#else

+	file=fopen(filename,mode);	

+#endif

+	if (file == NULL)

+		{

+		SYSerr(SYS_F_FOPEN,get_last_sys_error());

+		ERR_add_error_data(5,"fopen('",filename,"','",mode,"')");

+		if (errno == ENOENT)

+			BIOerr(BIO_F_BIO_NEW_FILE,BIO_R_NO_SUCH_FILE);

+		else

+			BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB);

+		return(NULL);

+		}

+	if ((ret=BIO_new(BIO_s_file())) == NULL)

+		{

+		fclose(file);

+		return(NULL);

+		}

+

+	BIO_clear_flags(ret,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */

+	BIO_set_fp(ret,file,BIO_CLOSE);

+	return(ret);

+	}

+

+BIO *BIO_new_fp(FILE *stream, int close_flag)

+	{

+	BIO *ret;

+

+	if ((ret=BIO_new(BIO_s_file())) == NULL)

+		return(NULL);

+

+	BIO_set_flags(ret,BIO_FLAGS_UPLINK); /* redundant, left for documentation puposes */

+	BIO_set_fp(ret,stream,close_flag);

+	return(ret);

+	}

+

+BIO_METHOD *BIO_s_file(void)

+	{

+	return(&methods_filep);

+	}

+

+static int MS_CALLBACK file_new(BIO *bi)

+	{

+	bi->init=0;

+	bi->num=0;

+	bi->ptr=NULL;

+	bi->flags=BIO_FLAGS_UPLINK; /* default to UPLINK */

+	return(1);

+	}

+

+static int MS_CALLBACK file_free(BIO *a)

+	{

+	if (a == NULL) return(0);

+	if (a->shutdown)

+		{

+		if ((a->init) && (a->ptr != NULL))

+			{

+			if (a->flags&BIO_FLAGS_UPLINK)

+				UP_fclose (a->ptr);

+			else

+				fclose (a->ptr);

+			a->ptr=NULL;

+			a->flags=BIO_FLAGS_UPLINK;

+			}

+		a->init=0;

+		}

+	return(1);

+	}

+	

+static int MS_CALLBACK file_read(BIO *b, char *out, int outl)

+	{

+	int ret=0;

+

+	if (b->init && (out != NULL))

+		{

+		if (b->flags&BIO_FLAGS_UPLINK)

+			ret=UP_fread(out,1,(int)outl,b->ptr);

+		else

+			ret=fread(out,1,(int)outl,(FILE *)b->ptr);

+		if(ret == 0 && (b->flags&BIO_FLAGS_UPLINK)?UP_ferror((FILE *)b->ptr):ferror((FILE *)b->ptr))

+			{

+			SYSerr(SYS_F_FREAD,get_last_sys_error());

+			BIOerr(BIO_F_FILE_READ,ERR_R_SYS_LIB);

+			ret=-1;

+			}

+		}

+	return(ret);

+	}

+

+static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)

+	{

+	int ret=0;

+

+	if (b->init && (in != NULL))

+		{

+		if (b->flags&BIO_FLAGS_UPLINK)

+			ret=UP_fwrite(in,(int)inl,1,b->ptr);

+		else

+			ret=fwrite(in,(int)inl,1,(FILE *)b->ptr);

+		if (ret)

+			ret=inl;

+		/* ret=fwrite(in,1,(int)inl,(FILE *)b->ptr); */

+		/* according to Tim Hudson <tjh@cryptsoft.com>, the commented

+		 * out version above can cause 'inl' write calls under

+		 * some stupid stdio implementations (VMS) */

+		}

+	return(ret);

+	}

+

+static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)

+	{

+	long ret=1;

+	FILE *fp=(FILE *)b->ptr;

+	FILE **fpp;

+	char p[4];

+

+	switch (cmd)

+		{

+	case BIO_C_FILE_SEEK:

+	case BIO_CTRL_RESET:

+		if (b->flags&BIO_FLAGS_UPLINK)

+			ret=(long)UP_fseek(b->ptr,num,0);

+		else

+			ret=(long)fseek(fp,num,0);

+		break;

+	case BIO_CTRL_EOF:

+		if (b->flags&BIO_FLAGS_UPLINK)

+			ret=(long)UP_feof(fp);

+		else

+			ret=(long)feof(fp);

+		break;

+	case BIO_C_FILE_TELL:

+	case BIO_CTRL_INFO:

+		if (b->flags&BIO_FLAGS_UPLINK)

+			ret=UP_ftell(b->ptr);

+		else

+			ret=ftell(fp);

+		break;

+	case BIO_C_SET_FILE_PTR:

+		file_free(b);

+		b->shutdown=(int)num&BIO_CLOSE;

+		b->ptr=ptr;

+		b->init=1;

+#if BIO_FLAGS_UPLINK!=0

+#if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)

+#define _IOB_ENTRIES 20

+#endif

+#if defined(_IOB_ENTRIES)

+		/* Safety net to catch purely internal BIO_set_fp calls */

+		if ((size_t)ptr >= (size_t)stdin &&

+		    (size_t)ptr <  (size_t)(stdin+_IOB_ENTRIES))

+			BIO_clear_flags(b,BIO_FLAGS_UPLINK);

+#endif

+#endif

+#ifdef UP_fsetmod

+		if (b->flags&BIO_FLAGS_UPLINK)

+			UP_fsetmod(b->ptr,(char)((num&BIO_FP_TEXT)?'t':'b'));

+		else

+#endif

+		{

+#if defined(OPENSSL_SYS_WINDOWS)

+		int fd = _fileno((FILE*)ptr);

+		if (num & BIO_FP_TEXT)

+			_setmode(fd,_O_TEXT);

+		else

+			_setmode(fd,_O_BINARY);

+#elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)

+		int fd = fileno((FILE*)ptr);

+		/* Under CLib there are differences in file modes */

+		if (num & BIO_FP_TEXT)

+			setmode(fd,O_TEXT);

+		else

+			setmode(fd,O_BINARY);

+#elif defined(OPENSSL_SYS_MSDOS)

+		int fd = fileno((FILE*)ptr);

+		/* Set correct text/binary mode */

+		if (num & BIO_FP_TEXT)

+			_setmode(fd,_O_TEXT);

+		/* Dangerous to set stdin/stdout to raw (unless redirected) */

+		else

+			{

+			if (fd == STDIN_FILENO || fd == STDOUT_FILENO)

+				{

+				if (isatty(fd) <= 0)

+					_setmode(fd,_O_BINARY);

+				}

+			else

+				_setmode(fd,_O_BINARY);

+			}

+#elif defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)

+		int fd = fileno((FILE*)ptr);

+		if (num & BIO_FP_TEXT)

+			setmode(fd, O_TEXT);

+		else

+			setmode(fd, O_BINARY);

+#endif

+		}

+		break;

+	case BIO_C_SET_FILENAME:

+		file_free(b);

+		b->shutdown=(int)num&BIO_CLOSE;

+		if (num & BIO_FP_APPEND)

+			{

+			if (num & BIO_FP_READ)

+				BUF_strlcpy(p,"a+",sizeof p);

+			else	BUF_strlcpy(p,"a",sizeof p);

+			}

+		else if ((num & BIO_FP_READ) && (num & BIO_FP_WRITE))

+			BUF_strlcpy(p,"r+",sizeof p);

+		else if (num & BIO_FP_WRITE)

+			BUF_strlcpy(p,"w",sizeof p);

+		else if (num & BIO_FP_READ)

+			BUF_strlcpy(p,"r",sizeof p);

+		else

+			{

+			BIOerr(BIO_F_FILE_CTRL,BIO_R_BAD_FOPEN_MODE);

+			ret=0;

+			break;

+			}

+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)

+		if (!(num & BIO_FP_TEXT))

+			strcat(p,"b");

+		else

+			strcat(p,"t");

+#endif

+#if defined(OPENSSL_SYS_NETWARE)

+		if (!(num & BIO_FP_TEXT))

+			strcat(p,"b");

+		else

+			strcat(p,"t");

+#endif

+		fp=fopen(ptr,p);

+		if (fp == NULL)

+			{

+			SYSerr(SYS_F_FOPEN,get_last_sys_error());

+			ERR_add_error_data(5,"fopen('",ptr,"','",p,"')");

+			BIOerr(BIO_F_FILE_CTRL,ERR_R_SYS_LIB);

+			ret=0;

+			break;

+			}

+		b->ptr=fp;

+		b->init=1;

+		BIO_clear_flags(b,BIO_FLAGS_UPLINK); /* we did fopen -> we disengage UPLINK */

+		break;

+	case BIO_C_GET_FILE_PTR:

+		/* the ptr parameter is actually a FILE ** in this case. */

+		if (ptr != NULL)

+			{

+			fpp=(FILE **)ptr;

+			*fpp=(FILE *)b->ptr;

+			}

+		break;

+	case BIO_CTRL_GET_CLOSE:

+		ret=(long)b->shutdown;

+		break;

+	case BIO_CTRL_SET_CLOSE:

+		b->shutdown=(int)num;

+		break;

+	case BIO_CTRL_FLUSH:

+		if (b->flags&BIO_FLAGS_UPLINK)

+			UP_fflush(b->ptr);

+		else

+			fflush((FILE *)b->ptr);

+		break;

+	case BIO_CTRL_DUP:

+		ret=1;

+		break;

+

+	case BIO_CTRL_WPENDING:

+	case BIO_CTRL_PENDING:

+	case BIO_CTRL_PUSH:

+	case BIO_CTRL_POP:

+	default:

+		ret=0;

+		break;

+		}

+	return(ret);

+	}

+

+static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)

+	{

+	int ret=0;

+

+	buf[0]='\0';

+	if (bp->flags&BIO_FLAGS_UPLINK)

+		{

+		if (!UP_fgets(buf,size,bp->ptr))

+			goto err;

+		}

+	else

+		{

+		if (!fgets(buf,size,(FILE *)bp->ptr))

+			goto err;

+		}

+	if (buf[0] != '\0')

+		ret=strlen(buf);

+	err:

+	return(ret);

+	}

+

+static int MS_CALLBACK file_puts(BIO *bp, const char *str)

+	{

+	int n,ret;

+

+	n=strlen(str);

+	ret=file_write(bp,str,n);

+	return(ret);

+	}

+

+#endif /* OPENSSL_NO_STDIO */

+

+#endif /* HEADER_BSS_FILE_C */

+

+

diff --git a/openssl/crypto/comp/c_rle.c b/openssl/crypto/comp/c_rle.c
index efd366fa2..3f0ae4c56 100644
--- a/openssl/crypto/comp/c_rle.c
+++ b/openssl/crypto/comp/c_rle.c
@@ -1,62 +1,61 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/objects.h>
-#include <openssl/comp.h>
-
-static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
-	unsigned int olen, unsigned char *in, unsigned int ilen);
-static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
-	unsigned int olen, unsigned char *in, unsigned int ilen);
-
-static COMP_METHOD rle_method={
-	NID_rle_compression,
-	LN_rle_compression,
-	NULL,
-	NULL,
-	rle_compress_block,
-	rle_expand_block,
-	NULL,
-	NULL,
-	};
-
-COMP_METHOD *COMP_rle(void)
-	{
-	return(&rle_method);
-	}
-
-static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
-	     unsigned int olen, unsigned char *in, unsigned int ilen)
-	{
-	/* int i; */
-
-	if (olen < (ilen+1))
-		{
-		/* ZZZZZZZZZZZZZZZZZZZZZZ */
-		return(-1);
-		}
-
-	*(out++)=0;
-	memcpy(out,in,ilen);
-	return(ilen+1);
-	}
-
-static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
-	     unsigned int olen, unsigned char *in, unsigned int ilen)
-	{
-	int i;
-
-	if (olen < (ilen-1))
-		{
-		/* ZZZZZZZZZZZZZZZZZZZZZZ */
-		return(-1);
-		}
-
-	i= *(in++);
-	if (i == 0)
-		{
-		memcpy(out,in,ilen-1);
-		}
-	return(ilen-1);
-	}
-
+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+#include <openssl/objects.h>

+#include <openssl/comp.h>

+

+static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,

+	unsigned int olen, unsigned char *in, unsigned int ilen);

+static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,

+	unsigned int olen, unsigned char *in, unsigned int ilen);

+

+static COMP_METHOD rle_method={

+	NID_rle_compression,

+	LN_rle_compression,

+	NULL,

+	NULL,

+	rle_compress_block,

+	rle_expand_block,

+	NULL,

+	NULL,

+	};

+

+COMP_METHOD *COMP_rle(void)

+	{

+	return(&rle_method);

+	}

+

+static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,

+	     unsigned int olen, unsigned char *in, unsigned int ilen)

+	{

+	/* int i; */

+

+	if (olen < (ilen+1))

+		{

+		/* ZZZZZZZZZZZZZZZZZZZZZZ */

+		return(-1);

+		}

+

+	*(out++)=0;

+	memcpy(out,in,ilen);

+	return(ilen+1);

+	}

+

+static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,

+	     unsigned int olen, unsigned char *in, unsigned int ilen)

+	{

+	int i;

+

+	if (ilen == 0 || olen < (ilen-1))

+		{

+		/* ZZZZZZZZZZZZZZZZZZZZZZ */

+		return(-1);

+		}

+

+	i= *(in++);

+	if (i == 0)

+		{

+		memcpy(out,in,ilen-1);

+		}

+	return(ilen-1);

+	}

diff --git a/openssl/crypto/crypto-lib.com b/openssl/crypto/crypto-lib.com
index 96d9d5354..f6d6c53cb 100644
--- a/openssl/crypto/crypto-lib.com
+++ b/openssl/crypto/crypto-lib.com
@@ -1,1336 +1,1395 @@
-$!
-$!  CRYPTO-LIB.COM
-$!  Written By:  Robert Byer
-$!               Vice-President
-$!               A-Com Computing, Inc.
-$!               byer@mail.all-net.net
-$!
-$!  Changes by Richard Levitte <richard@levitte.org>
-$!             Zoltan Arpadffy <arpadffy@polarhome.com>
-$!
-$!  This command files compiles and creates the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" 
-$!  library for OpenSSL.  The "xxx" denotes the machine architecture, ALPHA,
-$!  IA64 or VAX.
-$!
-$!  It was re-written so it would try to determine what "C" compiler to use 
-$!  or you can specify which "C" compiler to use.
-$!
-$!  Specify the following as P1 to build just that part or ALL to just
-$!  build everything.
-$!
-$!    	LIBRARY    To just compile the [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.
-$!    	APPS       To just compile the [.xxx.EXE.CRYPTO]*.EXE
-$!	ALL	   To do both LIBRARY and APPS
-$!
-$!  Specify DEBUG or NODEBUG as P2 to compile with or without debugger
-$!  information.
-$!
-$!  Specify which compiler at P3 to try to compile under.
-$!
-$!	VAXC	   For VAX C.
-$!	DECC	   For DEC C.
-$!	GNUC	   For GNU C.
-$!
-$!  If you don't specify a compiler, it will try to determine which
-$!  "C" compiler to use.
-$!
-$!  P4, if defined, sets a TCP/IP library to use, through one of the following
-$!  keywords:
-$!
-$!	UCX	   For UCX
-$!	TCPIP	   For TCPIP (post UCX)
-$!	SOCKETSHR  For SOCKETSHR+NETLIB
-$!
-$!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
-$!
-$!  P6, if defined, sets a choice of crypto methods to compile.
-$!  WARNING: this should only be done to recompile some part of an already
-$!  fully compiled library.
-$!
-$!
-$! Define A TCP/IP Library That We Will Need To Link To.
-$! (That Is, If We Need To Link To One.)
-$!
-$ TCPIP_LIB = ""
-$!
-$! Check Which Architecture We Are Using.
-$!
-$ IF (F$GETSYI("CPU").LT.128)
-$ THEN
-$!
-$!  The Architecture Is VAX
-$!
-$   ARCH = "VAX"
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  The Architecture Is Alpha, IA64 or whatever comes in the future.
-$!
-$   ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
-$   IF (ARCH .EQS. "") THEN ARCH = "UNK"
-$!
-$! End The Architecture Check.
-$!
-$ ENDIF
-$!
-$! Define The Different Encryption Types.
-$! NOTE: Some might think this list ugly.  However, it's made this way to
-$! reflect the SDIRS variable in [-]Makefile.org as closely as possible,
-$! thereby making it fairly easy to verify that the lists are the same.
-$!
-$ ET_WHIRLPOOL = "WHRLPOOL"
-$ IF ARCH .EQS. "VAX" THEN ET_WHIRLPOOL = ""
-$ ENCRYPT_TYPES = "Basic,"+ -
-		  "OBJECTS,"+ -
-		  "MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ -
-		  "DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,"+ -
-		  "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,"+ -
-		  "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -
-		  "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
-		  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -
-		  "STORE,CMS,PQUEUE,TS,JPAKE"
-$! Define The OBJ Directory.
-$!
-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.CRYPTO]
-$!
-$! Define The EXE Directory.
-$!
-$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]
-$!
-$! Check To Make Sure We Have Valid Command Line Parameters.
-$!
-$ GOSUB CHECK_OPTIONS
-$!
-$! Initialise logical names and such
-$!
-$ GOSUB INITIALISE
-$!
-$! Tell The User What Kind of Machine We Run On.
-$!
-$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
-$!
-$!
-$! Check To See If The Architecture Specific OBJ Directory Exists.
-$!
-$ IF (F$PARSE(OBJ_DIR).EQS."")
-$ THEN
-$!
-$!  It Dosen't Exist, So Create It.
-$!
-$   CREATE/DIR 'OBJ_DIR'
-$!
-$! End The Architecture Specific OBJ Directory Check.
-$!
-$ ENDIF
-$!
-$! Check To See If The Architecture Specific Directory Exists.
-$!
-$ IF (F$PARSE(EXE_DIR).EQS."")
-$ THEN
-$!
-$!  It Dosen't Exist, So Create It.
-$!
-$   CREATE/DIRECTORY 'EXE_DIR'
-$!
-$! End The Architecture Specific Directory Check.
-$!
-$ ENDIF
-$!
-$! Define The Library Name.
-$!
-$ LIB_NAME := 'EXE_DIR'LIBCRYPTO.OLB
-$!
-$! Define The CRYPTO-LIB We Are To Use.
-$!
-$ CRYPTO_LIB := 'EXE_DIR'LIBCRYPTO.OLB
-$!
-$! Check To See If We Already Have A "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" Library...
-$!
-$ IF (F$SEARCH(LIB_NAME).EQS."")
-$ THEN
-$!
-$! Guess Not, Create The Library.
-$!
-$   LIBRARY/CREATE/OBJECT 'LIB_NAME'
-$!
-$! End The Library Check.
-$!
-$ ENDIF
-$!
-$! Build our options file for the application
-$!
-$ GOSUB CHECK_OPT_FILE
-$!
-$! Define The Different Encryption "library" Strings.
-$!
-$ APPS_DES = "DES/DES,CBC3_ENC"
-$ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"
-$
-$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,ebcdic,uid,o_time,o_str,o_dir"
-$ LIB_MD2 = "md2_dgst,md2_one"
-$ LIB_MD4 = "md4_dgst,md4_one"
-$ LIB_MD5 = "md5_dgst,md5_one"
-$ LIB_SHA = "sha_dgst,sha1dgst,sha_one,sha1_one,sha256,sha512"
-$ LIB_MDC2 = "mdc2dgst,mdc2_one"
-$ LIB_HMAC = "hmac,hm_ameth,hm_pmeth"
-$ LIB_RIPEMD = "rmd_dgst,rmd_one"
-$ LIB_WHRLPOOL = "wp_dgst,wp_block"
-$ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -
-	"ecb3_enc,cfb64enc,cfb64ede,cfb_enc,ofb64ede,"+ -
-	"enc_read,enc_writ,ofb64enc,"+ -
-	"ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ -
-	"des_enc,fcrypt_b,"+ -
-	"fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -
-	"ede_cbcm_enc,des_old,des_old2,read2pwd"
-$ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"
-$ LIB_RC4 = "rc4_skey,rc4_enc"
-$ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"
-$ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey"
-$ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"
-$ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"
-$ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -
-	"cmll_cfb,cmll_ctr"
-$ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"
-$ LIB_MODES = "cbc128,ctr128,cfb128,ofb128,cts128"
-$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
-$ IF F$TRNLNM("OPENSSL_NO_ASM") .OR. ARCH .NES. "VAX" THEN -
-     LIB_BN_ASM = "bn_asm"
-$ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -
-	"bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -
-	"bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -
-	"bn_recp,bn_mont,bn_mpi,bn_exp2,bn_gf2m,bn_nist,"+ -
-	"bn_depr,bn_const"
-$ LIB_EC = "ec_lib,ecp_smpl,ecp_mont,ecp_nist,ec_cvt,ec_mult,"+ -
-	"ec_err,ec_curve,ec_check,ec_print,ec_asn1,ec_key,"+ -
-	"ec2_smpl,ec2_mult,ec_ameth,ec_pmeth,eck_prn"
-$ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ -
-	"rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null,"+ -
-	"rsa_pss,rsa_x931,rsa_asn1,rsa_depr,rsa_ameth,rsa_prn,"+ -
-	"rsa_pmeth"
-$ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,"+ -
-	"dsa_err,dsa_ossl,dsa_depr,dsa_ameth,dsa_pmeth,dsa_prn"
-$ LIB_ECDSA = "ecs_lib,ecs_asn1,ecs_ossl,ecs_sign,ecs_vrf,ecs_err"
-$ LIB_DH = "dh_asn1,dh_gen,dh_key,dh_lib,dh_check,dh_err,dh_depr,"+ -
-	"dh_ameth,dh_pmeth,dh_prn"
-$ LIB_ECDH = "ech_lib,ech_ossl,ech_key,ech_err"
-$ LIB_DSO = "dso_dl,dso_dlfcn,dso_err,dso_lib,dso_null,"+ -
-	"dso_openssl,dso_win32,dso_vms,dso_beos"
-$ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ -
-	"eng_table,eng_pkey,eng_fat,eng_all,"+ -
-	"tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -
-	"tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ -
-	"eng_openssl,eng_dyn,eng_cnf,eng_cryptodev"
-$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ -
-	"aes_ige,aes_wrap"
-$ LIB_BUFFER = "buffer,buf_err"
-$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
-	"bss_mem,bss_null,bss_fd,"+ -
-	"bss_file,bss_sock,bss_conn,"+ -
-	"bf_null,bf_buff,b_print,b_dump,"+ -
-	"b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log,"+ -
-	"bss_dgram,"+ -
-	"bf_lbuf"
-$ LIB_STACK = "stack"
-$ LIB_LHASH = "lhash,lh_stats"
-$ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd,"+ -
-	"rand_vms"
-$ LIB_ERR = "err,err_all,err_prn"
-$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err,obj_xref"
-$ LIB_EVP = "encode,digest,evp_enc,evp_key,evp_acnf,"+ -
-	"e_des,e_bf,e_idea,e_des3,e_camellia,"+ -
-	"e_rc4,e_aes,names,e_seed,"+ -
-	"e_xcbc_d,e_rc2,e_cast,e_rc5"
-$ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1,m_wp," + -
-	"m_dss,m_dss1,m_mdc2,m_ripemd,m_ecdsa,"+ -
-	"p_open,p_seal,p_sign,p_verify,p_lib,p_enc,p_dec,"+ -
-	"bio_md,bio_b64,bio_enc,evp_err,e_null,"+ -
-	"c_all,c_allc,c_alld,evp_lib,bio_ok,"+-
-	"evp_pkey,evp_pbe,p5_crpt,p5_crpt2"
-$ LIB_EVP_3 = "e_old,pmeth_lib,pmeth_fn,pmeth_gn,m_sigver"
-$ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ -
-	"a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,"+ -
-	"a_enum,a_utf8,a_sign,a_digest,a_verify,a_mbstr,a_strex,"+ -
-	"x_algor,x_val,x_pubkey,x_sig,x_req,x_attrib,x_bignum,"+ -
-	"x_long,x_name,x_x509,x_x509a,x_crl,x_info,x_spki,nsseq,"+ -
-	"x_nx509,d2i_pu,d2i_pr,i2d_pu,i2d_pr"
-$ LIB_ASN1_2 = "t_req,t_x509,t_x509a,t_crl,t_pkey,t_spki,t_bitst,"+ -
-	"tasn_new,tasn_fre,tasn_enc,tasn_dec,tasn_utl,tasn_typ,"+ -
-	"tasn_prn,ameth_lib,"+ -
-	"f_int,f_string,n_pkey,"+ -
-	"f_enum,x_pkey,a_bool,x_exten,bio_asn1,bio_ndef,asn_mime,"+ -
-	"asn1_gen,asn1_par,asn1_lib,asn1_err,a_bytes,a_strnid,"+ -
-	"evp_asn1,asn_pack,p5_pbe,p5_pbev2,p8_pkey,asn_moid"
-$ LIB_PEM = "pem_sign,pem_seal,pem_info,pem_lib,pem_all,pem_err,"+ -
-	"pem_x509,pem_xaux,pem_oth,pem_pk8,pem_pkey,pvkfmt"
-$ LIB_X509 = "x509_def,x509_d2,x509_r2x,x509_cmp,"+ -
-	"x509_obj,x509_req,x509spki,x509_vfy,"+ -
-	"x509_set,x509cset,x509rset,x509_err,"+ -
-	"x509name,x509_v3,x509_ext,x509_att,"+ -
-	"x509type,x509_lu,x_all,x509_txt,"+ -
-	"x509_trs,by_file,by_dir,x509_vpm"
-$ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ -
-	"v3_prn,v3_utl,v3err,v3_genn,v3_alt,v3_skey,v3_akey,v3_pku,"+ -
-	"v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ -
-	"v3_ocsp,v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -
-	"pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -
-	"v3_asid,v3_addr"
-$ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap"
-$ LIB_TXT_DB = "txt_db"
-$ LIB_PKCS7 = "pk7_asn1,pk7_lib,pkcs7err,pk7_doit,pk7_smime,pk7_attr,"+ -
-	"pk7_mime,bio_pk7"
-$ LIB_PKCS12 = "p12_add,p12_asn,p12_attr,p12_crpt,p12_crt,p12_decr,"+ -
-	"p12_init,p12_key,p12_kiss,p12_mutl,"+ -
-	"p12_utl,p12_npas,pk12err,p12_p8d,p12_p8e"
-$ LIB_COMP = "comp_lib,comp_err,"+ -
-	"c_rle,c_zlib"
-$ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
-	"ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"
-$ LIB_UI_COMPAT = ",ui_compat"
-$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT
-$ LIB_KRB5 = "krb5_asn"
-$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
-$ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
-	"cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess"
-$ LIB_PQUEUE = "pqueue"
-$ LIB_TS = "ts_err,ts_req_utils,ts_req_print,ts_rsp_utils,ts_rsp_print,"+ -
-	"ts_rsp_sign,ts_rsp_verify,ts_verify_ctx,ts_lib,ts_conf,"+ -
-	"ts_asn1"
-$ LIB_JPAKE = "jpake,jpake_err"
-$!
-$! Setup exceptional compilations
-$!
-$ ! Add definitions for no threads on OpenVMS 7.1 and higher
-$ COMPILEWITH_CC3 = ",bss_rtcp,"
-$ ! Disable the DOLLARID warning
-$ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time,o_dir"
-$ ! Disable disjoint optimization
-$ COMPILEWITH_CC5 = ",md2_dgst,md4_dgst,md5_dgst,mdc2dgst," + -
-                    "seed,sha_dgst,sha1dgst,rmd_dgst,bf_enc,"
-$ ! Disable the MIXLINKAGE warning
-$ COMPILEWITH_CC6 = ",enc_read,set_key,"
-$!
-$! Figure Out What Other Modules We Are To Build.
-$!
-$ BUILD_SET:
-$!
-$! Define A Module Counter.
-$!
-$ MODULE_COUNTER = 0
-$!
-$! Top Of The Loop.
-$!
-$ MODULE_NEXT:
-$!
-$! Extract The Module Name From The Encryption List.
-$!
-$ MODULE_NAME = F$ELEMENT(MODULE_COUNTER,",",ENCRYPT_TYPES)
-$ IF MODULE_NAME.EQS."Basic" THEN MODULE_NAME = ""
-$ MODULE_NAME1 = MODULE_NAME
-$!
-$! Check To See If We Are At The End Of The Module List.
-$!
-$ IF (MODULE_NAME.EQS.",") 
-$ THEN 
-$!
-$!  We Are At The End Of The Module List, Go To MODULE_DONE.
-$!
-$   GOTO MODULE_DONE
-$!
-$! End The Module List Check.
-$!
-$ ENDIF
-$!
-$! Increment The Moudle Counter.
-$!
-$ MODULE_COUNTER = MODULE_COUNTER + 1
-$!
-$! Create The Library and Apps Module Names.
-$!
-$ LIB_MODULE = "LIB_" + MODULE_NAME
-$ APPS_MODULE = "APPS_" + MODULE_NAME
-$ IF (F$EXTRACT(0,5,MODULE_NAME).EQS."ASN1_")
-$ THEN
-$   MODULE_NAME = "ASN1"
-$ ENDIF
-$ IF (F$EXTRACT(0,4,MODULE_NAME).EQS."EVP_")
-$ THEN
-$   MODULE_NAME = "EVP"
-$ ENDIF
-$!
-$! Set state (can be LIB and APPS)
-$!
-$ STATE = "LIB"
-$ IF BUILDALL .EQS. "APPS" THEN STATE = "APPS"
-$!
-$! Check if the library module name actually is defined
-$!
-$ IF F$TYPE('LIB_MODULE') .EQS. ""
-$ THEN
-$   WRITE SYS$ERROR ""
-$   WRITE SYS$ERROR "The module ",MODULE_NAME1," does not exist.  Continuing..."
-$   WRITE SYS$ERROR ""
-$   GOTO MODULE_NEXT
-$ ENDIF
-$!
-$! Top Of The Module Loop.
-$!
-$ MODULE_AGAIN:
-$!
-$! Tell The User What Module We Are Building.
-$!
-$ IF (MODULE_NAME1.NES."") 
-$ THEN
-$   IF STATE .EQS. "LIB"
-$   THEN
-$     WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Library Files. (",BUILDALL,",",STATE,")"
-$   ELSE IF F$TYPE('APPS_MODULE') .NES. ""
-$     THEN
-$       WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Applications. (",BUILDALL,",",STATE,")"
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$!  Define A File Counter And Set It To "0".
-$!
-$ FILE_COUNTER = 0
-$ APPLICATION = ""
-$ APPLICATION_COUNTER = 0
-$!
-$! Top Of The File Loop.
-$!
-$ NEXT_FILE:
-$!
-$! Look in the LIB_MODULE is we're in state LIB
-$!
-$ IF STATE .EQS. "LIB"
-$ THEN
-$!
-$!   O.K, Extract The File Name From The File List.
-$!
-$   FILE_NAME = F$ELEMENT(FILE_COUNTER,",",'LIB_MODULE')
-$!
-$!   else
-$!
-$ ELSE
-$   FILE_NAME = ","
-$!
-$   IF F$TYPE('APPS_MODULE') .NES. ""
-$   THEN
-$!
-$!     Extract The File Name From The File List.
-$!     This part is a bit more complicated.
-$!
-$     IF APPLICATION .EQS. ""
-$     THEN
-$       APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')
-$       APPLICATION_COUNTER = APPLICATION_COUNTER + 1
-$       APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)
-$       APPLICATION = F$ELEMENT(0,"/",APPLICATION)
-$       FILE_COUNTER = 0
-$     ENDIF
-$
-$!     WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"
-$!     SHOW SYMBOL APPLICATION*
-$!
-$     IF APPLICATION .NES. ";"
-$     THEN
-$       FILE_NAME = F$ELEMENT(FILE_COUNTER,",",APPLICATION_OBJECTS)
-$       IF FILE_NAME .EQS. ","
-$       THEN
-$         APPLICATION = ""
-$         GOTO NEXT_FILE
-$       ENDIF
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$! Check To See If We Are At The End Of The File List.
-$!
-$ IF (FILE_NAME.EQS.",") 
-$ THEN 
-$!
-$!  We Are At The End Of The File List, Change State Or Goto FILE_DONE.
-$!
-$   IF STATE .EQS. "LIB" .AND. BUILDALL .NES. "LIBRARY"
-$   THEN
-$     STATE = "APPS"
-$     GOTO MODULE_AGAIN
-$   ELSE
-$     GOTO FILE_DONE
-$   ENDIF
-$!
-$! End The File List Check.
-$!
-$ ENDIF
-$!
-$! Increment The Counter.
-$!
-$ FILE_COUNTER = FILE_COUNTER + 1
-$!
-$! Create The Source File Name.
-$!
-$ TMP_FILE_NAME = F$ELEMENT(1,"]",FILE_NAME)
-$ IF TMP_FILE_NAME .EQS. "]" THEN TMP_FILE_NAME = FILE_NAME
-$ IF F$ELEMENT(0,".",TMP_FILE_NAME) .EQS. TMP_FILE_NAME THEN -
-	FILE_NAME = FILE_NAME + ".c"
-$ IF (MODULE_NAME.NES."")
-$ THEN
-$   SOURCE_FILE = "SYS$DISK:[." + MODULE_NAME+ "]" + FILE_NAME
-$ ELSE
-$   SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME
-$ ENDIF
-$ SOURCE_FILE = SOURCE_FILE - "]["
-$!
-$! Create The Object File Name.
-$!
-$ OBJECT_FILE = OBJ_DIR + F$PARSE(FILE_NAME,,,"NAME","SYNTAX_ONLY") + ".OBJ"
-$ ON WARNING THEN GOTO NEXT_FILE
-$!
-$! Check To See If The File We Want To Compile Is Actually There.
-$!
-$ IF (F$SEARCH(SOURCE_FILE).EQS."")
-$ THEN
-$!
-$!  Tell The User That The File Doesn't Exist.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Doesn't Exist."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Exit The Build.
-$!
-$   GOTO EXIT
-$!
-$! End The File Exist Check.
-$!
-$ ENDIF
-$!
-$! Tell The User We Are Compiling The File.
-$!
-$ IF (MODULE_NAME.EQS."")
-$ THEN
-$   WRITE SYS$OUTPUT "Compiling The ",FILE_NAME," File.  (",BUILDALL,",",STATE,")"
-$ ENDIF
-$ IF (MODULE_NAME.NES."")
-$ THEN 
-$   WRITE SYS$OUTPUT "	",FILE_NAME,""
-$ ENDIF
-$!
-$! Compile The File.
-$!
-$ ON ERROR THEN GOTO NEXT_FILE
-$ FILE_NAME0 = F$ELEMENT(0,".",FILE_NAME)
-$ IF FILE_NAME - ".mar" .NES. FILE_NAME
-$ THEN
-$   MACRO/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$ ELSE
-$   IF COMPILEWITH_CC3 - FILE_NAME0 .NES. COMPILEWITH_CC3
-$   THEN
-$     CC3/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$   ELSE
-$     IF COMPILEWITH_CC4 - FILE_NAME0 .NES. COMPILEWITH_CC4
-$     THEN
-$       CC4/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$     ELSE
-$       IF COMPILEWITH_CC5 - FILE_NAME0 .NES. COMPILEWITH_CC5
-$       THEN
-$         CC5/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$       ELSE
-$         IF COMPILEWITH_CC6 - FILE_NAME0 .NES. COMPILEWITH_CC6
-$         THEN
-$           CC6/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$         ELSE
-$           CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$         ENDIF
-$       ENDIF
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$ IF STATE .EQS. "LIB"
-$ THEN 
-$!
-$!   Add It To The Library.
-$!
-$   LIBRARY/REPLACE 'LIB_NAME' 'OBJECT_FILE'
-$!
-$!   Time To Clean Up The Object File.
-$!
-$   DELETE 'OBJECT_FILE';*
-$ ENDIF
-$!
-$! Go Back And Do It Again.
-$!
-$ GOTO NEXT_FILE
-$!
-$! All Done With This Library Part.
-$!
-$ FILE_DONE:
-$!
-$! Time To Build Some Applications
-$!
-$ IF F$TYPE('APPS_MODULE') .NES. "" .AND. BUILDALL .NES. "LIBRARY"
-$ THEN
-$   APPLICATION_COUNTER = 0
-$ NEXT_APPLICATION:
-$   APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')
-$   IF APPLICATION .EQS. ";" THEN GOTO APPLICATION_DONE
-$
-$   APPLICATION_COUNTER = APPLICATION_COUNTER + 1
-$   APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)
-$   APPLICATION = F$ELEMENT(0,"/",APPLICATION)
-$
-$!   WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"
-$!   SHOW SYMBOL APPLICATION*
-$!
-$! Tell the user what happens
-$!
-$   WRITE SYS$OUTPUT "	",APPLICATION,".exe"
-$!
-$! Link The Program.
-$!
-$   ON ERROR THEN GOTO NEXT_APPLICATION
-$!
-$! Check To See If We Are To Link With A Specific TCP/IP Library.
-$!
-$   IF (TCPIP_LIB.NES."")
-$   THEN
-$!
-$!    Link With A TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
-          'OBJ_DIR''APPLICATION_OBJECTS', -
-	  'CRYPTO_LIB'/LIBRARY, -
-          'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$! Else...
-$!
-$   ELSE
-$!
-$!    Don't Link With A TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
-          'OBJ_DIR''APPLICATION_OBJECTS',-
-	  'CRYPTO_LIB'/LIBRARY, -
-          'OPT_FILE'/OPTION
-$!
-$! End The TCP/IP Library Check.
-$!
-$   ENDIF
-$   GOTO NEXT_APPLICATION
-$  APPLICATION_DONE:
-$ ENDIF
-$!
-$! Go Back And Get The Next Module.
-$!
-$ GOTO MODULE_NEXT
-$!
-$! All Done With This Module.
-$!
-$ MODULE_DONE:
-$!
-$! Tell The User That We Are All Done.
-$!
-$ WRITE SYS$OUTPUT "All Done..."
-$ EXIT:
-$ GOSUB CLEANUP
-$ EXIT
-$!
-$! Check For The Link Option FIle.
-$!
-$ CHECK_OPT_FILE:
-$!
-$! Check To See If We Need To Make A VAX C Option File.
-$!
-$ IF (COMPILER.EQS."VAXC")
-$ THEN
-$!
-$!  Check To See If We Already Have A VAX C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A VAX C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable VAX C Runtime Library.
-!
-SYS$SHARE:VAXCRTL.EXE/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The VAXC Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A GNU C Option File.
-$!
-$ IF (COMPILER.EQS."GNUC")
-$ THEN
-$!
-$!  Check To See If We Already Have A GNU C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A GNU C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable C Runtime Library.
-!
-GNU_CC:[000000]GCCLIB/LIBRARY
-SYS$SHARE:VAXCRTL/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The GNU C Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A DEC C Option File.
-$!
-$ IF (COMPILER.EQS."DECC")
-$ THEN
-$!
-$!  Check To See If We Already Have A DEC C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    Figure Out If We Need A non-VAX Or A VAX Linker Option File.
-$!
-$     IF ARCH .EQS. "VAX"
-$     THEN
-$!
-$!      We Need A DEC C Linker Option File For VAX.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable DEC C Runtime Library.
-!
-SYS$SHARE:DECC$SHR.EXE/SHARE
-$EOD
-$!
-$!    Else...
-$!
-$     ELSE
-$!
-$!      Create The non-VAX Linker Option File.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File For non-VAX To Link Agianst 
-! The Sharable C Runtime Library.
-!
-SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
-SYS$SHARE:CMA$OPEN_RTL/SHARE
-$EOD
-$!
-$!    End The DEC C Option File Check.
-$!
-$     ENDIF
-$!
-$!  End The Option File Search.
-$!
-$   ENDIF
-$!
-$! End The DEC C Check.
-$!
-$ ENDIF
-$!
-$!  Tell The User What Linker Option File We Are Using.
-$!
-$ WRITE SYS$OUTPUT "Using Linker Option File ",OPT_FILE,"."	
-$!
-$! Time To RETURN.
-$!
-$ RETURN
-$!
-$! Check The User's Options.
-$!
-$ CHECK_OPTIONS:
-$!
-$! Check To See If P1 Is Blank.
-$!
-$ IF (P1.EQS."ALL")
-$ THEN
-$!
-$!   P1 Is Blank, So Build Everything.
-$!
-$    BUILDALL = "TRUE"
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  Else, Check To See If P1 Has A Valid Argument.
-$!
-$   IF (P1.EQS."LIBRARY").OR.(P1.EQS."APPS")
-$   THEN
-$!
-$!    A Valid Argument.
-$!
-$     BUILDALL = P1
-$!
-$!  Else...
-$!
-$   ELSE
-$!
-$!    Tell The User We Don't Know What They Want.
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "    ALL      :  Just Build Everything."
-$     WRITE SYS$OUTPUT "    LIBRARY  :  To Compile Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."
-$     WRITE SYS$OUTPUT "    APPS     :  To Compile Just The [.xxx.EXE.CRYPTO]*.EXE Programs."
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT " Where 'xxx' Stands For:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "    ALPHA    :  Alpha Architecture."
-$     WRITE SYS$OUTPUT "    IA64     :  IA64 Architecture."
-$     WRITE SYS$OUTPUT "    VAX      :  VAX Architecture."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Time To EXIT.
-$!
-$     EXIT
-$!
-$!  End The Valid Argument Check.
-$!
-$   ENDIF
-$!
-$! End The P1 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P2 Is Blank.
-$!
-$ IF (P2.EQS."NODEBUG")
-$ THEN
-$!
-$!   P2 Is NODEBUG, So Compile Without The Debugger Information.
-$!
-$    DEBUGGER = "NODEBUG"
-$    TRACEBACK = "NOTRACEBACK" 
-$    GCC_OPTIMIZE = "OPTIMIZE"
-$    CC_OPTIMIZE = "OPTIMIZE"
-$    MACRO_OPTIMIZE = "OPTIMIZE"
-$    WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
-$    WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
-$ ELSE
-$!
-$!  Check To See If We Are To Compile With Debugger Information.
-$!
-$   IF (P2.EQS."DEBUG")
-$   THEN
-$!
-$!    Compile With Debugger Information.
-$!
-$     DEBUGGER = "DEBUG"
-$     TRACEBACK = "TRACEBACK"
-$     GCC_OPTIMIZE = "NOOPTIMIZE"
-$     CC_OPTIMIZE = "NOOPTIMIZE"
-$     MACRO_OPTIMIZE = "NOOPTIMIZE"
-$     WRITE SYS$OUTPUT "Debugger Information Will Be Produced During Compile."
-$     WRITE SYS$OUTPUT "Compiling Without Compiler Optimization."
-$   ELSE 
-$!
-$!    They Entered An Invalid Option..
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "     DEBUG   :  Compile With The Debugger Information."
-$     WRITE SYS$OUTPUT "     NODEBUG :  Compile Without The Debugger Information."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Time To EXIT.
-$!
-$     EXIT
-$!
-$!  End The Valid Argument Check.
-$!
-$   ENDIF
-$!
-$! End The P2 Check.
-$!
-$ ENDIF
-$!
-$! Special Threads For OpenVMS v7.1 Or Later
-$!
-$! Written By:  Richard Levitte
-$!              richard@levitte.org
-$!
-$!
-$! Check To See If We Have A Option For P5.
-$!
-$ IF (P5.EQS."")
-$ THEN
-$!
-$!  Get The Version Of VMS We Are Using.
-$!
-$   ISSEVEN :=
-$   TMP = F$ELEMENT(0,"-",F$EXTRACT(1,4,F$GETSYI("VERSION")))
-$   TMP = F$INTEGER(F$ELEMENT(0,".",TMP)+F$ELEMENT(1,".",TMP))
-$!
-$!  Check To See If The VMS Version Is v7.1 Or Later.
-$!
-$   IF (TMP.GE.71)
-$   THEN
-$!
-$!    We Have OpenVMS v7.1 Or Later, So Use The Special Threads.
-$!
-$     ISSEVEN := ,PTHREAD_USE_D4
-$!
-$!  End The VMS Version Check.
-$!
-$   ENDIF
-$!
-$! End The P5 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P3 Is Blank.
-$!
-$ IF (P3.EQS."")
-$ THEN
-$!
-$!  O.K., The User Didn't Specify A Compiler, Let's Try To
-$!  Find Out Which One To Use.
-$!
-$!  Check To See If We Have GNU C.
-$!
-$   IF (F$TRNLNM("GNU_CC").NES."")
-$   THEN
-$!
-$!    Looks Like GNUC, Set To Use GNUC.
-$!
-$     P3 = "GNUC"
-$!
-$!  Else...
-$!
-$   ELSE
-$!
-$!    Check To See If We Have VAXC Or DECC.
-$!
-$     IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
-$     THEN 
-$!
-$!      Looks Like DECC, Set To Use DECC.
-$!
-$       P3 = "DECC"
-$!
-$!    Else...
-$!
-$     ELSE
-$!
-$!      Looks Like VAXC, Set To Use VAXC.
-$!
-$       P3 = "VAXC"
-$!
-$!    End The VAXC Compiler Check.
-$!
-$     ENDIF
-$!
-$!  End The DECC & VAXC Compiler Check.
-$!
-$   ENDIF
-$!
-$!  End The Compiler Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Have A Option For P4.
-$!
-$ IF (P4.EQS."")
-$ THEN
-$!
-$!  Find out what socket library we have available
-$!
-$   IF F$PARSE("SOCKETSHR:") .NES. ""
-$   THEN
-$!
-$!    We have SOCKETSHR, and it is my opinion that it's the best to use.
-$!
-$     P4 = "SOCKETSHR"
-$!
-$!    Tell the user
-$!
-$     WRITE SYS$OUTPUT "Using SOCKETSHR for TCP/IP"
-$!
-$!    Else, let's look for something else
-$!
-$   ELSE
-$!
-$!    Like UCX (the reason to do this before Multinet is that the UCX
-$!    emulation is easier to use...)
-$!
-$     IF F$TRNLNM("UCX$IPC_SHR") .NES. "" -
-	 .OR. F$PARSE("SYS$SHARE:UCX$IPC_SHR.EXE") .NES. "" -
-	 .OR. F$PARSE("SYS$LIBRARY:UCX$IPC.OLB") .NES. ""
-$     THEN
-$!
-$!	Last resort: a UCX or UCX-compatible library
-$!
-$	P4 = "UCX"
-$!
-$!      Tell the user
-$!
-$       WRITE SYS$OUTPUT "Using UCX or an emulation thereof for TCP/IP"
-$!
-$!	That was all...
-$!
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$! Set Up Initial CC Definitions, Possibly With User Ones
-$!
-$ CCDEFS = "TCPIP_TYPE_''P4',DSO_VMS"
-$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
-$ CCEXTRAFLAGS = ""
-$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
-$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
-$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
-	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
-$!
-$!  Check To See If The User Entered A Valid Paramter.
-$!
-$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
-$ THEN
-$!
-$!    Check To See If The User Wanted DECC.
-$!
-$   IF (P3.EQS."DECC")
-$   THEN
-$!
-$!    Looks Like DECC, Set To Use DECC.
-$!
-$     COMPILER = "DECC"
-$!
-$!    Tell The User We Are Using DECC.
-$!
-$     WRITE SYS$OUTPUT "Using DECC 'C' Compiler."
-$!
-$!    Use DECC...
-$!
-$     CC = "CC"
-$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
-	 THEN CC = "CC/DECC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
-           "/NOLIST/PREFIX=ALL" + -
-	   "/INCLUDE=(SYS$DISK:[._''ARCH'],SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + -
-	   CCEXTRAFLAGS
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"
-$!
-$!  End DECC Check.
-$!
-$   ENDIF
-$!
-$!  Check To See If We Are To Use VAXC.
-$!
-$   IF (P3.EQS."VAXC")
-$   THEN
-$!
-$!    Looks Like VAXC, Set To Use VAXC.
-$!
-$     COMPILER = "VAXC"
-$!
-$!    Tell The User We Are Using VAX C.
-$!
-$     WRITE SYS$OUTPUT "Using VAXC 'C' Compiler."
-$!
-$!    Compile Using VAXC.
-$!
-$     CC = "CC"
-$     IF ARCH.NES."VAX"
-$     THEN
-$	WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!"
-$	EXIT
-$     ENDIF
-$     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(SYS$DISK:[._''ARCH'],SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + -
-	   CCEXTRAFLAGS
-$     CCDEFS = """VAXC""," + CCDEFS
-$!
-$!    Define <sys> As SYS$COMMON:[SYSLIB]
-$!
-$     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"
-$!
-$!  End VAXC Check
-$!
-$   ENDIF
-$!
-$!  Check To See If We Are To Use GNU C.
-$!
-$   IF (P3.EQS."GNUC")
-$   THEN
-$!
-$!    Looks Like GNUC, Set To Use GNUC.
-$!
-$     COMPILER = "GNUC"
-$!
-$!    Tell The User We Are Using GNUC.
-$!
-$     WRITE SYS$OUTPUT "Using GNU 'C' Compiler."
-$!
-$!    Use GNU C...
-$!
-$     CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(SYS$DISK:[._''ARCH'],SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + -
-	   CCEXTRAFLAGS
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"
-$!
-$!  End The GNU C Check.
-$!
-$   ENDIF
-$!
-$!  Set up default defines
-$!
-$   CCDEFS = """FLAT_INC=1""," + CCDEFS
-$!
-$!  Finish up the definition of CC.
-$!
-$   IF COMPILER .EQS. "DECC"
-$   THEN
-$     IF CCDISABLEWARNINGS .EQS. ""
-$     THEN
-$       CC4DISABLEWARNINGS = "DOLLARID"
-$       CC6DISABLEWARNINGS = "MIXLINKAGE"
-$     ELSE
-$       CC4DISABLEWARNINGS = CCDISABLEWARNINGS + ",DOLLARID"
-$       CC6DISABLEWARNINGS = CCDISABLEWARNINGS + ",MIXLINKAGE"
-$       CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
-$     ENDIF
-$     CC4DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))"
-$     CC6DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC6DISABLEWARNINGS + "))"
-$   ELSE
-$     CCDISABLEWARNINGS = ""
-$     CC4DISABLEWARNINGS = ""
-$     CC6DISABLEWARNINGS = ""
-$   ENDIF
-$   CC3 = CC + "/DEFINE=(" + CCDEFS + ISSEVEN + ")" + CCDISABLEWARNINGS
-$   CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
-$   IF ARCH .EQS. "VAX" .AND. COMPILER .EQS. "DECC" .AND. P2 .NES. "DEBUG"
-$   THEN
-$     CC5 = CC + "/OPTIMIZE=NODISJOINT"
-$   ELSE
-$     CC5 = CC + "/NOOPTIMIZE"
-$   ENDIF
-$   CC4 = CC - CCDISABLEWARNINGS + CC4DISABLEWARNINGS
-$   CC6 = CC - CCDISABLEWARNINGS + CC6DISABLEWARNINGS
-$!
-$!  Show user the result
-$!
-$   WRITE/SYMBOL SYS$OUTPUT "Main C Compiling Command: ",CC
-$!
-$!  Else The User Entered An Invalid Argument.
-$!
-$ ELSE
-$!
-$!  Tell The User We Don't Know What They Want.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."
-$   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."
-$   WRITE SYS$OUTPUT "    GNUC  :  To Compile With GNU C."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Time To EXIT.
-$!
-$   EXIT
-$!
-$! End The Valid Argument Check.
-$!
-$ ENDIF
-$!
-$! Build a MACRO command for the architecture at hand
-$!
-$ IF ARCH .EQS. "VAX" THEN MACRO = "MACRO/''DEBUGGER'"
-$ IF ARCH .NES. "VAX" THEN MACRO = "MACRO/MIGRATION/''DEBUGGER'/''MACRO_OPTIMIZE'"
-$!
-$!  Show user the result
-$!
-$   WRITE/SYMBOL SYS$OUTPUT "Main MACRO Compiling Command: ",MACRO
-$!
-$! Time to check the contents, and to make sure we get the correct library.
-$!
-$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
-     .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
-$ THEN
-$!
-$!  Check to see if SOCKETSHR was chosen
-$!
-$   IF P4.EQS."SOCKETSHR"
-$   THEN
-$!
-$!    Set the library to use SOCKETSHR
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
-$!
-$!    Done with SOCKETSHR
-$!
-$   ENDIF
-$!
-$!  Check to see if MULTINET was chosen
-$!
-$   IF P4.EQS."MULTINET"
-$   THEN
-$!
-$!    Set the library to use UCX emulation.
-$!
-$     P4 = "UCX"
-$!
-$!    Done with MULTINET
-$!
-$   ENDIF
-$!
-$!  Check to see if UCX was chosen
-$!
-$   IF P4.EQS."UCX"
-$   THEN
-$!
-$!    Set the library to use UCX.
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
-$     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
-$     THEN
-$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
-$     ELSE
-$       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-	  TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
-$     ENDIF
-$!
-$!    Done with UCX
-$!
-$   ENDIF
-$!
-$!  Check to see if TCPIP was chosen
-$!
-$   IF P4.EQS."TCPIP"
-$   THEN
-$!
-$!    Set the library to use TCPIP (post UCX).
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
-$!  Check to see if NONE was chosen
-$!
-$   IF P4.EQS."NONE"
-$   THEN
-$!
-$!    Do not use a TCPIP library.
-$!
-$     TCPIP_LIB = ""
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
-$!  Print info
-$!
-$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
-$!
-$!  Else The User Entered An Invalid Argument.
-$!
-$ ELSE
-$!
-$!  Tell The User We Don't Know What They Want.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
-$   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."
-$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Time To EXIT.
-$!
-$   EXIT
-$!
-$!  Done with TCP/IP libraries
-$!
-$ ENDIF
-$!
-$! Check if the user wanted to compile just a subset of all the encryption
-$! methods.
-$!
-$ IF P6 .NES. ""
-$ THEN
-$   ENCRYPT_TYPES = P6
-$ ENDIF
-$!
-$!  Time To RETURN...
-$!
-$ RETURN
-$!
-$ INITIALISE:
-$!
-$! Save old value of the logical name OPENSSL
-$!
-$ __SAVE_OPENSSL = F$TRNLNM("OPENSSL","LNM$PROCESS_TABLE")
-$!
-$! Save directory information
-$!
-$ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
-$ __HERE = F$EDIT(__HERE,"UPCASE")
-$ __TOP = __HERE - "CRYPTO]"
-$ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
-$!
-$! Set up the logical name OPENSSL to point at the include directory
-$!
-$ DEFINE OPENSSL/NOLOG '__INCLUDE'
-$!
-$! Done
-$!
-$ RETURN
-$!
-$ CLEANUP:
-$!
-$! Restore the logical name OPENSSL if it had a value
-$!
-$ IF __SAVE_OPENSSL .EQS. ""
-$ THEN
-$   DEASSIGN OPENSSL
-$ ELSE
-$   DEFINE/NOLOG OPENSSL '__SAVE_OPENSSL'
-$ ENDIF
-$!
-$! Done
-$!
-$ RETURN
+$!

+$!  CRYPTO-LIB.COM

+$!  Written By:  Robert Byer

+$!               Vice-President

+$!               A-Com Computing, Inc.

+$!               byer@mail.all-net.net

+$!

+$!  Changes by Richard Levitte <richard@levitte.org>

+$!             Zoltan Arpadffy <arpadffy@polarhome.com>

+$!

+$!  This command files compiles and creates the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" 

+$!  library for OpenSSL.  The "xxx" denotes the machine architecture, ALPHA,

+$!  IA64 or VAX.

+$!

+$!  It was re-written so it would try to determine what "C" compiler to use 

+$!  or you can specify which "C" compiler to use.

+$!

+$!  Specify the following as P1 to build just that part or ALL to just

+$!  build everything.

+$!

+$!    	LIBRARY    To just compile the [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.

+$!    	APPS       To just compile the [.xxx.EXE.CRYPTO]*.EXE

+$!	ALL	   To do both LIBRARY and APPS

+$!

+$!  Specify DEBUG or NODEBUG as P2 to compile with or without debugger

+$!  information.

+$!

+$!  Specify which compiler at P3 to try to compile under.

+$!

+$!	VAXC	   For VAX C.

+$!	DECC	   For DEC C.

+$!	GNUC	   For GNU C.

+$!

+$!  If you don't specify a compiler, it will try to determine which

+$!  "C" compiler to use.

+$!

+$!  P4, if defined, sets a TCP/IP library to use, through one of the following

+$!  keywords:

+$!

+$!	UCX	   For UCX

+$!	TCPIP	   For TCPIP (post UCX)

+$!	SOCKETSHR  For SOCKETSHR+NETLIB

+$!

+$!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)

+$!

+$!  P6, if defined, sets a choice of crypto methods to compile.

+$!  WARNING: this should only be done to recompile some part of an already

+$!  fully compiled library.

+$!

+$!  For 64 bit architectures (Alpha and IA64), specify the pointer size as P7.

+$!  For 32 bit architectures (VAX), P7 is ignored.

+$!  Currently supported values are:

+$!

+$!	32	To ge a library compiled with /POINTER_SIZE=32

+$!	64	To ge a library compiled with /POINTER_SIZE=64

+$!

+$!

+$! Define A TCP/IP Library That We Will Need To Link To.

+$! (That Is, If We Need To Link To One.)

+$!

+$ TCPIP_LIB = ""

+$!

+$! Check Which Architecture We Are Using.

+$!

+$ IF (F$GETSYI("CPU").LT.128)

+$ THEN

+$!

+$!  The Architecture Is VAX

+$!

+$   ARCH = "VAX"

+$!

+$! Else...

+$!

+$ ELSE

+$!

+$!  The Architecture Is Alpha, IA64 or whatever comes in the future.

+$!

+$   ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")

+$   IF (ARCH .EQS. "") THEN ARCH = "UNK"

+$!

+$! End The Architecture Check.

+$!

+$ ENDIF

+$!

+$! Define The Different Encryption Types.

+$! NOTE: Some might think this list ugly.  However, it's made this way to

+$! reflect the SDIRS variable in [-]Makefile.org as closely as possible,

+$! thereby making it fairly easy to verify that the lists are the same.

+$!

+$ ET_WHIRLPOOL = "WHRLPOOL"

+$ IF ARCH .EQS. "VAX" THEN ET_WHIRLPOOL = ""

+$ ENCRYPT_TYPES = "Basic,"+ -

+		  "OBJECTS,"+ -

+		  "MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ -

+		  "DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,"+ -

+		  "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,"+ -

+		  "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -

+		  "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ -

+		  "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -

+		  "STORE,CMS,PQUEUE,TS,JPAKE"

+$! Define The OBJ Directory.

+$!

+$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.CRYPTO]

+$!

+$! Define The EXE Directory.

+$!

+$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]

+$!

+$! Check To Make Sure We Have Valid Command Line Parameters.

+$!

+$ GOSUB CHECK_OPTIONS

+$!

+$! Initialise logical names and such

+$!

+$ GOSUB INITIALISE

+$!

+$! Tell The User What Kind of Machine We Run On.

+$!

+$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."

+$!

+$!

+$! Check To See If The Architecture Specific OBJ Directory Exists.

+$!

+$ IF (F$PARSE(OBJ_DIR).EQS."")

+$ THEN

+$!

+$!  It Dosen't Exist, So Create It.

+$!

+$   CREATE/DIR 'OBJ_DIR'

+$!

+$! End The Architecture Specific OBJ Directory Check.

+$!

+$ ENDIF

+$!

+$! Check To See If The Architecture Specific Directory Exists.

+$!

+$ IF (F$PARSE(EXE_DIR).EQS."")

+$ THEN

+$!

+$!  It Dosen't Exist, So Create It.

+$!

+$   CREATE/DIRECTORY 'EXE_DIR'

+$!

+$! End The Architecture Specific Directory Check.

+$!

+$ ENDIF

+$!

+$! Define The Library Name.

+$!

+$ LIB_NAME := 'EXE_DIR'LIBCRYPTO'LIB32'.OLB

+$!

+$! Define The CRYPTO-LIB We Are To Use.

+$!

+$ CRYPTO_LIB := 'EXE_DIR'LIBCRYPTO'LIB32'.OLB

+$!

+$! Check To See If We Already Have A "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" Library...

+$!

+$ IF (F$SEARCH(LIB_NAME).EQS."")

+$ THEN

+$!

+$! Guess Not, Create The Library.

+$!

+$   LIBRARY/CREATE/OBJECT 'LIB_NAME'

+$!

+$! End The Library Check.

+$!

+$ ENDIF

+$!

+$! Build our options file for the application

+$!

+$ GOSUB CHECK_OPT_FILE

+$!

+$! Define The Different Encryption "library" Strings.

+$!

+$ APPS_DES = "DES/DES,CBC3_ENC"

+$ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"

+$

+$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,ebcdic,uid,o_time,o_str,o_dir"

+$ LIB_MD2 = "md2_dgst,md2_one"

+$ LIB_MD4 = "md4_dgst,md4_one"

+$ LIB_MD5 = "md5_dgst,md5_one"

+$ LIB_SHA = "sha_dgst,sha1dgst,sha_one,sha1_one,sha256,sha512"

+$ LIB_MDC2 = "mdc2dgst,mdc2_one"

+$ LIB_HMAC = "hmac,hm_ameth,hm_pmeth"

+$ LIB_RIPEMD = "rmd_dgst,rmd_one"

+$ LIB_WHRLPOOL = "wp_dgst,wp_block"

+$ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -

+	"ecb3_enc,cfb64enc,cfb64ede,cfb_enc,ofb64ede,"+ -

+	"enc_read,enc_writ,ofb64enc,"+ -

+	"ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ -

+	"des_enc,fcrypt_b,"+ -

+	"fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -

+	"ede_cbcm_enc,des_old,des_old2,read2pwd"

+$ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"

+$ LIB_RC4 = "rc4_skey,rc4_enc"

+$ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"

+$ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey"

+$ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"

+$ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"

+$ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -

+	"cmll_cfb,cmll_ctr"

+$ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"

+$ LIB_MODES = "cbc128,ctr128,cfb128,ofb128,cts128"

+$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"

+$ IF F$TRNLNM("OPENSSL_NO_ASM") .OR. ARCH .NES. "VAX" THEN -

+     LIB_BN_ASM = "bn_asm"

+$ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -

+	"bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -

+	"bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -

+	"bn_recp,bn_mont,bn_mpi,bn_exp2,bn_gf2m,bn_nist,"+ -

+	"bn_depr,bn_const"

+$ LIB_EC = "ec_lib,ecp_smpl,ecp_mont,ecp_nist,ec_cvt,ec_mult,"+ -

+	"ec_err,ec_curve,ec_check,ec_print,ec_asn1,ec_key,"+ -

+	"ec2_smpl,ec2_mult,ec_ameth,ec_pmeth,eck_prn"

+$ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ -

+	"rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null,"+ -

+	"rsa_pss,rsa_x931,rsa_asn1,rsa_depr,rsa_ameth,rsa_prn,"+ -

+	"rsa_pmeth"

+$ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,"+ -

+	"dsa_err,dsa_ossl,dsa_depr,dsa_ameth,dsa_pmeth,dsa_prn"

+$ LIB_ECDSA = "ecs_lib,ecs_asn1,ecs_ossl,ecs_sign,ecs_vrf,ecs_err"

+$ LIB_DH = "dh_asn1,dh_gen,dh_key,dh_lib,dh_check,dh_err,dh_depr,"+ -

+	"dh_ameth,dh_pmeth,dh_prn"

+$ LIB_ECDH = "ech_lib,ech_ossl,ech_key,ech_err"

+$ LIB_DSO = "dso_dl,dso_dlfcn,dso_err,dso_lib,dso_null,"+ -

+	"dso_openssl,dso_win32,dso_vms,dso_beos"

+$ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ -

+	"eng_table,eng_pkey,eng_fat,eng_all,"+ -

+	"tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -

+	"tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ -

+	"eng_openssl,eng_dyn,eng_cnf,eng_cryptodev"

+$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ -

+	"aes_ige,aes_wrap"

+$ LIB_BUFFER = "buffer,buf_err"

+$ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -

+	"bss_mem,bss_null,bss_fd,"+ -

+	"bss_file,bss_sock,bss_conn,"+ -

+	"bf_null,bf_buff,b_print,b_dump,"+ -

+	"b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log,"+ -

+	"bss_dgram,"+ -

+	"bf_lbuf"

+$ LIB_STACK = "stack"

+$ LIB_LHASH = "lhash,lh_stats"

+$ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd,"+ -

+	"rand_vms"

+$ LIB_ERR = "err,err_all,err_prn"

+$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err,obj_xref"

+$ LIB_EVP = "encode,digest,evp_enc,evp_key,evp_acnf,"+ -

+	"e_des,e_bf,e_idea,e_des3,e_camellia,"+ -

+	"e_rc4,e_aes,names,e_seed,"+ -

+	"e_xcbc_d,e_rc2,e_cast,e_rc5"

+$ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1,m_wp," + -

+	"m_dss,m_dss1,m_mdc2,m_ripemd,m_ecdsa,"+ -

+	"p_open,p_seal,p_sign,p_verify,p_lib,p_enc,p_dec,"+ -

+	"bio_md,bio_b64,bio_enc,evp_err,e_null,"+ -

+	"c_all,c_allc,c_alld,evp_lib,bio_ok,"+-

+	"evp_pkey,evp_pbe,p5_crpt,p5_crpt2"

+$ LIB_EVP_3 = "e_old,pmeth_lib,pmeth_fn,pmeth_gn,m_sigver"

+$ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ -

+	"a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,"+ -

+	"a_enum,a_utf8,a_sign,a_digest,a_verify,a_mbstr,a_strex,"+ -

+	"x_algor,x_val,x_pubkey,x_sig,x_req,x_attrib,x_bignum,"+ -

+	"x_long,x_name,x_x509,x_x509a,x_crl,x_info,x_spki,nsseq,"+ -

+	"x_nx509,d2i_pu,d2i_pr,i2d_pu,i2d_pr"

+$ LIB_ASN1_2 = "t_req,t_x509,t_x509a,t_crl,t_pkey,t_spki,t_bitst,"+ -

+	"tasn_new,tasn_fre,tasn_enc,tasn_dec,tasn_utl,tasn_typ,"+ -

+	"tasn_prn,ameth_lib,"+ -

+	"f_int,f_string,n_pkey,"+ -

+	"f_enum,x_pkey,a_bool,x_exten,bio_asn1,bio_ndef,asn_mime,"+ -

+	"asn1_gen,asn1_par,asn1_lib,asn1_err,a_bytes,a_strnid,"+ -

+	"evp_asn1,asn_pack,p5_pbe,p5_pbev2,p8_pkey,asn_moid"

+$ LIB_PEM = "pem_sign,pem_seal,pem_info,pem_lib,pem_all,pem_err,"+ -

+	"pem_x509,pem_xaux,pem_oth,pem_pk8,pem_pkey,pvkfmt"

+$ LIB_X509 = "x509_def,x509_d2,x509_r2x,x509_cmp,"+ -

+	"x509_obj,x509_req,x509spki,x509_vfy,"+ -

+	"x509_set,x509cset,x509rset,x509_err,"+ -

+	"x509name,x509_v3,x509_ext,x509_att,"+ -

+	"x509type,x509_lu,x_all,x509_txt,"+ -

+	"x509_trs,by_file,by_dir,x509_vpm"

+$ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ -

+	"v3_prn,v3_utl,v3err,v3_genn,v3_alt,v3_skey,v3_akey,v3_pku,"+ -

+	"v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ -

+	"v3_ocsp,v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -

+	"pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -

+	"v3_asid,v3_addr"

+$ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap"

+$ LIB_TXT_DB = "txt_db"

+$ LIB_PKCS7 = "pk7_asn1,pk7_lib,pkcs7err,pk7_doit,pk7_smime,pk7_attr,"+ -

+	"pk7_mime,bio_pk7"

+$ LIB_PKCS12 = "p12_add,p12_asn,p12_attr,p12_crpt,p12_crt,p12_decr,"+ -

+	"p12_init,p12_key,p12_kiss,p12_mutl,"+ -

+	"p12_utl,p12_npas,pk12err,p12_p8d,p12_p8e"

+$ LIB_COMP = "comp_lib,comp_err,"+ -

+	"c_rle,c_zlib"

+$ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -

+	"ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"

+$ LIB_UI_COMPAT = ",ui_compat"

+$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT

+$ LIB_KRB5 = "krb5_asn"

+$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"

+$ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -

+	"cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess"

+$ LIB_PQUEUE = "pqueue"

+$ LIB_TS = "ts_err,ts_req_utils,ts_req_print,ts_rsp_utils,ts_rsp_print,"+ -

+	"ts_rsp_sign,ts_rsp_verify,ts_verify_ctx,ts_lib,ts_conf,"+ -

+	"ts_asn1"

+$ LIB_JPAKE = "jpake,jpake_err"

+$!

+$! Setup exceptional compilations

+$!

+$ ! Add definitions for no threads on OpenVMS 7.1 and higher

+$ COMPILEWITH_CC3 = ",bss_rtcp,"

+$ ! Disable the DOLLARID warning

+$ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time,o_dir"

+$ ! Disable disjoint optimization

+$ COMPILEWITH_CC5 = ",md2_dgst,md4_dgst,md5_dgst,mdc2dgst," + -

+                    "seed,sha_dgst,sha1dgst,rmd_dgst,bf_enc,"

+$ ! Disable the MIXLINKAGE warning

+$ COMPILEWITH_CC6 = ",enc_read,set_key,"

+$!

+$! Figure Out What Other Modules We Are To Build.

+$!

+$ BUILD_SET:

+$!

+$! Define A Module Counter.

+$!

+$ MODULE_COUNTER = 0

+$!

+$! Top Of The Loop.

+$!

+$ MODULE_NEXT:

+$!

+$! Extract The Module Name From The Encryption List.

+$!

+$ MODULE_NAME = F$ELEMENT(MODULE_COUNTER,",",ENCRYPT_TYPES)

+$ IF MODULE_NAME.EQS."Basic" THEN MODULE_NAME = ""

+$ MODULE_NAME1 = MODULE_NAME

+$!

+$! Check To See If We Are At The End Of The Module List.

+$!

+$ IF (MODULE_NAME.EQS.",") 

+$ THEN 

+$!

+$!  We Are At The End Of The Module List, Go To MODULE_DONE.

+$!

+$   GOTO MODULE_DONE

+$!

+$! End The Module List Check.

+$!

+$ ENDIF

+$!

+$! Increment The Moudle Counter.

+$!

+$ MODULE_COUNTER = MODULE_COUNTER + 1

+$!

+$! Create The Library and Apps Module Names.

+$!

+$ LIB_MODULE = "LIB_" + MODULE_NAME

+$ APPS_MODULE = "APPS_" + MODULE_NAME

+$ IF (F$EXTRACT(0,5,MODULE_NAME).EQS."ASN1_")

+$ THEN

+$   MODULE_NAME = "ASN1"

+$ ENDIF

+$ IF (F$EXTRACT(0,4,MODULE_NAME).EQS."EVP_")

+$ THEN

+$   MODULE_NAME = "EVP"

+$ ENDIF

+$!

+$! Set state (can be LIB and APPS)

+$!

+$ STATE = "LIB"

+$ IF BUILDALL .EQS. "APPS" THEN STATE = "APPS"

+$!

+$! Check if the library module name actually is defined

+$!

+$ IF F$TYPE('LIB_MODULE') .EQS. ""

+$ THEN

+$   WRITE SYS$ERROR ""

+$   WRITE SYS$ERROR "The module ",MODULE_NAME1," does not exist.  Continuing..."

+$   WRITE SYS$ERROR ""

+$   GOTO MODULE_NEXT

+$ ENDIF

+$!

+$! Top Of The Module Loop.

+$!

+$ MODULE_AGAIN:

+$!

+$! Tell The User What Module We Are Building.

+$!

+$ IF (MODULE_NAME1.NES."") 

+$ THEN

+$   IF STATE .EQS. "LIB"

+$   THEN

+$     WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Library Files. (",BUILDALL,",",STATE,")"

+$   ELSE IF F$TYPE('APPS_MODULE') .NES. ""

+$     THEN

+$       WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Applications. (",BUILDALL,",",STATE,")"

+$     ENDIF

+$   ENDIF

+$ ENDIF

+$!

+$!  Define A File Counter And Set It To "0".

+$!

+$ FILE_COUNTER = 0

+$ APPLICATION = ""

+$ APPLICATION_COUNTER = 0

+$!

+$! Top Of The File Loop.

+$!

+$ NEXT_FILE:

+$!

+$! Look in the LIB_MODULE is we're in state LIB

+$!

+$ IF STATE .EQS. "LIB"

+$ THEN

+$!

+$!   O.K, Extract The File Name From The File List.

+$!

+$   FILE_NAME = F$ELEMENT(FILE_COUNTER,",",'LIB_MODULE')

+$!

+$!   else

+$!

+$ ELSE

+$   FILE_NAME = ","

+$!

+$   IF F$TYPE('APPS_MODULE') .NES. ""

+$   THEN

+$!

+$!     Extract The File Name From The File List.

+$!     This part is a bit more complicated.

+$!

+$     IF APPLICATION .EQS. ""

+$     THEN

+$       APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')

+$       APPLICATION_COUNTER = APPLICATION_COUNTER + 1

+$       APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)

+$       APPLICATION = F$ELEMENT(0,"/",APPLICATION)

+$       FILE_COUNTER = 0

+$     ENDIF

+$

+$!     WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"

+$!     SHOW SYMBOL APPLICATION*

+$!

+$     IF APPLICATION .NES. ";"

+$     THEN

+$       FILE_NAME = F$ELEMENT(FILE_COUNTER,",",APPLICATION_OBJECTS)

+$       IF FILE_NAME .EQS. ","

+$       THEN

+$         APPLICATION = ""

+$         GOTO NEXT_FILE

+$       ENDIF

+$     ENDIF

+$   ENDIF

+$ ENDIF

+$!

+$! Check To See If We Are At The End Of The File List.

+$!

+$ IF (FILE_NAME.EQS.",") 

+$ THEN 

+$!

+$!  We Are At The End Of The File List, Change State Or Goto FILE_DONE.

+$!

+$   IF STATE .EQS. "LIB" .AND. BUILDALL .NES. "LIBRARY"

+$   THEN

+$     STATE = "APPS"

+$     GOTO MODULE_AGAIN

+$   ELSE

+$     GOTO FILE_DONE

+$   ENDIF

+$!

+$! End The File List Check.

+$!

+$ ENDIF

+$!

+$! Increment The Counter.

+$!

+$ FILE_COUNTER = FILE_COUNTER + 1

+$!

+$! Create The Source File Name.

+$!

+$ TMP_FILE_NAME = F$ELEMENT(1,"]",FILE_NAME)

+$ IF TMP_FILE_NAME .EQS. "]" THEN TMP_FILE_NAME = FILE_NAME

+$ IF F$ELEMENT(0,".",TMP_FILE_NAME) .EQS. TMP_FILE_NAME THEN -

+	FILE_NAME = FILE_NAME + ".c"

+$ IF (MODULE_NAME.NES."")

+$ THEN

+$   SOURCE_FILE = "SYS$DISK:[." + MODULE_NAME+ "]" + FILE_NAME

+$ ELSE

+$   SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME

+$ ENDIF

+$ SOURCE_FILE = SOURCE_FILE - "]["

+$!

+$! Create The Object File Name.

+$!

+$ OBJECT_FILE = OBJ_DIR + F$PARSE(FILE_NAME,,,"NAME","SYNTAX_ONLY") + ".OBJ"

+$ ON WARNING THEN GOTO NEXT_FILE

+$!

+$! Check To See If The File We Want To Compile Is Actually There.

+$!

+$ IF (F$SEARCH(SOURCE_FILE).EQS."")

+$ THEN

+$!

+$!  Tell The User That The File Doesn't Exist.

+$!

+$   WRITE SYS$OUTPUT ""

+$   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Doesn't Exist."

+$   WRITE SYS$OUTPUT ""

+$!

+$!  Exit The Build.

+$!

+$   GOTO EXIT

+$!

+$! End The File Exist Check.

+$!

+$ ENDIF

+$!

+$! Tell The User We Are Compiling The File.

+$!

+$ IF (MODULE_NAME.EQS."")

+$ THEN

+$   WRITE SYS$OUTPUT "Compiling The ",FILE_NAME," File.  (",BUILDALL,",",STATE,")"

+$ ENDIF

+$ IF (MODULE_NAME.NES."")

+$ THEN 

+$   WRITE SYS$OUTPUT "	",FILE_NAME,""

+$ ENDIF

+$!

+$! Compile The File.

+$!

+$ ON ERROR THEN GOTO NEXT_FILE

+$ FILE_NAME0 = F$ELEMENT(0,".",FILE_NAME)

+$ IF FILE_NAME - ".mar" .NES. FILE_NAME

+$ THEN

+$   MACRO/OBJECT='OBJECT_FILE' 'SOURCE_FILE'

+$ ELSE

+$   IF COMPILEWITH_CC3 - FILE_NAME0 .NES. COMPILEWITH_CC3

+$   THEN

+$     CC3/OBJECT='OBJECT_FILE' 'SOURCE_FILE'

+$   ELSE

+$     IF COMPILEWITH_CC4 - FILE_NAME0 .NES. COMPILEWITH_CC4

+$     THEN

+$       CC4/OBJECT='OBJECT_FILE' 'SOURCE_FILE'

+$     ELSE

+$       IF COMPILEWITH_CC5 - FILE_NAME0 .NES. COMPILEWITH_CC5

+$       THEN

+$         CC5/OBJECT='OBJECT_FILE' 'SOURCE_FILE'

+$       ELSE

+$         IF COMPILEWITH_CC6 - FILE_NAME0 .NES. COMPILEWITH_CC6

+$         THEN

+$           CC6/OBJECT='OBJECT_FILE' 'SOURCE_FILE'

+$         ELSE

+$           CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'

+$         ENDIF

+$       ENDIF

+$     ENDIF

+$   ENDIF

+$ ENDIF

+$ IF STATE .EQS. "LIB"

+$ THEN 

+$!

+$!   Add It To The Library.

+$!

+$   LIBRARY/REPLACE 'LIB_NAME' 'OBJECT_FILE'

+$!

+$!   Time To Clean Up The Object File.

+$!

+$   DELETE 'OBJECT_FILE';*

+$ ENDIF

+$!

+$! Go Back And Do It Again.

+$!

+$ GOTO NEXT_FILE

+$!

+$! All Done With This Library Part.

+$!

+$ FILE_DONE:

+$!

+$! Time To Build Some Applications

+$!

+$ IF F$TYPE('APPS_MODULE') .NES. "" .AND. BUILDALL .NES. "LIBRARY"

+$ THEN

+$   APPLICATION_COUNTER = 0

+$ NEXT_APPLICATION:

+$   APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')

+$   IF APPLICATION .EQS. ";" THEN GOTO APPLICATION_DONE

+$

+$   APPLICATION_COUNTER = APPLICATION_COUNTER + 1

+$   APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)

+$   APPLICATION = F$ELEMENT(0,"/",APPLICATION)

+$

+$!   WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"

+$!   SHOW SYMBOL APPLICATION*

+$!

+$! Tell the user what happens

+$!

+$   WRITE SYS$OUTPUT "	",APPLICATION,".exe"

+$!

+$! Link The Program.

+$!

+$   ON ERROR THEN GOTO NEXT_APPLICATION

+$!

+$! Check To See If We Are To Link With A Specific TCP/IP Library.

+$!

+$   IF (TCPIP_LIB.NES."")

+$   THEN

+$!

+$!    Link With A TCP/IP Library.

+$!

+$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -

+          'OBJ_DIR''APPLICATION_OBJECTS', -

+	  'CRYPTO_LIB'/LIBRARY, -

+          'TCPIP_LIB','OPT_FILE'/OPTION

+$!

+$! Else...

+$!

+$   ELSE

+$!

+$!    Don't Link With A TCP/IP Library.

+$!

+$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -

+          'OBJ_DIR''APPLICATION_OBJECTS',-

+	  'CRYPTO_LIB'/LIBRARY, -

+          'OPT_FILE'/OPTION

+$!

+$! End The TCP/IP Library Check.

+$!

+$   ENDIF

+$   GOTO NEXT_APPLICATION

+$  APPLICATION_DONE:

+$ ENDIF

+$!

+$! Go Back And Get The Next Module.

+$!

+$ GOTO MODULE_NEXT

+$!

+$! All Done With This Module.

+$!

+$ MODULE_DONE:

+$!

+$! Tell The User That We Are All Done.

+$!

+$ WRITE SYS$OUTPUT "All Done..."

+$ EXIT:

+$ GOSUB CLEANUP

+$ EXIT

+$!

+$! Check For The Link Option FIle.

+$!

+$ CHECK_OPT_FILE:

+$!

+$! Check To See If We Need To Make A VAX C Option File.

+$!

+$ IF (COMPILER.EQS."VAXC")

+$ THEN

+$!

+$!  Check To See If We Already Have A VAX C Linker Option File.

+$!

+$   IF (F$SEARCH(OPT_FILE).EQS."")

+$   THEN

+$!

+$!    We Need A VAX C Linker Option File.

+$!

+$     CREATE 'OPT_FILE'

+$DECK

+!

+! Default System Options File To Link Agianst 

+! The Sharable VAX C Runtime Library.

+!

+SYS$SHARE:VAXCRTL.EXE/SHARE

+$EOD

+$!

+$!  End The Option File Check.

+$!

+$   ENDIF

+$!

+$! End The VAXC Check.

+$!

+$ ENDIF

+$!

+$! Check To See If We Need A GNU C Option File.

+$!

+$ IF (COMPILER.EQS."GNUC")

+$ THEN

+$!

+$!  Check To See If We Already Have A GNU C Linker Option File.

+$!

+$   IF (F$SEARCH(OPT_FILE).EQS."")

+$   THEN

+$!

+$!    We Need A GNU C Linker Option File.

+$!

+$     CREATE 'OPT_FILE'

+$DECK

+!

+! Default System Options File To Link Agianst 

+! The Sharable C Runtime Library.

+!

+GNU_CC:[000000]GCCLIB/LIBRARY

+SYS$SHARE:VAXCRTL/SHARE

+$EOD

+$!

+$!  End The Option File Check.

+$!

+$   ENDIF

+$!

+$! End The GNU C Check.

+$!

+$ ENDIF

+$!

+$! Check To See If We Need A DEC C Option File.

+$!

+$ IF (COMPILER.EQS."DECC")

+$ THEN

+$!

+$!  Check To See If We Already Have A DEC C Linker Option File.

+$!

+$   IF (F$SEARCH(OPT_FILE).EQS."")

+$   THEN

+$!

+$!    Figure Out If We Need A non-VAX Or A VAX Linker Option File.

+$!

+$     IF ARCH .EQS. "VAX"

+$     THEN

+$!

+$!      We Need A DEC C Linker Option File For VAX.

+$!

+$       CREATE 'OPT_FILE'

+$DECK

+!

+! Default System Options File To Link Agianst 

+! The Sharable DEC C Runtime Library.

+!

+SYS$SHARE:DECC$SHR.EXE/SHARE

+$EOD

+$!

+$!    Else...

+$!

+$     ELSE

+$!

+$!      Create The non-VAX Linker Option File.

+$!

+$       CREATE 'OPT_FILE'

+$DECK

+!

+! Default System Options File For non-VAX To Link Agianst 

+! The Sharable C Runtime Library.

+!

+SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE

+SYS$SHARE:CMA$OPEN_RTL/SHARE

+$EOD

+$!

+$!    End The DEC C Option File Check.

+$!

+$     ENDIF

+$!

+$!  End The Option File Search.

+$!

+$   ENDIF

+$!

+$! End The DEC C Check.

+$!

+$ ENDIF

+$!

+$!  Tell The User What Linker Option File We Are Using.

+$!

+$ WRITE SYS$OUTPUT "Using Linker Option File ",OPT_FILE,"."	

+$!

+$! Time To RETURN.

+$!

+$ RETURN

+$!

+$! Check The User's Options.

+$!

+$ CHECK_OPTIONS:

+$!

+$! Check To See If P1 Is Blank.

+$!

+$ IF (P1.EQS."ALL")

+$ THEN

+$!

+$!   P1 Is Blank, So Build Everything.

+$!

+$    BUILDALL = "TRUE"

+$!

+$! Else...

+$!

+$ ELSE

+$!

+$!  Else, Check To See If P1 Has A Valid Argument.

+$!

+$   IF (P1.EQS."LIBRARY").OR.(P1.EQS."APPS")

+$   THEN

+$!

+$!    A Valid Argument.

+$!

+$     BUILDALL = P1

+$!

+$!  Else...

+$!

+$   ELSE

+$!

+$!    Tell The User We Don't Know What They Want.

+$!

+$     WRITE SYS$OUTPUT ""

+$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"

+$     WRITE SYS$OUTPUT ""

+$     WRITE SYS$OUTPUT "    ALL      :  Just Build Everything."

+$     WRITE SYS$OUTPUT "    LIBRARY  :  To Compile Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."

+$     WRITE SYS$OUTPUT "    APPS     :  To Compile Just The [.xxx.EXE.CRYPTO]*.EXE Programs."

+$     WRITE SYS$OUTPUT ""

+$     WRITE SYS$OUTPUT " Where 'xxx' Stands For:"

+$     WRITE SYS$OUTPUT ""

+$     WRITE SYS$OUTPUT "    ALPHA    :  Alpha Architecture."

+$     WRITE SYS$OUTPUT "    IA64     :  IA64 Architecture."

+$     WRITE SYS$OUTPUT "    VAX      :  VAX Architecture."

+$     WRITE SYS$OUTPUT ""

+$!

+$!    Time To EXIT.

+$!

+$     EXIT

+$!

+$!  End The Valid Argument Check.

+$!

+$   ENDIF

+$!

+$! End The P1 Check.

+$!

+$ ENDIF

+$!

+$! Check To See If P2 Is Blank.

+$!

+$ IF (P2.EQS."NODEBUG")

+$ THEN

+$!

+$!   P2 Is NODEBUG, So Compile Without The Debugger Information.

+$!

+$    DEBUGGER = "NODEBUG"

+$    TRACEBACK = "NOTRACEBACK" 

+$    GCC_OPTIMIZE = "OPTIMIZE"

+$    CC_OPTIMIZE = "OPTIMIZE"

+$    MACRO_OPTIMIZE = "OPTIMIZE"

+$    WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."

+$    WRITE SYS$OUTPUT "Compiling With Compiler Optimization."

+$ ELSE

+$!

+$!  Check To See If We Are To Compile With Debugger Information.

+$!

+$   IF (P2.EQS."DEBUG")

+$   THEN

+$!

+$!    Compile With Debugger Information.

+$!

+$     DEBUGGER = "DEBUG"

+$     TRACEBACK = "TRACEBACK"

+$     GCC_OPTIMIZE = "NOOPTIMIZE"

+$     CC_OPTIMIZE = "NOOPTIMIZE"

+$     MACRO_OPTIMIZE = "NOOPTIMIZE"

+$     WRITE SYS$OUTPUT "Debugger Information Will Be Produced During Compile."

+$     WRITE SYS$OUTPUT "Compiling Without Compiler Optimization."

+$   ELSE 

+$!

+$!    They Entered An Invalid Option..

+$!

+$     WRITE SYS$OUTPUT ""

+$     WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"

+$     WRITE SYS$OUTPUT ""

+$     WRITE SYS$OUTPUT "     DEBUG   :  Compile With The Debugger Information."

+$     WRITE SYS$OUTPUT "     NODEBUG :  Compile Without The Debugger Information."

+$     WRITE SYS$OUTPUT ""

+$!

+$!    Time To EXIT.

+$!

+$     EXIT

+$!

+$!  End The Valid Argument Check.

+$!

+$   ENDIF

+$!

+$! End The P2 Check.

+$!

+$ ENDIF

+$!

+$! Special Threads For OpenVMS v7.1 Or Later

+$!

+$! Written By:  Richard Levitte

+$!              richard@levitte.org

+$!

+$!

+$! Check To See If We Have A Option For P5.

+$!

+$ IF (P5.EQS."")

+$ THEN

+$!

+$!  Get The Version Of VMS We Are Using.

+$!

+$   ISSEVEN :=

+$   TMP = F$ELEMENT(0,"-",F$EXTRACT(1,4,F$GETSYI("VERSION")))

+$   TMP = F$INTEGER(F$ELEMENT(0,".",TMP)+F$ELEMENT(1,".",TMP))

+$!

+$!  Check To See If The VMS Version Is v7.1 Or Later.

+$!

+$   IF (TMP.GE.71)

+$   THEN

+$!

+$!    We Have OpenVMS v7.1 Or Later, So Use The Special Threads.

+$!

+$     ISSEVEN := ,PTHREAD_USE_D4

+$!

+$!  End The VMS Version Check.

+$!

+$   ENDIF

+$!

+$! End The P5 Check.

+$!

+$ ENDIF

+$!

+$! Check To See If P7 Is Blank.

+$!

+$ IF (P7.EQS."")

+$ THEN

+$   POINTER_SIZE = ""

+$ ELSE

+$!

+$!  Check is P7 Is Valid

+$!

+$   IF (P7.EQS."32")

+$   THEN

+$     POINTER_SIZE = "/POINTER_SIZE=32"

+$     IF ARCH .EQS. "VAX"

+$     THEN

+$       LIB32 = ""

+$     ELSE

+$       LIB32 = "32"

+$     ENDIF

+$   ELSE

+$     IF (P7.EQS."64")

+$     THEN

+$       LIB32 = ""

+$       IF ARCH .EQS. "VAX"

+$       THEN

+$         POINTER_SIZE = "/POINTER_SIZE=32"

+$       ELSE

+$         POINTER_SIZE = "/POINTER_SIZE=64"

+$       ENDIF

+$     ELSE

+$!

+$!      Tell The User Entered An Invalid Option..

+$!

+$       WRITE SYS$OUTPUT ""

+$       WRITE SYS$OUTPUT "The Option ",P7," Is Invalid.  The Valid Options Are:"

+$       WRITE SYS$OUTPUT ""

+$       WRITE SYS$OUTPUT "    32  :  Compile with 32 bit pointer size"

+$       WRITE SYS$OUTPUT "    64  :  Compile with 64 bit pointer size"

+$       WRITE SYS$OUTPUT ""

+$!

+$!      Time To EXIT.

+$!

+$       GOTO TIDY

+$!

+$!      End The Valid Arguement Check.

+$!

+$     ENDIF

+$   ENDIF

+$!

+$! End The P7 Check.

+$!

+$ ENDIF

+$!

+$! Check To See If P3 Is Blank.

+$!

+$ IF (P3.EQS."")

+$ THEN

+$!

+$!  O.K., The User Didn't Specify A Compiler, Let's Try To

+$!  Find Out Which One To Use.

+$!

+$!  Check To See If We Have GNU C.

+$!

+$   IF (F$TRNLNM("GNU_CC").NES."")

+$   THEN

+$!

+$!    Looks Like GNUC, Set To Use GNUC.

+$!

+$     P3 = "GNUC"

+$!

+$!  Else...

+$!

+$   ELSE

+$!

+$!    Check To See If We Have VAXC Or DECC.

+$!

+$     IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")

+$     THEN 

+$!

+$!      Looks Like DECC, Set To Use DECC.

+$!

+$       P3 = "DECC"

+$!

+$!    Else...

+$!

+$     ELSE

+$!

+$!      Looks Like VAXC, Set To Use VAXC.

+$!

+$       P3 = "VAXC"

+$!

+$!    End The VAXC Compiler Check.

+$!

+$     ENDIF

+$!

+$!  End The DECC & VAXC Compiler Check.

+$!

+$   ENDIF

+$!

+$!  End The Compiler Check.

+$!

+$ ENDIF

+$!

+$! Check To See If We Have A Option For P4.

+$!

+$ IF (P4.EQS."")

+$ THEN

+$!

+$!  Find out what socket library we have available

+$!

+$   IF F$PARSE("SOCKETSHR:") .NES. ""

+$   THEN

+$!

+$!    We have SOCKETSHR, and it is my opinion that it's the best to use.

+$!

+$     P4 = "SOCKETSHR"

+$!

+$!    Tell the user

+$!

+$     WRITE SYS$OUTPUT "Using SOCKETSHR for TCP/IP"

+$!

+$!    Else, let's look for something else

+$!

+$   ELSE

+$!

+$!    Like UCX (the reason to do this before Multinet is that the UCX

+$!    emulation is easier to use...)

+$!

+$     IF F$TRNLNM("UCX$IPC_SHR") .NES. "" -

+	 .OR. F$PARSE("SYS$SHARE:UCX$IPC_SHR.EXE") .NES. "" -

+	 .OR. F$PARSE("SYS$LIBRARY:UCX$IPC.OLB") .NES. ""

+$     THEN

+$!

+$!	Last resort: a UCX or UCX-compatible library

+$!

+$	P4 = "UCX"

+$!

+$!      Tell the user

+$!

+$       WRITE SYS$OUTPUT "Using UCX or an emulation thereof for TCP/IP"

+$!

+$!	That was all...

+$!

+$     ENDIF

+$   ENDIF

+$ ENDIF

+$!

+$! Set Up Initial CC Definitions, Possibly With User Ones

+$!

+$ CCDEFS = "TCPIP_TYPE_''P4',DSO_VMS"

+$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS

+$ CCEXTRAFLAGS = ""

+$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS

+$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"

+$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -

+	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS

+$!

+$!  Check To See If The User Entered A Valid Paramter.

+$!

+$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")

+$ THEN

+$!

+$!    Check To See If The User Wanted DECC.

+$!

+$   IF (P3.EQS."DECC")

+$   THEN

+$!

+$!    Looks Like DECC, Set To Use DECC.

+$!

+$     COMPILER = "DECC"

+$!

+$!    Tell The User We Are Using DECC.

+$!

+$     WRITE SYS$OUTPUT "Using DECC 'C' Compiler."

+$!

+$!    Use DECC...

+$!

+$     CC = "CC"

+$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -

+	 THEN CC = "CC/DECC"

+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89''POINTER_SIZE'" + -

+           "/NOLIST/PREFIX=ALL" + -

+	   "/INCLUDE=(SYS$DISK:[._''ARCH'],SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + -

+	   CCEXTRAFLAGS

+$!

+$!    Define The Linker Options File Name.

+$!

+$     OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"

+$!

+$!  End DECC Check.

+$!

+$   ENDIF

+$!

+$!  Check To See If We Are To Use VAXC.

+$!

+$   IF (P3.EQS."VAXC")

+$   THEN

+$!

+$!    Looks Like VAXC, Set To Use VAXC.

+$!

+$     COMPILER = "VAXC"

+$!

+$!    Tell The User We Are Using VAX C.

+$!

+$     WRITE SYS$OUTPUT "Using VAXC 'C' Compiler."

+$!

+$!    Compile Using VAXC.

+$!

+$     CC = "CC"

+$     IF ARCH.NES."VAX"

+$     THEN

+$	WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!"

+$	EXIT

+$     ENDIF

+$     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"

+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -

+	   "/INCLUDE=(SYS$DISK:[._''ARCH'],SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + -

+	   CCEXTRAFLAGS

+$     CCDEFS = """VAXC""," + CCDEFS

+$!

+$!    Define <sys> As SYS$COMMON:[SYSLIB]

+$!

+$     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]

+$!

+$!    Define The Linker Options File Name.

+$!

+$     OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"

+$!

+$!  End VAXC Check

+$!

+$   ENDIF

+$!

+$!  Check To See If We Are To Use GNU C.

+$!

+$   IF (P3.EQS."GNUC")

+$   THEN

+$!

+$!    Looks Like GNUC, Set To Use GNUC.

+$!

+$     COMPILER = "GNUC"

+$!

+$!    Tell The User We Are Using GNUC.

+$!

+$     WRITE SYS$OUTPUT "Using GNU 'C' Compiler."

+$!

+$!    Use GNU C...

+$!

+$     CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -

+	   "/INCLUDE=(SYS$DISK:[._''ARCH'],SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + -

+	   CCEXTRAFLAGS

+$!

+$!    Define The Linker Options File Name.

+$!

+$     OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"

+$!

+$!  End The GNU C Check.

+$!

+$   ENDIF

+$!

+$!  Set up default defines

+$!

+$   CCDEFS = """FLAT_INC=1""," + CCDEFS

+$!

+$!  Finish up the definition of CC.

+$!

+$   IF COMPILER .EQS. "DECC"

+$   THEN

+$     IF CCDISABLEWARNINGS .EQS. ""

+$     THEN

+$       CC4DISABLEWARNINGS = "DOLLARID"

+$       CC6DISABLEWARNINGS = "MIXLINKAGE"

+$     ELSE

+$       CC4DISABLEWARNINGS = CCDISABLEWARNINGS + ",DOLLARID"

+$       CC6DISABLEWARNINGS = CCDISABLEWARNINGS + ",MIXLINKAGE"

+$       CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"

+$     ENDIF

+$     CC4DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))"

+$     CC6DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC6DISABLEWARNINGS + "))"

+$   ELSE

+$     CCDISABLEWARNINGS = ""

+$     CC4DISABLEWARNINGS = ""

+$     CC6DISABLEWARNINGS = ""

+$   ENDIF

+$   CC3 = CC + "/DEFINE=(" + CCDEFS + ISSEVEN + ")" + CCDISABLEWARNINGS

+$   CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS

+$   IF ARCH .EQS. "VAX" .AND. COMPILER .EQS. "DECC" .AND. P2 .NES. "DEBUG"

+$   THEN

+$     CC5 = CC + "/OPTIMIZE=NODISJOINT"

+$   ELSE

+$     CC5 = CC + "/NOOPTIMIZE"

+$   ENDIF

+$   CC4 = CC - CCDISABLEWARNINGS + CC4DISABLEWARNINGS

+$   CC6 = CC - CCDISABLEWARNINGS + CC6DISABLEWARNINGS

+$!

+$!  Show user the result

+$!

+$   WRITE/SYMBOL SYS$OUTPUT "Main C Compiling Command: ",CC

+$!

+$!  Else The User Entered An Invalid Argument.

+$!

+$ ELSE

+$!

+$!  Tell The User We Don't Know What They Want.

+$!

+$   WRITE SYS$OUTPUT ""

+$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"

+$   WRITE SYS$OUTPUT ""

+$   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."

+$   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."

+$   WRITE SYS$OUTPUT "    GNUC  :  To Compile With GNU C."

+$   WRITE SYS$OUTPUT ""

+$!

+$!  Time To EXIT.

+$!

+$   EXIT

+$!

+$! End The Valid Argument Check.

+$!

+$ ENDIF

+$!

+$! Build a MACRO command for the architecture at hand

+$!

+$ IF ARCH .EQS. "VAX" THEN MACRO = "MACRO/''DEBUGGER'"

+$ IF ARCH .NES. "VAX" THEN MACRO = "MACRO/MIGRATION/''DEBUGGER'/''MACRO_OPTIMIZE'"

+$!

+$!  Show user the result

+$!

+$   WRITE/SYMBOL SYS$OUTPUT "Main MACRO Compiling Command: ",MACRO

+$!

+$! Time to check the contents, and to make sure we get the correct library.

+$!

+$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -

+     .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"

+$ THEN

+$!

+$!  Check to see if SOCKETSHR was chosen

+$!

+$   IF P4.EQS."SOCKETSHR"

+$   THEN

+$!

+$!    Set the library to use SOCKETSHR

+$!

+$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"

+$!

+$!    Done with SOCKETSHR

+$!

+$   ENDIF

+$!

+$!  Check to see if MULTINET was chosen

+$!

+$   IF P4.EQS."MULTINET"

+$   THEN

+$!

+$!    Set the library to use UCX emulation.

+$!

+$     P4 = "UCX"

+$!

+$!    Done with MULTINET

+$!

+$   ENDIF

+$!

+$!  Check to see if UCX was chosen

+$!

+$   IF P4.EQS."UCX"

+$   THEN

+$!

+$!    Set the library to use UCX.

+$!

+$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"

+$     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""

+$     THEN

+$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"

+$     ELSE

+$       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -

+	  TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"

+$     ENDIF

+$!

+$!    Done with UCX

+$!

+$   ENDIF

+$!

+$!  Check to see if TCPIP was chosen

+$!

+$   IF P4.EQS."TCPIP"

+$   THEN

+$!

+$!    Set the library to use TCPIP (post UCX).

+$!

+$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"

+$!

+$!    Done with TCPIP

+$!

+$   ENDIF

+$!

+$!  Check to see if NONE was chosen

+$!

+$   IF P4.EQS."NONE"

+$   THEN

+$!

+$!    Do not use a TCPIP library.

+$!

+$     TCPIP_LIB = ""

+$!

+$!    Done with TCPIP

+$!

+$   ENDIF

+$!

+$!  Print info

+$!

+$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB

+$!

+$!  Else The User Entered An Invalid Argument.

+$!

+$ ELSE

+$!

+$!  Tell The User We Don't Know What They Want.

+$!

+$   WRITE SYS$OUTPUT ""

+$   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"

+$   WRITE SYS$OUTPUT ""

+$   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."

+$   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."

+$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."

+$   WRITE SYS$OUTPUT ""

+$!

+$!  Time To EXIT.

+$!

+$   EXIT

+$!

+$!  Done with TCP/IP libraries

+$!

+$ ENDIF

+$!

+$! Check if the user wanted to compile just a subset of all the encryption

+$! methods.

+$!

+$ IF P6 .NES. ""

+$ THEN

+$   ENCRYPT_TYPES = P6

+$ ENDIF

+$!

+$!  Time To RETURN...

+$!

+$ RETURN

+$!

+$ INITIALISE:

+$!

+$! Save old value of the logical name OPENSSL

+$!

+$ __SAVE_OPENSSL = F$TRNLNM("OPENSSL","LNM$PROCESS_TABLE")

+$!

+$! Save directory information

+$!

+$ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"

+$ __HERE = F$EDIT(__HERE,"UPCASE")

+$ __TOP = __HERE - "CRYPTO]"

+$ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"

+$!

+$! Set up the logical name OPENSSL to point at the include directory

+$!

+$ DEFINE OPENSSL/NOLOG '__INCLUDE'

+$!

+$! Done

+$!

+$ RETURN

+$!

+$ CLEANUP:

+$!

+$! Restore the logical name OPENSSL if it had a value

+$!

+$ IF __SAVE_OPENSSL .EQS. ""

+$ THEN

+$   DEASSIGN OPENSSL

+$ ELSE

+$   DEFINE/NOLOG OPENSSL '__SAVE_OPENSSL'

+$ ENDIF

+$!

+$! Done

+$!

+$ RETURN

diff --git a/openssl/crypto/dsa/dsa_ossl.c b/openssl/crypto/dsa/dsa_ossl.c
index 1fb665ec5..927f6e2b8 100644
--- a/openssl/crypto/dsa/dsa_ossl.c
+++ b/openssl/crypto/dsa/dsa_ossl.c
@@ -1,416 +1,398 @@
-/* crypto/dsa/dsa_ossl.c */
-/* 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.]
- */
-
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/sha.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-#include <openssl/asn1.h>
-
-static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
-static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-			 DSA *dsa);
-static int dsa_init(DSA *dsa);
-static int dsa_finish(DSA *dsa);
-
-static DSA_METHOD openssl_dsa_meth = {
-"OpenSSL DSA method",
-dsa_do_sign,
-dsa_sign_setup,
-dsa_do_verify,
-NULL, /* dsa_mod_exp, */
-NULL, /* dsa_bn_mod_exp, */
-dsa_init,
-dsa_finish,
-0,
-NULL,
-NULL,
-NULL
-};
-
-/* These macro wrappers replace attempts to use the dsa_mod_exp() and
- * bn_mod_exp() handlers in the DSA_METHOD structure. We avoid the problem of
- * having a the macro work as an expression by bundling an "err_instr". So;
- * 
- *     if (!dsa->meth->bn_mod_exp(dsa, r,dsa->g,&k,dsa->p,ctx,
- *                 dsa->method_mont_p)) goto err;
- *
- * can be replaced by;
- *
- *     DSA_BN_MOD_EXP(goto err, dsa, r, dsa->g, &k, dsa->p, ctx,
- *                 dsa->method_mont_p);
- */
-
-#define DSA_MOD_EXP(err_instr,dsa,rr,a1,p1,a2,p2,m,ctx,in_mont) \
-	do { \
-	int _tmp_res53; \
-	if((dsa)->meth->dsa_mod_exp) \
-		_tmp_res53 = (dsa)->meth->dsa_mod_exp((dsa), (rr), (a1), (p1), \
-				(a2), (p2), (m), (ctx), (in_mont)); \
-	else \
-		_tmp_res53 = BN_mod_exp2_mont((rr), (a1), (p1), (a2), (p2), \
-				(m), (ctx), (in_mont)); \
-	if(!_tmp_res53) err_instr; \
-	} while(0)
-#define DSA_BN_MOD_EXP(err_instr,dsa,r,a,p,m,ctx,m_ctx) \
-	do { \
-	int _tmp_res53; \
-	if((dsa)->meth->bn_mod_exp) \
-		_tmp_res53 = (dsa)->meth->bn_mod_exp((dsa), (r), (a), (p), \
-				(m), (ctx), (m_ctx)); \
-	else \
-		_tmp_res53 = BN_mod_exp_mont((r), (a), (p), (m), (ctx), (m_ctx)); \
-	if(!_tmp_res53) err_instr; \
-	} while(0)
-
-const DSA_METHOD *DSA_OpenSSL(void)
-{
-	return &openssl_dsa_meth;
-}
-
-static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
-	{
-	BIGNUM *kinv=NULL,*r=NULL,*s=NULL;
-	BIGNUM m;
-	BIGNUM xr;
-	BN_CTX *ctx=NULL;
-	int reason=ERR_R_BN_LIB;
-	DSA_SIG *ret=NULL;
-
-	BN_init(&m);
-	BN_init(&xr);
-
-	if (!dsa->p || !dsa->q || !dsa->g)
-		{
-		reason=DSA_R_MISSING_PARAMETERS;
-		goto err;
-		}
-
-	s=BN_new();
-	if (s == NULL) goto err;
-
-	/* reject a excessive digest length (currently at most
-	 * dsa-with-SHA256 is supported) */
-	if (dlen > SHA256_DIGEST_LENGTH)
-		{
-		reason=DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE;
-		goto err;
-		}
-
-	ctx=BN_CTX_new();
-	if (ctx == NULL) goto err;
-
-	if ((dsa->kinv == NULL) || (dsa->r == NULL))
-		{
-		if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;
-		}
-	else
-		{
-		kinv=dsa->kinv;
-		dsa->kinv=NULL;
-		r=dsa->r;
-		dsa->r=NULL;
-		}
-
-	
-	if (dlen > BN_num_bytes(dsa->q))
-		/* if the digest length is greater than the size of q use the
-		 * BN_num_bits(dsa->q) leftmost bits of the digest, see
-		 * fips 186-3, 4.2 */
-		dlen = BN_num_bytes(dsa->q);
-	if (BN_bin2bn(dgst,dlen,&m) == NULL)
-		goto err;
-
-	/* Compute  s = inv(k) (m + xr) mod q */
-	if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */
-	if (!BN_add(s, &xr, &m)) goto err;		/* s = m + xr */
-	if (BN_cmp(s,dsa->q) > 0)
-		if (!BN_sub(s,s,dsa->q)) goto err;
-	if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;
-
-	ret=DSA_SIG_new();
-	if (ret == NULL) goto err;
-	ret->r = r;
-	ret->s = s;
-	
-err:
-	if (!ret)
-		{
-		DSAerr(DSA_F_DSA_DO_SIGN,reason);
-		BN_free(r);
-		BN_free(s);
-		}
-	if (ctx != NULL) BN_CTX_free(ctx);
-	BN_clear_free(&m);
-	BN_clear_free(&xr);
-	if (kinv != NULL) /* dsa->kinv is NULL now if we used it */
-	    BN_clear_free(kinv);
-	return(ret);
-	}
-
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
-	{
-	BN_CTX *ctx;
-	BIGNUM k,kq,*K,*kinv=NULL,*r=NULL;
-	int ret=0;
-
-	if (!dsa->p || !dsa->q || !dsa->g)
-		{
-		DSAerr(DSA_F_DSA_SIGN_SETUP,DSA_R_MISSING_PARAMETERS);
-		return 0;
-		}
-
-	BN_init(&k);
-	BN_init(&kq);
-
-	if (ctx_in == NULL)
-		{
-		if ((ctx=BN_CTX_new()) == NULL) goto err;
-		}
-	else
-		ctx=ctx_in;
-
-	if ((r=BN_new()) == NULL) goto err;
-
-	/* Get random k */
-	do
-		if (!BN_rand_range(&k, dsa->q)) goto err;
-	while (BN_is_zero(&k));
-	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
-		{
-		BN_set_flags(&k, BN_FLG_CONSTTIME);
-		}
-
-	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
-		{
-		if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p,
-						CRYPTO_LOCK_DSA,
-						dsa->p, ctx))
-			goto err;
-		}
-
-	/* Compute r = (g^k mod p) mod q */
-
-	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
-		{
-		if (!BN_copy(&kq, &k)) goto err;
-
-		/* We do not want timing information to leak the length of k,
-		 * so we compute g^k using an equivalent exponent of fixed length.
-		 *
-		 * (This is a kludge that we need because the BN_mod_exp_mont()
-		 * does not let us specify the desired timing behaviour.) */
-
-		if (!BN_add(&kq, &kq, dsa->q)) goto err;
-		if (BN_num_bits(&kq) <= BN_num_bits(dsa->q))
-			{
-			if (!BN_add(&kq, &kq, dsa->q)) goto err;
-			}
-
-		K = &kq;
-		}
-	else
-		{
-		K = &k;
-		}
-	DSA_BN_MOD_EXP(goto err, dsa, r, dsa->g, K, dsa->p, ctx,
-			dsa->method_mont_p);
-	if (!BN_mod(r,r,dsa->q,ctx)) goto err;
-
-	/* Compute  part of 's = inv(k) (m + xr) mod q' */
-	if ((kinv=BN_mod_inverse(NULL,&k,dsa->q,ctx)) == NULL) goto err;
-
-	if (*kinvp != NULL) BN_clear_free(*kinvp);
-	*kinvp=kinv;
-	kinv=NULL;
-	if (*rp != NULL) BN_clear_free(*rp);
-	*rp=r;
-	ret=1;
-err:
-	if (!ret)
-		{
-		DSAerr(DSA_F_DSA_SIGN_SETUP,ERR_R_BN_LIB);
-		if (r != NULL)
-			BN_clear_free(r);
-		}
-	if (ctx_in == NULL) BN_CTX_free(ctx);
-	BN_clear_free(&k);
-	BN_clear_free(&kq);
-	return(ret);
-	}
-
-static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-			 DSA *dsa)
-	{
-	BN_CTX *ctx;
-	BIGNUM u1,u2,t1;
-	BN_MONT_CTX *mont=NULL;
-	int ret = -1, i;
-	if (!dsa->p || !dsa->q || !dsa->g)
-		{
-		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MISSING_PARAMETERS);
-		return -1;
-		}
-
-	i = BN_num_bits(dsa->q);
-	/* fips 186-3 allows only different sizes for q */
-	if (i != 160 && i != 224 && i != 256)
-		{
-		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE);
-		return -1;
-		}
-
-	if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS)
-		{
-		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE);
-		return -1;
-		}
-
-	/* reject a excessive digest length (currently at most
-	 * dsa-with-SHA256 is supported) */
-	if (dgst_len > SHA256_DIGEST_LENGTH)
-		{
-		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-		return -1;
-		}
-
-	BN_init(&u1);
-	BN_init(&u2);
-	BN_init(&t1);
-
-	if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-	if (BN_is_zero(sig->r) || BN_is_negative(sig->r) ||
-	    BN_ucmp(sig->r, dsa->q) >= 0)
-		{
-		ret = 0;
-		goto err;
-		}
-	if (BN_is_zero(sig->s) || BN_is_negative(sig->s) ||
-	    BN_ucmp(sig->s, dsa->q) >= 0)
-		{
-		ret = 0;
-		goto err;
-		}
-
-	/* Calculate W = inv(S) mod Q
-	 * save W in u2 */
-	if ((BN_mod_inverse(&u2,sig->s,dsa->q,ctx)) == NULL) goto err;
-
-	/* save M in u1 */
-	if (dgst_len > (i >> 3))
-		/* if the digest length is greater than the size of q use the
-		 * BN_num_bits(dsa->q) leftmost bits of the digest, see
-		 * fips 186-3, 4.2 */
-		dgst_len = (i >> 3);
-	if (BN_bin2bn(dgst,dgst_len,&u1) == NULL) goto err;
-
-	/* u1 = M * w mod q */
-	if (!BN_mod_mul(&u1,&u1,&u2,dsa->q,ctx)) goto err;
-
-	/* u2 = r * w mod q */
-	if (!BN_mod_mul(&u2,sig->r,&u2,dsa->q,ctx)) goto err;
-
-
-	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
-		{
-		mont = BN_MONT_CTX_set_locked(&dsa->method_mont_p,
-					CRYPTO_LOCK_DSA, dsa->p, ctx);
-		if (!mont)
-			goto err;
-		}
-
-
-	DSA_MOD_EXP(goto err, dsa, &t1, dsa->g, &u1, dsa->pub_key, &u2, dsa->p, ctx, mont);
-	/* BN_copy(&u1,&t1); */
-	/* let u1 = u1 mod q */
-	if (!BN_mod(&u1,&t1,dsa->q,ctx)) goto err;
-
-	/* V is now in u1.  If the signature is correct, it will be
-	 * equal to R. */
-	ret=(BN_ucmp(&u1, sig->r) == 0);
-
-	err:
-	/* XXX: surely this is wrong - if ret is 0, it just didn't verify;
-	   there is no error in BN. Test should be ret == -1 (Ben) */
-	if (ret != 1) DSAerr(DSA_F_DSA_DO_VERIFY,ERR_R_BN_LIB);
-	if (ctx != NULL) BN_CTX_free(ctx);
-	BN_free(&u1);
-	BN_free(&u2);
-	BN_free(&t1);
-	return(ret);
-	}
-
-static int dsa_init(DSA *dsa)
-{
-	dsa->flags|=DSA_FLAG_CACHE_MONT_P;
-	return(1);
-}
-
-static int dsa_finish(DSA *dsa)
-{
-	if(dsa->method_mont_p)
-		BN_MONT_CTX_free(dsa->method_mont_p);
-	return(1);
-}
-
+/* crypto/dsa/dsa_ossl.c */

+/* 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.]

+ */

+

+/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */

+

+#include <stdio.h>

+#include "cryptlib.h"

+#include <openssl/bn.h>

+#include <openssl/sha.h>

+#include <openssl/dsa.h>

+#include <openssl/rand.h>

+#include <openssl/asn1.h>

+

+static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);

+static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);

+static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,

+			 DSA *dsa);

+static int dsa_init(DSA *dsa);

+static int dsa_finish(DSA *dsa);

+

+static DSA_METHOD openssl_dsa_meth = {

+"OpenSSL DSA method",

+dsa_do_sign,

+dsa_sign_setup,

+dsa_do_verify,

+NULL, /* dsa_mod_exp, */

+NULL, /* dsa_bn_mod_exp, */

+dsa_init,

+dsa_finish,

+0,

+NULL,

+NULL,

+NULL

+};

+

+/* These macro wrappers replace attempts to use the dsa_mod_exp() and

+ * bn_mod_exp() handlers in the DSA_METHOD structure. We avoid the problem of

+ * having a the macro work as an expression by bundling an "err_instr". So;

+ * 

+ *     if (!dsa->meth->bn_mod_exp(dsa, r,dsa->g,&k,dsa->p,ctx,

+ *                 dsa->method_mont_p)) goto err;

+ *

+ * can be replaced by;

+ *

+ *     DSA_BN_MOD_EXP(goto err, dsa, r, dsa->g, &k, dsa->p, ctx,

+ *                 dsa->method_mont_p);

+ */

+

+#define DSA_MOD_EXP(err_instr,dsa,rr,a1,p1,a2,p2,m,ctx,in_mont) \

+	do { \

+	int _tmp_res53; \

+	if((dsa)->meth->dsa_mod_exp) \

+		_tmp_res53 = (dsa)->meth->dsa_mod_exp((dsa), (rr), (a1), (p1), \

+				(a2), (p2), (m), (ctx), (in_mont)); \

+	else \

+		_tmp_res53 = BN_mod_exp2_mont((rr), (a1), (p1), (a2), (p2), \

+				(m), (ctx), (in_mont)); \

+	if(!_tmp_res53) err_instr; \

+	} while(0)

+#define DSA_BN_MOD_EXP(err_instr,dsa,r,a,p,m,ctx,m_ctx) \

+	do { \

+	int _tmp_res53; \

+	if((dsa)->meth->bn_mod_exp) \

+		_tmp_res53 = (dsa)->meth->bn_mod_exp((dsa), (r), (a), (p), \

+				(m), (ctx), (m_ctx)); \

+	else \

+		_tmp_res53 = BN_mod_exp_mont((r), (a), (p), (m), (ctx), (m_ctx)); \

+	if(!_tmp_res53) err_instr; \

+	} while(0)

+

+const DSA_METHOD *DSA_OpenSSL(void)

+{

+	return &openssl_dsa_meth;

+}

+

+static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)

+	{

+	BIGNUM *kinv=NULL,*r=NULL,*s=NULL;

+	BIGNUM m;

+	BIGNUM xr;

+	BN_CTX *ctx=NULL;

+	int reason=ERR_R_BN_LIB;

+	DSA_SIG *ret=NULL;

+

+	BN_init(&m);

+	BN_init(&xr);

+

+	if (!dsa->p || !dsa->q || !dsa->g)

+		{

+		reason=DSA_R_MISSING_PARAMETERS;

+		goto err;

+		}

+

+	s=BN_new();

+	if (s == NULL) goto err;

+	ctx=BN_CTX_new();

+	if (ctx == NULL) goto err;

+

+	if ((dsa->kinv == NULL) || (dsa->r == NULL))

+		{

+		if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;

+		}

+	else

+		{

+		kinv=dsa->kinv;

+		dsa->kinv=NULL;

+		r=dsa->r;

+		dsa->r=NULL;

+		}

+

+	

+	if (dlen > BN_num_bytes(dsa->q))

+		/* if the digest length is greater than the size of q use the

+		 * BN_num_bits(dsa->q) leftmost bits of the digest, see

+		 * fips 186-3, 4.2 */

+		dlen = BN_num_bytes(dsa->q);

+	if (BN_bin2bn(dgst,dlen,&m) == NULL)

+		goto err;

+

+	/* Compute  s = inv(k) (m + xr) mod q */

+	if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */

+	if (!BN_add(s, &xr, &m)) goto err;		/* s = m + xr */

+	if (BN_cmp(s,dsa->q) > 0)

+		if (!BN_sub(s,s,dsa->q)) goto err;

+	if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;

+

+	ret=DSA_SIG_new();

+	if (ret == NULL) goto err;

+	ret->r = r;

+	ret->s = s;

+	

+err:

+	if (!ret)

+		{

+		DSAerr(DSA_F_DSA_DO_SIGN,reason);

+		BN_free(r);

+		BN_free(s);

+		}

+	if (ctx != NULL) BN_CTX_free(ctx);

+	BN_clear_free(&m);

+	BN_clear_free(&xr);

+	if (kinv != NULL) /* dsa->kinv is NULL now if we used it */

+	    BN_clear_free(kinv);

+	return(ret);

+	}

+

+static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)

+	{

+	BN_CTX *ctx;

+	BIGNUM k,kq,*K,*kinv=NULL,*r=NULL;

+	int ret=0;

+

+	if (!dsa->p || !dsa->q || !dsa->g)

+		{

+		DSAerr(DSA_F_DSA_SIGN_SETUP,DSA_R_MISSING_PARAMETERS);

+		return 0;

+		}

+

+	BN_init(&k);

+	BN_init(&kq);

+

+	if (ctx_in == NULL)

+		{

+		if ((ctx=BN_CTX_new()) == NULL) goto err;

+		}

+	else

+		ctx=ctx_in;

+

+	if ((r=BN_new()) == NULL) goto err;

+

+	/* Get random k */

+	do

+		if (!BN_rand_range(&k, dsa->q)) goto err;

+	while (BN_is_zero(&k));

+	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)

+		{

+		BN_set_flags(&k, BN_FLG_CONSTTIME);

+		}

+

+	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)

+		{

+		if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p,

+						CRYPTO_LOCK_DSA,

+						dsa->p, ctx))

+			goto err;

+		}

+

+	/* Compute r = (g^k mod p) mod q */

+

+	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)

+		{

+		if (!BN_copy(&kq, &k)) goto err;

+

+		/* We do not want timing information to leak the length of k,

+		 * so we compute g^k using an equivalent exponent of fixed length.

+		 *

+		 * (This is a kludge that we need because the BN_mod_exp_mont()

+		 * does not let us specify the desired timing behaviour.) */

+

+		if (!BN_add(&kq, &kq, dsa->q)) goto err;

+		if (BN_num_bits(&kq) <= BN_num_bits(dsa->q))

+			{

+			if (!BN_add(&kq, &kq, dsa->q)) goto err;

+			}

+

+		K = &kq;

+		}

+	else

+		{

+		K = &k;

+		}

+	DSA_BN_MOD_EXP(goto err, dsa, r, dsa->g, K, dsa->p, ctx,

+			dsa->method_mont_p);

+	if (!BN_mod(r,r,dsa->q,ctx)) goto err;

+

+	/* Compute  part of 's = inv(k) (m + xr) mod q' */

+	if ((kinv=BN_mod_inverse(NULL,&k,dsa->q,ctx)) == NULL) goto err;

+

+	if (*kinvp != NULL) BN_clear_free(*kinvp);

+	*kinvp=kinv;

+	kinv=NULL;

+	if (*rp != NULL) BN_clear_free(*rp);

+	*rp=r;

+	ret=1;

+err:

+	if (!ret)

+		{

+		DSAerr(DSA_F_DSA_SIGN_SETUP,ERR_R_BN_LIB);

+		if (r != NULL)

+			BN_clear_free(r);

+		}

+	if (ctx_in == NULL) BN_CTX_free(ctx);

+	BN_clear_free(&k);

+	BN_clear_free(&kq);

+	return(ret);

+	}

+

+static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,

+			 DSA *dsa)

+	{

+	BN_CTX *ctx;

+	BIGNUM u1,u2,t1;

+	BN_MONT_CTX *mont=NULL;

+	int ret = -1, i;

+	if (!dsa->p || !dsa->q || !dsa->g)

+		{

+		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MISSING_PARAMETERS);

+		return -1;

+		}

+

+	i = BN_num_bits(dsa->q);

+	/* fips 186-3 allows only different sizes for q */

+	if (i != 160 && i != 224 && i != 256)

+		{

+		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE);

+		return -1;

+		}

+

+	if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS)

+		{

+		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE);

+		return -1;

+		}

+	BN_init(&u1);

+	BN_init(&u2);

+	BN_init(&t1);

+

+	if ((ctx=BN_CTX_new()) == NULL) goto err;

+

+	if (BN_is_zero(sig->r) || BN_is_negative(sig->r) ||

+	    BN_ucmp(sig->r, dsa->q) >= 0)

+		{

+		ret = 0;

+		goto err;

+		}

+	if (BN_is_zero(sig->s) || BN_is_negative(sig->s) ||

+	    BN_ucmp(sig->s, dsa->q) >= 0)

+		{

+		ret = 0;

+		goto err;

+		}

+

+	/* Calculate W = inv(S) mod Q

+	 * save W in u2 */

+	if ((BN_mod_inverse(&u2,sig->s,dsa->q,ctx)) == NULL) goto err;

+

+	/* save M in u1 */

+	if (dgst_len > (i >> 3))

+		/* if the digest length is greater than the size of q use the

+		 * BN_num_bits(dsa->q) leftmost bits of the digest, see

+		 * fips 186-3, 4.2 */

+		dgst_len = (i >> 3);

+	if (BN_bin2bn(dgst,dgst_len,&u1) == NULL) goto err;

+

+	/* u1 = M * w mod q */

+	if (!BN_mod_mul(&u1,&u1,&u2,dsa->q,ctx)) goto err;

+

+	/* u2 = r * w mod q */

+	if (!BN_mod_mul(&u2,sig->r,&u2,dsa->q,ctx)) goto err;

+

+

+	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)

+		{

+		mont = BN_MONT_CTX_set_locked(&dsa->method_mont_p,

+					CRYPTO_LOCK_DSA, dsa->p, ctx);

+		if (!mont)

+			goto err;

+		}

+

+

+	DSA_MOD_EXP(goto err, dsa, &t1, dsa->g, &u1, dsa->pub_key, &u2, dsa->p, ctx, mont);

+	/* BN_copy(&u1,&t1); */

+	/* let u1 = u1 mod q */

+	if (!BN_mod(&u1,&t1,dsa->q,ctx)) goto err;

+

+	/* V is now in u1.  If the signature is correct, it will be

+	 * equal to R. */

+	ret=(BN_ucmp(&u1, sig->r) == 0);

+

+	err:

+	/* XXX: surely this is wrong - if ret is 0, it just didn't verify;

+	   there is no error in BN. Test should be ret == -1 (Ben) */

+	if (ret != 1) DSAerr(DSA_F_DSA_DO_VERIFY,ERR_R_BN_LIB);

+	if (ctx != NULL) BN_CTX_free(ctx);

+	BN_free(&u1);

+	BN_free(&u2);

+	BN_free(&t1);

+	return(ret);

+	}

+

+static int dsa_init(DSA *dsa)

+{

+	dsa->flags|=DSA_FLAG_CACHE_MONT_P;

+	return(1);

+}

+

+static int dsa_finish(DSA *dsa)

+{

+	if(dsa->method_mont_p)

+		BN_MONT_CTX_free(dsa->method_mont_p);

+	return(1);

+}

+

diff --git a/openssl/crypto/ec/ec2_smpl.c b/openssl/crypto/ec/ec2_smpl.c
index cf357b462..1725dd128 100644
--- a/openssl/crypto/ec/ec2_smpl.c
+++ b/openssl/crypto/ec/ec2_smpl.c
@@ -1,1039 +1,1042 @@
-/* crypto/ec/ec2_smpl.c */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The software is originally written by Sheueling Chang Shantz and
- * Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright (c) 1998-2005 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
- *    openssl-core@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 <openssl/err.h>
-
-#include "ec_lcl.h"
-
-
-const EC_METHOD *EC_GF2m_simple_method(void)
-	{
-	static const EC_METHOD ret = {
-		NID_X9_62_characteristic_two_field,
-		ec_GF2m_simple_group_init,
-		ec_GF2m_simple_group_finish,
-		ec_GF2m_simple_group_clear_finish,
-		ec_GF2m_simple_group_copy,
-		ec_GF2m_simple_group_set_curve,
-		ec_GF2m_simple_group_get_curve,
-		ec_GF2m_simple_group_get_degree,
-		ec_GF2m_simple_group_check_discriminant,
-		ec_GF2m_simple_point_init,
-		ec_GF2m_simple_point_finish,
-		ec_GF2m_simple_point_clear_finish,
-		ec_GF2m_simple_point_copy,
-		ec_GF2m_simple_point_set_to_infinity,
-		0 /* set_Jprojective_coordinates_GFp */,
-		0 /* get_Jprojective_coordinates_GFp */,
-		ec_GF2m_simple_point_set_affine_coordinates,
-		ec_GF2m_simple_point_get_affine_coordinates,
-		ec_GF2m_simple_set_compressed_coordinates,
-		ec_GF2m_simple_point2oct,
-		ec_GF2m_simple_oct2point,
-		ec_GF2m_simple_add,
-		ec_GF2m_simple_dbl,
-		ec_GF2m_simple_invert,
-		ec_GF2m_simple_is_at_infinity,
-		ec_GF2m_simple_is_on_curve,
-		ec_GF2m_simple_cmp,
-		ec_GF2m_simple_make_affine,
-		ec_GF2m_simple_points_make_affine,
-
-		/* the following three method functions are defined in ec2_mult.c */
-		ec_GF2m_simple_mul,
-		ec_GF2m_precompute_mult,
-		ec_GF2m_have_precompute_mult,
-
-		ec_GF2m_simple_field_mul,
-		ec_GF2m_simple_field_sqr,
-		ec_GF2m_simple_field_div,
-		0 /* field_encode */,
-		0 /* field_decode */,
-		0 /* field_set_to_one */ };
-
-	return &ret;
-	}
-
-
-/* Initialize a GF(2^m)-based EC_GROUP structure.
- * Note that all other members are handled by EC_GROUP_new.
- */
-int ec_GF2m_simple_group_init(EC_GROUP *group)
-	{
-	BN_init(&group->field);
-	BN_init(&group->a);
-	BN_init(&group->b);
-	return 1;
-	}
-
-
-/* Free a GF(2^m)-based EC_GROUP structure.
- * Note that all other members are handled by EC_GROUP_free.
- */
-void ec_GF2m_simple_group_finish(EC_GROUP *group)
-	{
-	BN_free(&group->field);
-	BN_free(&group->a);
-	BN_free(&group->b);
-	}
-
-
-/* Clear and free a GF(2^m)-based EC_GROUP structure.
- * Note that all other members are handled by EC_GROUP_clear_free.
- */
-void ec_GF2m_simple_group_clear_finish(EC_GROUP *group)
-	{
-	BN_clear_free(&group->field);
-	BN_clear_free(&group->a);
-	BN_clear_free(&group->b);
-	group->poly[0] = 0;
-	group->poly[1] = 0;
-	group->poly[2] = 0;
-	group->poly[3] = 0;
-	group->poly[4] = 0;
-	group->poly[5] = -1;
-	}
-
-
-/* Copy a GF(2^m)-based EC_GROUP structure.
- * Note that all other members are handled by EC_GROUP_copy.
- */
-int ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
-	{
-	int i;
-	if (!BN_copy(&dest->field, &src->field)) return 0;
-	if (!BN_copy(&dest->a, &src->a)) return 0;
-	if (!BN_copy(&dest->b, &src->b)) return 0;
-	dest->poly[0] = src->poly[0];
-	dest->poly[1] = src->poly[1];
-	dest->poly[2] = src->poly[2];
-	dest->poly[3] = src->poly[3];
-	dest->poly[4] = src->poly[4];
-	dest->poly[5] = src->poly[5];
-	if (bn_wexpand(&dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) return 0;
-	if (bn_wexpand(&dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) return 0;
-	for (i = dest->a.top; i < dest->a.dmax; i++) dest->a.d[i] = 0;
-	for (i = dest->b.top; i < dest->b.dmax; i++) dest->b.d[i] = 0;
-	return 1;
-	}
-
-
-/* Set the curve parameters of an EC_GROUP structure. */
-int ec_GF2m_simple_group_set_curve(EC_GROUP *group,
-	const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	int ret = 0, i;
-
-	/* group->field */
-	if (!BN_copy(&group->field, p)) goto err;
-	i = BN_GF2m_poly2arr(&group->field, group->poly, 6) - 1;
-	if ((i != 5) && (i != 3))
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
-		goto err;
-		}
-
-	/* group->a */
-	if (!BN_GF2m_mod_arr(&group->a, a, group->poly)) goto err;
-	if(bn_wexpand(&group->a, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) goto err;
-	for (i = group->a.top; i < group->a.dmax; i++) group->a.d[i] = 0;
-	
-	/* group->b */
-	if (!BN_GF2m_mod_arr(&group->b, b, group->poly)) goto err;
-	if(bn_wexpand(&group->b, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) goto err;
-	for (i = group->b.top; i < group->b.dmax; i++) group->b.d[i] = 0;
-		
-	ret = 1;
-  err:
-	return ret;
-	}
-
-
-/* Get the curve parameters of an EC_GROUP structure.
- * If p, a, or b are NULL then there values will not be set but the method will return with success.
- */
-int ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
-	{
-	int ret = 0;
-	
-	if (p != NULL)
-		{
-		if (!BN_copy(p, &group->field)) return 0;
-		}
-
-	if (a != NULL)
-		{
-		if (!BN_copy(a, &group->a)) goto err;
-		}
-
-	if (b != NULL)
-		{
-		if (!BN_copy(b, &group->b)) goto err;
-		}
-	
-	ret = 1;
-	
-  err:
-	return ret;
-	}
-
-
-/* Gets the degree of the field.  For a curve over GF(2^m) this is the value m. */
-int ec_GF2m_simple_group_get_degree(const EC_GROUP *group)
-	{
-	return BN_num_bits(&group->field)-1;
-	}
-
-
-/* Checks the discriminant of the curve.
- * y^2 + x*y = x^3 + a*x^2 + b is an elliptic curve <=> b != 0 (mod p) 
- */
-int ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
-	{
-	int ret = 0;
-	BIGNUM *b;
-	BN_CTX *new_ctx = NULL;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			{
-			ECerr(EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT, ERR_R_MALLOC_FAILURE);
-			goto err;
-			}
-		}
-	BN_CTX_start(ctx);
-	b = BN_CTX_get(ctx);
-	if (b == NULL) goto err;
-
-	if (!BN_GF2m_mod_arr(b, &group->b, group->poly)) goto err;
-	
-	/* check the discriminant:
-	 * y^2 + x*y = x^3 + a*x^2 + b is an elliptic curve <=> b != 0 (mod p) 
-	 */
-	if (BN_is_zero(b)) goto err;
-
-	ret = 1;
-
-err:
-	if (ctx != NULL)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-/* Initializes an EC_POINT. */
-int ec_GF2m_simple_point_init(EC_POINT *point)
-	{
-	BN_init(&point->X);
-	BN_init(&point->Y);
-	BN_init(&point->Z);
-	return 1;
-	}
-
-
-/* Frees an EC_POINT. */
-void ec_GF2m_simple_point_finish(EC_POINT *point)
-	{
-	BN_free(&point->X);
-	BN_free(&point->Y);
-	BN_free(&point->Z);
-	}
-
-
-/* Clears and frees an EC_POINT. */
-void ec_GF2m_simple_point_clear_finish(EC_POINT *point)
-	{
-	BN_clear_free(&point->X);
-	BN_clear_free(&point->Y);
-	BN_clear_free(&point->Z);
-	point->Z_is_one = 0;
-	}
-
-
-/* Copy the contents of one EC_POINT into another.  Assumes dest is initialized. */
-int ec_GF2m_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
-	{
-	if (!BN_copy(&dest->X, &src->X)) return 0;
-	if (!BN_copy(&dest->Y, &src->Y)) return 0;
-	if (!BN_copy(&dest->Z, &src->Z)) return 0;
-	dest->Z_is_one = src->Z_is_one;
-
-	return 1;
-	}
-
-
-/* Set an EC_POINT to the point at infinity.  
- * A point at infinity is represented by having Z=0.
- */
-int ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
-	{
-	point->Z_is_one = 0;
-	BN_zero(&point->Z);
-	return 1;
-	}
-
-
-/* Set the coordinates of an EC_POINT using affine coordinates. 
- * Note that the simple implementation only uses affine coordinates.
- */
-int ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)
-	{
-	int ret = 0;	
-	if (x == NULL || y == NULL)
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES, ERR_R_PASSED_NULL_PARAMETER);
-		return 0;
-		}
-
-	if (!BN_copy(&point->X, x)) goto err;
-	BN_set_negative(&point->X, 0);
-	if (!BN_copy(&point->Y, y)) goto err;
-	BN_set_negative(&point->Y, 0);
-	if (!BN_copy(&point->Z, BN_value_one())) goto err;
-	BN_set_negative(&point->Z, 0);
-	point->Z_is_one = 1;
-	ret = 1;
-
-  err:
-	return ret;
-	}
-
-
-/* Gets the affine coordinates of an EC_POINT. 
- * Note that the simple implementation only uses affine coordinates.
- */
-int ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,
-	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
-	{
-	int ret = 0;
-
-	if (EC_POINT_is_at_infinity(group, point))
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES, EC_R_POINT_AT_INFINITY);
-		return 0;
-		}
-
-	if (BN_cmp(&point->Z, BN_value_one())) 
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-		return 0;
-		}
-	if (x != NULL)
-		{
-		if (!BN_copy(x, &point->X)) goto err;
-		BN_set_negative(x, 0);
-		}
-	if (y != NULL)
-		{
-		if (!BN_copy(y, &point->Y)) goto err;
-		BN_set_negative(y, 0);
-		}
-	ret = 1;
-		
- err:
-	return ret;
-	}
-
-
-/* Calculates and sets the affine coordinates of an EC_POINT from the given
- * compressed coordinates.  Uses algorithm 2.3.4 of SEC 1. 
- * Note that the simple implementation only uses affine coordinates.
- *
- * The method is from the following publication:
- * 
- *     Harper, Menezes, Vanstone:
- *     "Public-Key Cryptosystems with Very Small Key Lengths",
- *     EUROCRYPT '92, Springer-Verlag LNCS 658,
- *     published February 1993
- *
- * US Patents 6,141,420 and 6,618,483 (Vanstone, Mullin, Agnew) describe
- * the same method, but claim no priority date earlier than July 29, 1994
- * (and additionally fail to cite the EUROCRYPT '92 publication as prior art).
- */
-int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x_, int y_bit, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *tmp, *x, *y, *z;
-	int ret = 0, z0;
-
-	/* clear error queue */
-	ERR_clear_error();
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	y_bit = (y_bit != 0) ? 1 : 0;
-
-	BN_CTX_start(ctx);
-	tmp = BN_CTX_get(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	z = BN_CTX_get(ctx);
-	if (z == NULL) goto err;
-
-	if (!BN_GF2m_mod_arr(x, x_, group->poly)) goto err;
-	if (BN_is_zero(x))
-		{
-		if (!BN_GF2m_mod_sqrt_arr(y, &group->b, group->poly, ctx)) goto err;
-		}
-	else
-		{
-		if (!group->meth->field_sqr(group, tmp, x, ctx)) goto err;
-		if (!group->meth->field_div(group, tmp, &group->b, tmp, ctx)) goto err;
-		if (!BN_GF2m_add(tmp, &group->a, tmp)) goto err;
-		if (!BN_GF2m_add(tmp, x, tmp)) goto err;
-		if (!BN_GF2m_mod_solve_quad_arr(z, tmp, group->poly, ctx))
-			{
-			unsigned long err = ERR_peek_last_error();
-			
-			if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NO_SOLUTION)
-				{
-				ERR_clear_error();
-				ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-				}
-			else
-				ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
-			goto err;
-			}
-		z0 = (BN_is_odd(z)) ? 1 : 0;
-		if (!group->meth->field_mul(group, y, x, z, ctx)) goto err;
-		if (z0 != y_bit)
-			{
-			if (!BN_GF2m_add(y, y, x)) goto err;
-			}
-		}
-
-	if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
-
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-/* Converts an EC_POINT to an octet string.  
- * If buf is NULL, the encoded length will be returned.
- * If the length len of buf is smaller than required an error will be returned.
- */
-size_t ec_GF2m_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-	unsigned char *buf, size_t len, BN_CTX *ctx)
-	{
-	size_t ret;
-	BN_CTX *new_ctx = NULL;
-	int used_ctx = 0;
-	BIGNUM *x, *y, *yxi;
-	size_t field_len, i, skip;
-
-	if ((form != POINT_CONVERSION_COMPRESSED)
-		&& (form != POINT_CONVERSION_UNCOMPRESSED)
-		&& (form != POINT_CONVERSION_HYBRID))
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
-		goto err;
-		}
-
-	if (EC_POINT_is_at_infinity(group, point))
-		{
-		/* encodes to a single 0 octet */
-		if (buf != NULL)
-			{
-			if (len < 1)
-				{
-				ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-				return 0;
-				}
-			buf[0] = 0;
-			}
-		return 1;
-		}
-
-
-	/* ret := required output buffer length */
-	field_len = (EC_GROUP_get_degree(group) + 7) / 8;
-	ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-	/* if 'buf' is NULL, just return required length */
-	if (buf != NULL)
-		{
-		if (len < ret)
-			{
-			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-			goto err;
-			}
-
-		if (ctx == NULL)
-			{
-			ctx = new_ctx = BN_CTX_new();
-			if (ctx == NULL)
-				return 0;
-			}
-
-		BN_CTX_start(ctx);
-		used_ctx = 1;
-		x = BN_CTX_get(ctx);
-		y = BN_CTX_get(ctx);
-		yxi = BN_CTX_get(ctx);
-		if (yxi == NULL) goto err;
-
-		if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
-
-		buf[0] = form;
-		if ((form != POINT_CONVERSION_UNCOMPRESSED) && !BN_is_zero(x))
-			{
-			if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
-			if (BN_is_odd(yxi)) buf[0]++;
-			}
-
-		i = 1;
-		
-		skip = field_len - BN_num_bytes(x);
-		if (skip > field_len)
-			{
-			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-		while (skip > 0)
-			{
-			buf[i++] = 0;
-			skip--;
-			}
-		skip = BN_bn2bin(x, buf + i);
-		i += skip;
-		if (i != 1 + field_len)
-			{
-			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-
-		if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
-			{
-			skip = field_len - BN_num_bytes(y);
-			if (skip > field_len)
-				{
-				ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-				goto err;
-				}
-			while (skip > 0)
-				{
-				buf[i++] = 0;
-				skip--;
-				}
-			skip = BN_bn2bin(y, buf + i);
-			i += skip;
-			}
-
-		if (i != ret)
-			{
-			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-		}
-	
-	if (used_ctx)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-
- err:
-	if (used_ctx)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return 0;
-	}
-
-
-/* Converts an octet string representation to an EC_POINT. 
- * Note that the simple implementation only uses affine coordinates.
- */
-int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-	const unsigned char *buf, size_t len, BN_CTX *ctx)
-	{
-	point_conversion_form_t form;
-	int y_bit;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *x, *y, *yxi;
-	size_t field_len, enc_len;
-	int ret = 0;
-
-	if (len == 0)
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
-		return 0;
-		}
-	form = buf[0];
-	y_bit = form & 1;
-	form = form & ~1U;
-	if ((form != 0)	&& (form != POINT_CONVERSION_COMPRESSED)
-		&& (form != POINT_CONVERSION_UNCOMPRESSED)
-		&& (form != POINT_CONVERSION_HYBRID))
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-	if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-
-	if (form == 0)
-		{
-		if (len != 1)
-			{
-			ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-			return 0;
-			}
-
-		return EC_POINT_set_to_infinity(group, point);
-		}
-	
-	field_len = (EC_GROUP_get_degree(group) + 7) / 8;
-	enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-	if (len != enc_len)
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	yxi = BN_CTX_get(ctx);
-	if (yxi == NULL) goto err;
-
-	if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
-	if (BN_ucmp(x, &group->field) >= 0)
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		goto err;
-		}
-
-	if (form == POINT_CONVERSION_COMPRESSED)
-		{
-		if (!EC_POINT_set_compressed_coordinates_GF2m(group, point, x, y_bit, ctx)) goto err;
-		}
-	else
-		{
-		if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
-		if (BN_ucmp(y, &group->field) >= 0)
-			{
-			ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-			goto err;
-			}
-		if (form == POINT_CONVERSION_HYBRID)
-			{
-			if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
-			if (y_bit != BN_is_odd(yxi))
-				{
-				ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-				goto err;
-				}
-			}
-
-		if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
-		}
-	
-	if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
-		{
-		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
-		goto err;
-		}
-
-	ret = 1;
-	
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-/* Computes a + b and stores the result in r.  r could be a or b, a could be b.
- * Uses algorithm A.10.2 of IEEE P1363.
- */
-int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *x0, *y0, *x1, *y1, *x2, *y2, *s, *t;
-	int ret = 0;
-	
-	if (EC_POINT_is_at_infinity(group, a))
-		{
-		if (!EC_POINT_copy(r, b)) return 0;
-		return 1;
-		}
-
-	if (EC_POINT_is_at_infinity(group, b))
-		{
-		if (!EC_POINT_copy(r, a)) return 0;
-		return 1;
-		}
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	x0 = BN_CTX_get(ctx);
-	y0 = BN_CTX_get(ctx);
-	x1 = BN_CTX_get(ctx);
-	y1 = BN_CTX_get(ctx);
-	x2 = BN_CTX_get(ctx);
-	y2 = BN_CTX_get(ctx);
-	s = BN_CTX_get(ctx);
-	t = BN_CTX_get(ctx);
-	if (t == NULL) goto err;
-
-	if (a->Z_is_one) 
-		{
-		if (!BN_copy(x0, &a->X)) goto err;
-		if (!BN_copy(y0, &a->Y)) goto err;
-		}
-	else
-		{
-		if (!EC_POINT_get_affine_coordinates_GF2m(group, a, x0, y0, ctx)) goto err;
-		}
-	if (b->Z_is_one) 
-		{
-		if (!BN_copy(x1, &b->X)) goto err;
-		if (!BN_copy(y1, &b->Y)) goto err;
-		}
-	else
-		{
-		if (!EC_POINT_get_affine_coordinates_GF2m(group, b, x1, y1, ctx)) goto err;
-		}
-
-
-	if (BN_GF2m_cmp(x0, x1))
-		{
-		if (!BN_GF2m_add(t, x0, x1)) goto err;
-		if (!BN_GF2m_add(s, y0, y1)) goto err;
-		if (!group->meth->field_div(group, s, s, t, ctx)) goto err;
-		if (!group->meth->field_sqr(group, x2, s, ctx)) goto err;
-		if (!BN_GF2m_add(x2, x2, &group->a)) goto err;
-		if (!BN_GF2m_add(x2, x2, s)) goto err;
-		if (!BN_GF2m_add(x2, x2, t)) goto err;
-		}
-	else
-		{
-		if (BN_GF2m_cmp(y0, y1) || BN_is_zero(x1))
-			{
-			if (!EC_POINT_set_to_infinity(group, r)) goto err;
-			ret = 1;
-			goto err;
-			}
-		if (!group->meth->field_div(group, s, y1, x1, ctx)) goto err;
-		if (!BN_GF2m_add(s, s, x1)) goto err;
-		
-		if (!group->meth->field_sqr(group, x2, s, ctx)) goto err;
-		if (!BN_GF2m_add(x2, x2, s)) goto err;
-		if (!BN_GF2m_add(x2, x2, &group->a)) goto err;
-		}
-
-	if (!BN_GF2m_add(y2, x1, x2)) goto err;
-	if (!group->meth->field_mul(group, y2, y2, s, ctx)) goto err;
-	if (!BN_GF2m_add(y2, y2, x2)) goto err;
-	if (!BN_GF2m_add(y2, y2, y1)) goto err;
-
-	if (!EC_POINT_set_affine_coordinates_GF2m(group, r, x2, y2, ctx)) goto err;
-
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-/* Computes 2 * a and stores the result in r.  r could be a.
- * Uses algorithm A.10.2 of IEEE P1363.
- */
-int ec_GF2m_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)
-	{
-	return ec_GF2m_simple_add(group, r, a, a, ctx);
-	}
-
-
-int ec_GF2m_simple_invert(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
-	{
-	if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(&point->Y))
-		/* point is its own inverse */
-		return 1;
-	
-	if (!EC_POINT_make_affine(group, point, ctx)) return 0;
-	return BN_GF2m_add(&point->Y, &point->X, &point->Y);
-	}
-
-
-/* Indicates whether the given point is the point at infinity. */
-int ec_GF2m_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
-	{
-	return BN_is_zero(&point->Z);
-	}
-
-
-/* Determines whether the given EC_POINT is an actual point on the curve defined
- * in the EC_GROUP.  A point is valid if it satisfies the Weierstrass equation:
- *      y^2 + x*y = x^3 + a*x^2 + b.
- */
-int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)
-	{
-	int ret = -1;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *lh, *y2;
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
-
-	if (EC_POINT_is_at_infinity(group, point))
-		return 1;
-
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;	
-
-	/* only support affine coordinates */
-	if (!point->Z_is_one) goto err;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return -1;
-		}
-
-	BN_CTX_start(ctx);
-	y2 = BN_CTX_get(ctx);
-	lh = BN_CTX_get(ctx);
-	if (lh == NULL) goto err;
-
-	/* We have a curve defined by a Weierstrass equation
-	 *      y^2 + x*y = x^3 + a*x^2 + b.
-	 *  <=> x^3 + a*x^2 + x*y + b + y^2 = 0
-	 *  <=> ((x + a) * x + y ) * x + b + y^2 = 0
-	 */
-	if (!BN_GF2m_add(lh, &point->X, &group->a)) goto err;
-	if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;
-	if (!BN_GF2m_add(lh, lh, &point->Y)) goto err;
-	if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;
-	if (!BN_GF2m_add(lh, lh, &group->b)) goto err;
-	if (!field_sqr(group, y2, &point->Y, ctx)) goto err;
-	if (!BN_GF2m_add(lh, lh, y2)) goto err;
-	ret = BN_is_zero(lh);
- err:
-	if (ctx) BN_CTX_end(ctx);
-	if (new_ctx) BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-/* Indicates whether two points are equal.
- * Return values:
- *  -1   error
- *   0   equal (in affine coordinates)
- *   1   not equal
- */
-int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
-	{
-	BIGNUM *aX, *aY, *bX, *bY;
-	BN_CTX *new_ctx = NULL;
-	int ret = -1;
-
-	if (EC_POINT_is_at_infinity(group, a))
-		{
-		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
-		}
-	
-	if (a->Z_is_one && b->Z_is_one)
-		{
-		return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;
-		}
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return -1;
-		}
-
-	BN_CTX_start(ctx);
-	aX = BN_CTX_get(ctx);
-	aY = BN_CTX_get(ctx);
-	bX = BN_CTX_get(ctx);
-	bY = BN_CTX_get(ctx);
-	if (bY == NULL) goto err;
-
-	if (!EC_POINT_get_affine_coordinates_GF2m(group, a, aX, aY, ctx)) goto err;
-	if (!EC_POINT_get_affine_coordinates_GF2m(group, b, bX, bY, ctx)) goto err;
-	ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;
-
-  err:	
-	if (ctx) BN_CTX_end(ctx);
-	if (new_ctx) BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-/* Forces the given EC_POINT to internally use affine coordinates. */
-int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *x, *y;
-	int ret = 0;
-
-	if (point->Z_is_one || EC_POINT_is_at_infinity(group, point))
-		return 1;
-	
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	if (y == NULL) goto err;
-	
-	if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
-	if (!BN_copy(&point->X, x)) goto err;
-	if (!BN_copy(&point->Y, y)) goto err;
-	if (!BN_one(&point->Z)) goto err;
-	
-	ret = 1;		
-
-  err:
-	if (ctx) BN_CTX_end(ctx);
-	if (new_ctx) BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-/* Forces each of the EC_POINTs in the given array to use affine coordinates. */
-int ec_GF2m_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
-	{
-	size_t i;
-
-	for (i = 0; i < num; i++)
-		{
-		if (!group->meth->make_affine(group, points[i], ctx)) return 0;
-		}
-
-	return 1;
-	}
-
-
-/* Wrapper to simple binary polynomial field multiplication implementation. */
-int ec_GF2m_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	return BN_GF2m_mod_mul_arr(r, a, b, group->poly, ctx);
-	}
-
-
-/* Wrapper to simple binary polynomial field squaring implementation. */
-int ec_GF2m_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
-	{
-	return BN_GF2m_mod_sqr_arr(r, a, group->poly, ctx);
-	}
-
-
-/* Wrapper to simple binary polynomial field division implementation. */
-int ec_GF2m_simple_field_div(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	return BN_GF2m_mod_div(r, a, b, &group->field, ctx);
-	}
+/* crypto/ec/ec2_smpl.c */

+/* ====================================================================

+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.

+ *

+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included

+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed

+ * to the OpenSSL project.

+ *

+ * The ECC Code is licensed pursuant to the OpenSSL open source

+ * license provided below.

+ *

+ * The software is originally written by Sheueling Chang Shantz and

+ * Douglas Stebila of Sun Microsystems Laboratories.

+ *

+ */

+/* ====================================================================

+ * Copyright (c) 1998-2005 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

+ *    openssl-core@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 <openssl/err.h>

+

+#include "ec_lcl.h"

+

+

+const EC_METHOD *EC_GF2m_simple_method(void)

+	{

+	static const EC_METHOD ret = {

+		NID_X9_62_characteristic_two_field,

+		ec_GF2m_simple_group_init,

+		ec_GF2m_simple_group_finish,

+		ec_GF2m_simple_group_clear_finish,

+		ec_GF2m_simple_group_copy,

+		ec_GF2m_simple_group_set_curve,

+		ec_GF2m_simple_group_get_curve,

+		ec_GF2m_simple_group_get_degree,

+		ec_GF2m_simple_group_check_discriminant,

+		ec_GF2m_simple_point_init,

+		ec_GF2m_simple_point_finish,

+		ec_GF2m_simple_point_clear_finish,

+		ec_GF2m_simple_point_copy,

+		ec_GF2m_simple_point_set_to_infinity,

+		0 /* set_Jprojective_coordinates_GFp */,

+		0 /* get_Jprojective_coordinates_GFp */,

+		ec_GF2m_simple_point_set_affine_coordinates,

+		ec_GF2m_simple_point_get_affine_coordinates,

+		ec_GF2m_simple_set_compressed_coordinates,

+		ec_GF2m_simple_point2oct,

+		ec_GF2m_simple_oct2point,

+		ec_GF2m_simple_add,

+		ec_GF2m_simple_dbl,

+		ec_GF2m_simple_invert,

+		ec_GF2m_simple_is_at_infinity,

+		ec_GF2m_simple_is_on_curve,

+		ec_GF2m_simple_cmp,

+		ec_GF2m_simple_make_affine,

+		ec_GF2m_simple_points_make_affine,

+

+		/* the following three method functions are defined in ec2_mult.c */

+		ec_GF2m_simple_mul,

+		ec_GF2m_precompute_mult,

+		ec_GF2m_have_precompute_mult,

+

+		ec_GF2m_simple_field_mul,

+		ec_GF2m_simple_field_sqr,

+		ec_GF2m_simple_field_div,

+		0 /* field_encode */,

+		0 /* field_decode */,

+		0 /* field_set_to_one */ };

+

+	return &ret;

+	}

+

+

+/* Initialize a GF(2^m)-based EC_GROUP structure.

+ * Note that all other members are handled by EC_GROUP_new.

+ */

+int ec_GF2m_simple_group_init(EC_GROUP *group)

+	{

+	BN_init(&group->field);

+	BN_init(&group->a);

+	BN_init(&group->b);

+	return 1;

+	}

+

+

+/* Free a GF(2^m)-based EC_GROUP structure.

+ * Note that all other members are handled by EC_GROUP_free.

+ */

+void ec_GF2m_simple_group_finish(EC_GROUP *group)

+	{

+	BN_free(&group->field);

+	BN_free(&group->a);

+	BN_free(&group->b);

+	}

+

+

+/* Clear and free a GF(2^m)-based EC_GROUP structure.

+ * Note that all other members are handled by EC_GROUP_clear_free.

+ */

+void ec_GF2m_simple_group_clear_finish(EC_GROUP *group)

+	{

+	BN_clear_free(&group->field);

+	BN_clear_free(&group->a);

+	BN_clear_free(&group->b);

+	group->poly[0] = 0;

+	group->poly[1] = 0;

+	group->poly[2] = 0;

+	group->poly[3] = 0;

+	group->poly[4] = 0;

+	group->poly[5] = -1;

+	}

+

+

+/* Copy a GF(2^m)-based EC_GROUP structure.

+ * Note that all other members are handled by EC_GROUP_copy.

+ */

+int ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)

+	{

+	int i;

+	if (!BN_copy(&dest->field, &src->field)) return 0;

+	if (!BN_copy(&dest->a, &src->a)) return 0;

+	if (!BN_copy(&dest->b, &src->b)) return 0;

+	dest->poly[0] = src->poly[0];

+	dest->poly[1] = src->poly[1];

+	dest->poly[2] = src->poly[2];

+	dest->poly[3] = src->poly[3];

+	dest->poly[4] = src->poly[4];

+	dest->poly[5] = src->poly[5];

+	if (bn_wexpand(&dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) return 0;

+	if (bn_wexpand(&dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) return 0;

+	for (i = dest->a.top; i < dest->a.dmax; i++) dest->a.d[i] = 0;

+	for (i = dest->b.top; i < dest->b.dmax; i++) dest->b.d[i] = 0;

+	return 1;

+	}

+

+

+/* Set the curve parameters of an EC_GROUP structure. */

+int ec_GF2m_simple_group_set_curve(EC_GROUP *group,

+	const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)

+	{

+	int ret = 0, i;

+

+	/* group->field */

+	if (!BN_copy(&group->field, p)) goto err;

+	i = BN_GF2m_poly2arr(&group->field, group->poly, 6) - 1;

+	if ((i != 5) && (i != 3))

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);

+		goto err;

+		}

+

+	/* group->a */

+	if (!BN_GF2m_mod_arr(&group->a, a, group->poly)) goto err;

+	if(bn_wexpand(&group->a, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) goto err;

+	for (i = group->a.top; i < group->a.dmax; i++) group->a.d[i] = 0;

+	

+	/* group->b */

+	if (!BN_GF2m_mod_arr(&group->b, b, group->poly)) goto err;

+	if(bn_wexpand(&group->b, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) goto err;

+	for (i = group->b.top; i < group->b.dmax; i++) group->b.d[i] = 0;

+		

+	ret = 1;

+  err:

+	return ret;

+	}

+

+

+/* Get the curve parameters of an EC_GROUP structure.

+ * If p, a, or b are NULL then there values will not be set but the method will return with success.

+ */

+int ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)

+	{

+	int ret = 0;

+	

+	if (p != NULL)

+		{

+		if (!BN_copy(p, &group->field)) return 0;

+		}

+

+	if (a != NULL)

+		{

+		if (!BN_copy(a, &group->a)) goto err;

+		}

+

+	if (b != NULL)

+		{

+		if (!BN_copy(b, &group->b)) goto err;

+		}

+	

+	ret = 1;

+	

+  err:

+	return ret;

+	}

+

+

+/* Gets the degree of the field.  For a curve over GF(2^m) this is the value m. */

+int ec_GF2m_simple_group_get_degree(const EC_GROUP *group)

+	{

+	return BN_num_bits(&group->field)-1;

+	}

+

+

+/* Checks the discriminant of the curve.

+ * y^2 + x*y = x^3 + a*x^2 + b is an elliptic curve <=> b != 0 (mod p) 

+ */

+int ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)

+	{

+	int ret = 0;

+	BIGNUM *b;

+	BN_CTX *new_ctx = NULL;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			{

+			ECerr(EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT, ERR_R_MALLOC_FAILURE);

+			goto err;

+			}

+		}

+	BN_CTX_start(ctx);

+	b = BN_CTX_get(ctx);

+	if (b == NULL) goto err;

+

+	if (!BN_GF2m_mod_arr(b, &group->b, group->poly)) goto err;

+	

+	/* check the discriminant:

+	 * y^2 + x*y = x^3 + a*x^2 + b is an elliptic curve <=> b != 0 (mod p) 

+	 */

+	if (BN_is_zero(b)) goto err;

+

+	ret = 1;

+

+err:

+	if (ctx != NULL)

+		BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+/* Initializes an EC_POINT. */

+int ec_GF2m_simple_point_init(EC_POINT *point)

+	{

+	BN_init(&point->X);

+	BN_init(&point->Y);

+	BN_init(&point->Z);

+	return 1;

+	}

+

+

+/* Frees an EC_POINT. */

+void ec_GF2m_simple_point_finish(EC_POINT *point)

+	{

+	BN_free(&point->X);

+	BN_free(&point->Y);

+	BN_free(&point->Z);

+	}

+

+

+/* Clears and frees an EC_POINT. */

+void ec_GF2m_simple_point_clear_finish(EC_POINT *point)

+	{

+	BN_clear_free(&point->X);

+	BN_clear_free(&point->Y);

+	BN_clear_free(&point->Z);

+	point->Z_is_one = 0;

+	}

+

+

+/* Copy the contents of one EC_POINT into another.  Assumes dest is initialized. */

+int ec_GF2m_simple_point_copy(EC_POINT *dest, const EC_POINT *src)

+	{

+	if (!BN_copy(&dest->X, &src->X)) return 0;

+	if (!BN_copy(&dest->Y, &src->Y)) return 0;

+	if (!BN_copy(&dest->Z, &src->Z)) return 0;

+	dest->Z_is_one = src->Z_is_one;

+

+	return 1;

+	}

+

+

+/* Set an EC_POINT to the point at infinity.  

+ * A point at infinity is represented by having Z=0.

+ */

+int ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *group, EC_POINT *point)

+	{

+	point->Z_is_one = 0;

+	BN_zero(&point->Z);

+	return 1;

+	}

+

+

+/* Set the coordinates of an EC_POINT using affine coordinates. 

+ * Note that the simple implementation only uses affine coordinates.

+ */

+int ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,

+	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)

+	{

+	int ret = 0;	

+	if (x == NULL || y == NULL)

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES, ERR_R_PASSED_NULL_PARAMETER);

+		return 0;

+		}

+

+	if (!BN_copy(&point->X, x)) goto err;

+	BN_set_negative(&point->X, 0);

+	if (!BN_copy(&point->Y, y)) goto err;

+	BN_set_negative(&point->Y, 0);

+	if (!BN_copy(&point->Z, BN_value_one())) goto err;

+	BN_set_negative(&point->Z, 0);

+	point->Z_is_one = 1;

+	ret = 1;

+

+  err:

+	return ret;

+	}

+

+

+/* Gets the affine coordinates of an EC_POINT. 

+ * Note that the simple implementation only uses affine coordinates.

+ */

+int ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,

+	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)

+	{

+	int ret = 0;

+

+	if (EC_POINT_is_at_infinity(group, point))

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES, EC_R_POINT_AT_INFINITY);

+		return 0;

+		}

+

+	if (BN_cmp(&point->Z, BN_value_one())) 

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

+		return 0;

+		}

+	if (x != NULL)

+		{

+		if (!BN_copy(x, &point->X)) goto err;

+		BN_set_negative(x, 0);

+		}

+	if (y != NULL)

+		{

+		if (!BN_copy(y, &point->Y)) goto err;

+		BN_set_negative(y, 0);

+		}

+	ret = 1;

+		

+ err:

+	return ret;

+	}

+

+

+/* Calculates and sets the affine coordinates of an EC_POINT from the given

+ * compressed coordinates.  Uses algorithm 2.3.4 of SEC 1. 

+ * Note that the simple implementation only uses affine coordinates.

+ *

+ * The method is from the following publication:

+ * 

+ *     Harper, Menezes, Vanstone:

+ *     "Public-Key Cryptosystems with Very Small Key Lengths",

+ *     EUROCRYPT '92, Springer-Verlag LNCS 658,

+ *     published February 1993

+ *

+ * US Patents 6,141,420 and 6,618,483 (Vanstone, Mullin, Agnew) describe

+ * the same method, but claim no priority date earlier than July 29, 1994

+ * (and additionally fail to cite the EUROCRYPT '92 publication as prior art).

+ */

+int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,

+	const BIGNUM *x_, int y_bit, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *tmp, *x, *y, *z;

+	int ret = 0, z0;

+

+	/* clear error queue */

+	ERR_clear_error();

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	y_bit = (y_bit != 0) ? 1 : 0;

+

+	BN_CTX_start(ctx);

+	tmp = BN_CTX_get(ctx);

+	x = BN_CTX_get(ctx);

+	y = BN_CTX_get(ctx);

+	z = BN_CTX_get(ctx);

+	if (z == NULL) goto err;

+

+	if (!BN_GF2m_mod_arr(x, x_, group->poly)) goto err;

+	if (BN_is_zero(x))

+		{

+		if (!BN_GF2m_mod_sqrt_arr(y, &group->b, group->poly, ctx)) goto err;

+		}

+	else

+		{

+		if (!group->meth->field_sqr(group, tmp, x, ctx)) goto err;

+		if (!group->meth->field_div(group, tmp, &group->b, tmp, ctx)) goto err;

+		if (!BN_GF2m_add(tmp, &group->a, tmp)) goto err;

+		if (!BN_GF2m_add(tmp, x, tmp)) goto err;

+		if (!BN_GF2m_mod_solve_quad_arr(z, tmp, group->poly, ctx))

+			{

+			unsigned long err = ERR_peek_last_error();

+			

+			if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NO_SOLUTION)

+				{

+				ERR_clear_error();

+				ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);

+				}

+			else

+				ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);

+			goto err;

+			}

+		z0 = (BN_is_odd(z)) ? 1 : 0;

+		if (!group->meth->field_mul(group, y, x, z, ctx)) goto err;

+		if (z0 != y_bit)

+			{

+			if (!BN_GF2m_add(y, y, x)) goto err;

+			}

+		}

+

+	if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;

+

+	ret = 1;

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+/* Converts an EC_POINT to an octet string.  

+ * If buf is NULL, the encoded length will be returned.

+ * If the length len of buf is smaller than required an error will be returned.

+ */

+size_t ec_GF2m_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,

+	unsigned char *buf, size_t len, BN_CTX *ctx)

+	{

+	size_t ret;

+	BN_CTX *new_ctx = NULL;

+	int used_ctx = 0;

+	BIGNUM *x, *y, *yxi;

+	size_t field_len, i, skip;

+

+	if ((form != POINT_CONVERSION_COMPRESSED)

+		&& (form != POINT_CONVERSION_UNCOMPRESSED)

+		&& (form != POINT_CONVERSION_HYBRID))

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);

+		goto err;

+		}

+

+	if (EC_POINT_is_at_infinity(group, point))

+		{

+		/* encodes to a single 0 octet */

+		if (buf != NULL)

+			{

+			if (len < 1)

+				{

+				ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);

+				return 0;

+				}

+			buf[0] = 0;

+			}

+		return 1;

+		}

+

+

+	/* ret := required output buffer length */

+	field_len = (EC_GROUP_get_degree(group) + 7) / 8;

+	ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;

+

+	/* if 'buf' is NULL, just return required length */

+	if (buf != NULL)

+		{

+		if (len < ret)

+			{

+			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);

+			goto err;

+			}

+

+		if (ctx == NULL)

+			{

+			ctx = new_ctx = BN_CTX_new();

+			if (ctx == NULL)

+				return 0;

+			}

+

+		BN_CTX_start(ctx);

+		used_ctx = 1;

+		x = BN_CTX_get(ctx);

+		y = BN_CTX_get(ctx);

+		yxi = BN_CTX_get(ctx);

+		if (yxi == NULL) goto err;

+

+		if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;

+

+		buf[0] = form;

+		if ((form != POINT_CONVERSION_UNCOMPRESSED) && !BN_is_zero(x))

+			{

+			if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;

+			if (BN_is_odd(yxi)) buf[0]++;

+			}

+

+		i = 1;

+		

+		skip = field_len - BN_num_bytes(x);

+		if (skip > field_len)

+			{

+			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+			goto err;

+			}

+		while (skip > 0)

+			{

+			buf[i++] = 0;

+			skip--;

+			}

+		skip = BN_bn2bin(x, buf + i);

+		i += skip;

+		if (i != 1 + field_len)

+			{

+			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+			goto err;

+			}

+

+		if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)

+			{

+			skip = field_len - BN_num_bytes(y);

+			if (skip > field_len)

+				{

+				ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+				goto err;

+				}

+			while (skip > 0)

+				{

+				buf[i++] = 0;

+				skip--;

+				}

+			skip = BN_bn2bin(y, buf + i);

+			i += skip;

+			}

+

+		if (i != ret)

+			{

+			ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+			goto err;

+			}

+		}

+	

+	if (used_ctx)

+		BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+

+ err:

+	if (used_ctx)

+		BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return 0;

+	}

+

+

+/* Converts an octet string representation to an EC_POINT. 

+ * Note that the simple implementation only uses affine coordinates.

+ */

+int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,

+	const unsigned char *buf, size_t len, BN_CTX *ctx)

+	{

+	point_conversion_form_t form;

+	int y_bit;

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *x, *y, *yxi;

+	size_t field_len, enc_len;

+	int ret = 0;

+

+	if (len == 0)

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);

+		return 0;

+		}

+	form = buf[0];

+	y_bit = form & 1;

+	form = form & ~1U;

+	if ((form != 0)	&& (form != POINT_CONVERSION_COMPRESSED)

+		&& (form != POINT_CONVERSION_UNCOMPRESSED)

+		&& (form != POINT_CONVERSION_HYBRID))

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		return 0;

+		}

+	if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		return 0;

+		}

+

+	if (form == 0)

+		{

+		if (len != 1)

+			{

+			ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+			return 0;

+			}

+

+		return EC_POINT_set_to_infinity(group, point);

+		}

+	

+	field_len = (EC_GROUP_get_degree(group) + 7) / 8;

+	enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;

+

+	if (len != enc_len)

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		return 0;

+		}

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	x = BN_CTX_get(ctx);

+	y = BN_CTX_get(ctx);

+	yxi = BN_CTX_get(ctx);

+	if (yxi == NULL) goto err;

+

+	if (!BN_bin2bn(buf + 1, field_len, x)) goto err;

+	if (BN_ucmp(x, &group->field) >= 0)

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		goto err;

+		}

+

+	if (form == POINT_CONVERSION_COMPRESSED)

+		{

+		if (!EC_POINT_set_compressed_coordinates_GF2m(group, point, x, y_bit, ctx)) goto err;

+		}

+	else

+		{

+		if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;

+		if (BN_ucmp(y, &group->field) >= 0)

+			{

+			ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+			goto err;

+			}

+		if (form == POINT_CONVERSION_HYBRID)

+			{

+			if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;

+			if (y_bit != BN_is_odd(yxi))

+				{

+				ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+				goto err;

+				}

+			}

+

+		if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;

+		}

+	

+	if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */

+		{

+		ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);

+		goto err;

+		}

+

+	ret = 1;

+	

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+/* Computes a + b and stores the result in r.  r could be a or b, a could be b.

+ * Uses algorithm A.10.2 of IEEE P1363.

+ */

+int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *x0, *y0, *x1, *y1, *x2, *y2, *s, *t;

+	int ret = 0;

+	

+	if (EC_POINT_is_at_infinity(group, a))

+		{

+		if (!EC_POINT_copy(r, b)) return 0;

+		return 1;

+		}

+

+	if (EC_POINT_is_at_infinity(group, b))

+		{

+		if (!EC_POINT_copy(r, a)) return 0;

+		return 1;

+		}

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	x0 = BN_CTX_get(ctx);

+	y0 = BN_CTX_get(ctx);

+	x1 = BN_CTX_get(ctx);

+	y1 = BN_CTX_get(ctx);

+	x2 = BN_CTX_get(ctx);

+	y2 = BN_CTX_get(ctx);

+	s = BN_CTX_get(ctx);

+	t = BN_CTX_get(ctx);

+	if (t == NULL) goto err;

+

+	if (a->Z_is_one) 

+		{

+		if (!BN_copy(x0, &a->X)) goto err;

+		if (!BN_copy(y0, &a->Y)) goto err;

+		}

+	else

+		{

+		if (!EC_POINT_get_affine_coordinates_GF2m(group, a, x0, y0, ctx)) goto err;

+		}

+	if (b->Z_is_one) 

+		{

+		if (!BN_copy(x1, &b->X)) goto err;

+		if (!BN_copy(y1, &b->Y)) goto err;

+		}

+	else

+		{

+		if (!EC_POINT_get_affine_coordinates_GF2m(group, b, x1, y1, ctx)) goto err;

+		}

+

+

+	if (BN_GF2m_cmp(x0, x1))

+		{

+		if (!BN_GF2m_add(t, x0, x1)) goto err;

+		if (!BN_GF2m_add(s, y0, y1)) goto err;

+		if (!group->meth->field_div(group, s, s, t, ctx)) goto err;

+		if (!group->meth->field_sqr(group, x2, s, ctx)) goto err;

+		if (!BN_GF2m_add(x2, x2, &group->a)) goto err;

+		if (!BN_GF2m_add(x2, x2, s)) goto err;

+		if (!BN_GF2m_add(x2, x2, t)) goto err;

+		}

+	else

+		{

+		if (BN_GF2m_cmp(y0, y1) || BN_is_zero(x1))

+			{

+			if (!EC_POINT_set_to_infinity(group, r)) goto err;

+			ret = 1;

+			goto err;

+			}

+		if (!group->meth->field_div(group, s, y1, x1, ctx)) goto err;

+		if (!BN_GF2m_add(s, s, x1)) goto err;

+		

+		if (!group->meth->field_sqr(group, x2, s, ctx)) goto err;

+		if (!BN_GF2m_add(x2, x2, s)) goto err;

+		if (!BN_GF2m_add(x2, x2, &group->a)) goto err;

+		}

+

+	if (!BN_GF2m_add(y2, x1, x2)) goto err;

+	if (!group->meth->field_mul(group, y2, y2, s, ctx)) goto err;

+	if (!BN_GF2m_add(y2, y2, x2)) goto err;

+	if (!BN_GF2m_add(y2, y2, y1)) goto err;

+

+	if (!EC_POINT_set_affine_coordinates_GF2m(group, r, x2, y2, ctx)) goto err;

+

+	ret = 1;

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+/* Computes 2 * a and stores the result in r.  r could be a.

+ * Uses algorithm A.10.2 of IEEE P1363.

+ */

+int ec_GF2m_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)

+	{

+	return ec_GF2m_simple_add(group, r, a, a, ctx);

+	}

+

+

+int ec_GF2m_simple_invert(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)

+	{

+	if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(&point->Y))

+		/* point is its own inverse */

+		return 1;

+	

+	if (!EC_POINT_make_affine(group, point, ctx)) return 0;

+	return BN_GF2m_add(&point->Y, &point->X, &point->Y);

+	}

+

+

+/* Indicates whether the given point is the point at infinity. */

+int ec_GF2m_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)

+	{

+	return BN_is_zero(&point->Z);

+	}

+

+

+/* Determines whether the given EC_POINT is an actual point on the curve defined

+ * in the EC_GROUP.  A point is valid if it satisfies the Weierstrass equation:

+ *      y^2 + x*y = x^3 + a*x^2 + b.

+ */

+int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)

+	{

+	int ret = -1;

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *lh, *y2;

+	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);

+	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);

+

+	if (EC_POINT_is_at_infinity(group, point))

+		return 1;

+

+	field_mul = group->meth->field_mul;

+	field_sqr = group->meth->field_sqr;	

+

+	/* only support affine coordinates */

+	if (!point->Z_is_one) goto err;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return -1;

+		}

+

+	BN_CTX_start(ctx);

+	y2 = BN_CTX_get(ctx);

+	lh = BN_CTX_get(ctx);

+	if (lh == NULL) goto err;

+

+	/* We have a curve defined by a Weierstrass equation

+	 *      y^2 + x*y = x^3 + a*x^2 + b.

+	 *  <=> x^3 + a*x^2 + x*y + b + y^2 = 0

+	 *  <=> ((x + a) * x + y ) * x + b + y^2 = 0

+	 */

+	if (!BN_GF2m_add(lh, &point->X, &group->a)) goto err;

+	if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;

+	if (!BN_GF2m_add(lh, lh, &point->Y)) goto err;

+	if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;

+	if (!BN_GF2m_add(lh, lh, &group->b)) goto err;

+	if (!field_sqr(group, y2, &point->Y, ctx)) goto err;

+	if (!BN_GF2m_add(lh, lh, y2)) goto err;

+	ret = BN_is_zero(lh);

+ err:

+	if (ctx) BN_CTX_end(ctx);

+	if (new_ctx) BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+/* Indicates whether two points are equal.

+ * Return values:

+ *  -1   error

+ *   0   equal (in affine coordinates)

+ *   1   not equal

+ */

+int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)

+	{

+	BIGNUM *aX, *aY, *bX, *bY;

+	BN_CTX *new_ctx = NULL;

+	int ret = -1;

+

+	if (EC_POINT_is_at_infinity(group, a))

+		{

+		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;

+		}

+

+	if (EC_POINT_is_at_infinity(group, b))

+		return 1;

+	

+	if (a->Z_is_one && b->Z_is_one)

+		{

+		return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;

+		}

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return -1;

+		}

+

+	BN_CTX_start(ctx);

+	aX = BN_CTX_get(ctx);

+	aY = BN_CTX_get(ctx);

+	bX = BN_CTX_get(ctx);

+	bY = BN_CTX_get(ctx);

+	if (bY == NULL) goto err;

+

+	if (!EC_POINT_get_affine_coordinates_GF2m(group, a, aX, aY, ctx)) goto err;

+	if (!EC_POINT_get_affine_coordinates_GF2m(group, b, bX, bY, ctx)) goto err;

+	ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;

+

+  err:	

+	if (ctx) BN_CTX_end(ctx);

+	if (new_ctx) BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+/* Forces the given EC_POINT to internally use affine coordinates. */

+int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *x, *y;

+	int ret = 0;

+

+	if (point->Z_is_one || EC_POINT_is_at_infinity(group, point))

+		return 1;

+	

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	x = BN_CTX_get(ctx);

+	y = BN_CTX_get(ctx);

+	if (y == NULL) goto err;

+	

+	if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;

+	if (!BN_copy(&point->X, x)) goto err;

+	if (!BN_copy(&point->Y, y)) goto err;

+	if (!BN_one(&point->Z)) goto err;

+	

+	ret = 1;		

+

+  err:

+	if (ctx) BN_CTX_end(ctx);

+	if (new_ctx) BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+/* Forces each of the EC_POINTs in the given array to use affine coordinates. */

+int ec_GF2m_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)

+	{

+	size_t i;

+

+	for (i = 0; i < num; i++)

+		{

+		if (!group->meth->make_affine(group, points[i], ctx)) return 0;

+		}

+

+	return 1;

+	}

+

+

+/* Wrapper to simple binary polynomial field multiplication implementation. */

+int ec_GF2m_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)

+	{

+	return BN_GF2m_mod_mul_arr(r, a, b, group->poly, ctx);

+	}

+

+

+/* Wrapper to simple binary polynomial field squaring implementation. */

+int ec_GF2m_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)

+	{

+	return BN_GF2m_mod_sqr_arr(r, a, group->poly, ctx);

+	}

+

+

+/* Wrapper to simple binary polynomial field division implementation. */

+int ec_GF2m_simple_field_div(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)

+	{

+	return BN_GF2m_mod_div(r, a, b, &group->field, ctx);

+	}

diff --git a/openssl/crypto/ec/ec_key.c b/openssl/crypto/ec/ec_key.c
index 12fb0e6d6..0458d340b 100644
--- a/openssl/crypto/ec/ec_key.c
+++ b/openssl/crypto/ec/ec_key.c
@@ -1,457 +1,463 @@
-/* crypto/ec/ec_key.c */
-/*
- * Written by Nils Larsch for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 1998-2005 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
- *    openssl-core@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).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions originally developed by SUN MICROSYSTEMS, INC., and 
- * contributed to the OpenSSL project.
- */
-
-#include <string.h>
-#include "ec_lcl.h"
-#include <openssl/err.h>
-#include <string.h>
-
-EC_KEY *EC_KEY_new(void)
-	{
-	EC_KEY *ret;
-
-	ret=(EC_KEY *)OPENSSL_malloc(sizeof(EC_KEY));
-	if (ret == NULL)
-		{
-		ECerr(EC_F_EC_KEY_NEW, ERR_R_MALLOC_FAILURE);
-		return(NULL);
-		}
-
-	ret->version = 1;	
-	ret->group   = NULL;
-	ret->pub_key = NULL;
-	ret->priv_key= NULL;
-	ret->enc_flag= 0; 
-	ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;
-	ret->references= 1;
-	ret->method_data = NULL;
-	return(ret);
-	}
-
-EC_KEY *EC_KEY_new_by_curve_name(int nid)
-	{
-	EC_KEY *ret = EC_KEY_new();
-	if (ret == NULL)
-		return NULL;
-	ret->group = EC_GROUP_new_by_curve_name(nid);
-	if (ret->group == NULL)
-		{
-		EC_KEY_free(ret);
-		return NULL;
-		}
-	return ret;
-	}
-
-void EC_KEY_free(EC_KEY *r)
-	{
-	int i;
-
-	if (r == NULL) return;
-
-	i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_EC);
-#ifdef REF_PRINT
-	REF_PRINT("EC_KEY",r);
-#endif
-	if (i > 0) return;
-#ifdef REF_CHECK
-	if (i < 0)
-		{
-		fprintf(stderr,"EC_KEY_free, bad reference count\n");
-		abort();
-		}
-#endif
-
-	if (r->group    != NULL) 
-		EC_GROUP_free(r->group);
-	if (r->pub_key  != NULL)
-		EC_POINT_free(r->pub_key);
-	if (r->priv_key != NULL)
-		BN_clear_free(r->priv_key);
-
-	EC_EX_DATA_free_all_data(&r->method_data);
-
-	OPENSSL_cleanse((void *)r, sizeof(EC_KEY));
-
-	OPENSSL_free(r);
-	}
-
-EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
-	{
-	EC_EXTRA_DATA *d;
-
-	if (dest == NULL || src == NULL)
-		{
-		ECerr(EC_F_EC_KEY_COPY, ERR_R_PASSED_NULL_PARAMETER);
-		return NULL;
-		}
-	/* copy the parameters */
-	if (src->group)
-		{
-		const EC_METHOD *meth = EC_GROUP_method_of(src->group);
-		/* clear the old group */
-		if (dest->group)
-			EC_GROUP_free(dest->group);
-		dest->group = EC_GROUP_new(meth);
-		if (dest->group == NULL)
-			return NULL;
-		if (!EC_GROUP_copy(dest->group, src->group))
-			return NULL;
-		}
-	/*  copy the public key */
-	if (src->pub_key && src->group)
-		{
-		if (dest->pub_key)
-			EC_POINT_free(dest->pub_key);
-		dest->pub_key = EC_POINT_new(src->group);
-		if (dest->pub_key == NULL)
-			return NULL;
-		if (!EC_POINT_copy(dest->pub_key, src->pub_key))
-			return NULL;
-		}
-	/* copy the private key */
-	if (src->priv_key)
-		{
-		if (dest->priv_key == NULL)
-			{
-			dest->priv_key = BN_new();
-			if (dest->priv_key == NULL)
-				return NULL;
-			}
-		if (!BN_copy(dest->priv_key, src->priv_key))
-			return NULL;
-		}
-	/* copy method/extra data */
-	EC_EX_DATA_free_all_data(&dest->method_data);
-
-	for (d = src->method_data; d != NULL; d = d->next)
-		{
-		void *t = d->dup_func(d->data);
-		
-		if (t == NULL)
-			return 0;
-		if (!EC_EX_DATA_set_data(&dest->method_data, t, d->dup_func, d->free_func, d->clear_free_func))
-			return 0;
-		}
-
-	/* copy the rest */
-	dest->enc_flag  = src->enc_flag;
-	dest->conv_form = src->conv_form;
-	dest->version   = src->version;
-
-	return dest;
-	}
-
-EC_KEY *EC_KEY_dup(const EC_KEY *ec_key)
-	{
-	EC_KEY *ret = EC_KEY_new();
-	if (ret == NULL)
-		return NULL;
-	if (EC_KEY_copy(ret, ec_key) == NULL)
-		{
-		EC_KEY_free(ret);
-		return NULL;
-		}
-	return ret;
-	}
-
-int EC_KEY_up_ref(EC_KEY *r)
-	{
-	int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_EC);
-#ifdef REF_PRINT
-	REF_PRINT("EC_KEY",r);
-#endif
-#ifdef REF_CHECK
-	if (i < 2)
-		{
-		fprintf(stderr, "EC_KEY_up, bad reference count\n");
-		abort();
-		}
-#endif
-	return ((i > 1) ? 1 : 0);
-	}
-
-int EC_KEY_generate_key(EC_KEY *eckey)
-	{	
-	int	ok = 0;
-	BN_CTX	*ctx = NULL;
-	BIGNUM	*priv_key = NULL, *order = NULL;
-	EC_POINT *pub_key = NULL;
-
-	if (!eckey || !eckey->group)
-		{
-		ECerr(EC_F_EC_KEY_GENERATE_KEY, ERR_R_PASSED_NULL_PARAMETER);
-		return 0;
-		}
-
-	if ((order = BN_new()) == NULL) goto err;
-	if ((ctx = BN_CTX_new()) == NULL) goto err;
-
-	if (eckey->priv_key == NULL)
-		{
-		priv_key = BN_new();
-		if (priv_key == NULL)
-			goto err;
-		}
-	else
-		priv_key = eckey->priv_key;
-
-	if (!EC_GROUP_get_order(eckey->group, order, ctx))
-		goto err;
-
-	do
-		if (!BN_rand_range(priv_key, order))
-			goto err;
-	while (BN_is_zero(priv_key));
-
-	if (eckey->pub_key == NULL)
-		{
-		pub_key = EC_POINT_new(eckey->group);
-		if (pub_key == NULL)
-			goto err;
-		}
-	else
-		pub_key = eckey->pub_key;
-
-	if (!EC_POINT_mul(eckey->group, pub_key, priv_key, NULL, NULL, ctx))
-		goto err;
-
-	eckey->priv_key = priv_key;
-	eckey->pub_key  = pub_key;
-
-	ok=1;
-
-err:	
-	if (order)
-		BN_free(order);
-	if (pub_key  != NULL && eckey->pub_key  == NULL)
-		EC_POINT_free(pub_key);
-	if (priv_key != NULL && eckey->priv_key == NULL)
-		BN_free(priv_key);
-	if (ctx != NULL)
-		BN_CTX_free(ctx);
-	return(ok);
-	}
-
-int EC_KEY_check_key(const EC_KEY *eckey)
-	{
-	int	ok   = 0;
-	BN_CTX	*ctx = NULL;
-	const BIGNUM	*order  = NULL;
-	EC_POINT *point = NULL;
-
-	if (!eckey || !eckey->group || !eckey->pub_key)
-		{
-		ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_PASSED_NULL_PARAMETER);
-		return 0;
-		}
-	
-	if ((ctx = BN_CTX_new()) == NULL)
-		goto err;
-	if ((point = EC_POINT_new(eckey->group)) == NULL)
-		goto err;
-
-	/* testing whether the pub_key is on the elliptic curve */
-	if (!EC_POINT_is_on_curve(eckey->group, eckey->pub_key, ctx))
-		{
-		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_IS_NOT_ON_CURVE);
-		goto err;
-		}
-	/* testing whether pub_key * order is the point at infinity */
-	order = &eckey->group->order;
-	if (BN_is_zero(order))
-		{
-		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_INVALID_GROUP_ORDER);
-		goto err;
-		}
-	if (!EC_POINT_mul(eckey->group, point, NULL, eckey->pub_key, order, ctx))
-		{
-		ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB);
-		goto err;
-		}
-	if (!EC_POINT_is_at_infinity(eckey->group, point))
-		{
-		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER);
-		goto err;
-		}
-	/* in case the priv_key is present : 
-	 * check if generator * priv_key == pub_key 
-	 */
-	if (eckey->priv_key)
-		{
-		if (BN_cmp(eckey->priv_key, order) >= 0)
-			{
-			ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER);
-			goto err;
-			}
-		if (!EC_POINT_mul(eckey->group, point, eckey->priv_key,
-			NULL, NULL, ctx))
-			{
-			ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB);
-			goto err;
-			}
-		if (EC_POINT_cmp(eckey->group, point, eckey->pub_key, 
-			ctx) != 0)
-			{
-			ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_INVALID_PRIVATE_KEY);
-			goto err;
-			}
-		}
-	ok = 1;
-err:
-	if (ctx   != NULL)
-		BN_CTX_free(ctx);
-	if (point != NULL)
-		EC_POINT_free(point);
-	return(ok);
-	}
-
-const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key)
-	{
-	return key->group;
-	}
-
-int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group)
-	{
-	if (key->group != NULL)
-		EC_GROUP_free(key->group);
-	key->group = EC_GROUP_dup(group);
-	return (key->group == NULL) ? 0 : 1;
-	}
-
-const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key)
-	{
-	return key->priv_key;
-	}
-
-int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key)
-	{
-	if (key->priv_key)
-		BN_clear_free(key->priv_key);
-	key->priv_key = BN_dup(priv_key);
-	return (key->priv_key == NULL) ? 0 : 1;
-	}
-
-const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key)
-	{
-	return key->pub_key;
-	}
-
-int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key)
-	{
-	if (key->pub_key != NULL)
-		EC_POINT_free(key->pub_key);
-	key->pub_key = EC_POINT_dup(pub_key, key->group);
-	return (key->pub_key == NULL) ? 0 : 1;
-	}
-
-unsigned int EC_KEY_get_enc_flags(const EC_KEY *key)
-	{
-	return key->enc_flag;
-	}
-
-void EC_KEY_set_enc_flags(EC_KEY *key, unsigned int flags)
-	{
-	key->enc_flag = flags;
-	}
-
-point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key)
-	{
-	return key->conv_form;
-	}
-
-void EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform)
-	{
-	key->conv_form = cform;
-	if (key->group != NULL)
-		EC_GROUP_set_point_conversion_form(key->group, cform);
-	}
-
-void *EC_KEY_get_key_method_data(EC_KEY *key,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
-	{
-	return EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func);
-	}
-
-void EC_KEY_insert_key_method_data(EC_KEY *key, void *data,
-	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
-	{
-	EC_EXTRA_DATA *ex_data;
-	CRYPTO_w_lock(CRYPTO_LOCK_EC);
-	ex_data = EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func);
-	if (ex_data == NULL)
-		EC_EX_DATA_set_data(&key->method_data, data, dup_func, free_func, clear_free_func);
-	CRYPTO_w_unlock(CRYPTO_LOCK_EC);
-	}
-
-void EC_KEY_set_asn1_flag(EC_KEY *key, int flag)
-	{
-	if (key->group != NULL)
-		EC_GROUP_set_asn1_flag(key->group, flag);
-	}
-
-int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx)
-	{
-	if (key->group == NULL)
-		return 0;
-	return EC_GROUP_precompute_mult(key->group, ctx);
-	}
+/* crypto/ec/ec_key.c */

+/*

+ * Written by Nils Larsch for the OpenSSL project.

+ */

+/* ====================================================================

+ * Copyright (c) 1998-2005 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

+ *    openssl-core@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).

+ *

+ */

+/* ====================================================================

+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.

+ * Portions originally developed by SUN MICROSYSTEMS, INC., and 

+ * contributed to the OpenSSL project.

+ */

+

+#include <string.h>

+#include "ec_lcl.h"

+#include <openssl/err.h>

+#include <string.h>

+

+EC_KEY *EC_KEY_new(void)

+	{

+	EC_KEY *ret;

+

+	ret=(EC_KEY *)OPENSSL_malloc(sizeof(EC_KEY));

+	if (ret == NULL)

+		{

+		ECerr(EC_F_EC_KEY_NEW, ERR_R_MALLOC_FAILURE);

+		return(NULL);

+		}

+

+	ret->version = 1;	

+	ret->group   = NULL;

+	ret->pub_key = NULL;

+	ret->priv_key= NULL;

+	ret->enc_flag= 0; 

+	ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;

+	ret->references= 1;

+	ret->method_data = NULL;

+	return(ret);

+	}

+

+EC_KEY *EC_KEY_new_by_curve_name(int nid)

+	{

+	EC_KEY *ret = EC_KEY_new();

+	if (ret == NULL)

+		return NULL;

+	ret->group = EC_GROUP_new_by_curve_name(nid);

+	if (ret->group == NULL)

+		{

+		EC_KEY_free(ret);

+		return NULL;

+		}

+	return ret;

+	}

+

+void EC_KEY_free(EC_KEY *r)

+	{

+	int i;

+

+	if (r == NULL) return;

+

+	i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_EC);

+#ifdef REF_PRINT

+	REF_PRINT("EC_KEY",r);

+#endif

+	if (i > 0) return;

+#ifdef REF_CHECK

+	if (i < 0)

+		{

+		fprintf(stderr,"EC_KEY_free, bad reference count\n");

+		abort();

+		}

+#endif

+

+	if (r->group    != NULL) 

+		EC_GROUP_free(r->group);

+	if (r->pub_key  != NULL)

+		EC_POINT_free(r->pub_key);

+	if (r->priv_key != NULL)

+		BN_clear_free(r->priv_key);

+

+	EC_EX_DATA_free_all_data(&r->method_data);

+

+	OPENSSL_cleanse((void *)r, sizeof(EC_KEY));

+

+	OPENSSL_free(r);

+	}

+

+EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)

+	{

+	EC_EXTRA_DATA *d;

+

+	if (dest == NULL || src == NULL)

+		{

+		ECerr(EC_F_EC_KEY_COPY, ERR_R_PASSED_NULL_PARAMETER);

+		return NULL;

+		}

+	/* copy the parameters */

+	if (src->group)

+		{

+		const EC_METHOD *meth = EC_GROUP_method_of(src->group);

+		/* clear the old group */

+		if (dest->group)

+			EC_GROUP_free(dest->group);

+		dest->group = EC_GROUP_new(meth);

+		if (dest->group == NULL)

+			return NULL;

+		if (!EC_GROUP_copy(dest->group, src->group))

+			return NULL;

+		}

+	/*  copy the public key */

+	if (src->pub_key && src->group)

+		{

+		if (dest->pub_key)

+			EC_POINT_free(dest->pub_key);

+		dest->pub_key = EC_POINT_new(src->group);

+		if (dest->pub_key == NULL)

+			return NULL;

+		if (!EC_POINT_copy(dest->pub_key, src->pub_key))

+			return NULL;

+		}

+	/* copy the private key */

+	if (src->priv_key)

+		{

+		if (dest->priv_key == NULL)

+			{

+			dest->priv_key = BN_new();

+			if (dest->priv_key == NULL)

+				return NULL;

+			}

+		if (!BN_copy(dest->priv_key, src->priv_key))

+			return NULL;

+		}

+	/* copy method/extra data */

+	EC_EX_DATA_free_all_data(&dest->method_data);

+

+	for (d = src->method_data; d != NULL; d = d->next)

+		{

+		void *t = d->dup_func(d->data);

+		

+		if (t == NULL)

+			return 0;

+		if (!EC_EX_DATA_set_data(&dest->method_data, t, d->dup_func, d->free_func, d->clear_free_func))

+			return 0;

+		}

+

+	/* copy the rest */

+	dest->enc_flag  = src->enc_flag;

+	dest->conv_form = src->conv_form;

+	dest->version   = src->version;

+

+	return dest;

+	}

+

+EC_KEY *EC_KEY_dup(const EC_KEY *ec_key)

+	{

+	EC_KEY *ret = EC_KEY_new();

+	if (ret == NULL)

+		return NULL;

+	if (EC_KEY_copy(ret, ec_key) == NULL)

+		{

+		EC_KEY_free(ret);

+		return NULL;

+		}

+	return ret;

+	}

+

+int EC_KEY_up_ref(EC_KEY *r)

+	{

+	int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_EC);

+#ifdef REF_PRINT

+	REF_PRINT("EC_KEY",r);

+#endif

+#ifdef REF_CHECK

+	if (i < 2)

+		{

+		fprintf(stderr, "EC_KEY_up, bad reference count\n");

+		abort();

+		}

+#endif

+	return ((i > 1) ? 1 : 0);

+	}

+

+int EC_KEY_generate_key(EC_KEY *eckey)

+	{	

+	int	ok = 0;

+	BN_CTX	*ctx = NULL;

+	BIGNUM	*priv_key = NULL, *order = NULL;

+	EC_POINT *pub_key = NULL;

+

+	if (!eckey || !eckey->group)

+		{

+		ECerr(EC_F_EC_KEY_GENERATE_KEY, ERR_R_PASSED_NULL_PARAMETER);

+		return 0;

+		}

+

+	if ((order = BN_new()) == NULL) goto err;

+	if ((ctx = BN_CTX_new()) == NULL) goto err;

+

+	if (eckey->priv_key == NULL)

+		{

+		priv_key = BN_new();

+		if (priv_key == NULL)

+			goto err;

+		}

+	else

+		priv_key = eckey->priv_key;

+

+	if (!EC_GROUP_get_order(eckey->group, order, ctx))

+		goto err;

+

+	do

+		if (!BN_rand_range(priv_key, order))

+			goto err;

+	while (BN_is_zero(priv_key));

+

+	if (eckey->pub_key == NULL)

+		{

+		pub_key = EC_POINT_new(eckey->group);

+		if (pub_key == NULL)

+			goto err;

+		}

+	else

+		pub_key = eckey->pub_key;

+

+	if (!EC_POINT_mul(eckey->group, pub_key, priv_key, NULL, NULL, ctx))

+		goto err;

+

+	eckey->priv_key = priv_key;

+	eckey->pub_key  = pub_key;

+

+	ok=1;

+

+err:	

+	if (order)

+		BN_free(order);

+	if (pub_key  != NULL && eckey->pub_key  == NULL)

+		EC_POINT_free(pub_key);

+	if (priv_key != NULL && eckey->priv_key == NULL)

+		BN_free(priv_key);

+	if (ctx != NULL)

+		BN_CTX_free(ctx);

+	return(ok);

+	}

+

+int EC_KEY_check_key(const EC_KEY *eckey)

+	{

+	int	ok   = 0;

+	BN_CTX	*ctx = NULL;

+	const BIGNUM	*order  = NULL;

+	EC_POINT *point = NULL;

+

+	if (!eckey || !eckey->group || !eckey->pub_key)

+		{

+		ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_PASSED_NULL_PARAMETER);

+		return 0;

+		}

+

+	if (EC_POINT_is_at_infinity(eckey->group, eckey->pub_key))

+		{

+		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_AT_INFINITY);

+		goto err;

+		}

+

+	if ((ctx = BN_CTX_new()) == NULL)

+		goto err;

+	if ((point = EC_POINT_new(eckey->group)) == NULL)

+		goto err;

+

+	/* testing whether the pub_key is on the elliptic curve */

+	if (!EC_POINT_is_on_curve(eckey->group, eckey->pub_key, ctx))

+		{

+		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_IS_NOT_ON_CURVE);

+		goto err;

+		}

+	/* testing whether pub_key * order is the point at infinity */

+	order = &eckey->group->order;

+	if (BN_is_zero(order))

+		{

+		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_INVALID_GROUP_ORDER);

+		goto err;

+		}

+	if (!EC_POINT_mul(eckey->group, point, NULL, eckey->pub_key, order, ctx))

+		{

+		ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB);

+		goto err;

+		}

+	if (!EC_POINT_is_at_infinity(eckey->group, point))

+		{

+		ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER);

+		goto err;

+		}

+	/* in case the priv_key is present : 

+	 * check if generator * priv_key == pub_key 

+	 */

+	if (eckey->priv_key)

+		{

+		if (BN_cmp(eckey->priv_key, order) >= 0)

+			{

+			ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER);

+			goto err;

+			}

+		if (!EC_POINT_mul(eckey->group, point, eckey->priv_key,

+			NULL, NULL, ctx))

+			{

+			ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB);

+			goto err;

+			}

+		if (EC_POINT_cmp(eckey->group, point, eckey->pub_key, 

+			ctx) != 0)

+			{

+			ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_INVALID_PRIVATE_KEY);

+			goto err;

+			}

+		}

+	ok = 1;

+err:

+	if (ctx   != NULL)

+		BN_CTX_free(ctx);

+	if (point != NULL)

+		EC_POINT_free(point);

+	return(ok);

+	}

+

+const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key)

+	{

+	return key->group;

+	}

+

+int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group)

+	{

+	if (key->group != NULL)

+		EC_GROUP_free(key->group);

+	key->group = EC_GROUP_dup(group);

+	return (key->group == NULL) ? 0 : 1;

+	}

+

+const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key)

+	{

+	return key->priv_key;

+	}

+

+int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key)

+	{

+	if (key->priv_key)

+		BN_clear_free(key->priv_key);

+	key->priv_key = BN_dup(priv_key);

+	return (key->priv_key == NULL) ? 0 : 1;

+	}

+

+const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key)

+	{

+	return key->pub_key;

+	}

+

+int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key)

+	{

+	if (key->pub_key != NULL)

+		EC_POINT_free(key->pub_key);

+	key->pub_key = EC_POINT_dup(pub_key, key->group);

+	return (key->pub_key == NULL) ? 0 : 1;

+	}

+

+unsigned int EC_KEY_get_enc_flags(const EC_KEY *key)

+	{

+	return key->enc_flag;

+	}

+

+void EC_KEY_set_enc_flags(EC_KEY *key, unsigned int flags)

+	{

+	key->enc_flag = flags;

+	}

+

+point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key)

+	{

+	return key->conv_form;

+	}

+

+void EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform)

+	{

+	key->conv_form = cform;

+	if (key->group != NULL)

+		EC_GROUP_set_point_conversion_form(key->group, cform);

+	}

+

+void *EC_KEY_get_key_method_data(EC_KEY *key,

+	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))

+	{

+	return EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func);

+	}

+

+void EC_KEY_insert_key_method_data(EC_KEY *key, void *data,

+	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))

+	{

+	EC_EXTRA_DATA *ex_data;

+	CRYPTO_w_lock(CRYPTO_LOCK_EC);

+	ex_data = EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func);

+	if (ex_data == NULL)

+		EC_EX_DATA_set_data(&key->method_data, data, dup_func, free_func, clear_free_func);

+	CRYPTO_w_unlock(CRYPTO_LOCK_EC);

+	}

+

+void EC_KEY_set_asn1_flag(EC_KEY *key, int flag)

+	{

+	if (key->group != NULL)

+		EC_GROUP_set_asn1_flag(key->group, flag);

+	}

+

+int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx)

+	{

+	if (key->group == NULL)

+		return 0;

+	return EC_GROUP_precompute_mult(key->group, ctx);

+	}

diff --git a/openssl/crypto/ec/ecp_smpl.c b/openssl/crypto/ec/ecp_smpl.c
index 4d26f8bdf..766f5fc51 100644
--- a/openssl/crypto/ec/ecp_smpl.c
+++ b/openssl/crypto/ec/ecp_smpl.c
@@ -1,1716 +1,1719 @@
-/* crypto/ec/ecp_smpl.c */
-/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
- * for the OpenSSL project. 
- * Includes code written by Bodo Moeller for the OpenSSL project.
-*/
-/* ====================================================================
- * Copyright (c) 1998-2002 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
- *    openssl-core@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).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * Portions of this software developed by SUN MICROSYSTEMS, INC.,
- * and contributed to the OpenSSL project.
- */
-
-#include <openssl/err.h>
-#include <openssl/symhacks.h>
-
-#include "ec_lcl.h"
-
-const EC_METHOD *EC_GFp_simple_method(void)
-	{
-	static const EC_METHOD ret = {
-		NID_X9_62_prime_field,
-		ec_GFp_simple_group_init,
-		ec_GFp_simple_group_finish,
-		ec_GFp_simple_group_clear_finish,
-		ec_GFp_simple_group_copy,
-		ec_GFp_simple_group_set_curve,
-		ec_GFp_simple_group_get_curve,
-		ec_GFp_simple_group_get_degree,
-		ec_GFp_simple_group_check_discriminant,
-		ec_GFp_simple_point_init,
-		ec_GFp_simple_point_finish,
-		ec_GFp_simple_point_clear_finish,
-		ec_GFp_simple_point_copy,
-		ec_GFp_simple_point_set_to_infinity,
-		ec_GFp_simple_set_Jprojective_coordinates_GFp,
-		ec_GFp_simple_get_Jprojective_coordinates_GFp,
-		ec_GFp_simple_point_set_affine_coordinates,
-		ec_GFp_simple_point_get_affine_coordinates,
-		ec_GFp_simple_set_compressed_coordinates,
-		ec_GFp_simple_point2oct,
-		ec_GFp_simple_oct2point,
-		ec_GFp_simple_add,
-		ec_GFp_simple_dbl,
-		ec_GFp_simple_invert,
-		ec_GFp_simple_is_at_infinity,
-		ec_GFp_simple_is_on_curve,
-		ec_GFp_simple_cmp,
-		ec_GFp_simple_make_affine,
-		ec_GFp_simple_points_make_affine,
-		0 /* mul */,
-		0 /* precompute_mult */,
-		0 /* have_precompute_mult */,	
-		ec_GFp_simple_field_mul,
-		ec_GFp_simple_field_sqr,
-		0 /* field_div */,
-		0 /* field_encode */,
-		0 /* field_decode */,
-		0 /* field_set_to_one */ };
-
-	return &ret;
-	}
-
-
-/* Most method functions in this file are designed to work with
- * non-trivial representations of field elements if necessary
- * (see ecp_mont.c): while standard modular addition and subtraction
- * are used, the field_mul and field_sqr methods will be used for
- * multiplication, and field_encode and field_decode (if defined)
- * will be used for converting between representations.
-
- * Functions ec_GFp_simple_points_make_affine() and
- * ec_GFp_simple_point_get_affine_coordinates() specifically assume
- * that if a non-trivial representation is used, it is a Montgomery
- * representation (i.e. 'encoding' means multiplying by some factor R).
- */
-
-
-int ec_GFp_simple_group_init(EC_GROUP *group)
-	{
-	BN_init(&group->field);
-	BN_init(&group->a);
-	BN_init(&group->b);
-	group->a_is_minus3 = 0;
-	return 1;
-	}
-
-
-void ec_GFp_simple_group_finish(EC_GROUP *group)
-	{
-	BN_free(&group->field);
-	BN_free(&group->a);
-	BN_free(&group->b);
-	}
-
-
-void ec_GFp_simple_group_clear_finish(EC_GROUP *group)
-	{
-	BN_clear_free(&group->field);
-	BN_clear_free(&group->a);
-	BN_clear_free(&group->b);
-	}
-
-
-int ec_GFp_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
-	{
-	if (!BN_copy(&dest->field, &src->field)) return 0;
-	if (!BN_copy(&dest->a, &src->a)) return 0;
-	if (!BN_copy(&dest->b, &src->b)) return 0;
-
-	dest->a_is_minus3 = src->a_is_minus3;
-
-	return 1;
-	}
-
-
-int ec_GFp_simple_group_set_curve(EC_GROUP *group,
-	const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	int ret = 0;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *tmp_a;
-	
-	/* p must be a prime > 3 */
-	if (BN_num_bits(p) <= 2 || !BN_is_odd(p))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_INVALID_FIELD);
-		return 0;
-		}
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	tmp_a = BN_CTX_get(ctx);
-	if (tmp_a == NULL) goto err;
-
-	/* group->field */
-	if (!BN_copy(&group->field, p)) goto err;
-	BN_set_negative(&group->field, 0);
-
-	/* group->a */
-	if (!BN_nnmod(tmp_a, a, p, ctx)) goto err;
-	if (group->meth->field_encode)
-		{ if (!group->meth->field_encode(group, &group->a, tmp_a, ctx)) goto err; }	
-	else
-		if (!BN_copy(&group->a, tmp_a)) goto err;
-	
-	/* group->b */
-	if (!BN_nnmod(&group->b, b, p, ctx)) goto err;
-	if (group->meth->field_encode)
-		if (!group->meth->field_encode(group, &group->b, &group->b, ctx)) goto err;
-	
-	/* group->a_is_minus3 */
-	if (!BN_add_word(tmp_a, 3)) goto err;
-	group->a_is_minus3 = (0 == BN_cmp(tmp_a, &group->field));
-
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
-	{
-	int ret = 0;
-	BN_CTX *new_ctx = NULL;
-	
-	if (p != NULL)
-		{
-		if (!BN_copy(p, &group->field)) return 0;
-		}
-
-	if (a != NULL || b != NULL)
-		{
-		if (group->meth->field_decode)
-			{
-			if (ctx == NULL)
-				{
-				ctx = new_ctx = BN_CTX_new();
-				if (ctx == NULL)
-					return 0;
-				}
-			if (a != NULL)
-				{
-				if (!group->meth->field_decode(group, a, &group->a, ctx)) goto err;
-				}
-			if (b != NULL)
-				{
-				if (!group->meth->field_decode(group, b, &group->b, ctx)) goto err;
-				}
-			}
-		else
-			{
-			if (a != NULL)
-				{
-				if (!BN_copy(a, &group->a)) goto err;
-				}
-			if (b != NULL)
-				{
-				if (!BN_copy(b, &group->b)) goto err;
-				}
-			}
-		}
-	
-	ret = 1;
-	
- err:
-	if (new_ctx)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_group_get_degree(const EC_GROUP *group)
-	{
-	return BN_num_bits(&group->field);
-	}
-
-
-int ec_GFp_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
-	{
-	int ret = 0;
-	BIGNUM *a,*b,*order,*tmp_1,*tmp_2;
-	const BIGNUM *p = &group->field;
-	BN_CTX *new_ctx = NULL;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT, ERR_R_MALLOC_FAILURE);
-			goto err;
-			}
-		}
-	BN_CTX_start(ctx);
-	a = BN_CTX_get(ctx);
-	b = BN_CTX_get(ctx);
-	tmp_1 = BN_CTX_get(ctx);
-	tmp_2 = BN_CTX_get(ctx);
-	order = BN_CTX_get(ctx);
-	if (order == NULL) goto err;
-
-	if (group->meth->field_decode)
-		{
-		if (!group->meth->field_decode(group, a, &group->a, ctx)) goto err;
-		if (!group->meth->field_decode(group, b, &group->b, ctx)) goto err;
-		}
-	else
-		{
-		if (!BN_copy(a, &group->a)) goto err;
-		if (!BN_copy(b, &group->b)) goto err;
-		}
-	
-	/* check the discriminant:
-	 * y^2 = x^3 + a*x + b is an elliptic curve <=> 4*a^3 + 27*b^2 != 0 (mod p) 
-         * 0 =< a, b < p */
-	if (BN_is_zero(a))
-		{
-		if (BN_is_zero(b)) goto err;
-		}
-	else if (!BN_is_zero(b))
-		{
-		if (!BN_mod_sqr(tmp_1, a, p, ctx)) goto err;
-		if (!BN_mod_mul(tmp_2, tmp_1, a, p, ctx)) goto err;
-		if (!BN_lshift(tmp_1, tmp_2, 2)) goto err;
-		/* tmp_1 = 4*a^3 */
-
-		if (!BN_mod_sqr(tmp_2, b, p, ctx)) goto err;
-		if (!BN_mul_word(tmp_2, 27)) goto err;
-		/* tmp_2 = 27*b^2 */
-
-		if (!BN_mod_add(a, tmp_1, tmp_2, p, ctx)) goto err;
-		if (BN_is_zero(a)) goto err;
-		}
-	ret = 1;
-
-err:
-	if (ctx != NULL)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_point_init(EC_POINT *point)
-	{
-	BN_init(&point->X);
-	BN_init(&point->Y);
-	BN_init(&point->Z);
-	point->Z_is_one = 0;
-
-	return 1;
-	}
-
-
-void ec_GFp_simple_point_finish(EC_POINT *point)
-	{
-	BN_free(&point->X);
-	BN_free(&point->Y);
-	BN_free(&point->Z);
-	}
-
-
-void ec_GFp_simple_point_clear_finish(EC_POINT *point)
-	{
-	BN_clear_free(&point->X);
-	BN_clear_free(&point->Y);
-	BN_clear_free(&point->Z);
-	point->Z_is_one = 0;
-	}
-
-
-int ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
-	{
-	if (!BN_copy(&dest->X, &src->X)) return 0;
-	if (!BN_copy(&dest->Y, &src->Y)) return 0;
-	if (!BN_copy(&dest->Z, &src->Z)) return 0;
-	dest->Z_is_one = src->Z_is_one;
-
-	return 1;
-	}
-
-
-int ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
-	{
-	point->Z_is_one = 0;
-	BN_zero(&point->Z);
-	return 1;
-	}
-
-
-int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	int ret = 0;
-	
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	if (x != NULL)
-		{
-		if (!BN_nnmod(&point->X, x, &group->field, ctx)) goto err;
-		if (group->meth->field_encode)
-			{
-			if (!group->meth->field_encode(group, &point->X, &point->X, ctx)) goto err;
-			}
-		}
-	
-	if (y != NULL)
-		{
-		if (!BN_nnmod(&point->Y, y, &group->field, ctx)) goto err;
-		if (group->meth->field_encode)
-			{
-			if (!group->meth->field_encode(group, &point->Y, &point->Y, ctx)) goto err;
-			}
-		}
-	
-	if (z != NULL)
-		{
-		int Z_is_one;
-
-		if (!BN_nnmod(&point->Z, z, &group->field, ctx)) goto err;
-		Z_is_one = BN_is_one(&point->Z);
-		if (group->meth->field_encode)
-			{
-			if (Z_is_one && (group->meth->field_set_to_one != 0))
-				{
-				if (!group->meth->field_set_to_one(group, &point->Z, ctx)) goto err;
-				}
-			else
-				{
-				if (!group->meth->field_encode(group, &point->Z, &point->Z, ctx)) goto err;
-				}
-			}
-		point->Z_is_one = Z_is_one;
-		}
-	
-	ret = 1;
-	
- err:
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point,
-	BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	int ret = 0;
-	
-	if (group->meth->field_decode != 0)
-		{
-		if (ctx == NULL)
-			{
-			ctx = new_ctx = BN_CTX_new();
-			if (ctx == NULL)
-				return 0;
-			}
-
-		if (x != NULL)
-			{
-			if (!group->meth->field_decode(group, x, &point->X, ctx)) goto err;
-			}
-		if (y != NULL)
-			{
-			if (!group->meth->field_decode(group, y, &point->Y, ctx)) goto err;
-			}
-		if (z != NULL)
-			{
-			if (!group->meth->field_decode(group, z, &point->Z, ctx)) goto err;
-			}
-		}
-	else	
-		{
-		if (x != NULL)
-			{
-			if (!BN_copy(x, &point->X)) goto err;
-			}
-		if (y != NULL)
-			{
-			if (!BN_copy(y, &point->Y)) goto err;
-			}
-		if (z != NULL)
-			{
-			if (!BN_copy(z, &point->Z)) goto err;
-			}
-		}
-	
-	ret = 1;
-
- err:
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)
-	{
-	if (x == NULL || y == NULL)
-		{
-		/* unlike for projective coordinates, we do not tolerate this */
-		ECerr(EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES, ERR_R_PASSED_NULL_PARAMETER);
-		return 0;
-		}
-
-	return EC_POINT_set_Jprojective_coordinates_GFp(group, point, x, y, BN_value_one(), ctx);
-	}
-
-
-int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,
-	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *Z, *Z_1, *Z_2, *Z_3;
-	const BIGNUM *Z_;
-	int ret = 0;
-
-	if (EC_POINT_is_at_infinity(group, point))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES, EC_R_POINT_AT_INFINITY);
-		return 0;
-		}
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	Z = BN_CTX_get(ctx);
-	Z_1 = BN_CTX_get(ctx);
-	Z_2 = BN_CTX_get(ctx);
-	Z_3 = BN_CTX_get(ctx);
-	if (Z_3 == NULL) goto err;
-
-	/* transform  (X, Y, Z)  into  (x, y) := (X/Z^2, Y/Z^3) */
-	
-	if (group->meth->field_decode)
-		{
-		if (!group->meth->field_decode(group, Z, &point->Z, ctx)) goto err;
-		Z_ = Z;
-		}
-	else
-		{
-		Z_ = &point->Z;
-		}
-	
-	if (BN_is_one(Z_))
-		{
-		if (group->meth->field_decode)
-			{
-			if (x != NULL)
-				{
-				if (!group->meth->field_decode(group, x, &point->X, ctx)) goto err;
-				}
-			if (y != NULL)
-				{
-				if (!group->meth->field_decode(group, y, &point->Y, ctx)) goto err;
-				}
-			}
-		else
-			{
-			if (x != NULL)
-				{
-				if (!BN_copy(x, &point->X)) goto err;
-				}
-			if (y != NULL)
-				{
-				if (!BN_copy(y, &point->Y)) goto err;
-				}
-			}
-		}
-	else
-		{
-		if (!BN_mod_inverse(Z_1, Z_, &group->field, ctx))
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES, ERR_R_BN_LIB);
-			goto err;
-			}
-		
-		if (group->meth->field_encode == 0)
-			{
-			/* field_sqr works on standard representation */
-			if (!group->meth->field_sqr(group, Z_2, Z_1, ctx)) goto err;
-			}
-		else
-			{
-			if (!BN_mod_sqr(Z_2, Z_1, &group->field, ctx)) goto err;
-			}
-	
-		if (x != NULL)
-			{
-			/* in the Montgomery case, field_mul will cancel out Montgomery factor in X: */
-			if (!group->meth->field_mul(group, x, &point->X, Z_2, ctx)) goto err;
-			}
-
-		if (y != NULL)
-			{
-			if (group->meth->field_encode == 0)
-				{
-				/* field_mul works on standard representation */
-				if (!group->meth->field_mul(group, Z_3, Z_2, Z_1, ctx)) goto err;
-				}
-			else
-				{
-				if (!BN_mod_mul(Z_3, Z_2, Z_1, &group->field, ctx)) goto err;
-				}
-
-			/* in the Montgomery case, field_mul will cancel out Montgomery factor in Y: */
-			if (!group->meth->field_mul(group, y, &point->Y, Z_3, ctx)) goto err;
-			}
-		}
-
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-	const BIGNUM *x_, int y_bit, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *tmp1, *tmp2, *x, *y;
-	int ret = 0;
-
-	/* clear error queue*/
-	ERR_clear_error();
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	y_bit = (y_bit != 0);
-
-	BN_CTX_start(ctx);
-	tmp1 = BN_CTX_get(ctx);
-	tmp2 = BN_CTX_get(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	if (y == NULL) goto err;
-
-	/* Recover y.  We have a Weierstrass equation
-	 *     y^2 = x^3 + a*x + b,
-	 * so  y  is one of the square roots of  x^3 + a*x + b.
-	 */
-
-	/* tmp1 := x^3 */
-	if (!BN_nnmod(x, x_, &group->field,ctx)) goto err;
-	if (group->meth->field_decode == 0)
-		{
-		/* field_{sqr,mul} work on standard representation */
-		if (!group->meth->field_sqr(group, tmp2, x_, ctx)) goto err;
-		if (!group->meth->field_mul(group, tmp1, tmp2, x_, ctx)) goto err;
-		}
-	else
-		{
-		if (!BN_mod_sqr(tmp2, x_, &group->field, ctx)) goto err;
-		if (!BN_mod_mul(tmp1, tmp2, x_, &group->field, ctx)) goto err;
-		}
-	
-	/* tmp1 := tmp1 + a*x */
-	if (group->a_is_minus3)
-		{
-		if (!BN_mod_lshift1_quick(tmp2, x, &group->field)) goto err;
-		if (!BN_mod_add_quick(tmp2, tmp2, x, &group->field)) goto err;
-		if (!BN_mod_sub_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-		}
-	else
-		{
-		if (group->meth->field_decode)
-			{
-			if (!group->meth->field_decode(group, tmp2, &group->a, ctx)) goto err;
-			if (!BN_mod_mul(tmp2, tmp2, x, &group->field, ctx)) goto err;
-			}
-		else
-			{
-			/* field_mul works on standard representation */
-			if (!group->meth->field_mul(group, tmp2, &group->a, x, ctx)) goto err;
-			}
-		
-		if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-		}
-	
-	/* tmp1 := tmp1 + b */
-	if (group->meth->field_decode)
-		{
-		if (!group->meth->field_decode(group, tmp2, &group->b, ctx)) goto err;
-		if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-		}
-	else
-		{
-		if (!BN_mod_add_quick(tmp1, tmp1, &group->b, &group->field)) goto err;
-		}
-	
-	if (!BN_mod_sqrt(y, tmp1, &group->field, ctx))
-		{
-		unsigned long err = ERR_peek_last_error();
-		
-		if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE)
-			{
-			ERR_clear_error();
-			ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-			}
-		else
-			ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
-		goto err;
-		}
-
-	if (y_bit != BN_is_odd(y))
-		{
-		if (BN_is_zero(y))
-			{
-			int kron;
-
-			kron = BN_kronecker(x, &group->field, ctx);
-			if (kron == -2) goto err;
-
-			if (kron == 1)
-				ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSION_BIT);
-			else
-				/* BN_mod_sqrt() should have cought this error (not a square) */
-				ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-			goto err;
-			}
-		if (!BN_usub(y, &group->field, y)) goto err;
-		}
-	if (y_bit != BN_is_odd(y))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_INTERNAL_ERROR);
-		goto err;
-		}
-
-	if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-size_t ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-	unsigned char *buf, size_t len, BN_CTX *ctx)
-	{
-	size_t ret;
-	BN_CTX *new_ctx = NULL;
-	int used_ctx = 0;
-	BIGNUM *x, *y;
-	size_t field_len, i, skip;
-
-	if ((form != POINT_CONVERSION_COMPRESSED)
-		&& (form != POINT_CONVERSION_UNCOMPRESSED)
-		&& (form != POINT_CONVERSION_HYBRID))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
-		goto err;
-		}
-
-	if (EC_POINT_is_at_infinity(group, point))
-		{
-		/* encodes to a single 0 octet */
-		if (buf != NULL)
-			{
-			if (len < 1)
-				{
-				ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-				return 0;
-				}
-			buf[0] = 0;
-			}
-		return 1;
-		}
-
-
-	/* ret := required output buffer length */
-	field_len = BN_num_bytes(&group->field);
-	ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-	/* if 'buf' is NULL, just return required length */
-	if (buf != NULL)
-		{
-		if (len < ret)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-			goto err;
-			}
-
-		if (ctx == NULL)
-			{
-			ctx = new_ctx = BN_CTX_new();
-			if (ctx == NULL)
-				return 0;
-			}
-
-		BN_CTX_start(ctx);
-		used_ctx = 1;
-		x = BN_CTX_get(ctx);
-		y = BN_CTX_get(ctx);
-		if (y == NULL) goto err;
-
-		if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-
-		if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))
-			buf[0] = form + 1;
-		else
-			buf[0] = form;
-	
-		i = 1;
-		
-		skip = field_len - BN_num_bytes(x);
-		if (skip > field_len)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-		while (skip > 0)
-			{
-			buf[i++] = 0;
-			skip--;
-			}
-		skip = BN_bn2bin(x, buf + i);
-		i += skip;
-		if (i != 1 + field_len)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-
-		if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
-			{
-			skip = field_len - BN_num_bytes(y);
-			if (skip > field_len)
-				{
-				ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-				goto err;
-				}
-			while (skip > 0)
-				{
-				buf[i++] = 0;
-				skip--;
-				}
-			skip = BN_bn2bin(y, buf + i);
-			i += skip;
-			}
-
-		if (i != ret)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-			goto err;
-			}
-		}
-	
-	if (used_ctx)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-
- err:
-	if (used_ctx)
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return 0;
-	}
-
-
-int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-	const unsigned char *buf, size_t len, BN_CTX *ctx)
-	{
-	point_conversion_form_t form;
-	int y_bit;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *x, *y;
-	size_t field_len, enc_len;
-	int ret = 0;
-
-	if (len == 0)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
-		return 0;
-		}
-	form = buf[0];
-	y_bit = form & 1;
-	form = form & ~1U;
-	if ((form != 0)	&& (form != POINT_CONVERSION_COMPRESSED)
-		&& (form != POINT_CONVERSION_UNCOMPRESSED)
-		&& (form != POINT_CONVERSION_HYBRID))
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-	if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-
-	if (form == 0)
-		{
-		if (len != 1)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-			return 0;
-			}
-
-		return EC_POINT_set_to_infinity(group, point);
-		}
-	
-	field_len = BN_num_bytes(&group->field);
-	enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-	if (len != enc_len)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		return 0;
-		}
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	if (y == NULL) goto err;
-
-	if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
-	if (BN_ucmp(x, &group->field) >= 0)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-		goto err;
-		}
-
-	if (form == POINT_CONVERSION_COMPRESSED)
-		{
-		if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) goto err;
-		}
-	else
-		{
-		if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
-		if (BN_ucmp(y, &group->field) >= 0)
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-			goto err;
-			}
-		if (form == POINT_CONVERSION_HYBRID)
-			{
-			if (y_bit != BN_is_odd(y))
-				{
-				ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-				goto err;
-				}
-			}
-
-		if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-		}
-	
-	if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
-		goto err;
-		}
-
-	ret = 1;
-	
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
-	{
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
-	const BIGNUM *p;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *n0, *n1, *n2, *n3, *n4, *n5, *n6;
-	int ret = 0;
-	
-	if (a == b)
-		return EC_POINT_dbl(group, r, a, ctx);
-	if (EC_POINT_is_at_infinity(group, a))
-		return EC_POINT_copy(r, b);
-	if (EC_POINT_is_at_infinity(group, b))
-		return EC_POINT_copy(r, a);
-	
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
-	p = &group->field;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	n0 = BN_CTX_get(ctx);
-	n1 = BN_CTX_get(ctx);
-	n2 = BN_CTX_get(ctx);
-	n3 = BN_CTX_get(ctx);
-	n4 = BN_CTX_get(ctx);
-	n5 = BN_CTX_get(ctx);
-	n6 = BN_CTX_get(ctx);
-	if (n6 == NULL) goto end;
-
-	/* Note that in this function we must not read components of 'a' or 'b'
-	 * once we have written the corresponding components of 'r'.
-	 * ('r' might be one of 'a' or 'b'.)
-	 */
-
-	/* n1, n2 */
-	if (b->Z_is_one)
-		{
-		if (!BN_copy(n1, &a->X)) goto end;
-		if (!BN_copy(n2, &a->Y)) goto end;
-		/* n1 = X_a */
-		/* n2 = Y_a */
-		}
-	else
-		{
-		if (!field_sqr(group, n0, &b->Z, ctx)) goto end;
-		if (!field_mul(group, n1, &a->X, n0, ctx)) goto end;
-		/* n1 = X_a * Z_b^2 */
-
-		if (!field_mul(group, n0, n0, &b->Z, ctx)) goto end;
-		if (!field_mul(group, n2, &a->Y, n0, ctx)) goto end;
-		/* n2 = Y_a * Z_b^3 */
-		}
-
-	/* n3, n4 */
-	if (a->Z_is_one)
-		{
-		if (!BN_copy(n3, &b->X)) goto end;
-		if (!BN_copy(n4, &b->Y)) goto end;
-		/* n3 = X_b */
-		/* n4 = Y_b */
-		}
-	else
-		{
-		if (!field_sqr(group, n0, &a->Z, ctx)) goto end;
-		if (!field_mul(group, n3, &b->X, n0, ctx)) goto end;
-		/* n3 = X_b * Z_a^2 */
-
-		if (!field_mul(group, n0, n0, &a->Z, ctx)) goto end;
-		if (!field_mul(group, n4, &b->Y, n0, ctx)) goto end;
-		/* n4 = Y_b * Z_a^3 */
-		}
-
-	/* n5, n6 */
-	if (!BN_mod_sub_quick(n5, n1, n3, p)) goto end;
-	if (!BN_mod_sub_quick(n6, n2, n4, p)) goto end;
-	/* n5 = n1 - n3 */
-	/* n6 = n2 - n4 */
-
-	if (BN_is_zero(n5))
-		{
-		if (BN_is_zero(n6))
-			{
-			/* a is the same point as b */
-			BN_CTX_end(ctx);
-			ret = EC_POINT_dbl(group, r, a, ctx);
-			ctx = NULL;
-			goto end;
-			}
-		else
-			{
-			/* a is the inverse of b */
-			BN_zero(&r->Z);
-			r->Z_is_one = 0;
-			ret = 1;
-			goto end;
-			}
-		}
-
-	/* 'n7', 'n8' */
-	if (!BN_mod_add_quick(n1, n1, n3, p)) goto end;
-	if (!BN_mod_add_quick(n2, n2, n4, p)) goto end;
-	/* 'n7' = n1 + n3 */
-	/* 'n8' = n2 + n4 */
-
-	/* Z_r */
-	if (a->Z_is_one && b->Z_is_one)
-		{
-		if (!BN_copy(&r->Z, n5)) goto end;
-		}
-	else
-		{
-		if (a->Z_is_one)
-			{ if (!BN_copy(n0, &b->Z)) goto end; }
-		else if (b->Z_is_one)
-			{ if (!BN_copy(n0, &a->Z)) goto end; }
-		else
-			{ if (!field_mul(group, n0, &a->Z, &b->Z, ctx)) goto end; }
-		if (!field_mul(group, &r->Z, n0, n5, ctx)) goto end;
-		}
-	r->Z_is_one = 0;
-	/* Z_r = Z_a * Z_b * n5 */
-
-	/* X_r */
-	if (!field_sqr(group, n0, n6, ctx)) goto end;
-	if (!field_sqr(group, n4, n5, ctx)) goto end;
-	if (!field_mul(group, n3, n1, n4, ctx)) goto end;
-	if (!BN_mod_sub_quick(&r->X, n0, n3, p)) goto end;
-	/* X_r = n6^2 - n5^2 * 'n7' */
-	
-	/* 'n9' */
-	if (!BN_mod_lshift1_quick(n0, &r->X, p)) goto end;
-	if (!BN_mod_sub_quick(n0, n3, n0, p)) goto end;
-	/* n9 = n5^2 * 'n7' - 2 * X_r */
-
-	/* Y_r */
-	if (!field_mul(group, n0, n0, n6, ctx)) goto end;
-	if (!field_mul(group, n5, n4, n5, ctx)) goto end; /* now n5 is n5^3 */
-	if (!field_mul(group, n1, n2, n5, ctx)) goto end;
-	if (!BN_mod_sub_quick(n0, n0, n1, p)) goto end;
-	if (BN_is_odd(n0))
-		if (!BN_add(n0, n0, p)) goto end;
-	/* now  0 <= n0 < 2*p,  and n0 is even */
-	if (!BN_rshift1(&r->Y, n0)) goto end;
-	/* Y_r = (n6 * 'n9' - 'n8' * 'n5^3') / 2 */
-
-	ret = 1;
-
- end:
-	if (ctx) /* otherwise we already called BN_CTX_end */
-		BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)
-	{
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
-	const BIGNUM *p;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *n0, *n1, *n2, *n3;
-	int ret = 0;
-	
-	if (EC_POINT_is_at_infinity(group, a))
-		{
-		BN_zero(&r->Z);
-		r->Z_is_one = 0;
-		return 1;
-		}
-
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
-	p = &group->field;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	n0 = BN_CTX_get(ctx);
-	n1 = BN_CTX_get(ctx);
-	n2 = BN_CTX_get(ctx);
-	n3 = BN_CTX_get(ctx);
-	if (n3 == NULL) goto err;
-
-	/* Note that in this function we must not read components of 'a'
-	 * once we have written the corresponding components of 'r'.
-	 * ('r' might the same as 'a'.)
-	 */
-
-	/* n1 */
-	if (a->Z_is_one)
-		{
-		if (!field_sqr(group, n0, &a->X, ctx)) goto err;
-		if (!BN_mod_lshift1_quick(n1, n0, p)) goto err;
-		if (!BN_mod_add_quick(n0, n0, n1, p)) goto err;
-		if (!BN_mod_add_quick(n1, n0, &group->a, p)) goto err;
-		/* n1 = 3 * X_a^2 + a_curve */
-		}
-	else if (group->a_is_minus3)
-		{
-		if (!field_sqr(group, n1, &a->Z, ctx)) goto err;
-		if (!BN_mod_add_quick(n0, &a->X, n1, p)) goto err;
-		if (!BN_mod_sub_quick(n2, &a->X, n1, p)) goto err;
-		if (!field_mul(group, n1, n0, n2, ctx)) goto err;
-		if (!BN_mod_lshift1_quick(n0, n1, p)) goto err;
-		if (!BN_mod_add_quick(n1, n0, n1, p)) goto err;
-		/* n1 = 3 * (X_a + Z_a^2) * (X_a - Z_a^2)
-		 *    = 3 * X_a^2 - 3 * Z_a^4 */
-		}
-	else
-		{
-		if (!field_sqr(group, n0, &a->X, ctx)) goto err;
-		if (!BN_mod_lshift1_quick(n1, n0, p)) goto err;
-		if (!BN_mod_add_quick(n0, n0, n1, p)) goto err;
-		if (!field_sqr(group, n1, &a->Z, ctx)) goto err;
-		if (!field_sqr(group, n1, n1, ctx)) goto err;
-		if (!field_mul(group, n1, n1, &group->a, ctx)) goto err;
-		if (!BN_mod_add_quick(n1, n1, n0, p)) goto err;
-		/* n1 = 3 * X_a^2 + a_curve * Z_a^4 */
-		}
-
-	/* Z_r */
-	if (a->Z_is_one)
-		{
-		if (!BN_copy(n0, &a->Y)) goto err;
-		}
-	else
-		{
-		if (!field_mul(group, n0, &a->Y, &a->Z, ctx)) goto err;
-		}
-	if (!BN_mod_lshift1_quick(&r->Z, n0, p)) goto err;
-	r->Z_is_one = 0;
-	/* Z_r = 2 * Y_a * Z_a */
-
-	/* n2 */
-	if (!field_sqr(group, n3, &a->Y, ctx)) goto err;
-	if (!field_mul(group, n2, &a->X, n3, ctx)) goto err;
-	if (!BN_mod_lshift_quick(n2, n2, 2, p)) goto err;
-	/* n2 = 4 * X_a * Y_a^2 */
-
-	/* X_r */
-	if (!BN_mod_lshift1_quick(n0, n2, p)) goto err;
-	if (!field_sqr(group, &r->X, n1, ctx)) goto err;
-	if (!BN_mod_sub_quick(&r->X, &r->X, n0, p)) goto err;
-	/* X_r = n1^2 - 2 * n2 */
-	
-	/* n3 */
-	if (!field_sqr(group, n0, n3, ctx)) goto err;
-	if (!BN_mod_lshift_quick(n3, n0, 3, p)) goto err;
-	/* n3 = 8 * Y_a^4 */
-	
-	/* Y_r */
-	if (!BN_mod_sub_quick(n0, n2, &r->X, p)) goto err;
-	if (!field_mul(group, n0, n1, n0, ctx)) goto err;
-	if (!BN_mod_sub_quick(&r->Y, n0, n3, p)) goto err;
-	/* Y_r = n1 * (n2 - X_r) - n3 */
-
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
-	{
-	if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(&point->Y))
-		/* point is its own inverse */
-		return 1;
-	
-	return BN_usub(&point->Y, &group->field, &point->Y);
-	}
-
-
-int ec_GFp_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
-	{
-	return BN_is_zero(&point->Z);
-	}
-
-
-int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)
-	{
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
-	const BIGNUM *p;
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *rh, *tmp, *Z4, *Z6;
-	int ret = -1;
-
-	if (EC_POINT_is_at_infinity(group, point))
-		return 1;
-	
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
-	p = &group->field;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return -1;
-		}
-
-	BN_CTX_start(ctx);
-	rh = BN_CTX_get(ctx);
-	tmp = BN_CTX_get(ctx);
-	Z4 = BN_CTX_get(ctx);
-	Z6 = BN_CTX_get(ctx);
-	if (Z6 == NULL) goto err;
-
-	/* We have a curve defined by a Weierstrass equation
-	 *      y^2 = x^3 + a*x + b.
-	 * The point to consider is given in Jacobian projective coordinates
-	 * where  (X, Y, Z)  represents  (x, y) = (X/Z^2, Y/Z^3).
-	 * Substituting this and multiplying by  Z^6  transforms the above equation into
-	 *      Y^2 = X^3 + a*X*Z^4 + b*Z^6.
-	 * To test this, we add up the right-hand side in 'rh'.
-	 */
-
-	/* rh := X^2 */
-	if (!field_sqr(group, rh, &point->X, ctx)) goto err;
-
-	if (!point->Z_is_one)
-		{
-		if (!field_sqr(group, tmp, &point->Z, ctx)) goto err;
-		if (!field_sqr(group, Z4, tmp, ctx)) goto err;
-		if (!field_mul(group, Z6, Z4, tmp, ctx)) goto err;
-
-		/* rh := (rh + a*Z^4)*X */
-		if (group->a_is_minus3)
-			{
-			if (!BN_mod_lshift1_quick(tmp, Z4, p)) goto err;
-			if (!BN_mod_add_quick(tmp, tmp, Z4, p)) goto err;
-			if (!BN_mod_sub_quick(rh, rh, tmp, p)) goto err;
-			if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;
-			}
-		else
-			{
-			if (!field_mul(group, tmp, Z4, &group->a, ctx)) goto err;
-			if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;
-			if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;
-			}
-
-		/* rh := rh + b*Z^6 */
-		if (!field_mul(group, tmp, &group->b, Z6, ctx)) goto err;
-		if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;
-		}
-	else
-		{
-		/* point->Z_is_one */
-
-		/* rh := (rh + a)*X */
-		if (!BN_mod_add_quick(rh, rh, &group->a, p)) goto err;
-		if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;
-		/* rh := rh + b */
-		if (!BN_mod_add_quick(rh, rh, &group->b, p)) goto err;
-		}
-
-	/* 'lh' := Y^2 */
-	if (!field_sqr(group, tmp, &point->Y, ctx)) goto err;
-
-	ret = (0 == BN_ucmp(tmp, rh));
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
-	{
-	/* return values:
-	 *  -1   error
-	 *   0   equal (in affine coordinates)
-	 *   1   not equal
-	 */
-
-	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
-	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *tmp1, *tmp2, *Za23, *Zb23;
-	const BIGNUM *tmp1_, *tmp2_;
-	int ret = -1;
-	
-	if (EC_POINT_is_at_infinity(group, a))
-		{
-		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
-		}
-	
-	if (a->Z_is_one && b->Z_is_one)
-		{
-		return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;
-		}
-
-	field_mul = group->meth->field_mul;
-	field_sqr = group->meth->field_sqr;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return -1;
-		}
-
-	BN_CTX_start(ctx);
-	tmp1 = BN_CTX_get(ctx);
-	tmp2 = BN_CTX_get(ctx);
-	Za23 = BN_CTX_get(ctx);
-	Zb23 = BN_CTX_get(ctx);
-	if (Zb23 == NULL) goto end;
-
-	/* We have to decide whether
-	 *     (X_a/Z_a^2, Y_a/Z_a^3) = (X_b/Z_b^2, Y_b/Z_b^3),
-	 * or equivalently, whether
-	 *     (X_a*Z_b^2, Y_a*Z_b^3) = (X_b*Z_a^2, Y_b*Z_a^3).
-	 */
-
-	if (!b->Z_is_one)
-		{
-		if (!field_sqr(group, Zb23, &b->Z, ctx)) goto end;
-		if (!field_mul(group, tmp1, &a->X, Zb23, ctx)) goto end;
-		tmp1_ = tmp1;
-		}
-	else
-		tmp1_ = &a->X;
-	if (!a->Z_is_one)
-		{
-		if (!field_sqr(group, Za23, &a->Z, ctx)) goto end;
-		if (!field_mul(group, tmp2, &b->X, Za23, ctx)) goto end;
-		tmp2_ = tmp2;
-		}
-	else
-		tmp2_ = &b->X;
-	
-	/* compare  X_a*Z_b^2  with  X_b*Z_a^2 */
-	if (BN_cmp(tmp1_, tmp2_) != 0)
-		{
-		ret = 1; /* points differ */
-		goto end;
-		}
-
-
-	if (!b->Z_is_one)
-		{
-		if (!field_mul(group, Zb23, Zb23, &b->Z, ctx)) goto end;
-		if (!field_mul(group, tmp1, &a->Y, Zb23, ctx)) goto end;
-		/* tmp1_ = tmp1 */
-		}
-	else
-		tmp1_ = &a->Y;
-	if (!a->Z_is_one)
-		{
-		if (!field_mul(group, Za23, Za23, &a->Z, ctx)) goto end;
-		if (!field_mul(group, tmp2, &b->Y, Za23, ctx)) goto end;
-		/* tmp2_ = tmp2 */
-		}
-	else
-		tmp2_ = &b->Y;
-
-	/* compare  Y_a*Z_b^3  with  Y_b*Z_a^3 */
-	if (BN_cmp(tmp1_, tmp2_) != 0)
-		{
-		ret = 1; /* points differ */
-		goto end;
-		}
-
-	/* points are equal */
-	ret = 0;
-
- end:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *x, *y;
-	int ret = 0;
-
-	if (point->Z_is_one || EC_POINT_is_at_infinity(group, point))
-		return 1;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	x = BN_CTX_get(ctx);
-	y = BN_CTX_get(ctx);
-	if (y == NULL) goto err;
-
-	if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-	if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-	if (!point->Z_is_one)
-		{
-		ECerr(EC_F_EC_GFP_SIMPLE_MAKE_AFFINE, ERR_R_INTERNAL_ERROR);
-		goto err;
-		}
-	
-	ret = 1;
-
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	return ret;
-	}
-
-
-int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BIGNUM *tmp0, *tmp1;
-	size_t pow2 = 0;
-	BIGNUM **heap = NULL;
-	size_t i;
-	int ret = 0;
-
-	if (num == 0)
-		return 1;
-
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	BN_CTX_start(ctx);
-	tmp0 = BN_CTX_get(ctx);
-	tmp1 = BN_CTX_get(ctx);
-	if (tmp0  == NULL || tmp1 == NULL) goto err;
-
-	/* Before converting the individual points, compute inverses of all Z values.
-	 * Modular inversion is rather slow, but luckily we can do with a single
-	 * explicit inversion, plus about 3 multiplications per input value.
-	 */
-
-	pow2 = 1;
-	while (num > pow2)
-		pow2 <<= 1;
-	/* Now pow2 is the smallest power of 2 satifsying pow2 >= num.
-	 * We need twice that. */
-	pow2 <<= 1;
-
-	heap = OPENSSL_malloc(pow2 * sizeof heap[0]);
-	if (heap == NULL) goto err;
-	
-	/* The array is used as a binary tree, exactly as in heapsort:
-	 *
-	 *                               heap[1]
-	 *                 heap[2]                     heap[3]
-	 *          heap[4]       heap[5]       heap[6]       heap[7]
-	 *   heap[8]heap[9] heap[10]heap[11] heap[12]heap[13] heap[14] heap[15]
-	 *
-	 * We put the Z's in the last line;
-	 * then we set each other node to the product of its two child-nodes (where
-	 * empty or 0 entries are treated as ones);
-	 * then we invert heap[1];
-	 * then we invert each other node by replacing it by the product of its
-	 * parent (after inversion) and its sibling (before inversion).
-	 */
-	heap[0] = NULL;
-	for (i = pow2/2 - 1; i > 0; i--)
-		heap[i] = NULL;
-	for (i = 0; i < num; i++)
-		heap[pow2/2 + i] = &points[i]->Z;
-	for (i = pow2/2 + num; i < pow2; i++)
-		heap[i] = NULL;
-	
-	/* set each node to the product of its children */
-	for (i = pow2/2 - 1; i > 0; i--)
-		{
-		heap[i] = BN_new();
-		if (heap[i] == NULL) goto err;
-		
-		if (heap[2*i] != NULL)
-			{
-			if ((heap[2*i + 1] == NULL) || BN_is_zero(heap[2*i + 1]))
-				{
-				if (!BN_copy(heap[i], heap[2*i])) goto err;
-				}
-			else
-				{
-				if (BN_is_zero(heap[2*i]))
-					{
-					if (!BN_copy(heap[i], heap[2*i + 1])) goto err;
-					}
-				else
-					{
-					if (!group->meth->field_mul(group, heap[i],
-						heap[2*i], heap[2*i + 1], ctx)) goto err;
-					}
-				}
-			}
-		}
-
-	/* invert heap[1] */
-	if (!BN_is_zero(heap[1]))
-		{
-		if (!BN_mod_inverse(heap[1], heap[1], &group->field, ctx))
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE, ERR_R_BN_LIB);
-			goto err;
-			}
-		}
-	if (group->meth->field_encode != 0)
-		{
-		/* in the Montgomery case, we just turned  R*H  (representing H)
-		 * into  1/(R*H),  but we need  R*(1/H)  (representing 1/H);
-		 * i.e. we have need to multiply by the Montgomery factor twice */
-		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;
-		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;
-		}
-
-	/* set other heap[i]'s to their inverses */
-	for (i = 2; i < pow2/2 + num; i += 2)
-		{
-		/* i is even */
-		if ((heap[i + 1] != NULL) && !BN_is_zero(heap[i + 1]))
-			{
-			if (!group->meth->field_mul(group, tmp0, heap[i/2], heap[i + 1], ctx)) goto err;
-			if (!group->meth->field_mul(group, tmp1, heap[i/2], heap[i], ctx)) goto err;
-			if (!BN_copy(heap[i], tmp0)) goto err;
-			if (!BN_copy(heap[i + 1], tmp1)) goto err;
-			}
-		else
-			{
-			if (!BN_copy(heap[i], heap[i/2])) goto err;
-			}
-		}
-
-	/* we have replaced all non-zero Z's by their inverses, now fix up all the points */
-	for (i = 0; i < num; i++)
-		{
-		EC_POINT *p = points[i];
-		
-		if (!BN_is_zero(&p->Z))
-			{
-			/* turn  (X, Y, 1/Z)  into  (X/Z^2, Y/Z^3, 1) */
-
-			if (!group->meth->field_sqr(group, tmp1, &p->Z, ctx)) goto err;
-			if (!group->meth->field_mul(group, &p->X, &p->X, tmp1, ctx)) goto err;
-
-			if (!group->meth->field_mul(group, tmp1, tmp1, &p->Z, ctx)) goto err;
-			if (!group->meth->field_mul(group, &p->Y, &p->Y, tmp1, ctx)) goto err;
-		
-			if (group->meth->field_set_to_one != 0)
-				{
-				if (!group->meth->field_set_to_one(group, &p->Z, ctx)) goto err;
-				}
-			else
-				{
-				if (!BN_one(&p->Z)) goto err;
-				}
-			p->Z_is_one = 1;
-			}
-		}
-
-	ret = 1;
-		
- err:
-	BN_CTX_end(ctx);
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	if (heap != NULL)
-		{
-		/* heap[pow2/2] .. heap[pow2-1] have not been allocated locally! */
-		for (i = pow2/2 - 1; i > 0; i--)
-			{
-			if (heap[i] != NULL)
-				BN_clear_free(heap[i]);
-			}
-		OPENSSL_free(heap);
-		}
-	return ret;
-	}
-
-
-int ec_GFp_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	return BN_mod_mul(r, a, b, &group->field, ctx);
-	}
-
-
-int ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
-	{
-	return BN_mod_sqr(r, a, &group->field, ctx);
-	}
+/* crypto/ec/ecp_smpl.c */

+/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>

+ * for the OpenSSL project. 

+ * Includes code written by Bodo Moeller for the OpenSSL project.

+*/

+/* ====================================================================

+ * Copyright (c) 1998-2002 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

+ *    openssl-core@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).

+ *

+ */

+/* ====================================================================

+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.

+ * Portions of this software developed by SUN MICROSYSTEMS, INC.,

+ * and contributed to the OpenSSL project.

+ */

+

+#include <openssl/err.h>

+#include <openssl/symhacks.h>

+

+#include "ec_lcl.h"

+

+const EC_METHOD *EC_GFp_simple_method(void)

+	{

+	static const EC_METHOD ret = {

+		NID_X9_62_prime_field,

+		ec_GFp_simple_group_init,

+		ec_GFp_simple_group_finish,

+		ec_GFp_simple_group_clear_finish,

+		ec_GFp_simple_group_copy,

+		ec_GFp_simple_group_set_curve,

+		ec_GFp_simple_group_get_curve,

+		ec_GFp_simple_group_get_degree,

+		ec_GFp_simple_group_check_discriminant,

+		ec_GFp_simple_point_init,

+		ec_GFp_simple_point_finish,

+		ec_GFp_simple_point_clear_finish,

+		ec_GFp_simple_point_copy,

+		ec_GFp_simple_point_set_to_infinity,

+		ec_GFp_simple_set_Jprojective_coordinates_GFp,

+		ec_GFp_simple_get_Jprojective_coordinates_GFp,

+		ec_GFp_simple_point_set_affine_coordinates,

+		ec_GFp_simple_point_get_affine_coordinates,

+		ec_GFp_simple_set_compressed_coordinates,

+		ec_GFp_simple_point2oct,

+		ec_GFp_simple_oct2point,

+		ec_GFp_simple_add,

+		ec_GFp_simple_dbl,

+		ec_GFp_simple_invert,

+		ec_GFp_simple_is_at_infinity,

+		ec_GFp_simple_is_on_curve,

+		ec_GFp_simple_cmp,

+		ec_GFp_simple_make_affine,

+		ec_GFp_simple_points_make_affine,

+		0 /* mul */,

+		0 /* precompute_mult */,

+		0 /* have_precompute_mult */,	

+		ec_GFp_simple_field_mul,

+		ec_GFp_simple_field_sqr,

+		0 /* field_div */,

+		0 /* field_encode */,

+		0 /* field_decode */,

+		0 /* field_set_to_one */ };

+

+	return &ret;

+	}

+

+

+/* Most method functions in this file are designed to work with

+ * non-trivial representations of field elements if necessary

+ * (see ecp_mont.c): while standard modular addition and subtraction

+ * are used, the field_mul and field_sqr methods will be used for

+ * multiplication, and field_encode and field_decode (if defined)

+ * will be used for converting between representations.

+

+ * Functions ec_GFp_simple_points_make_affine() and

+ * ec_GFp_simple_point_get_affine_coordinates() specifically assume

+ * that if a non-trivial representation is used, it is a Montgomery

+ * representation (i.e. 'encoding' means multiplying by some factor R).

+ */

+

+

+int ec_GFp_simple_group_init(EC_GROUP *group)

+	{

+	BN_init(&group->field);

+	BN_init(&group->a);

+	BN_init(&group->b);

+	group->a_is_minus3 = 0;

+	return 1;

+	}

+

+

+void ec_GFp_simple_group_finish(EC_GROUP *group)

+	{

+	BN_free(&group->field);

+	BN_free(&group->a);

+	BN_free(&group->b);

+	}

+

+

+void ec_GFp_simple_group_clear_finish(EC_GROUP *group)

+	{

+	BN_clear_free(&group->field);

+	BN_clear_free(&group->a);

+	BN_clear_free(&group->b);

+	}

+

+

+int ec_GFp_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)

+	{

+	if (!BN_copy(&dest->field, &src->field)) return 0;

+	if (!BN_copy(&dest->a, &src->a)) return 0;

+	if (!BN_copy(&dest->b, &src->b)) return 0;

+

+	dest->a_is_minus3 = src->a_is_minus3;

+

+	return 1;

+	}

+

+

+int ec_GFp_simple_group_set_curve(EC_GROUP *group,

+	const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)

+	{

+	int ret = 0;

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *tmp_a;

+	

+	/* p must be a prime > 3 */

+	if (BN_num_bits(p) <= 2 || !BN_is_odd(p))

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_INVALID_FIELD);

+		return 0;

+		}

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	tmp_a = BN_CTX_get(ctx);

+	if (tmp_a == NULL) goto err;

+

+	/* group->field */

+	if (!BN_copy(&group->field, p)) goto err;

+	BN_set_negative(&group->field, 0);

+

+	/* group->a */

+	if (!BN_nnmod(tmp_a, a, p, ctx)) goto err;

+	if (group->meth->field_encode)

+		{ if (!group->meth->field_encode(group, &group->a, tmp_a, ctx)) goto err; }	

+	else

+		if (!BN_copy(&group->a, tmp_a)) goto err;

+	

+	/* group->b */

+	if (!BN_nnmod(&group->b, b, p, ctx)) goto err;

+	if (group->meth->field_encode)

+		if (!group->meth->field_encode(group, &group->b, &group->b, ctx)) goto err;

+	

+	/* group->a_is_minus3 */

+	if (!BN_add_word(tmp_a, 3)) goto err;

+	group->a_is_minus3 = (0 == BN_cmp(tmp_a, &group->field));

+

+	ret = 1;

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)

+	{

+	int ret = 0;

+	BN_CTX *new_ctx = NULL;

+	

+	if (p != NULL)

+		{

+		if (!BN_copy(p, &group->field)) return 0;

+		}

+

+	if (a != NULL || b != NULL)

+		{

+		if (group->meth->field_decode)

+			{

+			if (ctx == NULL)

+				{

+				ctx = new_ctx = BN_CTX_new();

+				if (ctx == NULL)

+					return 0;

+				}

+			if (a != NULL)

+				{

+				if (!group->meth->field_decode(group, a, &group->a, ctx)) goto err;

+				}

+			if (b != NULL)

+				{

+				if (!group->meth->field_decode(group, b, &group->b, ctx)) goto err;

+				}

+			}

+		else

+			{

+			if (a != NULL)

+				{

+				if (!BN_copy(a, &group->a)) goto err;

+				}

+			if (b != NULL)

+				{

+				if (!BN_copy(b, &group->b)) goto err;

+				}

+			}

+		}

+	

+	ret = 1;

+	

+ err:

+	if (new_ctx)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_group_get_degree(const EC_GROUP *group)

+	{

+	return BN_num_bits(&group->field);

+	}

+

+

+int ec_GFp_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)

+	{

+	int ret = 0;

+	BIGNUM *a,*b,*order,*tmp_1,*tmp_2;

+	const BIGNUM *p = &group->field;

+	BN_CTX *new_ctx = NULL;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT, ERR_R_MALLOC_FAILURE);

+			goto err;

+			}

+		}

+	BN_CTX_start(ctx);

+	a = BN_CTX_get(ctx);

+	b = BN_CTX_get(ctx);

+	tmp_1 = BN_CTX_get(ctx);

+	tmp_2 = BN_CTX_get(ctx);

+	order = BN_CTX_get(ctx);

+	if (order == NULL) goto err;

+

+	if (group->meth->field_decode)

+		{

+		if (!group->meth->field_decode(group, a, &group->a, ctx)) goto err;

+		if (!group->meth->field_decode(group, b, &group->b, ctx)) goto err;

+		}

+	else

+		{

+		if (!BN_copy(a, &group->a)) goto err;

+		if (!BN_copy(b, &group->b)) goto err;

+		}

+	

+	/* check the discriminant:

+	 * y^2 = x^3 + a*x + b is an elliptic curve <=> 4*a^3 + 27*b^2 != 0 (mod p) 

+         * 0 =< a, b < p */

+	if (BN_is_zero(a))

+		{

+		if (BN_is_zero(b)) goto err;

+		}

+	else if (!BN_is_zero(b))

+		{

+		if (!BN_mod_sqr(tmp_1, a, p, ctx)) goto err;

+		if (!BN_mod_mul(tmp_2, tmp_1, a, p, ctx)) goto err;

+		if (!BN_lshift(tmp_1, tmp_2, 2)) goto err;

+		/* tmp_1 = 4*a^3 */

+

+		if (!BN_mod_sqr(tmp_2, b, p, ctx)) goto err;

+		if (!BN_mul_word(tmp_2, 27)) goto err;

+		/* tmp_2 = 27*b^2 */

+

+		if (!BN_mod_add(a, tmp_1, tmp_2, p, ctx)) goto err;

+		if (BN_is_zero(a)) goto err;

+		}

+	ret = 1;

+

+err:

+	if (ctx != NULL)

+		BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_point_init(EC_POINT *point)

+	{

+	BN_init(&point->X);

+	BN_init(&point->Y);

+	BN_init(&point->Z);

+	point->Z_is_one = 0;

+

+	return 1;

+	}

+

+

+void ec_GFp_simple_point_finish(EC_POINT *point)

+	{

+	BN_free(&point->X);

+	BN_free(&point->Y);

+	BN_free(&point->Z);

+	}

+

+

+void ec_GFp_simple_point_clear_finish(EC_POINT *point)

+	{

+	BN_clear_free(&point->X);

+	BN_clear_free(&point->Y);

+	BN_clear_free(&point->Z);

+	point->Z_is_one = 0;

+	}

+

+

+int ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)

+	{

+	if (!BN_copy(&dest->X, &src->X)) return 0;

+	if (!BN_copy(&dest->Y, &src->Y)) return 0;

+	if (!BN_copy(&dest->Z, &src->Z)) return 0;

+	dest->Z_is_one = src->Z_is_one;

+

+	return 1;

+	}

+

+

+int ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group, EC_POINT *point)

+	{

+	point->Z_is_one = 0;

+	BN_zero(&point->Z);

+	return 1;

+	}

+

+

+int ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,

+	const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	int ret = 0;

+	

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	if (x != NULL)

+		{

+		if (!BN_nnmod(&point->X, x, &group->field, ctx)) goto err;

+		if (group->meth->field_encode)

+			{

+			if (!group->meth->field_encode(group, &point->X, &point->X, ctx)) goto err;

+			}

+		}

+	

+	if (y != NULL)

+		{

+		if (!BN_nnmod(&point->Y, y, &group->field, ctx)) goto err;

+		if (group->meth->field_encode)

+			{

+			if (!group->meth->field_encode(group, &point->Y, &point->Y, ctx)) goto err;

+			}

+		}

+	

+	if (z != NULL)

+		{

+		int Z_is_one;

+

+		if (!BN_nnmod(&point->Z, z, &group->field, ctx)) goto err;

+		Z_is_one = BN_is_one(&point->Z);

+		if (group->meth->field_encode)

+			{

+			if (Z_is_one && (group->meth->field_set_to_one != 0))

+				{

+				if (!group->meth->field_set_to_one(group, &point->Z, ctx)) goto err;

+				}

+			else

+				{

+				if (!group->meth->field_encode(group, &point->Z, &point->Z, ctx)) goto err;

+				}

+			}

+		point->Z_is_one = Z_is_one;

+		}

+	

+	ret = 1;

+	

+ err:

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point,

+	BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	int ret = 0;

+	

+	if (group->meth->field_decode != 0)

+		{

+		if (ctx == NULL)

+			{

+			ctx = new_ctx = BN_CTX_new();

+			if (ctx == NULL)

+				return 0;

+			}

+

+		if (x != NULL)

+			{

+			if (!group->meth->field_decode(group, x, &point->X, ctx)) goto err;

+			}

+		if (y != NULL)

+			{

+			if (!group->meth->field_decode(group, y, &point->Y, ctx)) goto err;

+			}

+		if (z != NULL)

+			{

+			if (!group->meth->field_decode(group, z, &point->Z, ctx)) goto err;

+			}

+		}

+	else	

+		{

+		if (x != NULL)

+			{

+			if (!BN_copy(x, &point->X)) goto err;

+			}

+		if (y != NULL)

+			{

+			if (!BN_copy(y, &point->Y)) goto err;

+			}

+		if (z != NULL)

+			{

+			if (!BN_copy(z, &point->Z)) goto err;

+			}

+		}

+	

+	ret = 1;

+

+ err:

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,

+	const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)

+	{

+	if (x == NULL || y == NULL)

+		{

+		/* unlike for projective coordinates, we do not tolerate this */

+		ECerr(EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES, ERR_R_PASSED_NULL_PARAMETER);

+		return 0;

+		}

+

+	return EC_POINT_set_Jprojective_coordinates_GFp(group, point, x, y, BN_value_one(), ctx);

+	}

+

+

+int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,

+	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *Z, *Z_1, *Z_2, *Z_3;

+	const BIGNUM *Z_;

+	int ret = 0;

+

+	if (EC_POINT_is_at_infinity(group, point))

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES, EC_R_POINT_AT_INFINITY);

+		return 0;

+		}

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	Z = BN_CTX_get(ctx);

+	Z_1 = BN_CTX_get(ctx);

+	Z_2 = BN_CTX_get(ctx);

+	Z_3 = BN_CTX_get(ctx);

+	if (Z_3 == NULL) goto err;

+

+	/* transform  (X, Y, Z)  into  (x, y) := (X/Z^2, Y/Z^3) */

+	

+	if (group->meth->field_decode)

+		{

+		if (!group->meth->field_decode(group, Z, &point->Z, ctx)) goto err;

+		Z_ = Z;

+		}

+	else

+		{

+		Z_ = &point->Z;

+		}

+	

+	if (BN_is_one(Z_))

+		{

+		if (group->meth->field_decode)

+			{

+			if (x != NULL)

+				{

+				if (!group->meth->field_decode(group, x, &point->X, ctx)) goto err;

+				}

+			if (y != NULL)

+				{

+				if (!group->meth->field_decode(group, y, &point->Y, ctx)) goto err;

+				}

+			}

+		else

+			{

+			if (x != NULL)

+				{

+				if (!BN_copy(x, &point->X)) goto err;

+				}

+			if (y != NULL)

+				{

+				if (!BN_copy(y, &point->Y)) goto err;

+				}

+			}

+		}

+	else

+		{

+		if (!BN_mod_inverse(Z_1, Z_, &group->field, ctx))

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES, ERR_R_BN_LIB);

+			goto err;

+			}

+		

+		if (group->meth->field_encode == 0)

+			{

+			/* field_sqr works on standard representation */

+			if (!group->meth->field_sqr(group, Z_2, Z_1, ctx)) goto err;

+			}

+		else

+			{

+			if (!BN_mod_sqr(Z_2, Z_1, &group->field, ctx)) goto err;

+			}

+	

+		if (x != NULL)

+			{

+			/* in the Montgomery case, field_mul will cancel out Montgomery factor in X: */

+			if (!group->meth->field_mul(group, x, &point->X, Z_2, ctx)) goto err;

+			}

+

+		if (y != NULL)

+			{

+			if (group->meth->field_encode == 0)

+				{

+				/* field_mul works on standard representation */

+				if (!group->meth->field_mul(group, Z_3, Z_2, Z_1, ctx)) goto err;

+				}

+			else

+				{

+				if (!BN_mod_mul(Z_3, Z_2, Z_1, &group->field, ctx)) goto err;

+				}

+

+			/* in the Montgomery case, field_mul will cancel out Montgomery factor in Y: */

+			if (!group->meth->field_mul(group, y, &point->Y, Z_3, ctx)) goto err;

+			}

+		}

+

+	ret = 1;

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,

+	const BIGNUM *x_, int y_bit, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *tmp1, *tmp2, *x, *y;

+	int ret = 0;

+

+	/* clear error queue*/

+	ERR_clear_error();

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	y_bit = (y_bit != 0);

+

+	BN_CTX_start(ctx);

+	tmp1 = BN_CTX_get(ctx);

+	tmp2 = BN_CTX_get(ctx);

+	x = BN_CTX_get(ctx);

+	y = BN_CTX_get(ctx);

+	if (y == NULL) goto err;

+

+	/* Recover y.  We have a Weierstrass equation

+	 *     y^2 = x^3 + a*x + b,

+	 * so  y  is one of the square roots of  x^3 + a*x + b.

+	 */

+

+	/* tmp1 := x^3 */

+	if (!BN_nnmod(x, x_, &group->field,ctx)) goto err;

+	if (group->meth->field_decode == 0)

+		{

+		/* field_{sqr,mul} work on standard representation */

+		if (!group->meth->field_sqr(group, tmp2, x_, ctx)) goto err;

+		if (!group->meth->field_mul(group, tmp1, tmp2, x_, ctx)) goto err;

+		}

+	else

+		{

+		if (!BN_mod_sqr(tmp2, x_, &group->field, ctx)) goto err;

+		if (!BN_mod_mul(tmp1, tmp2, x_, &group->field, ctx)) goto err;

+		}

+	

+	/* tmp1 := tmp1 + a*x */

+	if (group->a_is_minus3)

+		{

+		if (!BN_mod_lshift1_quick(tmp2, x, &group->field)) goto err;

+		if (!BN_mod_add_quick(tmp2, tmp2, x, &group->field)) goto err;

+		if (!BN_mod_sub_quick(tmp1, tmp1, tmp2, &group->field)) goto err;

+		}

+	else

+		{

+		if (group->meth->field_decode)

+			{

+			if (!group->meth->field_decode(group, tmp2, &group->a, ctx)) goto err;

+			if (!BN_mod_mul(tmp2, tmp2, x, &group->field, ctx)) goto err;

+			}

+		else

+			{

+			/* field_mul works on standard representation */

+			if (!group->meth->field_mul(group, tmp2, &group->a, x, ctx)) goto err;

+			}

+		

+		if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;

+		}

+	

+	/* tmp1 := tmp1 + b */

+	if (group->meth->field_decode)

+		{

+		if (!group->meth->field_decode(group, tmp2, &group->b, ctx)) goto err;

+		if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;

+		}

+	else

+		{

+		if (!BN_mod_add_quick(tmp1, tmp1, &group->b, &group->field)) goto err;

+		}

+	

+	if (!BN_mod_sqrt(y, tmp1, &group->field, ctx))

+		{

+		unsigned long err = ERR_peek_last_error();

+		

+		if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE)

+			{

+			ERR_clear_error();

+			ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);

+			}

+		else

+			ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);

+		goto err;

+		}

+

+	if (y_bit != BN_is_odd(y))

+		{

+		if (BN_is_zero(y))

+			{

+			int kron;

+

+			kron = BN_kronecker(x, &group->field, ctx);

+			if (kron == -2) goto err;

+

+			if (kron == 1)

+				ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSION_BIT);

+			else

+				/* BN_mod_sqrt() should have cought this error (not a square) */

+				ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);

+			goto err;

+			}

+		if (!BN_usub(y, &group->field, y)) goto err;

+		}

+	if (y_bit != BN_is_odd(y))

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_INTERNAL_ERROR);

+		goto err;

+		}

+

+	if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;

+

+	ret = 1;

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+size_t ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,

+	unsigned char *buf, size_t len, BN_CTX *ctx)

+	{

+	size_t ret;

+	BN_CTX *new_ctx = NULL;

+	int used_ctx = 0;

+	BIGNUM *x, *y;

+	size_t field_len, i, skip;

+

+	if ((form != POINT_CONVERSION_COMPRESSED)

+		&& (form != POINT_CONVERSION_UNCOMPRESSED)

+		&& (form != POINT_CONVERSION_HYBRID))

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);

+		goto err;

+		}

+

+	if (EC_POINT_is_at_infinity(group, point))

+		{

+		/* encodes to a single 0 octet */

+		if (buf != NULL)

+			{

+			if (len < 1)

+				{

+				ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);

+				return 0;

+				}

+			buf[0] = 0;

+			}

+		return 1;

+		}

+

+

+	/* ret := required output buffer length */

+	field_len = BN_num_bytes(&group->field);

+	ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;

+

+	/* if 'buf' is NULL, just return required length */

+	if (buf != NULL)

+		{

+		if (len < ret)

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);

+			goto err;

+			}

+

+		if (ctx == NULL)

+			{

+			ctx = new_ctx = BN_CTX_new();

+			if (ctx == NULL)

+				return 0;

+			}

+

+		BN_CTX_start(ctx);

+		used_ctx = 1;

+		x = BN_CTX_get(ctx);

+		y = BN_CTX_get(ctx);

+		if (y == NULL) goto err;

+

+		if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;

+

+		if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))

+			buf[0] = form + 1;

+		else

+			buf[0] = form;

+	

+		i = 1;

+		

+		skip = field_len - BN_num_bytes(x);

+		if (skip > field_len)

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+			goto err;

+			}

+		while (skip > 0)

+			{

+			buf[i++] = 0;

+			skip--;

+			}

+		skip = BN_bn2bin(x, buf + i);

+		i += skip;

+		if (i != 1 + field_len)

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+			goto err;

+			}

+

+		if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)

+			{

+			skip = field_len - BN_num_bytes(y);

+			if (skip > field_len)

+				{

+				ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+				goto err;

+				}

+			while (skip > 0)

+				{

+				buf[i++] = 0;

+				skip--;

+				}

+			skip = BN_bn2bin(y, buf + i);

+			i += skip;

+			}

+

+		if (i != ret)

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);

+			goto err;

+			}

+		}

+	

+	if (used_ctx)

+		BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+

+ err:

+	if (used_ctx)

+		BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return 0;

+	}

+

+

+int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,

+	const unsigned char *buf, size_t len, BN_CTX *ctx)

+	{

+	point_conversion_form_t form;

+	int y_bit;

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *x, *y;

+	size_t field_len, enc_len;

+	int ret = 0;

+

+	if (len == 0)

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);

+		return 0;

+		}

+	form = buf[0];

+	y_bit = form & 1;

+	form = form & ~1U;

+	if ((form != 0)	&& (form != POINT_CONVERSION_COMPRESSED)

+		&& (form != POINT_CONVERSION_UNCOMPRESSED)

+		&& (form != POINT_CONVERSION_HYBRID))

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		return 0;

+		}

+	if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		return 0;

+		}

+

+	if (form == 0)

+		{

+		if (len != 1)

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+			return 0;

+			}

+

+		return EC_POINT_set_to_infinity(group, point);

+		}

+	

+	field_len = BN_num_bytes(&group->field);

+	enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;

+

+	if (len != enc_len)

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		return 0;

+		}

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	x = BN_CTX_get(ctx);

+	y = BN_CTX_get(ctx);

+	if (y == NULL) goto err;

+

+	if (!BN_bin2bn(buf + 1, field_len, x)) goto err;

+	if (BN_ucmp(x, &group->field) >= 0)

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+		goto err;

+		}

+

+	if (form == POINT_CONVERSION_COMPRESSED)

+		{

+		if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) goto err;

+		}

+	else

+		{

+		if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;

+		if (BN_ucmp(y, &group->field) >= 0)

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+			goto err;

+			}

+		if (form == POINT_CONVERSION_HYBRID)

+			{

+			if (y_bit != BN_is_odd(y))

+				{

+				ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);

+				goto err;

+				}

+			}

+

+		if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;

+		}

+	

+	if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);

+		goto err;

+		}

+

+	ret = 1;

+	

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)

+	{

+	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);

+	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);

+	const BIGNUM *p;

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *n0, *n1, *n2, *n3, *n4, *n5, *n6;

+	int ret = 0;

+	

+	if (a == b)

+		return EC_POINT_dbl(group, r, a, ctx);

+	if (EC_POINT_is_at_infinity(group, a))

+		return EC_POINT_copy(r, b);

+	if (EC_POINT_is_at_infinity(group, b))

+		return EC_POINT_copy(r, a);

+	

+	field_mul = group->meth->field_mul;

+	field_sqr = group->meth->field_sqr;

+	p = &group->field;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	n0 = BN_CTX_get(ctx);

+	n1 = BN_CTX_get(ctx);

+	n2 = BN_CTX_get(ctx);

+	n3 = BN_CTX_get(ctx);

+	n4 = BN_CTX_get(ctx);

+	n5 = BN_CTX_get(ctx);

+	n6 = BN_CTX_get(ctx);

+	if (n6 == NULL) goto end;

+

+	/* Note that in this function we must not read components of 'a' or 'b'

+	 * once we have written the corresponding components of 'r'.

+	 * ('r' might be one of 'a' or 'b'.)

+	 */

+

+	/* n1, n2 */

+	if (b->Z_is_one)

+		{

+		if (!BN_copy(n1, &a->X)) goto end;

+		if (!BN_copy(n2, &a->Y)) goto end;

+		/* n1 = X_a */

+		/* n2 = Y_a */

+		}

+	else

+		{

+		if (!field_sqr(group, n0, &b->Z, ctx)) goto end;

+		if (!field_mul(group, n1, &a->X, n0, ctx)) goto end;

+		/* n1 = X_a * Z_b^2 */

+

+		if (!field_mul(group, n0, n0, &b->Z, ctx)) goto end;

+		if (!field_mul(group, n2, &a->Y, n0, ctx)) goto end;

+		/* n2 = Y_a * Z_b^3 */

+		}

+

+	/* n3, n4 */

+	if (a->Z_is_one)

+		{

+		if (!BN_copy(n3, &b->X)) goto end;

+		if (!BN_copy(n4, &b->Y)) goto end;

+		/* n3 = X_b */

+		/* n4 = Y_b */

+		}

+	else

+		{

+		if (!field_sqr(group, n0, &a->Z, ctx)) goto end;

+		if (!field_mul(group, n3, &b->X, n0, ctx)) goto end;

+		/* n3 = X_b * Z_a^2 */

+

+		if (!field_mul(group, n0, n0, &a->Z, ctx)) goto end;

+		if (!field_mul(group, n4, &b->Y, n0, ctx)) goto end;

+		/* n4 = Y_b * Z_a^3 */

+		}

+

+	/* n5, n6 */

+	if (!BN_mod_sub_quick(n5, n1, n3, p)) goto end;

+	if (!BN_mod_sub_quick(n6, n2, n4, p)) goto end;

+	/* n5 = n1 - n3 */

+	/* n6 = n2 - n4 */

+

+	if (BN_is_zero(n5))

+		{

+		if (BN_is_zero(n6))

+			{

+			/* a is the same point as b */

+			BN_CTX_end(ctx);

+			ret = EC_POINT_dbl(group, r, a, ctx);

+			ctx = NULL;

+			goto end;

+			}

+		else

+			{

+			/* a is the inverse of b */

+			BN_zero(&r->Z);

+			r->Z_is_one = 0;

+			ret = 1;

+			goto end;

+			}

+		}

+

+	/* 'n7', 'n8' */

+	if (!BN_mod_add_quick(n1, n1, n3, p)) goto end;

+	if (!BN_mod_add_quick(n2, n2, n4, p)) goto end;

+	/* 'n7' = n1 + n3 */

+	/* 'n8' = n2 + n4 */

+

+	/* Z_r */

+	if (a->Z_is_one && b->Z_is_one)

+		{

+		if (!BN_copy(&r->Z, n5)) goto end;

+		}

+	else

+		{

+		if (a->Z_is_one)

+			{ if (!BN_copy(n0, &b->Z)) goto end; }

+		else if (b->Z_is_one)

+			{ if (!BN_copy(n0, &a->Z)) goto end; }

+		else

+			{ if (!field_mul(group, n0, &a->Z, &b->Z, ctx)) goto end; }

+		if (!field_mul(group, &r->Z, n0, n5, ctx)) goto end;

+		}

+	r->Z_is_one = 0;

+	/* Z_r = Z_a * Z_b * n5 */

+

+	/* X_r */

+	if (!field_sqr(group, n0, n6, ctx)) goto end;

+	if (!field_sqr(group, n4, n5, ctx)) goto end;

+	if (!field_mul(group, n3, n1, n4, ctx)) goto end;

+	if (!BN_mod_sub_quick(&r->X, n0, n3, p)) goto end;

+	/* X_r = n6^2 - n5^2 * 'n7' */

+	

+	/* 'n9' */

+	if (!BN_mod_lshift1_quick(n0, &r->X, p)) goto end;

+	if (!BN_mod_sub_quick(n0, n3, n0, p)) goto end;

+	/* n9 = n5^2 * 'n7' - 2 * X_r */

+

+	/* Y_r */

+	if (!field_mul(group, n0, n0, n6, ctx)) goto end;

+	if (!field_mul(group, n5, n4, n5, ctx)) goto end; /* now n5 is n5^3 */

+	if (!field_mul(group, n1, n2, n5, ctx)) goto end;

+	if (!BN_mod_sub_quick(n0, n0, n1, p)) goto end;

+	if (BN_is_odd(n0))

+		if (!BN_add(n0, n0, p)) goto end;

+	/* now  0 <= n0 < 2*p,  and n0 is even */

+	if (!BN_rshift1(&r->Y, n0)) goto end;

+	/* Y_r = (n6 * 'n9' - 'n8' * 'n5^3') / 2 */

+

+	ret = 1;

+

+ end:

+	if (ctx) /* otherwise we already called BN_CTX_end */

+		BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)

+	{

+	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);

+	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);

+	const BIGNUM *p;

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *n0, *n1, *n2, *n3;

+	int ret = 0;

+	

+	if (EC_POINT_is_at_infinity(group, a))

+		{

+		BN_zero(&r->Z);

+		r->Z_is_one = 0;

+		return 1;

+		}

+

+	field_mul = group->meth->field_mul;

+	field_sqr = group->meth->field_sqr;

+	p = &group->field;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	n0 = BN_CTX_get(ctx);

+	n1 = BN_CTX_get(ctx);

+	n2 = BN_CTX_get(ctx);

+	n3 = BN_CTX_get(ctx);

+	if (n3 == NULL) goto err;

+

+	/* Note that in this function we must not read components of 'a'

+	 * once we have written the corresponding components of 'r'.

+	 * ('r' might the same as 'a'.)

+	 */

+

+	/* n1 */

+	if (a->Z_is_one)

+		{

+		if (!field_sqr(group, n0, &a->X, ctx)) goto err;

+		if (!BN_mod_lshift1_quick(n1, n0, p)) goto err;

+		if (!BN_mod_add_quick(n0, n0, n1, p)) goto err;

+		if (!BN_mod_add_quick(n1, n0, &group->a, p)) goto err;

+		/* n1 = 3 * X_a^2 + a_curve */

+		}

+	else if (group->a_is_minus3)

+		{

+		if (!field_sqr(group, n1, &a->Z, ctx)) goto err;

+		if (!BN_mod_add_quick(n0, &a->X, n1, p)) goto err;

+		if (!BN_mod_sub_quick(n2, &a->X, n1, p)) goto err;

+		if (!field_mul(group, n1, n0, n2, ctx)) goto err;

+		if (!BN_mod_lshift1_quick(n0, n1, p)) goto err;

+		if (!BN_mod_add_quick(n1, n0, n1, p)) goto err;

+		/* n1 = 3 * (X_a + Z_a^2) * (X_a - Z_a^2)

+		 *    = 3 * X_a^2 - 3 * Z_a^4 */

+		}

+	else

+		{

+		if (!field_sqr(group, n0, &a->X, ctx)) goto err;

+		if (!BN_mod_lshift1_quick(n1, n0, p)) goto err;

+		if (!BN_mod_add_quick(n0, n0, n1, p)) goto err;

+		if (!field_sqr(group, n1, &a->Z, ctx)) goto err;

+		if (!field_sqr(group, n1, n1, ctx)) goto err;

+		if (!field_mul(group, n1, n1, &group->a, ctx)) goto err;

+		if (!BN_mod_add_quick(n1, n1, n0, p)) goto err;

+		/* n1 = 3 * X_a^2 + a_curve * Z_a^4 */

+		}

+

+	/* Z_r */

+	if (a->Z_is_one)

+		{

+		if (!BN_copy(n0, &a->Y)) goto err;

+		}

+	else

+		{

+		if (!field_mul(group, n0, &a->Y, &a->Z, ctx)) goto err;

+		}

+	if (!BN_mod_lshift1_quick(&r->Z, n0, p)) goto err;

+	r->Z_is_one = 0;

+	/* Z_r = 2 * Y_a * Z_a */

+

+	/* n2 */

+	if (!field_sqr(group, n3, &a->Y, ctx)) goto err;

+	if (!field_mul(group, n2, &a->X, n3, ctx)) goto err;

+	if (!BN_mod_lshift_quick(n2, n2, 2, p)) goto err;

+	/* n2 = 4 * X_a * Y_a^2 */

+

+	/* X_r */

+	if (!BN_mod_lshift1_quick(n0, n2, p)) goto err;

+	if (!field_sqr(group, &r->X, n1, ctx)) goto err;

+	if (!BN_mod_sub_quick(&r->X, &r->X, n0, p)) goto err;

+	/* X_r = n1^2 - 2 * n2 */

+	

+	/* n3 */

+	if (!field_sqr(group, n0, n3, ctx)) goto err;

+	if (!BN_mod_lshift_quick(n3, n0, 3, p)) goto err;

+	/* n3 = 8 * Y_a^4 */

+	

+	/* Y_r */

+	if (!BN_mod_sub_quick(n0, n2, &r->X, p)) goto err;

+	if (!field_mul(group, n0, n1, n0, ctx)) goto err;

+	if (!BN_mod_sub_quick(&r->Y, n0, n3, p)) goto err;

+	/* Y_r = n1 * (n2 - X_r) - n3 */

+

+	ret = 1;

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)

+	{

+	if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(&point->Y))

+		/* point is its own inverse */

+		return 1;

+	

+	return BN_usub(&point->Y, &group->field, &point->Y);

+	}

+

+

+int ec_GFp_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)

+	{

+	return BN_is_zero(&point->Z);

+	}

+

+

+int ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)

+	{

+	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);

+	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);

+	const BIGNUM *p;

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *rh, *tmp, *Z4, *Z6;

+	int ret = -1;

+

+	if (EC_POINT_is_at_infinity(group, point))

+		return 1;

+	

+	field_mul = group->meth->field_mul;

+	field_sqr = group->meth->field_sqr;

+	p = &group->field;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return -1;

+		}

+

+	BN_CTX_start(ctx);

+	rh = BN_CTX_get(ctx);

+	tmp = BN_CTX_get(ctx);

+	Z4 = BN_CTX_get(ctx);

+	Z6 = BN_CTX_get(ctx);

+	if (Z6 == NULL) goto err;

+

+	/* We have a curve defined by a Weierstrass equation

+	 *      y^2 = x^3 + a*x + b.

+	 * The point to consider is given in Jacobian projective coordinates

+	 * where  (X, Y, Z)  represents  (x, y) = (X/Z^2, Y/Z^3).

+	 * Substituting this and multiplying by  Z^6  transforms the above equation into

+	 *      Y^2 = X^3 + a*X*Z^4 + b*Z^6.

+	 * To test this, we add up the right-hand side in 'rh'.

+	 */

+

+	/* rh := X^2 */

+	if (!field_sqr(group, rh, &point->X, ctx)) goto err;

+

+	if (!point->Z_is_one)

+		{

+		if (!field_sqr(group, tmp, &point->Z, ctx)) goto err;

+		if (!field_sqr(group, Z4, tmp, ctx)) goto err;

+		if (!field_mul(group, Z6, Z4, tmp, ctx)) goto err;

+

+		/* rh := (rh + a*Z^4)*X */

+		if (group->a_is_minus3)

+			{

+			if (!BN_mod_lshift1_quick(tmp, Z4, p)) goto err;

+			if (!BN_mod_add_quick(tmp, tmp, Z4, p)) goto err;

+			if (!BN_mod_sub_quick(rh, rh, tmp, p)) goto err;

+			if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;

+			}

+		else

+			{

+			if (!field_mul(group, tmp, Z4, &group->a, ctx)) goto err;

+			if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;

+			if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;

+			}

+

+		/* rh := rh + b*Z^6 */

+		if (!field_mul(group, tmp, &group->b, Z6, ctx)) goto err;

+		if (!BN_mod_add_quick(rh, rh, tmp, p)) goto err;

+		}

+	else

+		{

+		/* point->Z_is_one */

+

+		/* rh := (rh + a)*X */

+		if (!BN_mod_add_quick(rh, rh, &group->a, p)) goto err;

+		if (!field_mul(group, rh, rh, &point->X, ctx)) goto err;

+		/* rh := rh + b */

+		if (!BN_mod_add_quick(rh, rh, &group->b, p)) goto err;

+		}

+

+	/* 'lh' := Y^2 */

+	if (!field_sqr(group, tmp, &point->Y, ctx)) goto err;

+

+	ret = (0 == BN_ucmp(tmp, rh));

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)

+	{

+	/* return values:

+	 *  -1   error

+	 *   0   equal (in affine coordinates)

+	 *   1   not equal

+	 */

+

+	int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);

+	int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *tmp1, *tmp2, *Za23, *Zb23;

+	const BIGNUM *tmp1_, *tmp2_;

+	int ret = -1;

+	

+	if (EC_POINT_is_at_infinity(group, a))

+		{

+		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;

+		}

+

+	if (EC_POINT_is_at_infinity(group, b))

+		return 1;

+	

+	if (a->Z_is_one && b->Z_is_one)

+		{

+		return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;

+		}

+

+	field_mul = group->meth->field_mul;

+	field_sqr = group->meth->field_sqr;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return -1;

+		}

+

+	BN_CTX_start(ctx);

+	tmp1 = BN_CTX_get(ctx);

+	tmp2 = BN_CTX_get(ctx);

+	Za23 = BN_CTX_get(ctx);

+	Zb23 = BN_CTX_get(ctx);

+	if (Zb23 == NULL) goto end;

+

+	/* We have to decide whether

+	 *     (X_a/Z_a^2, Y_a/Z_a^3) = (X_b/Z_b^2, Y_b/Z_b^3),

+	 * or equivalently, whether

+	 *     (X_a*Z_b^2, Y_a*Z_b^3) = (X_b*Z_a^2, Y_b*Z_a^3).

+	 */

+

+	if (!b->Z_is_one)

+		{

+		if (!field_sqr(group, Zb23, &b->Z, ctx)) goto end;

+		if (!field_mul(group, tmp1, &a->X, Zb23, ctx)) goto end;

+		tmp1_ = tmp1;

+		}

+	else

+		tmp1_ = &a->X;

+	if (!a->Z_is_one)

+		{

+		if (!field_sqr(group, Za23, &a->Z, ctx)) goto end;

+		if (!field_mul(group, tmp2, &b->X, Za23, ctx)) goto end;

+		tmp2_ = tmp2;

+		}

+	else

+		tmp2_ = &b->X;

+	

+	/* compare  X_a*Z_b^2  with  X_b*Z_a^2 */

+	if (BN_cmp(tmp1_, tmp2_) != 0)

+		{

+		ret = 1; /* points differ */

+		goto end;

+		}

+

+

+	if (!b->Z_is_one)

+		{

+		if (!field_mul(group, Zb23, Zb23, &b->Z, ctx)) goto end;

+		if (!field_mul(group, tmp1, &a->Y, Zb23, ctx)) goto end;

+		/* tmp1_ = tmp1 */

+		}

+	else

+		tmp1_ = &a->Y;

+	if (!a->Z_is_one)

+		{

+		if (!field_mul(group, Za23, Za23, &a->Z, ctx)) goto end;

+		if (!field_mul(group, tmp2, &b->Y, Za23, ctx)) goto end;

+		/* tmp2_ = tmp2 */

+		}

+	else

+		tmp2_ = &b->Y;

+

+	/* compare  Y_a*Z_b^3  with  Y_b*Z_a^3 */

+	if (BN_cmp(tmp1_, tmp2_) != 0)

+		{

+		ret = 1; /* points differ */

+		goto end;

+		}

+

+	/* points are equal */

+	ret = 0;

+

+ end:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *x, *y;

+	int ret = 0;

+

+	if (point->Z_is_one || EC_POINT_is_at_infinity(group, point))

+		return 1;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	x = BN_CTX_get(ctx);

+	y = BN_CTX_get(ctx);

+	if (y == NULL) goto err;

+

+	if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;

+	if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;

+	if (!point->Z_is_one)

+		{

+		ECerr(EC_F_EC_GFP_SIMPLE_MAKE_AFFINE, ERR_R_INTERNAL_ERROR);

+		goto err;

+		}

+	

+	ret = 1;

+

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	return ret;

+	}

+

+

+int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)

+	{

+	BN_CTX *new_ctx = NULL;

+	BIGNUM *tmp0, *tmp1;

+	size_t pow2 = 0;

+	BIGNUM **heap = NULL;

+	size_t i;

+	int ret = 0;

+

+	if (num == 0)

+		return 1;

+

+	if (ctx == NULL)

+		{

+		ctx = new_ctx = BN_CTX_new();

+		if (ctx == NULL)

+			return 0;

+		}

+

+	BN_CTX_start(ctx);

+	tmp0 = BN_CTX_get(ctx);

+	tmp1 = BN_CTX_get(ctx);

+	if (tmp0  == NULL || tmp1 == NULL) goto err;

+

+	/* Before converting the individual points, compute inverses of all Z values.

+	 * Modular inversion is rather slow, but luckily we can do with a single

+	 * explicit inversion, plus about 3 multiplications per input value.

+	 */

+

+	pow2 = 1;

+	while (num > pow2)

+		pow2 <<= 1;

+	/* Now pow2 is the smallest power of 2 satifsying pow2 >= num.

+	 * We need twice that. */

+	pow2 <<= 1;

+

+	heap = OPENSSL_malloc(pow2 * sizeof heap[0]);

+	if (heap == NULL) goto err;

+	

+	/* The array is used as a binary tree, exactly as in heapsort:

+	 *

+	 *                               heap[1]

+	 *                 heap[2]                     heap[3]

+	 *          heap[4]       heap[5]       heap[6]       heap[7]

+	 *   heap[8]heap[9] heap[10]heap[11] heap[12]heap[13] heap[14] heap[15]

+	 *

+	 * We put the Z's in the last line;

+	 * then we set each other node to the product of its two child-nodes (where

+	 * empty or 0 entries are treated as ones);

+	 * then we invert heap[1];

+	 * then we invert each other node by replacing it by the product of its

+	 * parent (after inversion) and its sibling (before inversion).

+	 */

+	heap[0] = NULL;

+	for (i = pow2/2 - 1; i > 0; i--)

+		heap[i] = NULL;

+	for (i = 0; i < num; i++)

+		heap[pow2/2 + i] = &points[i]->Z;

+	for (i = pow2/2 + num; i < pow2; i++)

+		heap[i] = NULL;

+	

+	/* set each node to the product of its children */

+	for (i = pow2/2 - 1; i > 0; i--)

+		{

+		heap[i] = BN_new();

+		if (heap[i] == NULL) goto err;

+		

+		if (heap[2*i] != NULL)

+			{

+			if ((heap[2*i + 1] == NULL) || BN_is_zero(heap[2*i + 1]))

+				{

+				if (!BN_copy(heap[i], heap[2*i])) goto err;

+				}

+			else

+				{

+				if (BN_is_zero(heap[2*i]))

+					{

+					if (!BN_copy(heap[i], heap[2*i + 1])) goto err;

+					}

+				else

+					{

+					if (!group->meth->field_mul(group, heap[i],

+						heap[2*i], heap[2*i + 1], ctx)) goto err;

+					}

+				}

+			}

+		}

+

+	/* invert heap[1] */

+	if (!BN_is_zero(heap[1]))

+		{

+		if (!BN_mod_inverse(heap[1], heap[1], &group->field, ctx))

+			{

+			ECerr(EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE, ERR_R_BN_LIB);

+			goto err;

+			}

+		}

+	if (group->meth->field_encode != 0)

+		{

+		/* in the Montgomery case, we just turned  R*H  (representing H)

+		 * into  1/(R*H),  but we need  R*(1/H)  (representing 1/H);

+		 * i.e. we have need to multiply by the Montgomery factor twice */

+		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;

+		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;

+		}

+

+	/* set other heap[i]'s to their inverses */

+	for (i = 2; i < pow2/2 + num; i += 2)

+		{

+		/* i is even */

+		if ((heap[i + 1] != NULL) && !BN_is_zero(heap[i + 1]))

+			{

+			if (!group->meth->field_mul(group, tmp0, heap[i/2], heap[i + 1], ctx)) goto err;

+			if (!group->meth->field_mul(group, tmp1, heap[i/2], heap[i], ctx)) goto err;

+			if (!BN_copy(heap[i], tmp0)) goto err;

+			if (!BN_copy(heap[i + 1], tmp1)) goto err;

+			}

+		else

+			{

+			if (!BN_copy(heap[i], heap[i/2])) goto err;

+			}

+		}

+

+	/* we have replaced all non-zero Z's by their inverses, now fix up all the points */

+	for (i = 0; i < num; i++)

+		{

+		EC_POINT *p = points[i];

+		

+		if (!BN_is_zero(&p->Z))

+			{

+			/* turn  (X, Y, 1/Z)  into  (X/Z^2, Y/Z^3, 1) */

+

+			if (!group->meth->field_sqr(group, tmp1, &p->Z, ctx)) goto err;

+			if (!group->meth->field_mul(group, &p->X, &p->X, tmp1, ctx)) goto err;

+

+			if (!group->meth->field_mul(group, tmp1, tmp1, &p->Z, ctx)) goto err;

+			if (!group->meth->field_mul(group, &p->Y, &p->Y, tmp1, ctx)) goto err;

+		

+			if (group->meth->field_set_to_one != 0)

+				{

+				if (!group->meth->field_set_to_one(group, &p->Z, ctx)) goto err;

+				}

+			else

+				{

+				if (!BN_one(&p->Z)) goto err;

+				}

+			p->Z_is_one = 1;

+			}

+		}

+

+	ret = 1;

+		

+ err:

+	BN_CTX_end(ctx);

+	if (new_ctx != NULL)

+		BN_CTX_free(new_ctx);

+	if (heap != NULL)

+		{

+		/* heap[pow2/2] .. heap[pow2-1] have not been allocated locally! */

+		for (i = pow2/2 - 1; i > 0; i--)

+			{

+			if (heap[i] != NULL)

+				BN_clear_free(heap[i]);

+			}

+		OPENSSL_free(heap);

+		}

+	return ret;

+	}

+

+

+int ec_GFp_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)

+	{

+	return BN_mod_mul(r, a, b, &group->field, ctx);

+	}

+

+

+int ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)

+	{

+	return BN_mod_sqr(r, a, &group->field, ctx);

+	}

diff --git a/openssl/crypto/engine/engine.h b/openssl/crypto/engine/engine.h
index 7fbd95f63..c24e26d4c 100644
--- a/openssl/crypto/engine/engine.h
+++ b/openssl/crypto/engine/engine.h
@@ -1,830 +1,833 @@
-/* openssl/engine.h */
-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 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).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_ENGINE_H
-#define HEADER_ENGINE_H
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ENGINE
-#error ENGINE is disabled.
-#endif
-
-#ifndef OPENSSL_NO_DEPRECATED
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#ifndef OPENSSL_NO_ECDH
-#include <openssl/ecdh.h>
-#endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
-#include <openssl/rand.h>
-#include <openssl/ui.h>
-#include <openssl/err.h>
-#endif
-
-#include <openssl/ossl_typ.h>
-#include <openssl/symhacks.h>
-
-#include <openssl/x509.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* These flags are used to control combinations of algorithm (methods)
- * by bitwise "OR"ing. */
-#define ENGINE_METHOD_RSA		(unsigned int)0x0001
-#define ENGINE_METHOD_DSA		(unsigned int)0x0002
-#define ENGINE_METHOD_DH		(unsigned int)0x0004
-#define ENGINE_METHOD_RAND		(unsigned int)0x0008
-#define ENGINE_METHOD_ECDH		(unsigned int)0x0010
-#define ENGINE_METHOD_ECDSA		(unsigned int)0x0020
-#define ENGINE_METHOD_CIPHERS		(unsigned int)0x0040
-#define ENGINE_METHOD_DIGESTS		(unsigned int)0x0080
-#define ENGINE_METHOD_STORE		(unsigned int)0x0100
-#define ENGINE_METHOD_PKEY_METHS	(unsigned int)0x0200
-#define ENGINE_METHOD_PKEY_ASN1_METHS	(unsigned int)0x0400
-/* Obvious all-or-nothing cases. */
-#define ENGINE_METHOD_ALL		(unsigned int)0xFFFF
-#define ENGINE_METHOD_NONE		(unsigned int)0x0000
-
-/* This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
- * internally to control registration of ENGINE implementations, and can be set
- * by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
- * initialise registered ENGINEs if they are not already initialised. */
-#define ENGINE_TABLE_FLAG_NOINIT	(unsigned int)0x0001
-
-/* ENGINE flags that can be set by ENGINE_set_flags(). */
-/* #define ENGINE_FLAGS_MALLOCED	0x0001 */ /* Not used */
-
-/* This flag is for ENGINEs that wish to handle the various 'CMD'-related
- * control commands on their own. Without this flag, ENGINE_ctrl() handles these
- * control commands on behalf of the ENGINE using their "cmd_defns" data. */
-#define ENGINE_FLAGS_MANUAL_CMD_CTRL	(int)0x0002
-
-/* This flag is for ENGINEs who return new duplicate structures when found via
- * "ENGINE_by_id()". When an ENGINE must store state (eg. if ENGINE_ctrl()
- * commands are called in sequence as part of some stateful process like
- * key-generation setup and execution), it can set this flag - then each attempt
- * to obtain the ENGINE will result in it being copied into a new structure.
- * Normally, ENGINEs don't declare this flag so ENGINE_by_id() just increments
- * the existing ENGINE's structural reference count. */
-#define ENGINE_FLAGS_BY_ID_COPY		(int)0x0004
-
-/* ENGINEs can support their own command types, and these flags are used in
- * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each
- * command expects. Currently only numeric and string input is supported. If a
- * control command supports none of the _NUMERIC, _STRING, or _NO_INPUT options,
- * then it is regarded as an "internal" control command - and not for use in
- * config setting situations. As such, they're not available to the
- * ENGINE_ctrl_cmd_string() function, only raw ENGINE_ctrl() access. Changes to
- * this list of 'command types' should be reflected carefully in
- * ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string(). */
-
-/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-#define ENGINE_CMD_FLAG_NUMERIC		(unsigned int)0x0001
-/* accepts string input (cast from 'void*' to 'const char *', 4th parameter to
- * ENGINE_ctrl) */
-#define ENGINE_CMD_FLAG_STRING		(unsigned int)0x0002
-/* Indicates that the control command takes *no* input. Ie. the control command
- * is unparameterised. */
-#define ENGINE_CMD_FLAG_NO_INPUT	(unsigned int)0x0004
-/* Indicates that the control command is internal. This control command won't
- * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
- * function. */
-#define ENGINE_CMD_FLAG_INTERNAL	(unsigned int)0x0008
-
-/* NB: These 3 control commands are deprecated and should not be used. ENGINEs
- * relying on these commands should compile conditional support for
- * compatibility (eg. if these symbols are defined) but should also migrate the
- * same functionality to their own ENGINE-specific control functions that can be
- * "discovered" by calling applications. The fact these control commands
- * wouldn't be "executable" (ie. usable by text-based config) doesn't change the
- * fact that application code can find and use them without requiring per-ENGINE
- * hacking. */
-
-/* These flags are used to tell the ctrl function what should be done.
- * All command numbers are shared between all engines, even if some don't
- * make sense to some engines.  In such a case, they do nothing but return
- * the error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED. */
-#define ENGINE_CTRL_SET_LOGSTREAM		1
-#define ENGINE_CTRL_SET_PASSWORD_CALLBACK	2
-#define ENGINE_CTRL_HUP				3 /* Close and reinitialise any
-						     handles/connections etc. */
-#define ENGINE_CTRL_SET_USER_INTERFACE          4 /* Alternative to callback */
-#define ENGINE_CTRL_SET_CALLBACK_DATA           5 /* User-specific data, used
-						     when calling the password
-						     callback and the user
-						     interface */
-#define ENGINE_CTRL_LOAD_CONFIGURATION		6 /* Load a configuration, given
-						     a string that represents a
-						     file name or so */
-#define ENGINE_CTRL_LOAD_SECTION		7 /* Load data from a given
-						     section in the already loaded
-						     configuration */
-
-/* These control commands allow an application to deal with an arbitrary engine
- * in a dynamic way. Warn: Negative return values indicate errors FOR THESE
- * COMMANDS because zero is used to indicate 'end-of-list'. Other commands,
- * including ENGINE-specific command types, return zero for an error.
- *
- * An ENGINE can choose to implement these ctrl functions, and can internally
- * manage things however it chooses - it does so by setting the
- * ENGINE_FLAGS_MANUAL_CMD_CTRL flag (using ENGINE_set_flags()). Otherwise the
- * ENGINE_ctrl() code handles this on the ENGINE's behalf using the cmd_defns
- * data (set using ENGINE_set_cmd_defns()). This means an ENGINE's ctrl()
- * handler need only implement its own commands - the above "meta" commands will
- * be taken care of. */
-
-/* Returns non-zero if the supplied ENGINE has a ctrl() handler. If "not", then
- * all the remaining control commands will return failure, so it is worth
- * checking this first if the caller is trying to "discover" the engine's
- * capabilities and doesn't want errors generated unnecessarily. */
-#define ENGINE_CTRL_HAS_CTRL_FUNCTION		10
-/* Returns a positive command number for the first command supported by the
- * engine. Returns zero if no ctrl commands are supported. */
-#define ENGINE_CTRL_GET_FIRST_CMD_TYPE		11
-/* The 'long' argument specifies a command implemented by the engine, and the
- * return value is the next command supported, or zero if there are no more. */
-#define ENGINE_CTRL_GET_NEXT_CMD_TYPE		12
-/* The 'void*' argument is a command name (cast from 'const char *'), and the
- * return value is the command that corresponds to it. */
-#define ENGINE_CTRL_GET_CMD_FROM_NAME		13
-/* The next two allow a command to be converted into its corresponding string
- * form. In each case, the 'long' argument supplies the command. In the NAME_LEN
- * case, the return value is the length of the command name (not counting a
- * trailing EOL). In the NAME case, the 'void*' argument must be a string buffer
- * large enough, and it will be populated with the name of the command (WITH a
- * trailing EOL). */
-#define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD	14
-#define ENGINE_CTRL_GET_NAME_FROM_CMD		15
-/* The next two are similar but give a "short description" of a command. */
-#define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD	16
-#define ENGINE_CTRL_GET_DESC_FROM_CMD		17
-/* With this command, the return value is the OR'd combination of
- * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
- * engine-specific ctrl command expects. */
-#define ENGINE_CTRL_GET_CMD_FLAGS		18
-
-/* ENGINE implementations should start the numbering of their own control
- * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */
-#define ENGINE_CMD_BASE				200
-
-/* NB: These 2 nCipher "chil" control commands are deprecated, and their
- * functionality is now available through ENGINE-specific control commands
- * (exposed through the above-mentioned 'CMD'-handling). Code using these 2
- * commands should be migrated to the more general command handling before these
- * are removed. */
-
-/* Flags specific to the nCipher "chil" engine */
-#define ENGINE_CTRL_CHIL_SET_FORKCHECK		100
-	/* Depending on the value of the (long)i argument, this sets or
-	 * unsets the SimpleForkCheck flag in the CHIL API to enable or
-	 * disable checking and workarounds for applications that fork().
-	 */
-#define ENGINE_CTRL_CHIL_NO_LOCKING		101
-	/* This prevents the initialisation function from providing mutex
-	 * callbacks to the nCipher library. */
-
-/* If an ENGINE supports its own specific control commands and wishes the
- * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its
- * behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN entries
- * to ENGINE_set_cmd_defns(). It should also implement a ctrl() handler that
- * supports the stated commands (ie. the "cmd_num" entries as described by the
- * array). NB: The array must be ordered in increasing order of cmd_num.
- * "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set
- * to zero and/or cmd_name set to NULL. */
-typedef struct ENGINE_CMD_DEFN_st
-	{
-	unsigned int cmd_num; /* The command number */
-	const char *cmd_name; /* The command name itself */
-	const char *cmd_desc; /* A short description of the command */
-	unsigned int cmd_flags; /* The input the command expects */
-	} ENGINE_CMD_DEFN;
-
-/* Generic function pointer */
-typedef int (*ENGINE_GEN_FUNC_PTR)(void);
-/* Generic function pointer taking no arguments */
-typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
-/* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void));
-/* Generic load_key function pointer */
-typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-	UI_METHOD *ui_method, void *callback_data);
-typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
-	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
-	STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
-/* These callback types are for an ENGINE's handler for cipher and digest logic.
- * These handlers have these prototypes;
- *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
- *   int foo(ENGINE *e, const EVP_MD **digest, const int **nids, int nid);
- * Looking at how to implement these handlers in the case of cipher support, if
- * the framework wants the EVP_CIPHER for 'nid', it will call;
- *   foo(e, &p_evp_cipher, NULL, nid);    (return zero for failure)
- * If the framework wants a list of supported 'nid's, it will call;
- *   foo(e, NULL, &p_nids, 0); (returns number of 'nids' or -1 for error)
- */
-/* Returns to a pointer to the array of supported cipher 'nid's. If the second
- * parameter is non-NULL it is set to the size of the returned array. */
-typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **, const int **, int);
-typedef int (*ENGINE_DIGESTS_PTR)(ENGINE *, const EVP_MD **, const int **, int);
-typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **, const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **, const int **, int);
-/* STRUCTURE functions ... all of these functions deal with pointers to ENGINE
- * structures where the pointers have a "structural reference". This means that
- * their reference is to allowed access to the structure but it does not imply
- * that the structure is functional. To simply increment or decrement the
- * structural reference count, use ENGINE_by_id and ENGINE_free. NB: This is not
- * required when iterating using ENGINE_get_next as it will automatically
- * decrement the structural reference count of the "current" ENGINE and
- * increment the structural reference count of the ENGINE it returns (unless it
- * is NULL). */
-
-/* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void);
-ENGINE *ENGINE_get_last(void);
-/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e);
-ENGINE *ENGINE_get_prev(ENGINE *e);
-/* Add another "ENGINE" type into the array. */
-int ENGINE_add(ENGINE *e);
-/* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e);
-/* Retrieve an engine from the list by its unique "id" value. */
-ENGINE *ENGINE_by_id(const char *id);
-/* Add all the built-in engines. */
-void ENGINE_load_openssl(void);
-void ENGINE_load_dynamic(void);
-#ifndef OPENSSL_NO_STATIC_ENGINE
-void ENGINE_load_4758cca(void);
-void ENGINE_load_aep(void);
-void ENGINE_load_atalla(void);
-void ENGINE_load_chil(void);
-void ENGINE_load_cswift(void);
-void ENGINE_load_nuron(void);
-void ENGINE_load_sureware(void);
-void ENGINE_load_ubsec(void);
-void ENGINE_load_padlock(void);
-void ENGINE_load_capi(void);
-#ifndef OPENSSL_NO_GMP
-void ENGINE_load_gmp(void);
-#endif
-#ifndef OPENSSL_NO_GOST
-void ENGINE_load_gost(void);
-#endif
-#endif
-void ENGINE_load_cryptodev(void);
-void ENGINE_load_builtin_engines(void);
-
-/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
- * "registry" handling. */
-unsigned int ENGINE_get_table_flags(void);
-void ENGINE_set_table_flags(unsigned int flags);
-
-/* Manage registration of ENGINEs per "table". For each type, there are 3
- * functions;
- *   ENGINE_register_***(e) - registers the implementation from 'e' (if it has one)
- *   ENGINE_unregister_***(e) - unregister the implementation from 'e'
- *   ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list
- * Cleanup is automatically registered from each table when required, so
- * ENGINE_cleanup() will reverse any "register" operations. */
-
-int ENGINE_register_RSA(ENGINE *e);
-void ENGINE_unregister_RSA(ENGINE *e);
-void ENGINE_register_all_RSA(void);
-
-int ENGINE_register_DSA(ENGINE *e);
-void ENGINE_unregister_DSA(ENGINE *e);
-void ENGINE_register_all_DSA(void);
-
-int ENGINE_register_ECDH(ENGINE *e);
-void ENGINE_unregister_ECDH(ENGINE *e);
-void ENGINE_register_all_ECDH(void);
-
-int ENGINE_register_ECDSA(ENGINE *e);
-void ENGINE_unregister_ECDSA(ENGINE *e);
-void ENGINE_register_all_ECDSA(void);
-
-int ENGINE_register_DH(ENGINE *e);
-void ENGINE_unregister_DH(ENGINE *e);
-void ENGINE_register_all_DH(void);
-
-int ENGINE_register_RAND(ENGINE *e);
-void ENGINE_unregister_RAND(ENGINE *e);
-void ENGINE_register_all_RAND(void);
-
-int ENGINE_register_STORE(ENGINE *e);
-void ENGINE_unregister_STORE(ENGINE *e);
-void ENGINE_register_all_STORE(void);
-
-int ENGINE_register_ciphers(ENGINE *e);
-void ENGINE_unregister_ciphers(ENGINE *e);
-void ENGINE_register_all_ciphers(void);
-
-int ENGINE_register_digests(ENGINE *e);
-void ENGINE_unregister_digests(ENGINE *e);
-void ENGINE_register_all_digests(void);
-
-int ENGINE_register_pkey_meths(ENGINE *e);
-void ENGINE_unregister_pkey_meths(ENGINE *e);
-void ENGINE_register_all_pkey_meths(void);
-
-int ENGINE_register_pkey_asn1_meths(ENGINE *e);
-void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);
-void ENGINE_register_all_pkey_asn1_meths(void);
-
-/* These functions register all support from the above categories. Note, use of
- * these functions can result in static linkage of code your application may not
- * need. If you only need a subset of functionality, consider using more
- * selective initialisation. */
-int ENGINE_register_complete(ENGINE *e);
-int ENGINE_register_all_complete(void);
-
-/* Send parametrised control commands to the engine. The possibilities to send
- * down an integer, a pointer to data or a function pointer are provided. Any of
- * the parameters may or may not be NULL, depending on the command number. In
- * actuality, this function only requires a structural (rather than functional)
- * reference to an engine, but many control commands may require the engine be
- * functional. The caller should be aware of trying commands that require an
- * operational ENGINE, and only use functional references in such situations. */
-int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
-
-/* This function tests if an ENGINE-specific command is usable as a "setting".
- * Eg. in an application's config file that gets processed through
- * ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to
- * ENGINE_ctrl_cmd_string(), only ENGINE_ctrl(). */
-int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
-
-/* This function works like ENGINE_ctrl() with the exception of taking a
- * command name instead of a command number, and can handle optional commands.
- * See the comment on ENGINE_ctrl_cmd_string() for an explanation on how to
- * use the cmd_name and cmd_optional. */
-int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-        long i, void *p, void (*f)(void), int cmd_optional);
-
-/* This function passes a command-name and argument to an ENGINE. The cmd_name
- * is converted to a command number and the control command is called using
- * 'arg' as an argument (unless the ENGINE doesn't support such a command, in
- * which case no control command is called). The command is checked for input
- * flags, and if necessary the argument will be converted to a numeric value. If
- * cmd_optional is non-zero, then if the ENGINE doesn't support the given
- * cmd_name the return value will be success anyway. This function is intended
- * for applications to use so that users (or config files) can supply
- * engine-specific config data to the ENGINE at run-time to control behaviour of
- * specific engines. As such, it shouldn't be used for calling ENGINE_ctrl()
- * functions that return data, deal with binary data, or that are otherwise
- * supposed to be used directly through ENGINE_ctrl() in application code. Any
- * "return" data from an ENGINE_ctrl() operation in this function will be lost -
- * the return value is interpreted as failure if the return value is zero,
- * success otherwise, and this function returns a boolean value as a result. In
- * other words, vendors of 'ENGINE'-enabled devices should write ENGINE
- * implementations with parameterisations that work in this scheme, so that
- * compliant ENGINE-based applications can work consistently with the same
- * configuration for the same ENGINE-enabled devices, across applications. */
-int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-				int cmd_optional);
-
-/* These functions are useful for manufacturing new ENGINE structures. They
- * don't address reference counting at all - one uses them to populate an ENGINE
- * structure with personalised implementations of things prior to using it
- * directly or adding it to the builtin ENGINE list in OpenSSL. These are also
- * here so that the ENGINE structure doesn't have to be exposed and break binary
- * compatibility! */
-ENGINE *ENGINE_new(void);
-int ENGINE_free(ENGINE *e);
-int ENGINE_up_ref(ENGINE *e);
-int ENGINE_set_id(ENGINE *e, const char *id);
-int ENGINE_set_name(ENGINE *e, const char *name);
-int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
-int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
-int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth);
-int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth);
-int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
-int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
-int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth);
-int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
-int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
-int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
-int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
-int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);
-int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
-int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-				ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
-int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
-int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
-int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
-int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
-int ENGINE_set_flags(ENGINE *e, int flags);
-int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
-/* These functions allow control over any per-structure ENGINE data. */
-int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-		CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
-void *ENGINE_get_ex_data(const ENGINE *e, int idx);
-
-/* This function cleans up anything that needs it. Eg. the ENGINE_add() function
- * automatically ensures the list cleanup function is registered to be called
- * from ENGINE_cleanup(). Similarly, all ENGINE_register_*** functions ensure
- * ENGINE_cleanup() will clean up after them. */
-void ENGINE_cleanup(void);
-
-/* These return values from within the ENGINE structure. These can be useful
- * with functional references as well as structural references - it depends
- * which you obtained. Using the result for functional purposes if you only
- * obtained a structural reference may be problematic! */
-const char *ENGINE_get_id(const ENGINE *e);
-const char *ENGINE_get_name(const ENGINE *e);
-const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
-const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);
-const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e);
-const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e);
-const DH_METHOD *ENGINE_get_DH(const ENGINE *e);
-const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);
-const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
-ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
-ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE *e);
-ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
-ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
-ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);
-ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);
-const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
-const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
-const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-					const char *str, int len);
-const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-					const char *str, int len);
-const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
-int ENGINE_get_flags(const ENGINE *e);
-
-/* FUNCTIONAL functions. These functions deal with ENGINE structures
- * that have (or will) be initialised for use. Broadly speaking, the
- * structural functions are useful for iterating the list of available
- * engine types, creating new engine types, and other "list" operations.
- * These functions actually deal with ENGINEs that are to be used. As
- * such these functions can fail (if applicable) when particular
- * engines are unavailable - eg. if a hardware accelerator is not
- * attached or not functioning correctly. Each ENGINE has 2 reference
- * counts; structural and functional. Every time a functional reference
- * is obtained or released, a corresponding structural reference is
- * automatically obtained or released too. */
-
-/* Initialise a engine type for use (or up its reference count if it's
- * already in use). This will fail if the engine is not currently
- * operational and cannot initialise. */
-int ENGINE_init(ENGINE *e);
-/* Free a functional reference to a engine type. This does not require
- * a corresponding call to ENGINE_free as it also releases a structural
- * reference. */
-int ENGINE_finish(ENGINE *e);
-
-/* The following functions handle keys that are stored in some secondary
- * location, handled by the engine.  The storage may be on a card or
- * whatever. */
-EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-	UI_METHOD *ui_method, void *callback_data);
-EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-	UI_METHOD *ui_method, void *callback_data);
-int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
-	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
-	STACK_OF(X509) **pother,
-	UI_METHOD *ui_method, void *callback_data);
-
-/* This returns a pointer for the current ENGINE structure that
- * is (by default) performing any RSA operations. The value returned
- * is an incremented reference, so it should be free'd (ENGINE_finish)
- * before it is discarded. */
-ENGINE *ENGINE_get_default_RSA(void);
-/* Same for the other "methods" */
-ENGINE *ENGINE_get_default_DSA(void);
-ENGINE *ENGINE_get_default_ECDH(void);
-ENGINE *ENGINE_get_default_ECDSA(void);
-ENGINE *ENGINE_get_default_DH(void);
-ENGINE *ENGINE_get_default_RAND(void);
-/* These functions can be used to get a functional reference to perform
- * ciphering or digesting corresponding to "nid". */
-ENGINE *ENGINE_get_cipher_engine(int nid);
-ENGINE *ENGINE_get_digest_engine(int nid);
-ENGINE *ENGINE_get_pkey_meth_engine(int nid);
-ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
-
-/* This sets a new default ENGINE structure for performing RSA
- * operations. If the result is non-zero (success) then the ENGINE
- * structure will have had its reference count up'd so the caller
- * should still free their own reference 'e'. */
-int ENGINE_set_default_RSA(ENGINE *e);
-int ENGINE_set_default_string(ENGINE *e, const char *def_list);
-/* Same for the other "methods" */
-int ENGINE_set_default_DSA(ENGINE *e);
-int ENGINE_set_default_ECDH(ENGINE *e);
-int ENGINE_set_default_ECDSA(ENGINE *e);
-int ENGINE_set_default_DH(ENGINE *e);
-int ENGINE_set_default_RAND(ENGINE *e);
-int ENGINE_set_default_ciphers(ENGINE *e);
-int ENGINE_set_default_digests(ENGINE *e);
-int ENGINE_set_default_pkey_meths(ENGINE *e);
-int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
-
-/* The combination "set" - the flags are bitwise "OR"d from the
- * ENGINE_METHOD_*** defines above. As with the "ENGINE_register_complete()"
- * function, this function can result in unnecessary static linkage. If your
- * application requires only specific functionality, consider using more
- * selective functions. */
-int ENGINE_set_default(ENGINE *e, unsigned int flags);
-
-void ENGINE_add_conf_module(void);
-
-/* Deprecated functions ... */
-/* int ENGINE_clear_defaults(void); */
-
-/**************************/
-/* DYNAMIC ENGINE SUPPORT */
-/**************************/
-
-/* Binary/behaviour compatibility levels */
-#define OSSL_DYNAMIC_VERSION		(unsigned long)0x00020000
-/* Binary versions older than this are too old for us (whether we're a loader or
- * a loadee) */
-#define OSSL_DYNAMIC_OLDEST		(unsigned long)0x00020000
-
-/* When compiling an ENGINE entirely as an external shared library, loadable by
- * the "dynamic" ENGINE, these types are needed. The 'dynamic_fns' structure
- * type provides the calling application's (or library's) error functionality
- * and memory management function pointers to the loaded library. These should
- * be used/set in the loaded library code so that the loading application's
- * 'state' will be used/changed in all operations. The 'static_state' pointer
- * allows the loaded library to know if it shares the same static data as the
- * calling application (or library), and thus whether these callbacks need to be
- * set or not. */
-typedef void *(*dyn_MEM_malloc_cb)(size_t);
-typedef void *(*dyn_MEM_realloc_cb)(void *, size_t);
-typedef void (*dyn_MEM_free_cb)(void *);
-typedef struct st_dynamic_MEM_fns {
-	dyn_MEM_malloc_cb			malloc_cb;
-	dyn_MEM_realloc_cb			realloc_cb;
-	dyn_MEM_free_cb				free_cb;
-	} dynamic_MEM_fns;
-/* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use
- * these types so we (and any other dependant code) can simplify a bit?? */
-typedef void (*dyn_lock_locking_cb)(int,int,const char *,int);
-typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int);
-typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)(
-						const char *,int);
-typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *,
-						const char *,int);
-typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *,
-						const char *,int);
-typedef struct st_dynamic_LOCK_fns {
-	dyn_lock_locking_cb			lock_locking_cb;
-	dyn_lock_add_lock_cb			lock_add_lock_cb;
-	dyn_dynlock_create_cb			dynlock_create_cb;
-	dyn_dynlock_lock_cb			dynlock_lock_cb;
-	dyn_dynlock_destroy_cb			dynlock_destroy_cb;
-	} dynamic_LOCK_fns;
-/* The top-level structure */
-typedef struct st_dynamic_fns {
-	void 					*static_state;
-	const ERR_FNS				*err_fns;
-	const CRYPTO_EX_DATA_IMPL		*ex_data_fns;
-	dynamic_MEM_fns				mem_fns;
-	dynamic_LOCK_fns			lock_fns;
-	} dynamic_fns;
-
-/* The version checking function should be of this prototype. NB: The
- * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code.
- * If this function returns zero, it indicates a (potential) version
- * incompatibility and the loaded library doesn't believe it can proceed.
- * Otherwise, the returned value is the (latest) version supported by the
- * loading library. The loader may still decide that the loaded code's version
- * is unsatisfactory and could veto the load. The function is expected to
- * be implemented with the symbol name "v_check", and a default implementation
- * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */
-typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
-#define IMPLEMENT_DYNAMIC_CHECK_FN() \
-	OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
-		if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
-		return 0; }
-
-/* This function is passed the ENGINE structure to initialise with its own
- * function and command settings. It should not adjust the structural or
- * functional reference counts. If this function returns zero, (a) the load will
- * be aborted, (b) the previous ENGINE state will be memcpy'd back onto the
- * structure, and (c) the shared library will be unloaded. So implementations
- * should do their own internal cleanup in failure circumstances otherwise they
- * could leak. The 'id' parameter, if non-NULL, represents the ENGINE id that
- * the loader is looking for. If this is NULL, the shared library can choose to
- * return failure or to initialise a 'default' ENGINE. If non-NULL, the shared
- * library must initialise only an ENGINE matching the passed 'id'. The function
- * is expected to be implemented with the symbol name "bind_engine". A standard
- * implementation can be instantiated with IMPLEMENT_DYNAMIC_BIND_FN(fn) where
- * the parameter 'fn' is a callback function that populates the ENGINE structure
- * and returns an int value (zero for failure). 'fn' should have prototype;
- *    [static] int fn(ENGINE *e, const char *id); */
-typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
-				const dynamic_fns *fns);
-#define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
-	OPENSSL_EXPORT \
-	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
-		if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
-		if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
-			fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \
-			return 0; \
-		CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \
-		CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \
-		CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \
-		CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \
-		CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \
-		if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \
-			return 0; \
-		if(!ERR_set_implementation(fns->err_fns)) return 0; \
-	skip_cbs: \
-		if(!fn(e,id)) return 0; \
-		return 1; }
-
-/* If the loading application (or library) and the loaded ENGINE library share
- * the same static data (eg. they're both dynamically linked to the same
- * libcrypto.so) we need a way to avoid trying to set system callbacks - this
- * would fail, and for the same reason that it's unnecessary to try. If the
- * loaded ENGINE has (or gets from through the loader) its own copy of the
- * libcrypto static data, we will need to set the callbacks. The easiest way to
- * detect this is to have a function that returns a pointer to some static data
- * and let the loading application and loaded ENGINE compare their respective
- * values. */
-void *ENGINE_get_static_state(void);
-
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-void ENGINE_setup_bsd_cryptodev(void);
-#endif
-
-/* 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_ENGINE_strings(void);
-
-/* Error codes for the ENGINE functions. */
-
-/* Function codes. */
-#define ENGINE_F_DYNAMIC_CTRL				 180
-#define ENGINE_F_DYNAMIC_GET_DATA_CTX			 181
-#define ENGINE_F_DYNAMIC_LOAD				 182
-#define ENGINE_F_DYNAMIC_SET_DATA_CTX			 183
-#define ENGINE_F_ENGINE_ADD				 105
-#define ENGINE_F_ENGINE_BY_ID				 106
-#define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE		 170
-#define ENGINE_F_ENGINE_CTRL				 142
-#define ENGINE_F_ENGINE_CTRL_CMD			 178
-#define ENGINE_F_ENGINE_CTRL_CMD_STRING			 171
-#define ENGINE_F_ENGINE_FINISH				 107
-#define ENGINE_F_ENGINE_FREE_UTIL			 108
-#define ENGINE_F_ENGINE_GET_CIPHER			 185
-#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE		 177
-#define ENGINE_F_ENGINE_GET_DIGEST			 186
-#define ENGINE_F_ENGINE_GET_NEXT			 115
-#define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH		 193
-#define ENGINE_F_ENGINE_GET_PKEY_METH			 192
-#define ENGINE_F_ENGINE_GET_PREV			 116
-#define ENGINE_F_ENGINE_INIT				 119
-#define ENGINE_F_ENGINE_LIST_ADD			 120
-#define ENGINE_F_ENGINE_LIST_REMOVE			 121
-#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY		 150
-#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY			 151
-#define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT		 194
-#define ENGINE_F_ENGINE_NEW				 122
-#define ENGINE_F_ENGINE_REMOVE				 123
-#define ENGINE_F_ENGINE_SET_DEFAULT_STRING		 189
-#define ENGINE_F_ENGINE_SET_DEFAULT_TYPE		 126
-#define ENGINE_F_ENGINE_SET_ID				 129
-#define ENGINE_F_ENGINE_SET_NAME			 130
-#define ENGINE_F_ENGINE_TABLE_REGISTER			 184
-#define ENGINE_F_ENGINE_UNLOAD_KEY			 152
-#define ENGINE_F_ENGINE_UNLOCKED_FINISH			 191
-#define ENGINE_F_ENGINE_UP_REF				 190
-#define ENGINE_F_INT_CTRL_HELPER			 172
-#define ENGINE_F_INT_ENGINE_CONFIGURE			 188
-#define ENGINE_F_INT_ENGINE_MODULE_INIT			 187
-#define ENGINE_F_LOG_MESSAGE				 141
-
-/* Reason codes. */
-#define ENGINE_R_ALREADY_LOADED				 100
-#define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER		 133
-#define ENGINE_R_CMD_NOT_EXECUTABLE			 134
-#define ENGINE_R_COMMAND_TAKES_INPUT			 135
-#define ENGINE_R_COMMAND_TAKES_NO_INPUT			 136
-#define ENGINE_R_CONFLICTING_ENGINE_ID			 103
-#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED		 119
-#define ENGINE_R_DH_NOT_IMPLEMENTED			 139
-#define ENGINE_R_DSA_NOT_IMPLEMENTED			 140
-#define ENGINE_R_DSO_FAILURE				 104
-#define ENGINE_R_DSO_NOT_FOUND				 132
-#define ENGINE_R_ENGINES_SECTION_ERROR			 148
-#define ENGINE_R_ENGINE_CONFIGURATION_ERROR		 102
-#define ENGINE_R_ENGINE_IS_NOT_IN_LIST			 105
-#define ENGINE_R_ENGINE_SECTION_ERROR			 149
-#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY		 128
-#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY		 129
-#define ENGINE_R_FINISH_FAILED				 106
-#define ENGINE_R_GET_HANDLE_FAILED			 107
-#define ENGINE_R_ID_OR_NAME_MISSING			 108
-#define ENGINE_R_INIT_FAILED				 109
-#define ENGINE_R_INTERNAL_LIST_ERROR			 110
-#define ENGINE_R_INVALID_ARGUMENT			 143
-#define ENGINE_R_INVALID_CMD_NAME			 137
-#define ENGINE_R_INVALID_CMD_NUMBER			 138
-#define ENGINE_R_INVALID_INIT_VALUE			 151
-#define ENGINE_R_INVALID_STRING				 150
-#define ENGINE_R_NOT_INITIALISED			 117
-#define ENGINE_R_NOT_LOADED				 112
-#define ENGINE_R_NO_CONTROL_FUNCTION			 120
-#define ENGINE_R_NO_INDEX				 144
-#define ENGINE_R_NO_LOAD_FUNCTION			 125
-#define ENGINE_R_NO_REFERENCE				 130
-#define ENGINE_R_NO_SUCH_ENGINE				 116
-#define ENGINE_R_NO_UNLOAD_FUNCTION			 126
-#define ENGINE_R_PROVIDE_PARAMETERS			 113
-#define ENGINE_R_RSA_NOT_IMPLEMENTED			 141
-#define ENGINE_R_UNIMPLEMENTED_CIPHER			 146
-#define ENGINE_R_UNIMPLEMENTED_DIGEST			 147
-#define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD	 101
-#define ENGINE_R_VERSION_INCOMPATIBILITY		 145
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
+/* openssl/engine.h */

+/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL

+ * project 2000.

+ */

+/* ====================================================================

+ * Copyright (c) 1999-2004 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).

+ *

+ */

+/* ====================================================================

+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.

+ * ECDH support in OpenSSL originally developed by 

+ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.

+ */

+

+#ifndef HEADER_ENGINE_H

+#define HEADER_ENGINE_H

+

+#include <openssl/opensslconf.h>

+

+#ifdef OPENSSL_NO_ENGINE

+#error ENGINE is disabled.

+#endif

+

+#ifndef OPENSSL_NO_DEPRECATED

+#include <openssl/bn.h>

+#ifndef OPENSSL_NO_RSA

+#include <openssl/rsa.h>

+#endif

+#ifndef OPENSSL_NO_DSA

+#include <openssl/dsa.h>

+#endif

+#ifndef OPENSSL_NO_DH

+#include <openssl/dh.h>

+#endif

+#ifndef OPENSSL_NO_ECDH

+#include <openssl/ecdh.h>

+#endif

+#ifndef OPENSSL_NO_ECDSA

+#include <openssl/ecdsa.h>

+#endif

+#include <openssl/rand.h>

+#include <openssl/ui.h>

+#include <openssl/err.h>

+#endif

+

+#include <openssl/ossl_typ.h>

+#include <openssl/symhacks.h>

+

+#include <openssl/x509.h>

+

+#ifdef  __cplusplus

+extern "C" {

+#endif

+

+/* These flags are used to control combinations of algorithm (methods)

+ * by bitwise "OR"ing. */

+#define ENGINE_METHOD_RSA		(unsigned int)0x0001

+#define ENGINE_METHOD_DSA		(unsigned int)0x0002

+#define ENGINE_METHOD_DH		(unsigned int)0x0004

+#define ENGINE_METHOD_RAND		(unsigned int)0x0008

+#define ENGINE_METHOD_ECDH		(unsigned int)0x0010

+#define ENGINE_METHOD_ECDSA		(unsigned int)0x0020

+#define ENGINE_METHOD_CIPHERS		(unsigned int)0x0040

+#define ENGINE_METHOD_DIGESTS		(unsigned int)0x0080

+#define ENGINE_METHOD_STORE		(unsigned int)0x0100

+#define ENGINE_METHOD_PKEY_METHS	(unsigned int)0x0200

+#define ENGINE_METHOD_PKEY_ASN1_METHS	(unsigned int)0x0400

+/* Obvious all-or-nothing cases. */

+#define ENGINE_METHOD_ALL		(unsigned int)0xFFFF

+#define ENGINE_METHOD_NONE		(unsigned int)0x0000

+

+/* This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used

+ * internally to control registration of ENGINE implementations, and can be set

+ * by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to

+ * initialise registered ENGINEs if they are not already initialised. */

+#define ENGINE_TABLE_FLAG_NOINIT	(unsigned int)0x0001

+

+/* ENGINE flags that can be set by ENGINE_set_flags(). */

+/* #define ENGINE_FLAGS_MALLOCED	0x0001 */ /* Not used */

+

+/* This flag is for ENGINEs that wish to handle the various 'CMD'-related

+ * control commands on their own. Without this flag, ENGINE_ctrl() handles these

+ * control commands on behalf of the ENGINE using their "cmd_defns" data. */

+#define ENGINE_FLAGS_MANUAL_CMD_CTRL	(int)0x0002

+

+/* This flag is for ENGINEs who return new duplicate structures when found via

+ * "ENGINE_by_id()". When an ENGINE must store state (eg. if ENGINE_ctrl()

+ * commands are called in sequence as part of some stateful process like

+ * key-generation setup and execution), it can set this flag - then each attempt

+ * to obtain the ENGINE will result in it being copied into a new structure.

+ * Normally, ENGINEs don't declare this flag so ENGINE_by_id() just increments

+ * the existing ENGINE's structural reference count. */

+#define ENGINE_FLAGS_BY_ID_COPY		(int)0x0004

+

+/* ENGINEs can support their own command types, and these flags are used in

+ * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each

+ * command expects. Currently only numeric and string input is supported. If a

+ * control command supports none of the _NUMERIC, _STRING, or _NO_INPUT options,

+ * then it is regarded as an "internal" control command - and not for use in

+ * config setting situations. As such, they're not available to the

+ * ENGINE_ctrl_cmd_string() function, only raw ENGINE_ctrl() access. Changes to

+ * this list of 'command types' should be reflected carefully in

+ * ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string(). */

+

+/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */

+#define ENGINE_CMD_FLAG_NUMERIC		(unsigned int)0x0001

+/* accepts string input (cast from 'void*' to 'const char *', 4th parameter to

+ * ENGINE_ctrl) */

+#define ENGINE_CMD_FLAG_STRING		(unsigned int)0x0002

+/* Indicates that the control command takes *no* input. Ie. the control command

+ * is unparameterised. */

+#define ENGINE_CMD_FLAG_NO_INPUT	(unsigned int)0x0004

+/* Indicates that the control command is internal. This control command won't

+ * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()

+ * function. */

+#define ENGINE_CMD_FLAG_INTERNAL	(unsigned int)0x0008

+

+/* NB: These 3 control commands are deprecated and should not be used. ENGINEs

+ * relying on these commands should compile conditional support for

+ * compatibility (eg. if these symbols are defined) but should also migrate the

+ * same functionality to their own ENGINE-specific control functions that can be

+ * "discovered" by calling applications. The fact these control commands

+ * wouldn't be "executable" (ie. usable by text-based config) doesn't change the

+ * fact that application code can find and use them without requiring per-ENGINE

+ * hacking. */

+

+/* These flags are used to tell the ctrl function what should be done.

+ * All command numbers are shared between all engines, even if some don't

+ * make sense to some engines.  In such a case, they do nothing but return

+ * the error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED. */

+#define ENGINE_CTRL_SET_LOGSTREAM		1

+#define ENGINE_CTRL_SET_PASSWORD_CALLBACK	2

+#define ENGINE_CTRL_HUP				3 /* Close and reinitialise any

+						     handles/connections etc. */

+#define ENGINE_CTRL_SET_USER_INTERFACE          4 /* Alternative to callback */

+#define ENGINE_CTRL_SET_CALLBACK_DATA           5 /* User-specific data, used

+						     when calling the password

+						     callback and the user

+						     interface */

+#define ENGINE_CTRL_LOAD_CONFIGURATION		6 /* Load a configuration, given

+						     a string that represents a

+						     file name or so */

+#define ENGINE_CTRL_LOAD_SECTION		7 /* Load data from a given

+						     section in the already loaded

+						     configuration */

+

+/* These control commands allow an application to deal with an arbitrary engine

+ * in a dynamic way. Warn: Negative return values indicate errors FOR THESE

+ * COMMANDS because zero is used to indicate 'end-of-list'. Other commands,

+ * including ENGINE-specific command types, return zero for an error.

+ *

+ * An ENGINE can choose to implement these ctrl functions, and can internally

+ * manage things however it chooses - it does so by setting the

+ * ENGINE_FLAGS_MANUAL_CMD_CTRL flag (using ENGINE_set_flags()). Otherwise the

+ * ENGINE_ctrl() code handles this on the ENGINE's behalf using the cmd_defns

+ * data (set using ENGINE_set_cmd_defns()). This means an ENGINE's ctrl()

+ * handler need only implement its own commands - the above "meta" commands will

+ * be taken care of. */

+

+/* Returns non-zero if the supplied ENGINE has a ctrl() handler. If "not", then

+ * all the remaining control commands will return failure, so it is worth

+ * checking this first if the caller is trying to "discover" the engine's

+ * capabilities and doesn't want errors generated unnecessarily. */

+#define ENGINE_CTRL_HAS_CTRL_FUNCTION		10

+/* Returns a positive command number for the first command supported by the

+ * engine. Returns zero if no ctrl commands are supported. */

+#define ENGINE_CTRL_GET_FIRST_CMD_TYPE		11

+/* The 'long' argument specifies a command implemented by the engine, and the

+ * return value is the next command supported, or zero if there are no more. */

+#define ENGINE_CTRL_GET_NEXT_CMD_TYPE		12

+/* The 'void*' argument is a command name (cast from 'const char *'), and the

+ * return value is the command that corresponds to it. */

+#define ENGINE_CTRL_GET_CMD_FROM_NAME		13

+/* The next two allow a command to be converted into its corresponding string

+ * form. In each case, the 'long' argument supplies the command. In the NAME_LEN

+ * case, the return value is the length of the command name (not counting a

+ * trailing EOL). In the NAME case, the 'void*' argument must be a string buffer

+ * large enough, and it will be populated with the name of the command (WITH a

+ * trailing EOL). */

+#define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD	14

+#define ENGINE_CTRL_GET_NAME_FROM_CMD		15

+/* The next two are similar but give a "short description" of a command. */

+#define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD	16

+#define ENGINE_CTRL_GET_DESC_FROM_CMD		17

+/* With this command, the return value is the OR'd combination of

+ * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given

+ * engine-specific ctrl command expects. */

+#define ENGINE_CTRL_GET_CMD_FLAGS		18

+

+/* ENGINE implementations should start the numbering of their own control

+ * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */

+#define ENGINE_CMD_BASE				200

+

+/* NB: These 2 nCipher "chil" control commands are deprecated, and their

+ * functionality is now available through ENGINE-specific control commands

+ * (exposed through the above-mentioned 'CMD'-handling). Code using these 2

+ * commands should be migrated to the more general command handling before these

+ * are removed. */

+

+/* Flags specific to the nCipher "chil" engine */

+#define ENGINE_CTRL_CHIL_SET_FORKCHECK		100

+	/* Depending on the value of the (long)i argument, this sets or

+	 * unsets the SimpleForkCheck flag in the CHIL API to enable or

+	 * disable checking and workarounds for applications that fork().

+	 */

+#define ENGINE_CTRL_CHIL_NO_LOCKING		101

+	/* This prevents the initialisation function from providing mutex

+	 * callbacks to the nCipher library. */

+

+/* If an ENGINE supports its own specific control commands and wishes the

+ * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its

+ * behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN entries

+ * to ENGINE_set_cmd_defns(). It should also implement a ctrl() handler that

+ * supports the stated commands (ie. the "cmd_num" entries as described by the

+ * array). NB: The array must be ordered in increasing order of cmd_num.

+ * "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set

+ * to zero and/or cmd_name set to NULL. */

+typedef struct ENGINE_CMD_DEFN_st

+	{

+	unsigned int cmd_num; /* The command number */

+	const char *cmd_name; /* The command name itself */

+	const char *cmd_desc; /* A short description of the command */

+	unsigned int cmd_flags; /* The input the command expects */

+	} ENGINE_CMD_DEFN;

+

+/* Generic function pointer */

+typedef int (*ENGINE_GEN_FUNC_PTR)(void);

+/* Generic function pointer taking no arguments */

+typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);

+/* Specific control function pointer */

+typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void));

+/* Generic load_key function pointer */

+typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,

+	UI_METHOD *ui_method, void *callback_data);

+typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,

+	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,

+	STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);

+/* These callback types are for an ENGINE's handler for cipher and digest logic.

+ * These handlers have these prototypes;

+ *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);

+ *   int foo(ENGINE *e, const EVP_MD **digest, const int **nids, int nid);

+ * Looking at how to implement these handlers in the case of cipher support, if

+ * the framework wants the EVP_CIPHER for 'nid', it will call;

+ *   foo(e, &p_evp_cipher, NULL, nid);    (return zero for failure)

+ * If the framework wants a list of supported 'nid's, it will call;

+ *   foo(e, NULL, &p_nids, 0); (returns number of 'nids' or -1 for error)

+ */

+/* Returns to a pointer to the array of supported cipher 'nid's. If the second

+ * parameter is non-NULL it is set to the size of the returned array. */

+typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **, const int **, int);

+typedef int (*ENGINE_DIGESTS_PTR)(ENGINE *, const EVP_MD **, const int **, int);

+typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **, const int **, int);

+typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **, const int **, int);

+/* STRUCTURE functions ... all of these functions deal with pointers to ENGINE

+ * structures where the pointers have a "structural reference". This means that

+ * their reference is to allowed access to the structure but it does not imply

+ * that the structure is functional. To simply increment or decrement the

+ * structural reference count, use ENGINE_by_id and ENGINE_free. NB: This is not

+ * required when iterating using ENGINE_get_next as it will automatically

+ * decrement the structural reference count of the "current" ENGINE and

+ * increment the structural reference count of the ENGINE it returns (unless it

+ * is NULL). */

+

+/* Get the first/last "ENGINE" type available. */

+ENGINE *ENGINE_get_first(void);

+ENGINE *ENGINE_get_last(void);

+/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */

+ENGINE *ENGINE_get_next(ENGINE *e);

+ENGINE *ENGINE_get_prev(ENGINE *e);

+/* Add another "ENGINE" type into the array. */

+int ENGINE_add(ENGINE *e);

+/* Remove an existing "ENGINE" type from the array. */

+int ENGINE_remove(ENGINE *e);

+/* Retrieve an engine from the list by its unique "id" value. */

+ENGINE *ENGINE_by_id(const char *id);

+/* Add all the built-in engines. */

+void ENGINE_load_openssl(void);

+void ENGINE_load_dynamic(void);

+#ifndef OPENSSL_NO_STATIC_ENGINE

+void ENGINE_load_4758cca(void);

+void ENGINE_load_aep(void);

+void ENGINE_load_atalla(void);

+void ENGINE_load_chil(void);

+void ENGINE_load_cswift(void);

+void ENGINE_load_nuron(void);

+void ENGINE_load_sureware(void);

+void ENGINE_load_ubsec(void);

+void ENGINE_load_padlock(void);

+void ENGINE_load_capi(void);

+#ifndef OPENSSL_NO_GMP

+void ENGINE_load_gmp(void);

+#endif

+#ifndef OPENSSL_NO_GOST

+void ENGINE_load_gost(void);

+#endif

+#endif

+void ENGINE_load_cryptodev(void);

+void ENGINE_load_builtin_engines(void);

+

+/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation

+ * "registry" handling. */

+unsigned int ENGINE_get_table_flags(void);

+void ENGINE_set_table_flags(unsigned int flags);

+

+/* Manage registration of ENGINEs per "table". For each type, there are 3

+ * functions;

+ *   ENGINE_register_***(e) - registers the implementation from 'e' (if it has one)

+ *   ENGINE_unregister_***(e) - unregister the implementation from 'e'

+ *   ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list

+ * Cleanup is automatically registered from each table when required, so

+ * ENGINE_cleanup() will reverse any "register" operations. */

+

+int ENGINE_register_RSA(ENGINE *e);

+void ENGINE_unregister_RSA(ENGINE *e);

+void ENGINE_register_all_RSA(void);

+

+int ENGINE_register_DSA(ENGINE *e);

+void ENGINE_unregister_DSA(ENGINE *e);

+void ENGINE_register_all_DSA(void);

+

+int ENGINE_register_ECDH(ENGINE *e);

+void ENGINE_unregister_ECDH(ENGINE *e);

+void ENGINE_register_all_ECDH(void);

+

+int ENGINE_register_ECDSA(ENGINE *e);

+void ENGINE_unregister_ECDSA(ENGINE *e);

+void ENGINE_register_all_ECDSA(void);

+

+int ENGINE_register_DH(ENGINE *e);

+void ENGINE_unregister_DH(ENGINE *e);

+void ENGINE_register_all_DH(void);

+

+int ENGINE_register_RAND(ENGINE *e);

+void ENGINE_unregister_RAND(ENGINE *e);

+void ENGINE_register_all_RAND(void);

+

+int ENGINE_register_STORE(ENGINE *e);

+void ENGINE_unregister_STORE(ENGINE *e);

+void ENGINE_register_all_STORE(void);

+

+int ENGINE_register_ciphers(ENGINE *e);

+void ENGINE_unregister_ciphers(ENGINE *e);

+void ENGINE_register_all_ciphers(void);

+

+int ENGINE_register_digests(ENGINE *e);

+void ENGINE_unregister_digests(ENGINE *e);

+void ENGINE_register_all_digests(void);

+

+int ENGINE_register_pkey_meths(ENGINE *e);

+void ENGINE_unregister_pkey_meths(ENGINE *e);

+void ENGINE_register_all_pkey_meths(void);

+

+int ENGINE_register_pkey_asn1_meths(ENGINE *e);

+void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);

+void ENGINE_register_all_pkey_asn1_meths(void);

+

+/* These functions register all support from the above categories. Note, use of

+ * these functions can result in static linkage of code your application may not

+ * need. If you only need a subset of functionality, consider using more

+ * selective initialisation. */

+int ENGINE_register_complete(ENGINE *e);

+int ENGINE_register_all_complete(void);

+

+/* Send parametrised control commands to the engine. The possibilities to send

+ * down an integer, a pointer to data or a function pointer are provided. Any of

+ * the parameters may or may not be NULL, depending on the command number. In

+ * actuality, this function only requires a structural (rather than functional)

+ * reference to an engine, but many control commands may require the engine be

+ * functional. The caller should be aware of trying commands that require an

+ * operational ENGINE, and only use functional references in such situations. */

+int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));

+

+/* This function tests if an ENGINE-specific command is usable as a "setting".

+ * Eg. in an application's config file that gets processed through

+ * ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to

+ * ENGINE_ctrl_cmd_string(), only ENGINE_ctrl(). */

+int ENGINE_cmd_is_executable(ENGINE *e, int cmd);

+

+/* This function works like ENGINE_ctrl() with the exception of taking a

+ * command name instead of a command number, and can handle optional commands.

+ * See the comment on ENGINE_ctrl_cmd_string() for an explanation on how to

+ * use the cmd_name and cmd_optional. */

+int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,

+        long i, void *p, void (*f)(void), int cmd_optional);

+

+/* This function passes a command-name and argument to an ENGINE. The cmd_name

+ * is converted to a command number and the control command is called using

+ * 'arg' as an argument (unless the ENGINE doesn't support such a command, in

+ * which case no control command is called). The command is checked for input

+ * flags, and if necessary the argument will be converted to a numeric value. If

+ * cmd_optional is non-zero, then if the ENGINE doesn't support the given

+ * cmd_name the return value will be success anyway. This function is intended

+ * for applications to use so that users (or config files) can supply

+ * engine-specific config data to the ENGINE at run-time to control behaviour of

+ * specific engines. As such, it shouldn't be used for calling ENGINE_ctrl()

+ * functions that return data, deal with binary data, or that are otherwise

+ * supposed to be used directly through ENGINE_ctrl() in application code. Any

+ * "return" data from an ENGINE_ctrl() operation in this function will be lost -

+ * the return value is interpreted as failure if the return value is zero,

+ * success otherwise, and this function returns a boolean value as a result. In

+ * other words, vendors of 'ENGINE'-enabled devices should write ENGINE

+ * implementations with parameterisations that work in this scheme, so that

+ * compliant ENGINE-based applications can work consistently with the same

+ * configuration for the same ENGINE-enabled devices, across applications. */

+int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,

+				int cmd_optional);

+

+/* These functions are useful for manufacturing new ENGINE structures. They

+ * don't address reference counting at all - one uses them to populate an ENGINE

+ * structure with personalised implementations of things prior to using it

+ * directly or adding it to the builtin ENGINE list in OpenSSL. These are also

+ * here so that the ENGINE structure doesn't have to be exposed and break binary

+ * compatibility! */

+ENGINE *ENGINE_new(void);

+int ENGINE_free(ENGINE *e);

+int ENGINE_up_ref(ENGINE *e);

+int ENGINE_set_id(ENGINE *e, const char *id);

+int ENGINE_set_name(ENGINE *e, const char *name);

+int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);

+int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);

+int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth);

+int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth);

+int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);

+int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);

+int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth);

+int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);

+int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);

+int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);

+int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);

+int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);

+int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);

+int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,

+				ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);

+int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);

+int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);

+int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);

+int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);

+int ENGINE_set_flags(ENGINE *e, int flags);

+int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);

+/* These functions allow control over any per-structure ENGINE data. */

+int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,

+		CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);

+int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);

+void *ENGINE_get_ex_data(const ENGINE *e, int idx);

+

+/* This function cleans up anything that needs it. Eg. the ENGINE_add() function

+ * automatically ensures the list cleanup function is registered to be called

+ * from ENGINE_cleanup(). Similarly, all ENGINE_register_*** functions ensure

+ * ENGINE_cleanup() will clean up after them. */

+void ENGINE_cleanup(void);

+

+/* These return values from within the ENGINE structure. These can be useful

+ * with functional references as well as structural references - it depends

+ * which you obtained. Using the result for functional purposes if you only

+ * obtained a structural reference may be problematic! */

+const char *ENGINE_get_id(const ENGINE *e);

+const char *ENGINE_get_name(const ENGINE *e);

+const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);

+const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);

+const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e);

+const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e);

+const DH_METHOD *ENGINE_get_DH(const ENGINE *e);

+const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);

+const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e);

+ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e);

+ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e);

+ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);

+ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);

+ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);

+ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);

+ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE *e);

+ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);

+ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);

+ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);

+ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);

+const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);

+const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);

+const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);

+const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);

+const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,

+					const char *str, int len);

+const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,

+					const char *str, int len);

+const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);

+int ENGINE_get_flags(const ENGINE *e);

+

+/* FUNCTIONAL functions. These functions deal with ENGINE structures

+ * that have (or will) be initialised for use. Broadly speaking, the

+ * structural functions are useful for iterating the list of available

+ * engine types, creating new engine types, and other "list" operations.

+ * These functions actually deal with ENGINEs that are to be used. As

+ * such these functions can fail (if applicable) when particular

+ * engines are unavailable - eg. if a hardware accelerator is not

+ * attached or not functioning correctly. Each ENGINE has 2 reference

+ * counts; structural and functional. Every time a functional reference

+ * is obtained or released, a corresponding structural reference is

+ * automatically obtained or released too. */

+

+/* Initialise a engine type for use (or up its reference count if it's

+ * already in use). This will fail if the engine is not currently

+ * operational and cannot initialise. */

+int ENGINE_init(ENGINE *e);

+/* Free a functional reference to a engine type. This does not require

+ * a corresponding call to ENGINE_free as it also releases a structural

+ * reference. */

+int ENGINE_finish(ENGINE *e);

+

+/* The following functions handle keys that are stored in some secondary

+ * location, handled by the engine.  The storage may be on a card or

+ * whatever. */

+EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,

+	UI_METHOD *ui_method, void *callback_data);

+EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,

+	UI_METHOD *ui_method, void *callback_data);

+int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,

+	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,

+	STACK_OF(X509) **pother,

+	UI_METHOD *ui_method, void *callback_data);

+

+/* This returns a pointer for the current ENGINE structure that

+ * is (by default) performing any RSA operations. The value returned

+ * is an incremented reference, so it should be free'd (ENGINE_finish)

+ * before it is discarded. */

+ENGINE *ENGINE_get_default_RSA(void);

+/* Same for the other "methods" */

+ENGINE *ENGINE_get_default_DSA(void);

+ENGINE *ENGINE_get_default_ECDH(void);

+ENGINE *ENGINE_get_default_ECDSA(void);

+ENGINE *ENGINE_get_default_DH(void);

+ENGINE *ENGINE_get_default_RAND(void);

+/* These functions can be used to get a functional reference to perform

+ * ciphering or digesting corresponding to "nid". */

+ENGINE *ENGINE_get_cipher_engine(int nid);

+ENGINE *ENGINE_get_digest_engine(int nid);

+ENGINE *ENGINE_get_pkey_meth_engine(int nid);

+ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);

+

+/* This sets a new default ENGINE structure for performing RSA

+ * operations. If the result is non-zero (success) then the ENGINE

+ * structure will have had its reference count up'd so the caller

+ * should still free their own reference 'e'. */

+int ENGINE_set_default_RSA(ENGINE *e);

+int ENGINE_set_default_string(ENGINE *e, const char *def_list);

+/* Same for the other "methods" */

+int ENGINE_set_default_DSA(ENGINE *e);

+int ENGINE_set_default_ECDH(ENGINE *e);

+int ENGINE_set_default_ECDSA(ENGINE *e);

+int ENGINE_set_default_DH(ENGINE *e);

+int ENGINE_set_default_RAND(ENGINE *e);

+int ENGINE_set_default_ciphers(ENGINE *e);

+int ENGINE_set_default_digests(ENGINE *e);

+int ENGINE_set_default_pkey_meths(ENGINE *e);

+int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);

+

+/* The combination "set" - the flags are bitwise "OR"d from the

+ * ENGINE_METHOD_*** defines above. As with the "ENGINE_register_complete()"

+ * function, this function can result in unnecessary static linkage. If your

+ * application requires only specific functionality, consider using more

+ * selective functions. */

+int ENGINE_set_default(ENGINE *e, unsigned int flags);

+

+void ENGINE_add_conf_module(void);

+

+/* Deprecated functions ... */

+/* int ENGINE_clear_defaults(void); */

+

+/**************************/

+/* DYNAMIC ENGINE SUPPORT */

+/**************************/

+

+/* Binary/behaviour compatibility levels */

+#define OSSL_DYNAMIC_VERSION		(unsigned long)0x00020000

+/* Binary versions older than this are too old for us (whether we're a loader or

+ * a loadee) */

+#define OSSL_DYNAMIC_OLDEST		(unsigned long)0x00020000

+

+/* When compiling an ENGINE entirely as an external shared library, loadable by

+ * the "dynamic" ENGINE, these types are needed. The 'dynamic_fns' structure

+ * type provides the calling application's (or library's) error functionality

+ * and memory management function pointers to the loaded library. These should

+ * be used/set in the loaded library code so that the loading application's

+ * 'state' will be used/changed in all operations. The 'static_state' pointer

+ * allows the loaded library to know if it shares the same static data as the

+ * calling application (or library), and thus whether these callbacks need to be

+ * set or not. */

+typedef void *(*dyn_MEM_malloc_cb)(size_t);

+typedef void *(*dyn_MEM_realloc_cb)(void *, size_t);

+typedef void (*dyn_MEM_free_cb)(void *);

+typedef struct st_dynamic_MEM_fns {

+	dyn_MEM_malloc_cb			malloc_cb;

+	dyn_MEM_realloc_cb			realloc_cb;

+	dyn_MEM_free_cb				free_cb;

+	} dynamic_MEM_fns;

+/* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use

+ * these types so we (and any other dependant code) can simplify a bit?? */

+typedef void (*dyn_lock_locking_cb)(int,int,const char *,int);

+typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int);

+typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)(

+						const char *,int);

+typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *,

+						const char *,int);

+typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *,

+						const char *,int);

+typedef struct st_dynamic_LOCK_fns {

+	dyn_lock_locking_cb			lock_locking_cb;

+	dyn_lock_add_lock_cb			lock_add_lock_cb;

+	dyn_dynlock_create_cb			dynlock_create_cb;

+	dyn_dynlock_lock_cb			dynlock_lock_cb;

+	dyn_dynlock_destroy_cb			dynlock_destroy_cb;

+	} dynamic_LOCK_fns;

+/* The top-level structure */

+typedef struct st_dynamic_fns {

+	void 					*static_state;

+	const ERR_FNS				*err_fns;

+	const CRYPTO_EX_DATA_IMPL		*ex_data_fns;

+	dynamic_MEM_fns				mem_fns;

+	dynamic_LOCK_fns			lock_fns;

+	} dynamic_fns;

+

+/* The version checking function should be of this prototype. NB: The

+ * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code.

+ * If this function returns zero, it indicates a (potential) version

+ * incompatibility and the loaded library doesn't believe it can proceed.

+ * Otherwise, the returned value is the (latest) version supported by the

+ * loading library. The loader may still decide that the loaded code's version

+ * is unsatisfactory and could veto the load. The function is expected to

+ * be implemented with the symbol name "v_check", and a default implementation

+ * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */

+typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);

+#define IMPLEMENT_DYNAMIC_CHECK_FN() \

+	OPENSSL_EXPORT unsigned long v_check(unsigned long v); \

+	OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \

+		if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \

+		return 0; }

+

+/* This function is passed the ENGINE structure to initialise with its own

+ * function and command settings. It should not adjust the structural or

+ * functional reference counts. If this function returns zero, (a) the load will

+ * be aborted, (b) the previous ENGINE state will be memcpy'd back onto the

+ * structure, and (c) the shared library will be unloaded. So implementations

+ * should do their own internal cleanup in failure circumstances otherwise they

+ * could leak. The 'id' parameter, if non-NULL, represents the ENGINE id that

+ * the loader is looking for. If this is NULL, the shared library can choose to

+ * return failure or to initialise a 'default' ENGINE. If non-NULL, the shared

+ * library must initialise only an ENGINE matching the passed 'id'. The function

+ * is expected to be implemented with the symbol name "bind_engine". A standard

+ * implementation can be instantiated with IMPLEMENT_DYNAMIC_BIND_FN(fn) where

+ * the parameter 'fn' is a callback function that populates the ENGINE structure

+ * and returns an int value (zero for failure). 'fn' should have prototype;

+ *    [static] int fn(ENGINE *e, const char *id); */

+typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,

+				const dynamic_fns *fns);

+#define IMPLEMENT_DYNAMIC_BIND_FN(fn) \

+	OPENSSL_EXPORT \

+	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \

+	OPENSSL_EXPORT \

+	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \

+		if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \

+		if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \

+			fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \

+			return 0; \

+		CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \

+		CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \

+		CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \

+		CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \

+		CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \

+		if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \

+			return 0; \

+		if(!ERR_set_implementation(fns->err_fns)) return 0; \

+	skip_cbs: \

+		if(!fn(e,id)) return 0; \

+		return 1; }

+

+/* If the loading application (or library) and the loaded ENGINE library share

+ * the same static data (eg. they're both dynamically linked to the same

+ * libcrypto.so) we need a way to avoid trying to set system callbacks - this

+ * would fail, and for the same reason that it's unnecessary to try. If the

+ * loaded ENGINE has (or gets from through the loader) its own copy of the

+ * libcrypto static data, we will need to set the callbacks. The easiest way to

+ * detect this is to have a function that returns a pointer to some static data

+ * and let the loading application and loaded ENGINE compare their respective

+ * values. */

+void *ENGINE_get_static_state(void);

+

+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)

+void ENGINE_setup_bsd_cryptodev(void);

+#endif

+

+/* 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_ENGINE_strings(void);

+

+/* Error codes for the ENGINE functions. */

+

+/* Function codes. */

+#define ENGINE_F_DYNAMIC_CTRL				 180

+#define ENGINE_F_DYNAMIC_GET_DATA_CTX			 181

+#define ENGINE_F_DYNAMIC_LOAD				 182

+#define ENGINE_F_DYNAMIC_SET_DATA_CTX			 183

+#define ENGINE_F_ENGINE_ADD				 105

+#define ENGINE_F_ENGINE_BY_ID				 106

+#define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE		 170

+#define ENGINE_F_ENGINE_CTRL				 142

+#define ENGINE_F_ENGINE_CTRL_CMD			 178

+#define ENGINE_F_ENGINE_CTRL_CMD_STRING			 171

+#define ENGINE_F_ENGINE_FINISH				 107

+#define ENGINE_F_ENGINE_FREE_UTIL			 108

+#define ENGINE_F_ENGINE_GET_CIPHER			 185

+#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE		 177

+#define ENGINE_F_ENGINE_GET_DIGEST			 186

+#define ENGINE_F_ENGINE_GET_NEXT			 115

+#define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH		 193

+#define ENGINE_F_ENGINE_GET_PKEY_METH			 192

+#define ENGINE_F_ENGINE_GET_PREV			 116

+#define ENGINE_F_ENGINE_INIT				 119

+#define ENGINE_F_ENGINE_LIST_ADD			 120

+#define ENGINE_F_ENGINE_LIST_REMOVE			 121

+#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY		 150

+#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY			 151

+#define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT		 194

+#define ENGINE_F_ENGINE_NEW				 122

+#define ENGINE_F_ENGINE_REMOVE				 123

+#define ENGINE_F_ENGINE_SET_DEFAULT_STRING		 189

+#define ENGINE_F_ENGINE_SET_DEFAULT_TYPE		 126

+#define ENGINE_F_ENGINE_SET_ID				 129

+#define ENGINE_F_ENGINE_SET_NAME			 130

+#define ENGINE_F_ENGINE_TABLE_REGISTER			 184

+#define ENGINE_F_ENGINE_UNLOAD_KEY			 152

+#define ENGINE_F_ENGINE_UNLOCKED_FINISH			 191

+#define ENGINE_F_ENGINE_UP_REF				 190

+#define ENGINE_F_INT_CTRL_HELPER			 172

+#define ENGINE_F_INT_ENGINE_CONFIGURE			 188

+#define ENGINE_F_INT_ENGINE_MODULE_INIT			 187

+#define ENGINE_F_LOG_MESSAGE				 141

+

+/* Reason codes. */

+#define ENGINE_R_ALREADY_LOADED				 100

+#define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER		 133

+#define ENGINE_R_CMD_NOT_EXECUTABLE			 134

+#define ENGINE_R_COMMAND_TAKES_INPUT			 135

+#define ENGINE_R_COMMAND_TAKES_NO_INPUT			 136

+#define ENGINE_R_CONFLICTING_ENGINE_ID			 103

+#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED		 119

+#define ENGINE_R_DH_NOT_IMPLEMENTED			 139

+#define ENGINE_R_DSA_NOT_IMPLEMENTED			 140

+#define ENGINE_R_DSO_FAILURE				 104

+#define ENGINE_R_DSO_NOT_FOUND				 132

+#define ENGINE_R_ENGINES_SECTION_ERROR			 148

+#define ENGINE_R_ENGINE_CONFIGURATION_ERROR		 102

+#define ENGINE_R_ENGINE_IS_NOT_IN_LIST			 105

+#define ENGINE_R_ENGINE_SECTION_ERROR			 149

+#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY		 128

+#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY		 129

+#define ENGINE_R_FINISH_FAILED				 106

+#define ENGINE_R_GET_HANDLE_FAILED			 107

+#define ENGINE_R_ID_OR_NAME_MISSING			 108

+#define ENGINE_R_INIT_FAILED				 109

+#define ENGINE_R_INTERNAL_LIST_ERROR			 110

+#define ENGINE_R_INVALID_ARGUMENT			 143

+#define ENGINE_R_INVALID_CMD_NAME			 137

+#define ENGINE_R_INVALID_CMD_NUMBER			 138

+#define ENGINE_R_INVALID_INIT_VALUE			 151

+#define ENGINE_R_INVALID_STRING				 150

+#define ENGINE_R_NOT_INITIALISED			 117

+#define ENGINE_R_NOT_LOADED				 112

+#define ENGINE_R_NO_CONTROL_FUNCTION			 120

+#define ENGINE_R_NO_INDEX				 144

+#define ENGINE_R_NO_LOAD_FUNCTION			 125

+#define ENGINE_R_NO_REFERENCE				 130

+#define ENGINE_R_NO_SUCH_ENGINE				 116

+#define ENGINE_R_NO_UNLOAD_FUNCTION			 126

+#define ENGINE_R_PROVIDE_PARAMETERS			 113

+#define ENGINE_R_RSA_NOT_IMPLEMENTED			 141

+#define ENGINE_R_UNIMPLEMENTED_CIPHER			 146

+#define ENGINE_R_UNIMPLEMENTED_DIGEST			 147

+#define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD	 101

+#define ENGINE_R_VERSION_INCOMPATIBILITY		 145

+

+#ifdef  __cplusplus

+}

+#endif

+#endif

diff --git a/openssl/crypto/install.com b/openssl/crypto/install.com
index b3290165c..5ddd4d794 100644
--- a/openssl/crypto/install.com
+++ b/openssl/crypto/install.com
@@ -1,150 +1,150 @@
-$! INSTALL.COM -- Installs the files in a given directory tree
-$!
-$! Author: Richard Levitte <richard@levitte.org>
-$! Time of creation: 22-MAY-1998 10:13
-$!
-$! Changes by Zoltan Arpadffy <zoli@polarhome.com>
-$!
-$! P1	root of the directory tree
-$!
-$	IF P1 .EQS. ""
-$	THEN
-$	    WRITE SYS$OUTPUT "First argument missing."
-$	    WRITE SYS$OUTPUT -
-		  "It should be the directory where you want things installed."
-$	    EXIT
-$	ENDIF
-$
-$	IF (F$GETSYI("CPU").LT.128)
-$	THEN
-$	    ARCH := VAX
-$	ELSE
-$	    ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
-$	    IF (ARCH .EQS. "") THEN ARCH = "UNK"
-$	ENDIF
-$
-$	ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
-$	ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
-$	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
-		   - "[000000." - "][" - "[" - "]"
-$	ROOT = ROOT_DEV + "[" + ROOT_DIR
-$
-$	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$	DEFINE/NOLOG WRK_SSLLIB WRK_SSLROOT:['ARCH'_LIB]
-$	DEFINE/NOLOG WRK_SSLINCLUDE WRK_SSLROOT:[INCLUDE]
-$
-$	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$	IF F$PARSE("WRK_SSLLIB:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLLIB:
-$	IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLINCLUDE:
-$
-$	SDIRS := ,-
-		 _'ARCH',-
-		 OBJECTS,-
-		 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
-		 DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-
-		 BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,-
-		 BUFFER,BIO,STACK,LHASH,RAND,ERR,-
-		 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-
-		 UI,KRB5,-
-		 STORE,CMS,PQUEUE,TS,JPAKE
-$	EXHEADER_ := crypto.h,opensslv.h,ebcdic.h,symhacks.h,ossl_typ.h
-$	EXHEADER__'ARCH' := opensslconf.h
-$	EXHEADER_OBJECTS := objects.h,obj_mac.h
-$	EXHEADER_MD2 := md2.h
-$	EXHEADER_MD4 := md4.h
-$	EXHEADER_MD5 := md5.h
-$	EXHEADER_SHA := sha.h
-$	EXHEADER_MDC2 := mdc2.h
-$	EXHEADER_HMAC := hmac.h
-$	EXHEADER_RIPEMD := ripemd.h
-$	EXHEADER_WHRLPOOL := whrlpool.h
-$	EXHEADER_DES := des.h,des_old.h
-$	EXHEADER_AES := aes.h
-$	EXHEADER_RC2 := rc2.h
-$	EXHEADER_RC4 := rc4.h
-$	EXHEADER_RC5 := rc5.h
-$	EXHEADER_IDEA := idea.h
-$	EXHEADER_BF := blowfish.h
-$	EXHEADER_CAST := cast.h
-$	EXHEADER_CAMELLIA := camellia.h
-$	EXHEADER_SEED := seed.h
-$	EXHEADER_MODES := modes.h
-$	EXHEADER_BN := bn.h
-$	EXHEADER_EC := ec.h
-$	EXHEADER_RSA := rsa.h
-$	EXHEADER_DSA := dsa.h
-$	EXHEADER_ECDSA := ecdsa.h
-$	EXHEADER_DH := dh.h
-$	EXHEADER_ECDH := ecdh.h
-$	EXHEADER_DSO := dso.h
-$	EXHEADER_ENGINE := engine.h
-$	EXHEADER_BUFFER := buffer.h
-$	EXHEADER_BIO := bio.h
-$	EXHEADER_STACK := stack.h,safestack.h
-$	EXHEADER_LHASH := lhash.h
-$	EXHEADER_RAND := rand.h
-$	EXHEADER_ERR := err.h
-$	EXHEADER_EVP := evp.h
-$	EXHEADER_ASN1 := asn1.h,asn1_mac.h,asn1t.h
-$	EXHEADER_PEM := pem.h,pem2.h
-$	EXHEADER_X509 := x509.h,x509_vfy.h
-$	EXHEADER_X509V3 := x509v3.h
-$	EXHEADER_CONF := conf.h,conf_api.h
-$	EXHEADER_TXT_DB := txt_db.h
-$	EXHEADER_PKCS7 := pkcs7.h
-$	EXHEADER_PKCS12 := pkcs12.h
-$	EXHEADER_COMP := comp.h
-$	EXHEADER_OCSP := ocsp.h
-$	EXHEADER_UI := ui.h,ui_compat.h
-$	EXHEADER_KRB5 := krb5_asn.h
-$!	EXHEADER_STORE := store.h,str_compat.h
-$	EXHEADER_STORE := store.h
-$	EXHEADER_CMS := cms.h
-$	EXHEADER_PQUEUE := pqueue.h
-$	EXHEADER_TS := ts.h
-$	EXHEADER_JPAKE := jpake.h
-$	LIBS := LIBCRYPTO
-$
-$	EXE_DIR := [-.'ARCH'.EXE.CRYPTO]
-$
-$	I = 0
-$ LOOP_SDIRS: 
-$	D = F$EDIT(F$ELEMENT(I, ",", SDIRS),"TRIM")
-$	I = I + 1
-$	IF D .EQS. "," THEN GOTO LOOP_SDIRS_END
-$	tmp = EXHEADER_'D'
-$	IF D .EQS. ""
-$	THEN
-$	  COPY 'tmp' WRK_SSLINCLUDE: /LOG
-$	ELSE
-$	  COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG
-$	ENDIF
-$	SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp'
-$	GOTO LOOP_SDIRS
-$ LOOP_SDIRS_END:
-$
-$	I = 0
-$ LOOP_LIB: 
-$	E = F$EDIT(F$ELEMENT(I, ",", LIBS),"TRIM")
-$	I = I + 1
-$	IF E .EQS. "," THEN GOTO LOOP_LIB_END
-$	SET NOON
-$	IF F$SEARCH(EXE_DIR+E+".OLB") .NES. ""
-$	THEN
-$	  COPY 'EXE_DIR''E'.OLB WRK_SSLLIB:'E'.OLB/log
-$	  SET FILE/PROT=W:RE WRK_SSLLIB:'E'.OLB
-$	ENDIF
-$	! Preparing for the time when we have shareable images
-$	IF F$SEARCH(EXE_DIR+E+".EXE") .NES. ""
-$	THEN
-$	  COPY 'EXE_DIR''E'.EXE WRK_SSLLIB:'E'.EXE/log
-$	  SET FILE/PROT=W:RE WRK_SSLLIB:'E'.EXE
-$	ENDIF
-$	SET ON
-$	GOTO LOOP_LIB
-$ LOOP_LIB_END:
-$
-$	EXIT
+$! INSTALL.COM -- Installs the files in a given directory tree

+$!

+$! Author: Richard Levitte <richard@levitte.org>

+$! Time of creation: 22-MAY-1998 10:13

+$!

+$! Changes by Zoltan Arpadffy <zoli@polarhome.com>

+$!

+$! P1	root of the directory tree

+$!

+$	IF P1 .EQS. ""

+$	THEN

+$	    WRITE SYS$OUTPUT "First argument missing."

+$	    WRITE SYS$OUTPUT -

+		  "It should be the directory where you want things installed."

+$	    EXIT

+$	ENDIF

+$

+$	IF (F$GETSYI("CPU").LT.128)

+$	THEN

+$	    ARCH := VAX

+$	ELSE

+$	    ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")

+$	    IF (ARCH .EQS. "") THEN ARCH = "UNK"

+$	ENDIF

+$

+$	ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"

+$	ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")

+$	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -

+		   - "[000000." - "][" - "[" - "]"

+$	ROOT = ROOT_DEV + "[" + ROOT_DIR

+$

+$	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC

+$	DEFINE/NOLOG WRK_SSLLIB WRK_SSLROOT:['ARCH'_LIB]

+$	DEFINE/NOLOG WRK_SSLINCLUDE WRK_SSLROOT:[INCLUDE]

+$

+$	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -

+	   CREATE/DIR/LOG WRK_SSLROOT:[000000]

+$	IF F$PARSE("WRK_SSLLIB:") .EQS. "" THEN -

+	   CREATE/DIR/LOG WRK_SSLLIB:

+$	IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -

+	   CREATE/DIR/LOG WRK_SSLINCLUDE:

+$

+$	SDIRS := ,-

+		 _'ARCH',-

+		 OBJECTS,-

+		 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-

+		 DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-

+		 BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,-

+		 BUFFER,BIO,STACK,LHASH,RAND,ERR,-

+		 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-

+		 UI,KRB5,-

+		 STORE,CMS,PQUEUE,TS,JPAKE

+$	EXHEADER_ := crypto.h,opensslv.h,ebcdic.h,symhacks.h,ossl_typ.h

+$	EXHEADER__'ARCH' := opensslconf.h

+$	EXHEADER_OBJECTS := objects.h,obj_mac.h

+$	EXHEADER_MD2 := md2.h

+$	EXHEADER_MD4 := md4.h

+$	EXHEADER_MD5 := md5.h

+$	EXHEADER_SHA := sha.h

+$	EXHEADER_MDC2 := mdc2.h

+$	EXHEADER_HMAC := hmac.h

+$	EXHEADER_RIPEMD := ripemd.h

+$	EXHEADER_WHRLPOOL := whrlpool.h

+$	EXHEADER_DES := des.h,des_old.h

+$	EXHEADER_AES := aes.h

+$	EXHEADER_RC2 := rc2.h

+$	EXHEADER_RC4 := rc4.h

+$	EXHEADER_RC5 := rc5.h

+$	EXHEADER_IDEA := idea.h

+$	EXHEADER_BF := blowfish.h

+$	EXHEADER_CAST := cast.h

+$	EXHEADER_CAMELLIA := camellia.h

+$	EXHEADER_SEED := seed.h

+$	EXHEADER_MODES := modes.h

+$	EXHEADER_BN := bn.h

+$	EXHEADER_EC := ec.h

+$	EXHEADER_RSA := rsa.h

+$	EXHEADER_DSA := dsa.h

+$	EXHEADER_ECDSA := ecdsa.h

+$	EXHEADER_DH := dh.h

+$	EXHEADER_ECDH := ecdh.h

+$	EXHEADER_DSO := dso.h

+$	EXHEADER_ENGINE := engine.h

+$	EXHEADER_BUFFER := buffer.h

+$	EXHEADER_BIO := bio.h

+$	EXHEADER_STACK := stack.h,safestack.h

+$	EXHEADER_LHASH := lhash.h

+$	EXHEADER_RAND := rand.h

+$	EXHEADER_ERR := err.h

+$	EXHEADER_EVP := evp.h

+$	EXHEADER_ASN1 := asn1.h,asn1_mac.h,asn1t.h

+$	EXHEADER_PEM := pem.h,pem2.h

+$	EXHEADER_X509 := x509.h,x509_vfy.h

+$	EXHEADER_X509V3 := x509v3.h

+$	EXHEADER_CONF := conf.h,conf_api.h

+$	EXHEADER_TXT_DB := txt_db.h

+$	EXHEADER_PKCS7 := pkcs7.h

+$	EXHEADER_PKCS12 := pkcs12.h

+$	EXHEADER_COMP := comp.h

+$	EXHEADER_OCSP := ocsp.h

+$	EXHEADER_UI := ui.h,ui_compat.h

+$	EXHEADER_KRB5 := krb5_asn.h

+$!	EXHEADER_STORE := store.h,str_compat.h

+$	EXHEADER_STORE := store.h

+$	EXHEADER_CMS := cms.h

+$	EXHEADER_PQUEUE := pqueue.h

+$	EXHEADER_TS := ts.h

+$	EXHEADER_JPAKE := jpake.h

+$	LIBS := LIBCRYPTO,LIBCRYPTO32

+$

+$	EXE_DIR := [-.'ARCH'.EXE.CRYPTO]

+$

+$	I = 0

+$ LOOP_SDIRS: 

+$	D = F$EDIT(F$ELEMENT(I, ",", SDIRS),"TRIM")

+$	I = I + 1

+$	IF D .EQS. "," THEN GOTO LOOP_SDIRS_END

+$	tmp = EXHEADER_'D'

+$	IF D .EQS. ""

+$	THEN

+$	  COPY 'tmp' WRK_SSLINCLUDE: /LOG

+$	ELSE

+$	  COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG

+$	ENDIF

+$	SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp'

+$	GOTO LOOP_SDIRS

+$ LOOP_SDIRS_END:

+$

+$	I = 0

+$ LOOP_LIB: 

+$	E = F$EDIT(F$ELEMENT(I, ",", LIBS),"TRIM")

+$	I = I + 1

+$	IF E .EQS. "," THEN GOTO LOOP_LIB_END

+$	SET NOON

+$	IF F$SEARCH(EXE_DIR+E+".OLB") .NES. ""

+$	THEN

+$	  COPY 'EXE_DIR''E'.OLB WRK_SSLLIB:'E'.OLB/log

+$	  SET FILE/PROT=W:RE WRK_SSLLIB:'E'.OLB

+$	ENDIF

+$	! Preparing for the time when we have shareable images

+$	IF F$SEARCH(EXE_DIR+E+".EXE") .NES. ""

+$	THEN

+$	  COPY 'EXE_DIR''E'.EXE WRK_SSLLIB:'E'.EXE/log

+$	  SET FILE/PROT=W:RE WRK_SSLLIB:'E'.EXE

+$	ENDIF

+$	SET ON

+$	GOTO LOOP_LIB

+$ LOOP_LIB_END:

+$

+$	EXIT

diff --git a/openssl/crypto/opensslv.h b/openssl/crypto/opensslv.h
index 79c679cbf..ecffe494f 100644
--- a/openssl/crypto/opensslv.h
+++ b/openssl/crypto/opensslv.h
@@ -1,89 +1,89 @@
-#ifndef HEADER_OPENSSLV_H
-#define HEADER_OPENSSLV_H
-
-/* Numeric release version identifier:
- * MNNFFPPS: major minor fix patch status
- * The status nibble has one of the values 0 for development, 1 to e for betas
- * 1 to 14, and f for release.  The patch level is exactly that.
- * For example:
- * 0.9.3-dev	  0x00903000
- * 0.9.3-beta1	  0x00903001
- * 0.9.3-beta2-dev 0x00903002
- * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)
- * 0.9.3	  0x0090300f
- * 0.9.3a	  0x0090301f
- * 0.9.4 	  0x0090400f
- * 1.2.3z	  0x102031af
- *
- * For continuity reasons (because 0.9.5 is already out, and is coded
- * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level
- * part is slightly different, by setting the highest bit.  This means
- * that 0.9.5a looks like this: 0x0090581f.  At 0.9.6, we can start
- * with 0x0090600S...
- *
- * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.)
- * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
- *  major minor fix final patch/beta)
- */
-#define OPENSSL_VERSION_NUMBER	0x1000003f
-#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0c-fips 2 Dec 2010"
-#else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0c 2 Dec 2010"
-#endif
-#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
-
-
-/* The macros below are to be used for shared library (.so, .dll, ...)
- * versioning.  That kind of versioning works a bit differently between
- * operating systems.  The most usual scheme is to set a major and a minor
- * number, and have the runtime loader check that the major number is equal
- * to what it was at application link time, while the minor number has to
- * be greater or equal to what it was at application link time.  With this
- * scheme, the version number is usually part of the file name, like this:
- *
- *	libcrypto.so.0.9
- *
- * Some unixen also make a softlink with the major verson number only:
- *
- *	libcrypto.so.0
- *
- * On Tru64 and IRIX 6.x it works a little bit differently.  There, the
- * shared library version is stored in the file, and is actually a series
- * of versions, separated by colons.  The rightmost version present in the
- * library when linking an application is stored in the application to be
- * matched at run time.  When the application is run, a check is done to
- * see if the library version stored in the application matches any of the
- * versions in the version string of the library itself.
- * This version string can be constructed in any way, depending on what
- * kind of matching is desired.  However, to implement the same scheme as
- * the one used in the other unixen, all compatible versions, from lowest
- * to highest, should be part of the string.  Consecutive builds would
- * give the following versions strings:
- *
- *	3.0
- *	3.0:3.1
- *	3.0:3.1:3.2
- *	4.0
- *	4.0:4.1
- *
- * Notice how version 4 is completely incompatible with version, and
- * therefore give the breach you can see.
- *
- * There may be other schemes as well that I haven't yet discovered.
- *
- * So, here's the way it works here: first of all, the library version
- * number doesn't need at all to match the overall OpenSSL version.
- * However, it's nice and more understandable if it actually does.
- * The current library version is stored in the macro SHLIB_VERSION_NUMBER,
- * which is just a piece of text in the format "M.m.e" (Major, minor, edit).
- * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways,
- * we need to keep a history of version numbers, which is done in the
- * macro SHLIB_VERSION_HISTORY.  The numbers are separated by colons and
- * should only keep the versions that are binary compatible with the current.
- */
-#define SHLIB_VERSION_HISTORY ""
-#define SHLIB_VERSION_NUMBER "1.0.0"
-
-
-#endif /* HEADER_OPENSSLV_H */
+#ifndef HEADER_OPENSSLV_H

+#define HEADER_OPENSSLV_H

+

+/* Numeric release version identifier:

+ * MNNFFPPS: major minor fix patch status

+ * The status nibble has one of the values 0 for development, 1 to e for betas

+ * 1 to 14, and f for release.  The patch level is exactly that.

+ * For example:

+ * 0.9.3-dev	  0x00903000

+ * 0.9.3-beta1	  0x00903001

+ * 0.9.3-beta2-dev 0x00903002

+ * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)

+ * 0.9.3	  0x0090300f

+ * 0.9.3a	  0x0090301f

+ * 0.9.4 	  0x0090400f

+ * 1.2.3z	  0x102031af

+ *

+ * For continuity reasons (because 0.9.5 is already out, and is coded

+ * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level

+ * part is slightly different, by setting the highest bit.  This means

+ * that 0.9.5a looks like this: 0x0090581f.  At 0.9.6, we can start

+ * with 0x0090600S...

+ *

+ * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.)

+ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for

+ *  major minor fix final patch/beta)

+ */

+#define OPENSSL_VERSION_NUMBER	0x1000004fL

+#ifdef OPENSSL_FIPS

+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0d-fips 8 Feb 2011"

+#else

+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0d 8 Feb 2011"

+#endif

+#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT

+

+

+/* The macros below are to be used for shared library (.so, .dll, ...)

+ * versioning.  That kind of versioning works a bit differently between

+ * operating systems.  The most usual scheme is to set a major and a minor

+ * number, and have the runtime loader check that the major number is equal

+ * to what it was at application link time, while the minor number has to

+ * be greater or equal to what it was at application link time.  With this

+ * scheme, the version number is usually part of the file name, like this:

+ *

+ *	libcrypto.so.0.9

+ *

+ * Some unixen also make a softlink with the major verson number only:

+ *

+ *	libcrypto.so.0

+ *

+ * On Tru64 and IRIX 6.x it works a little bit differently.  There, the

+ * shared library version is stored in the file, and is actually a series

+ * of versions, separated by colons.  The rightmost version present in the

+ * library when linking an application is stored in the application to be

+ * matched at run time.  When the application is run, a check is done to

+ * see if the library version stored in the application matches any of the

+ * versions in the version string of the library itself.

+ * This version string can be constructed in any way, depending on what

+ * kind of matching is desired.  However, to implement the same scheme as

+ * the one used in the other unixen, all compatible versions, from lowest

+ * to highest, should be part of the string.  Consecutive builds would

+ * give the following versions strings:

+ *

+ *	3.0

+ *	3.0:3.1

+ *	3.0:3.1:3.2

+ *	4.0

+ *	4.0:4.1

+ *

+ * Notice how version 4 is completely incompatible with version, and

+ * therefore give the breach you can see.

+ *

+ * There may be other schemes as well that I haven't yet discovered.

+ *

+ * So, here's the way it works here: first of all, the library version

+ * number doesn't need at all to match the overall OpenSSL version.

+ * However, it's nice and more understandable if it actually does.

+ * The current library version is stored in the macro SHLIB_VERSION_NUMBER,

+ * which is just a piece of text in the format "M.m.e" (Major, minor, edit).

+ * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways,

+ * we need to keep a history of version numbers, which is done in the

+ * macro SHLIB_VERSION_HISTORY.  The numbers are separated by colons and

+ * should only keep the versions that are binary compatible with the current.

+ */

+#define SHLIB_VERSION_HISTORY ""

+#define SHLIB_VERSION_NUMBER "1.0.0"

+

+

+#endif /* HEADER_OPENSSLV_H */

diff --git a/openssl/crypto/stack/safestack.h b/openssl/crypto/stack/safestack.h
index a498f1b10..d416f2c9b 100644
--- a/openssl/crypto/stack/safestack.h
+++ b/openssl/crypto/stack/safestack.h
@@ -1,2575 +1,2575 @@
-/* ====================================================================
- * 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
- *    openssl-core@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).
- *
- */
-
-#ifndef HEADER_SAFESTACK_H
-#define HEADER_SAFESTACK_H
-
-#include <openssl/stack.h>
-
-#ifndef CHECKED_PTR_OF
-#define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-#endif
-
-/* In C++ we get problems because an explicit cast is needed from (void *)
- * we use CHECKED_STACK_OF to ensure the correct type is passed in the macros
- * below. 
- */
-
-#define CHECKED_STACK_OF(type, p) \
-    ((_STACK*) (1 ? p : (STACK_OF(type)*)0))
-
-#define CHECKED_SK_FREE_FUNC(type, p) \
-    ((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))
-
-#define CHECKED_SK_FREE_FUNC2(type, p) \
-    ((void (*)(void *)) ((1 ? p : (void (*)(type))0)))
-
-#define CHECKED_SK_CMP_FUNC(type, p) \
-    ((int (*)(const void *, const void *)) \
-	((1 ? p : (int (*)(const type * const *, const type * const *))0)))
-
-#define STACK_OF(type) struct stack_st_##type
-#define PREDECLARE_STACK_OF(type) STACK_OF(type);
-
-#define DECLARE_STACK_OF(type) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-#define DECLARE_SPECIAL_STACK_OF(type, type2) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-
-#define IMPLEMENT_STACK_OF(type) /* nada (obsolete in new safestack approach)*/
-
-
-/* Strings are special: normally an lhash entry will point to a single
- * (somewhat) mutable object. In the case of strings:
- *
- * a) Instead of a single char, there is an array of chars, NUL-terminated.
- * b) The string may have be immutable.
- *
- * So, they need their own declarations. Especially important for
- * type-checking tools, such as Deputy.
- *
-o * In practice, however, it appears to be hard to have a const
- * string. For now, I'm settling for dealing with the fact it is a
- * string at all.
- */
-typedef char *OPENSSL_STRING;
-
-typedef const char *OPENSSL_CSTRING;
-
-/* Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
- * STACK_OF(STRING) is really more like STACK_OF(char), only, as
- * mentioned above, instead of a single char each entry is a
- * NUL-terminated array of chars. So, we have to implement STRING
- * specially for STACK_OF. This is dealt with in the autogenerated
- * macros below.
- */
-
-DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
-
-/* Similarly, we sometimes use a block of characters, NOT
- * nul-terminated. These should also be distinguished from "normal"
- * stacks. */
-
-typedef void *OPENSSL_BLOCK;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
-
-/* SKM_sk_... stack macros are internal to safestack.h:
- * never use them directly, use sk_<type>_... instead */
-#define SKM_sk_new(type, cmp) \
-	((STACK_OF(type) *)sk_new(CHECKED_SK_CMP_FUNC(type, cmp)))
-#define SKM_sk_new_null(type) \
-	((STACK_OF(type) *)sk_new_null())
-#define SKM_sk_free(type, st) \
-	sk_free(CHECKED_STACK_OF(type, st))
-#define SKM_sk_num(type, st) \
-	sk_num(CHECKED_STACK_OF(type, st))
-#define SKM_sk_value(type, st,i) \
-	((type *)sk_value(CHECKED_STACK_OF(type, st), i))
-#define SKM_sk_set(type, st,i,val) \
-	sk_set(CHECKED_STACK_OF(type, st), i, CHECKED_PTR_OF(type, val))
-#define SKM_sk_zero(type, st) \
-	sk_zero(CHECKED_STACK_OF(type, st))
-#define SKM_sk_push(type, st, val) \
-	sk_push(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_unshift(type, st, val) \
-	sk_unshift(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_find(type, st, val) \
-	sk_find(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-#define SKM_sk_find_ex(type, st, val) \
-	sk_find_ex(CHECKED_STACK_OF(type, st), \
-		   CHECKED_PTR_OF(type, val))
-#define SKM_sk_delete(type, st, i) \
-	(type *)sk_delete(CHECKED_STACK_OF(type, st), i)
-#define SKM_sk_delete_ptr(type, st, ptr) \
-	(type *)sk_delete_ptr(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, ptr))
-#define SKM_sk_insert(type, st,val, i) \
-	sk_insert(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val), i)
-#define SKM_sk_set_cmp_func(type, st, cmp) \
-	((int (*)(const type * const *,const type * const *)) \
-	sk_set_cmp_func(CHECKED_STACK_OF(type, st), CHECKED_SK_CMP_FUNC(type, cmp)))
-#define SKM_sk_dup(type, st) \
-	(STACK_OF(type) *)sk_dup(CHECKED_STACK_OF(type, st))
-#define SKM_sk_pop_free(type, st, free_func) \
-	sk_pop_free(CHECKED_STACK_OF(type, st), CHECKED_SK_FREE_FUNC(type, free_func))
-#define SKM_sk_shift(type, st) \
-	(type *)sk_shift(CHECKED_STACK_OF(type, st))
-#define SKM_sk_pop(type, st) \
-	(type *)sk_pop(CHECKED_STACK_OF(type, st))
-#define SKM_sk_sort(type, st) \
-	sk_sort(CHECKED_STACK_OF(type, st))
-#define SKM_sk_is_sorted(type, st) \
-	sk_is_sorted(CHECKED_STACK_OF(type, st))
-
-#define	SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-  (STACK_OF(type) *)d2i_ASN1_SET( \
-				(STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \
-				pp, length, \
-				CHECKED_D2I_OF(type, d2i_func), \
-				CHECKED_SK_FREE_FUNC(type, free_func), \
-				ex_tag, ex_class)
-
-#define	SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
-  i2d_ASN1_SET((STACK_OF(OPENSSL_BLOCK) *)CHECKED_STACK_OF(type, st), pp, \
-				CHECKED_I2D_OF(type, i2d_func), \
-				ex_tag, ex_class, is_set)
-
-#define	SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
-	ASN1_seq_pack(CHECKED_PTR_OF(STACK_OF(type), st), \
-			CHECKED_I2D_OF(type, i2d_func), buf, len)
-
-#define	SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
-	(STACK_OF(type) *)ASN1_seq_unpack(buf, len, CHECKED_D2I_OF(type, d2i_func), CHECKED_SK_FREE_FUNC(type, free_func))
-
-#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	(STACK_OF(type) *)PKCS12_decrypt_d2i(algor, \
-				CHECKED_D2I_OF(type, d2i_func), \
-				CHECKED_SK_FREE_FUNC(type, free_func), \
-				pass, passlen, oct, seq)
-
-/* This block of defines is updated by util/mkstack.pl, please do not touch! */
-#define sk_ACCESS_DESCRIPTION_new(cmp) SKM_sk_new(ACCESS_DESCRIPTION, (cmp))
-#define sk_ACCESS_DESCRIPTION_new_null() SKM_sk_new_null(ACCESS_DESCRIPTION)
-#define sk_ACCESS_DESCRIPTION_free(st) SKM_sk_free(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_num(st) SKM_sk_num(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_value(st, i) SKM_sk_value(ACCESS_DESCRIPTION, (st), (i))
-#define sk_ACCESS_DESCRIPTION_set(st, i, val) SKM_sk_set(ACCESS_DESCRIPTION, (st), (i), (val))
-#define sk_ACCESS_DESCRIPTION_zero(st) SKM_sk_zero(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_push(st, val) SKM_sk_push(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_unshift(st, val) SKM_sk_unshift(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_find(st, val) SKM_sk_find(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_find_ex(st, val) SKM_sk_find_ex(ACCESS_DESCRIPTION, (st), (val))
-#define sk_ACCESS_DESCRIPTION_delete(st, i) SKM_sk_delete(ACCESS_DESCRIPTION, (st), (i))
-#define sk_ACCESS_DESCRIPTION_delete_ptr(st, ptr) SKM_sk_delete_ptr(ACCESS_DESCRIPTION, (st), (ptr))
-#define sk_ACCESS_DESCRIPTION_insert(st, val, i) SKM_sk_insert(ACCESS_DESCRIPTION, (st), (val), (i))
-#define sk_ACCESS_DESCRIPTION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ACCESS_DESCRIPTION, (st), (cmp))
-#define sk_ACCESS_DESCRIPTION_dup(st) SKM_sk_dup(ACCESS_DESCRIPTION, st)
-#define sk_ACCESS_DESCRIPTION_pop_free(st, free_func) SKM_sk_pop_free(ACCESS_DESCRIPTION, (st), (free_func))
-#define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))
-#define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))
-
-#define sk_ASIdOrRange_new(cmp) SKM_sk_new(ASIdOrRange, (cmp))
-#define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)
-#define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))
-#define sk_ASIdOrRange_num(st) SKM_sk_num(ASIdOrRange, (st))
-#define sk_ASIdOrRange_value(st, i) SKM_sk_value(ASIdOrRange, (st), (i))
-#define sk_ASIdOrRange_set(st, i, val) SKM_sk_set(ASIdOrRange, (st), (i), (val))
-#define sk_ASIdOrRange_zero(st) SKM_sk_zero(ASIdOrRange, (st))
-#define sk_ASIdOrRange_push(st, val) SKM_sk_push(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_unshift(st, val) SKM_sk_unshift(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_find(st, val) SKM_sk_find(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_find_ex(st, val) SKM_sk_find_ex(ASIdOrRange, (st), (val))
-#define sk_ASIdOrRange_delete(st, i) SKM_sk_delete(ASIdOrRange, (st), (i))
-#define sk_ASIdOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASIdOrRange, (st), (ptr))
-#define sk_ASIdOrRange_insert(st, val, i) SKM_sk_insert(ASIdOrRange, (st), (val), (i))
-#define sk_ASIdOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASIdOrRange, (st), (cmp))
-#define sk_ASIdOrRange_dup(st) SKM_sk_dup(ASIdOrRange, st)
-#define sk_ASIdOrRange_pop_free(st, free_func) SKM_sk_pop_free(ASIdOrRange, (st), (free_func))
-#define sk_ASIdOrRange_shift(st) SKM_sk_shift(ASIdOrRange, (st))
-#define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))
-#define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))
-#define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))
-
-#define sk_ASN1_GENERALSTRING_new(cmp) SKM_sk_new(ASN1_GENERALSTRING, (cmp))
-#define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)
-#define sk_ASN1_GENERALSTRING_free(st) SKM_sk_free(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_num(st) SKM_sk_num(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_value(st, i) SKM_sk_value(ASN1_GENERALSTRING, (st), (i))
-#define sk_ASN1_GENERALSTRING_set(st, i, val) SKM_sk_set(ASN1_GENERALSTRING, (st), (i), (val))
-#define sk_ASN1_GENERALSTRING_zero(st) SKM_sk_zero(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_push(st, val) SKM_sk_push(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_unshift(st, val) SKM_sk_unshift(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_find(st, val) SKM_sk_find(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_find_ex(st, val) SKM_sk_find_ex(ASN1_GENERALSTRING, (st), (val))
-#define sk_ASN1_GENERALSTRING_delete(st, i) SKM_sk_delete(ASN1_GENERALSTRING, (st), (i))
-#define sk_ASN1_GENERALSTRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_GENERALSTRING, (st), (ptr))
-#define sk_ASN1_GENERALSTRING_insert(st, val, i) SKM_sk_insert(ASN1_GENERALSTRING, (st), (val), (i))
-#define sk_ASN1_GENERALSTRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_GENERALSTRING, (st), (cmp))
-#define sk_ASN1_GENERALSTRING_dup(st) SKM_sk_dup(ASN1_GENERALSTRING, st)
-#define sk_ASN1_GENERALSTRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_GENERALSTRING, (st), (free_func))
-#define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st))
-#define sk_ASN1_GENERALSTRING_is_sorted(st) SKM_sk_is_sorted(ASN1_GENERALSTRING, (st))
-
-#define sk_ASN1_INTEGER_new(cmp) SKM_sk_new(ASN1_INTEGER, (cmp))
-#define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER)
-#define sk_ASN1_INTEGER_free(st) SKM_sk_free(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_num(st) SKM_sk_num(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_value(st, i) SKM_sk_value(ASN1_INTEGER, (st), (i))
-#define sk_ASN1_INTEGER_set(st, i, val) SKM_sk_set(ASN1_INTEGER, (st), (i), (val))
-#define sk_ASN1_INTEGER_zero(st) SKM_sk_zero(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_push(st, val) SKM_sk_push(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_unshift(st, val) SKM_sk_unshift(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_find(st, val) SKM_sk_find(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_find_ex(st, val) SKM_sk_find_ex(ASN1_INTEGER, (st), (val))
-#define sk_ASN1_INTEGER_delete(st, i) SKM_sk_delete(ASN1_INTEGER, (st), (i))
-#define sk_ASN1_INTEGER_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_INTEGER, (st), (ptr))
-#define sk_ASN1_INTEGER_insert(st, val, i) SKM_sk_insert(ASN1_INTEGER, (st), (val), (i))
-#define sk_ASN1_INTEGER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_INTEGER, (st), (cmp))
-#define sk_ASN1_INTEGER_dup(st) SKM_sk_dup(ASN1_INTEGER, st)
-#define sk_ASN1_INTEGER_pop_free(st, free_func) SKM_sk_pop_free(ASN1_INTEGER, (st), (free_func))
-#define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st))
-#define sk_ASN1_INTEGER_is_sorted(st) SKM_sk_is_sorted(ASN1_INTEGER, (st))
-
-#define sk_ASN1_OBJECT_new(cmp) SKM_sk_new(ASN1_OBJECT, (cmp))
-#define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT)
-#define sk_ASN1_OBJECT_free(st) SKM_sk_free(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_num(st) SKM_sk_num(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_value(st, i) SKM_sk_value(ASN1_OBJECT, (st), (i))
-#define sk_ASN1_OBJECT_set(st, i, val) SKM_sk_set(ASN1_OBJECT, (st), (i), (val))
-#define sk_ASN1_OBJECT_zero(st) SKM_sk_zero(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_push(st, val) SKM_sk_push(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_unshift(st, val) SKM_sk_unshift(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_find(st, val) SKM_sk_find(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_find_ex(st, val) SKM_sk_find_ex(ASN1_OBJECT, (st), (val))
-#define sk_ASN1_OBJECT_delete(st, i) SKM_sk_delete(ASN1_OBJECT, (st), (i))
-#define sk_ASN1_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_OBJECT, (st), (ptr))
-#define sk_ASN1_OBJECT_insert(st, val, i) SKM_sk_insert(ASN1_OBJECT, (st), (val), (i))
-#define sk_ASN1_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_OBJECT, (st), (cmp))
-#define sk_ASN1_OBJECT_dup(st) SKM_sk_dup(ASN1_OBJECT, st)
-#define sk_ASN1_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(ASN1_OBJECT, (st), (free_func))
-#define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st))
-#define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st))
-
-#define sk_ASN1_STRING_TABLE_new(cmp) SKM_sk_new(ASN1_STRING_TABLE, (cmp))
-#define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)
-#define sk_ASN1_STRING_TABLE_free(st) SKM_sk_free(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_num(st) SKM_sk_num(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_value(st, i) SKM_sk_value(ASN1_STRING_TABLE, (st), (i))
-#define sk_ASN1_STRING_TABLE_set(st, i, val) SKM_sk_set(ASN1_STRING_TABLE, (st), (i), (val))
-#define sk_ASN1_STRING_TABLE_zero(st) SKM_sk_zero(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_push(st, val) SKM_sk_push(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_unshift(st, val) SKM_sk_unshift(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_find(st, val) SKM_sk_find(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_find_ex(st, val) SKM_sk_find_ex(ASN1_STRING_TABLE, (st), (val))
-#define sk_ASN1_STRING_TABLE_delete(st, i) SKM_sk_delete(ASN1_STRING_TABLE, (st), (i))
-#define sk_ASN1_STRING_TABLE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (st), (ptr))
-#define sk_ASN1_STRING_TABLE_insert(st, val, i) SKM_sk_insert(ASN1_STRING_TABLE, (st), (val), (i))
-#define sk_ASN1_STRING_TABLE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (st), (cmp))
-#define sk_ASN1_STRING_TABLE_dup(st) SKM_sk_dup(ASN1_STRING_TABLE, st)
-#define sk_ASN1_STRING_TABLE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_STRING_TABLE, (st), (free_func))
-#define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st))
-#define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st))
-
-#define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp))
-#define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)
-#define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_num(st) SKM_sk_num(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_value(st, i) SKM_sk_value(ASN1_TYPE, (st), (i))
-#define sk_ASN1_TYPE_set(st, i, val) SKM_sk_set(ASN1_TYPE, (st), (i), (val))
-#define sk_ASN1_TYPE_zero(st) SKM_sk_zero(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_push(st, val) SKM_sk_push(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_unshift(st, val) SKM_sk_unshift(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_find(st, val) SKM_sk_find(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_find_ex(st, val) SKM_sk_find_ex(ASN1_TYPE, (st), (val))
-#define sk_ASN1_TYPE_delete(st, i) SKM_sk_delete(ASN1_TYPE, (st), (i))
-#define sk_ASN1_TYPE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_TYPE, (st), (ptr))
-#define sk_ASN1_TYPE_insert(st, val, i) SKM_sk_insert(ASN1_TYPE, (st), (val), (i))
-#define sk_ASN1_TYPE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_TYPE, (st), (cmp))
-#define sk_ASN1_TYPE_dup(st) SKM_sk_dup(ASN1_TYPE, st)
-#define sk_ASN1_TYPE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_TYPE, (st), (free_func))
-#define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st))
-#define sk_ASN1_TYPE_is_sorted(st) SKM_sk_is_sorted(ASN1_TYPE, (st))
-
-#define sk_ASN1_UTF8STRING_new(cmp) SKM_sk_new(ASN1_UTF8STRING, (cmp))
-#define sk_ASN1_UTF8STRING_new_null() SKM_sk_new_null(ASN1_UTF8STRING)
-#define sk_ASN1_UTF8STRING_free(st) SKM_sk_free(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_num(st) SKM_sk_num(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_value(st, i) SKM_sk_value(ASN1_UTF8STRING, (st), (i))
-#define sk_ASN1_UTF8STRING_set(st, i, val) SKM_sk_set(ASN1_UTF8STRING, (st), (i), (val))
-#define sk_ASN1_UTF8STRING_zero(st) SKM_sk_zero(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_push(st, val) SKM_sk_push(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_unshift(st, val) SKM_sk_unshift(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_find(st, val) SKM_sk_find(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_find_ex(st, val) SKM_sk_find_ex(ASN1_UTF8STRING, (st), (val))
-#define sk_ASN1_UTF8STRING_delete(st, i) SKM_sk_delete(ASN1_UTF8STRING, (st), (i))
-#define sk_ASN1_UTF8STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_UTF8STRING, (st), (ptr))
-#define sk_ASN1_UTF8STRING_insert(st, val, i) SKM_sk_insert(ASN1_UTF8STRING, (st), (val), (i))
-#define sk_ASN1_UTF8STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_UTF8STRING, (st), (cmp))
-#define sk_ASN1_UTF8STRING_dup(st) SKM_sk_dup(ASN1_UTF8STRING, st)
-#define sk_ASN1_UTF8STRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_UTF8STRING, (st), (free_func))
-#define sk_ASN1_UTF8STRING_shift(st) SKM_sk_shift(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_pop(st) SKM_sk_pop(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_sort(st) SKM_sk_sort(ASN1_UTF8STRING, (st))
-#define sk_ASN1_UTF8STRING_is_sorted(st) SKM_sk_is_sorted(ASN1_UTF8STRING, (st))
-
-#define sk_ASN1_VALUE_new(cmp) SKM_sk_new(ASN1_VALUE, (cmp))
-#define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE)
-#define sk_ASN1_VALUE_free(st) SKM_sk_free(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_num(st) SKM_sk_num(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_value(st, i) SKM_sk_value(ASN1_VALUE, (st), (i))
-#define sk_ASN1_VALUE_set(st, i, val) SKM_sk_set(ASN1_VALUE, (st), (i), (val))
-#define sk_ASN1_VALUE_zero(st) SKM_sk_zero(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_push(st, val) SKM_sk_push(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_unshift(st, val) SKM_sk_unshift(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_find(st, val) SKM_sk_find(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_find_ex(st, val) SKM_sk_find_ex(ASN1_VALUE, (st), (val))
-#define sk_ASN1_VALUE_delete(st, i) SKM_sk_delete(ASN1_VALUE, (st), (i))
-#define sk_ASN1_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_VALUE, (st), (ptr))
-#define sk_ASN1_VALUE_insert(st, val, i) SKM_sk_insert(ASN1_VALUE, (st), (val), (i))
-#define sk_ASN1_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_VALUE, (st), (cmp))
-#define sk_ASN1_VALUE_dup(st) SKM_sk_dup(ASN1_VALUE, st)
-#define sk_ASN1_VALUE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_VALUE, (st), (free_func))
-#define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st))
-#define sk_ASN1_VALUE_is_sorted(st) SKM_sk_is_sorted(ASN1_VALUE, (st))
-
-#define sk_BIO_new(cmp) SKM_sk_new(BIO, (cmp))
-#define sk_BIO_new_null() SKM_sk_new_null(BIO)
-#define sk_BIO_free(st) SKM_sk_free(BIO, (st))
-#define sk_BIO_num(st) SKM_sk_num(BIO, (st))
-#define sk_BIO_value(st, i) SKM_sk_value(BIO, (st), (i))
-#define sk_BIO_set(st, i, val) SKM_sk_set(BIO, (st), (i), (val))
-#define sk_BIO_zero(st) SKM_sk_zero(BIO, (st))
-#define sk_BIO_push(st, val) SKM_sk_push(BIO, (st), (val))
-#define sk_BIO_unshift(st, val) SKM_sk_unshift(BIO, (st), (val))
-#define sk_BIO_find(st, val) SKM_sk_find(BIO, (st), (val))
-#define sk_BIO_find_ex(st, val) SKM_sk_find_ex(BIO, (st), (val))
-#define sk_BIO_delete(st, i) SKM_sk_delete(BIO, (st), (i))
-#define sk_BIO_delete_ptr(st, ptr) SKM_sk_delete_ptr(BIO, (st), (ptr))
-#define sk_BIO_insert(st, val, i) SKM_sk_insert(BIO, (st), (val), (i))
-#define sk_BIO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BIO, (st), (cmp))
-#define sk_BIO_dup(st) SKM_sk_dup(BIO, st)
-#define sk_BIO_pop_free(st, free_func) SKM_sk_pop_free(BIO, (st), (free_func))
-#define sk_BIO_shift(st) SKM_sk_shift(BIO, (st))
-#define sk_BIO_pop(st) SKM_sk_pop(BIO, (st))
-#define sk_BIO_sort(st) SKM_sk_sort(BIO, (st))
-#define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st))
-
-#define sk_BY_DIR_ENTRY_new(cmp) SKM_sk_new(BY_DIR_ENTRY, (cmp))
-#define sk_BY_DIR_ENTRY_new_null() SKM_sk_new_null(BY_DIR_ENTRY)
-#define sk_BY_DIR_ENTRY_free(st) SKM_sk_free(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_num(st) SKM_sk_num(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_value(st, i) SKM_sk_value(BY_DIR_ENTRY, (st), (i))
-#define sk_BY_DIR_ENTRY_set(st, i, val) SKM_sk_set(BY_DIR_ENTRY, (st), (i), (val))
-#define sk_BY_DIR_ENTRY_zero(st) SKM_sk_zero(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_push(st, val) SKM_sk_push(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_unshift(st, val) SKM_sk_unshift(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_find(st, val) SKM_sk_find(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_find_ex(st, val) SKM_sk_find_ex(BY_DIR_ENTRY, (st), (val))
-#define sk_BY_DIR_ENTRY_delete(st, i) SKM_sk_delete(BY_DIR_ENTRY, (st), (i))
-#define sk_BY_DIR_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_ENTRY, (st), (ptr))
-#define sk_BY_DIR_ENTRY_insert(st, val, i) SKM_sk_insert(BY_DIR_ENTRY, (st), (val), (i))
-#define sk_BY_DIR_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_ENTRY, (st), (cmp))
-#define sk_BY_DIR_ENTRY_dup(st) SKM_sk_dup(BY_DIR_ENTRY, st)
-#define sk_BY_DIR_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_ENTRY, (st), (free_func))
-#define sk_BY_DIR_ENTRY_shift(st) SKM_sk_shift(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_pop(st) SKM_sk_pop(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_sort(st) SKM_sk_sort(BY_DIR_ENTRY, (st))
-#define sk_BY_DIR_ENTRY_is_sorted(st) SKM_sk_is_sorted(BY_DIR_ENTRY, (st))
-
-#define sk_BY_DIR_HASH_new(cmp) SKM_sk_new(BY_DIR_HASH, (cmp))
-#define sk_BY_DIR_HASH_new_null() SKM_sk_new_null(BY_DIR_HASH)
-#define sk_BY_DIR_HASH_free(st) SKM_sk_free(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_num(st) SKM_sk_num(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_value(st, i) SKM_sk_value(BY_DIR_HASH, (st), (i))
-#define sk_BY_DIR_HASH_set(st, i, val) SKM_sk_set(BY_DIR_HASH, (st), (i), (val))
-#define sk_BY_DIR_HASH_zero(st) SKM_sk_zero(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_push(st, val) SKM_sk_push(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_unshift(st, val) SKM_sk_unshift(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_find(st, val) SKM_sk_find(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_find_ex(st, val) SKM_sk_find_ex(BY_DIR_HASH, (st), (val))
-#define sk_BY_DIR_HASH_delete(st, i) SKM_sk_delete(BY_DIR_HASH, (st), (i))
-#define sk_BY_DIR_HASH_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_HASH, (st), (ptr))
-#define sk_BY_DIR_HASH_insert(st, val, i) SKM_sk_insert(BY_DIR_HASH, (st), (val), (i))
-#define sk_BY_DIR_HASH_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_HASH, (st), (cmp))
-#define sk_BY_DIR_HASH_dup(st) SKM_sk_dup(BY_DIR_HASH, st)
-#define sk_BY_DIR_HASH_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_HASH, (st), (free_func))
-#define sk_BY_DIR_HASH_shift(st) SKM_sk_shift(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_pop(st) SKM_sk_pop(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_sort(st) SKM_sk_sort(BY_DIR_HASH, (st))
-#define sk_BY_DIR_HASH_is_sorted(st) SKM_sk_is_sorted(BY_DIR_HASH, (st))
-
-#define sk_CMS_CertificateChoices_new(cmp) SKM_sk_new(CMS_CertificateChoices, (cmp))
-#define sk_CMS_CertificateChoices_new_null() SKM_sk_new_null(CMS_CertificateChoices)
-#define sk_CMS_CertificateChoices_free(st) SKM_sk_free(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_num(st) SKM_sk_num(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_value(st, i) SKM_sk_value(CMS_CertificateChoices, (st), (i))
-#define sk_CMS_CertificateChoices_set(st, i, val) SKM_sk_set(CMS_CertificateChoices, (st), (i), (val))
-#define sk_CMS_CertificateChoices_zero(st) SKM_sk_zero(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_push(st, val) SKM_sk_push(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_unshift(st, val) SKM_sk_unshift(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_find(st, val) SKM_sk_find(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_find_ex(st, val) SKM_sk_find_ex(CMS_CertificateChoices, (st), (val))
-#define sk_CMS_CertificateChoices_delete(st, i) SKM_sk_delete(CMS_CertificateChoices, (st), (i))
-#define sk_CMS_CertificateChoices_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_CertificateChoices, (st), (ptr))
-#define sk_CMS_CertificateChoices_insert(st, val, i) SKM_sk_insert(CMS_CertificateChoices, (st), (val), (i))
-#define sk_CMS_CertificateChoices_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_CertificateChoices, (st), (cmp))
-#define sk_CMS_CertificateChoices_dup(st) SKM_sk_dup(CMS_CertificateChoices, st)
-#define sk_CMS_CertificateChoices_pop_free(st, free_func) SKM_sk_pop_free(CMS_CertificateChoices, (st), (free_func))
-#define sk_CMS_CertificateChoices_shift(st) SKM_sk_shift(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_pop(st) SKM_sk_pop(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_sort(st) SKM_sk_sort(CMS_CertificateChoices, (st))
-#define sk_CMS_CertificateChoices_is_sorted(st) SKM_sk_is_sorted(CMS_CertificateChoices, (st))
-
-#define sk_CMS_RecipientInfo_new(cmp) SKM_sk_new(CMS_RecipientInfo, (cmp))
-#define sk_CMS_RecipientInfo_new_null() SKM_sk_new_null(CMS_RecipientInfo)
-#define sk_CMS_RecipientInfo_free(st) SKM_sk_free(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_num(st) SKM_sk_num(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_value(st, i) SKM_sk_value(CMS_RecipientInfo, (st), (i))
-#define sk_CMS_RecipientInfo_set(st, i, val) SKM_sk_set(CMS_RecipientInfo, (st), (i), (val))
-#define sk_CMS_RecipientInfo_zero(st) SKM_sk_zero(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_push(st, val) SKM_sk_push(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_unshift(st, val) SKM_sk_unshift(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_find(st, val) SKM_sk_find(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientInfo, (st), (val))
-#define sk_CMS_RecipientInfo_delete(st, i) SKM_sk_delete(CMS_RecipientInfo, (st), (i))
-#define sk_CMS_RecipientInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientInfo, (st), (ptr))
-#define sk_CMS_RecipientInfo_insert(st, val, i) SKM_sk_insert(CMS_RecipientInfo, (st), (val), (i))
-#define sk_CMS_RecipientInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientInfo, (st), (cmp))
-#define sk_CMS_RecipientInfo_dup(st) SKM_sk_dup(CMS_RecipientInfo, st)
-#define sk_CMS_RecipientInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientInfo, (st), (free_func))
-#define sk_CMS_RecipientInfo_shift(st) SKM_sk_shift(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_pop(st) SKM_sk_pop(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_sort(st) SKM_sk_sort(CMS_RecipientInfo, (st))
-#define sk_CMS_RecipientInfo_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientInfo, (st))
-
-#define sk_CMS_RevocationInfoChoice_new(cmp) SKM_sk_new(CMS_RevocationInfoChoice, (cmp))
-#define sk_CMS_RevocationInfoChoice_new_null() SKM_sk_new_null(CMS_RevocationInfoChoice)
-#define sk_CMS_RevocationInfoChoice_free(st) SKM_sk_free(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_num(st) SKM_sk_num(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_value(st, i) SKM_sk_value(CMS_RevocationInfoChoice, (st), (i))
-#define sk_CMS_RevocationInfoChoice_set(st, i, val) SKM_sk_set(CMS_RevocationInfoChoice, (st), (i), (val))
-#define sk_CMS_RevocationInfoChoice_zero(st) SKM_sk_zero(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_push(st, val) SKM_sk_push(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_unshift(st, val) SKM_sk_unshift(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_find(st, val) SKM_sk_find(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_find_ex(st, val) SKM_sk_find_ex(CMS_RevocationInfoChoice, (st), (val))
-#define sk_CMS_RevocationInfoChoice_delete(st, i) SKM_sk_delete(CMS_RevocationInfoChoice, (st), (i))
-#define sk_CMS_RevocationInfoChoice_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RevocationInfoChoice, (st), (ptr))
-#define sk_CMS_RevocationInfoChoice_insert(st, val, i) SKM_sk_insert(CMS_RevocationInfoChoice, (st), (val), (i))
-#define sk_CMS_RevocationInfoChoice_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RevocationInfoChoice, (st), (cmp))
-#define sk_CMS_RevocationInfoChoice_dup(st) SKM_sk_dup(CMS_RevocationInfoChoice, st)
-#define sk_CMS_RevocationInfoChoice_pop_free(st, free_func) SKM_sk_pop_free(CMS_RevocationInfoChoice, (st), (free_func))
-#define sk_CMS_RevocationInfoChoice_shift(st) SKM_sk_shift(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_pop(st) SKM_sk_pop(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_sort(st) SKM_sk_sort(CMS_RevocationInfoChoice, (st))
-#define sk_CMS_RevocationInfoChoice_is_sorted(st) SKM_sk_is_sorted(CMS_RevocationInfoChoice, (st))
-
-#define sk_CMS_SignerInfo_new(cmp) SKM_sk_new(CMS_SignerInfo, (cmp))
-#define sk_CMS_SignerInfo_new_null() SKM_sk_new_null(CMS_SignerInfo)
-#define sk_CMS_SignerInfo_free(st) SKM_sk_free(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_num(st) SKM_sk_num(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_value(st, i) SKM_sk_value(CMS_SignerInfo, (st), (i))
-#define sk_CMS_SignerInfo_set(st, i, val) SKM_sk_set(CMS_SignerInfo, (st), (i), (val))
-#define sk_CMS_SignerInfo_zero(st) SKM_sk_zero(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_push(st, val) SKM_sk_push(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_unshift(st, val) SKM_sk_unshift(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_find(st, val) SKM_sk_find(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_find_ex(st, val) SKM_sk_find_ex(CMS_SignerInfo, (st), (val))
-#define sk_CMS_SignerInfo_delete(st, i) SKM_sk_delete(CMS_SignerInfo, (st), (i))
-#define sk_CMS_SignerInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_SignerInfo, (st), (ptr))
-#define sk_CMS_SignerInfo_insert(st, val, i) SKM_sk_insert(CMS_SignerInfo, (st), (val), (i))
-#define sk_CMS_SignerInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_SignerInfo, (st), (cmp))
-#define sk_CMS_SignerInfo_dup(st) SKM_sk_dup(CMS_SignerInfo, st)
-#define sk_CMS_SignerInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_SignerInfo, (st), (free_func))
-#define sk_CMS_SignerInfo_shift(st) SKM_sk_shift(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_pop(st) SKM_sk_pop(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_sort(st) SKM_sk_sort(CMS_SignerInfo, (st))
-#define sk_CMS_SignerInfo_is_sorted(st) SKM_sk_is_sorted(CMS_SignerInfo, (st))
-
-#define sk_CONF_IMODULE_new(cmp) SKM_sk_new(CONF_IMODULE, (cmp))
-#define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE)
-#define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_num(st) SKM_sk_num(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_value(st, i) SKM_sk_value(CONF_IMODULE, (st), (i))
-#define sk_CONF_IMODULE_set(st, i, val) SKM_sk_set(CONF_IMODULE, (st), (i), (val))
-#define sk_CONF_IMODULE_zero(st) SKM_sk_zero(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_push(st, val) SKM_sk_push(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_unshift(st, val) SKM_sk_unshift(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_find(st, val) SKM_sk_find(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_find_ex(st, val) SKM_sk_find_ex(CONF_IMODULE, (st), (val))
-#define sk_CONF_IMODULE_delete(st, i) SKM_sk_delete(CONF_IMODULE, (st), (i))
-#define sk_CONF_IMODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_IMODULE, (st), (ptr))
-#define sk_CONF_IMODULE_insert(st, val, i) SKM_sk_insert(CONF_IMODULE, (st), (val), (i))
-#define sk_CONF_IMODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_IMODULE, (st), (cmp))
-#define sk_CONF_IMODULE_dup(st) SKM_sk_dup(CONF_IMODULE, st)
-#define sk_CONF_IMODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_IMODULE, (st), (free_func))
-#define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st))
-#define sk_CONF_IMODULE_is_sorted(st) SKM_sk_is_sorted(CONF_IMODULE, (st))
-
-#define sk_CONF_MODULE_new(cmp) SKM_sk_new(CONF_MODULE, (cmp))
-#define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE)
-#define sk_CONF_MODULE_free(st) SKM_sk_free(CONF_MODULE, (st))
-#define sk_CONF_MODULE_num(st) SKM_sk_num(CONF_MODULE, (st))
-#define sk_CONF_MODULE_value(st, i) SKM_sk_value(CONF_MODULE, (st), (i))
-#define sk_CONF_MODULE_set(st, i, val) SKM_sk_set(CONF_MODULE, (st), (i), (val))
-#define sk_CONF_MODULE_zero(st) SKM_sk_zero(CONF_MODULE, (st))
-#define sk_CONF_MODULE_push(st, val) SKM_sk_push(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_unshift(st, val) SKM_sk_unshift(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_find(st, val) SKM_sk_find(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_find_ex(st, val) SKM_sk_find_ex(CONF_MODULE, (st), (val))
-#define sk_CONF_MODULE_delete(st, i) SKM_sk_delete(CONF_MODULE, (st), (i))
-#define sk_CONF_MODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_MODULE, (st), (ptr))
-#define sk_CONF_MODULE_insert(st, val, i) SKM_sk_insert(CONF_MODULE, (st), (val), (i))
-#define sk_CONF_MODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_MODULE, (st), (cmp))
-#define sk_CONF_MODULE_dup(st) SKM_sk_dup(CONF_MODULE, st)
-#define sk_CONF_MODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_MODULE, (st), (free_func))
-#define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st))
-#define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st))
-#define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st))
-#define sk_CONF_MODULE_is_sorted(st) SKM_sk_is_sorted(CONF_MODULE, (st))
-
-#define sk_CONF_VALUE_new(cmp) SKM_sk_new(CONF_VALUE, (cmp))
-#define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE)
-#define sk_CONF_VALUE_free(st) SKM_sk_free(CONF_VALUE, (st))
-#define sk_CONF_VALUE_num(st) SKM_sk_num(CONF_VALUE, (st))
-#define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))
-#define sk_CONF_VALUE_set(st, i, val) SKM_sk_set(CONF_VALUE, (st), (i), (val))
-#define sk_CONF_VALUE_zero(st) SKM_sk_zero(CONF_VALUE, (st))
-#define sk_CONF_VALUE_push(st, val) SKM_sk_push(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_unshift(st, val) SKM_sk_unshift(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_find(st, val) SKM_sk_find(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_find_ex(st, val) SKM_sk_find_ex(CONF_VALUE, (st), (val))
-#define sk_CONF_VALUE_delete(st, i) SKM_sk_delete(CONF_VALUE, (st), (i))
-#define sk_CONF_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_VALUE, (st), (ptr))
-#define sk_CONF_VALUE_insert(st, val, i) SKM_sk_insert(CONF_VALUE, (st), (val), (i))
-#define sk_CONF_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_VALUE, (st), (cmp))
-#define sk_CONF_VALUE_dup(st) SKM_sk_dup(CONF_VALUE, st)
-#define sk_CONF_VALUE_pop_free(st, free_func) SKM_sk_pop_free(CONF_VALUE, (st), (free_func))
-#define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st))
-#define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st))
-#define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st))
-#define sk_CONF_VALUE_is_sorted(st) SKM_sk_is_sorted(CONF_VALUE, (st))
-
-#define sk_CRYPTO_EX_DATA_FUNCS_new(cmp) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (cmp))
-#define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS)
-#define sk_CRYPTO_EX_DATA_FUNCS_free(st) SKM_sk_free(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_num(st) SKM_sk_num(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_value(st, i) SKM_sk_value(CRYPTO_EX_DATA_FUNCS, (st), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_set(st, i, val) SKM_sk_set(CRYPTO_EX_DATA_FUNCS, (st), (i), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_zero(st) SKM_sk_zero(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_push(st, val) SKM_sk_push(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_unshift(st, val) SKM_sk_unshift(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_find(st, val) SKM_sk_find(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_find_ex(st, val) SKM_sk_find_ex(CRYPTO_EX_DATA_FUNCS, (st), (val))
-#define sk_CRYPTO_EX_DATA_FUNCS_delete(st, i) SKM_sk_delete(CRYPTO_EX_DATA_FUNCS, (st), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_EX_DATA_FUNCS, (st), (ptr))
-#define sk_CRYPTO_EX_DATA_FUNCS_insert(st, val, i) SKM_sk_insert(CRYPTO_EX_DATA_FUNCS, (st), (val), (i))
-#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_EX_DATA_FUNCS, (st), (cmp))
-#define sk_CRYPTO_EX_DATA_FUNCS_dup(st) SKM_sk_dup(CRYPTO_EX_DATA_FUNCS, st)
-#define sk_CRYPTO_EX_DATA_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_EX_DATA_FUNCS, (st), (free_func))
-#define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st))
-#define sk_CRYPTO_EX_DATA_FUNCS_is_sorted(st) SKM_sk_is_sorted(CRYPTO_EX_DATA_FUNCS, (st))
-
-#define sk_CRYPTO_dynlock_new(cmp) SKM_sk_new(CRYPTO_dynlock, (cmp))
-#define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock)
-#define sk_CRYPTO_dynlock_free(st) SKM_sk_free(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_num(st) SKM_sk_num(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_value(st, i) SKM_sk_value(CRYPTO_dynlock, (st), (i))
-#define sk_CRYPTO_dynlock_set(st, i, val) SKM_sk_set(CRYPTO_dynlock, (st), (i), (val))
-#define sk_CRYPTO_dynlock_zero(st) SKM_sk_zero(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_push(st, val) SKM_sk_push(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_unshift(st, val) SKM_sk_unshift(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_find(st, val) SKM_sk_find(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_find_ex(st, val) SKM_sk_find_ex(CRYPTO_dynlock, (st), (val))
-#define sk_CRYPTO_dynlock_delete(st, i) SKM_sk_delete(CRYPTO_dynlock, (st), (i))
-#define sk_CRYPTO_dynlock_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_dynlock, (st), (ptr))
-#define sk_CRYPTO_dynlock_insert(st, val, i) SKM_sk_insert(CRYPTO_dynlock, (st), (val), (i))
-#define sk_CRYPTO_dynlock_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_dynlock, (st), (cmp))
-#define sk_CRYPTO_dynlock_dup(st) SKM_sk_dup(CRYPTO_dynlock, st)
-#define sk_CRYPTO_dynlock_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_dynlock, (st), (free_func))
-#define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st))
-#define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st))
-
-#define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp))
-#define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT)
-#define sk_DIST_POINT_free(st) SKM_sk_free(DIST_POINT, (st))
-#define sk_DIST_POINT_num(st) SKM_sk_num(DIST_POINT, (st))
-#define sk_DIST_POINT_value(st, i) SKM_sk_value(DIST_POINT, (st), (i))
-#define sk_DIST_POINT_set(st, i, val) SKM_sk_set(DIST_POINT, (st), (i), (val))
-#define sk_DIST_POINT_zero(st) SKM_sk_zero(DIST_POINT, (st))
-#define sk_DIST_POINT_push(st, val) SKM_sk_push(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_unshift(st, val) SKM_sk_unshift(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_find(st, val) SKM_sk_find(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_find_ex(st, val) SKM_sk_find_ex(DIST_POINT, (st), (val))
-#define sk_DIST_POINT_delete(st, i) SKM_sk_delete(DIST_POINT, (st), (i))
-#define sk_DIST_POINT_delete_ptr(st, ptr) SKM_sk_delete_ptr(DIST_POINT, (st), (ptr))
-#define sk_DIST_POINT_insert(st, val, i) SKM_sk_insert(DIST_POINT, (st), (val), (i))
-#define sk_DIST_POINT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(DIST_POINT, (st), (cmp))
-#define sk_DIST_POINT_dup(st) SKM_sk_dup(DIST_POINT, st)
-#define sk_DIST_POINT_pop_free(st, free_func) SKM_sk_pop_free(DIST_POINT, (st), (free_func))
-#define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st))
-#define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st))
-#define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))
-#define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st))
-
-#define sk_ENGINE_new(cmp) SKM_sk_new(ENGINE, (cmp))
-#define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)
-#define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))
-#define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))
-#define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))
-#define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))
-#define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))
-#define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))
-#define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))
-#define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))
-#define sk_ENGINE_find_ex(st, val) SKM_sk_find_ex(ENGINE, (st), (val))
-#define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))
-#define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))
-#define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))
-#define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))
-#define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)
-#define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))
-#define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))
-#define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))
-#define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))
-#define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st))
-
-#define sk_ENGINE_CLEANUP_ITEM_new(cmp) SKM_sk_new(ENGINE_CLEANUP_ITEM, (cmp))
-#define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM)
-#define sk_ENGINE_CLEANUP_ITEM_free(st) SKM_sk_free(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_num(st) SKM_sk_num(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_value(st, i) SKM_sk_value(ENGINE_CLEANUP_ITEM, (st), (i))
-#define sk_ENGINE_CLEANUP_ITEM_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_ITEM, (st), (i), (val))
-#define sk_ENGINE_CLEANUP_ITEM_zero(st) SKM_sk_zero(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_push(st, val) SKM_sk_push(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_find(st, val) SKM_sk_find(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_find_ex(st, val) SKM_sk_find_ex(ENGINE_CLEANUP_ITEM, (st), (val))
-#define sk_ENGINE_CLEANUP_ITEM_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_ITEM, (st), (i))
-#define sk_ENGINE_CLEANUP_ITEM_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_ITEM, (st), (ptr))
-#define sk_ENGINE_CLEANUP_ITEM_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_ITEM, (st), (val), (i))
-#define sk_ENGINE_CLEANUP_ITEM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_ITEM, (st), (cmp))
-#define sk_ENGINE_CLEANUP_ITEM_dup(st) SKM_sk_dup(ENGINE_CLEANUP_ITEM, st)
-#define sk_ENGINE_CLEANUP_ITEM_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_ITEM, (st), (free_func))
-#define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
-#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))
-
-#define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp))
-#define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID)
-#define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_num(st) SKM_sk_num(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_value(st, i) SKM_sk_value(ESS_CERT_ID, (st), (i))
-#define sk_ESS_CERT_ID_set(st, i, val) SKM_sk_set(ESS_CERT_ID, (st), (i), (val))
-#define sk_ESS_CERT_ID_zero(st) SKM_sk_zero(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_push(st, val) SKM_sk_push(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_unshift(st, val) SKM_sk_unshift(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_find(st, val) SKM_sk_find(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_find_ex(st, val) SKM_sk_find_ex(ESS_CERT_ID, (st), (val))
-#define sk_ESS_CERT_ID_delete(st, i) SKM_sk_delete(ESS_CERT_ID, (st), (i))
-#define sk_ESS_CERT_ID_delete_ptr(st, ptr) SKM_sk_delete_ptr(ESS_CERT_ID, (st), (ptr))
-#define sk_ESS_CERT_ID_insert(st, val, i) SKM_sk_insert(ESS_CERT_ID, (st), (val), (i))
-#define sk_ESS_CERT_ID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ESS_CERT_ID, (st), (cmp))
-#define sk_ESS_CERT_ID_dup(st) SKM_sk_dup(ESS_CERT_ID, st)
-#define sk_ESS_CERT_ID_pop_free(st, free_func) SKM_sk_pop_free(ESS_CERT_ID, (st), (free_func))
-#define sk_ESS_CERT_ID_shift(st) SKM_sk_shift(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_pop(st) SKM_sk_pop(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_sort(st) SKM_sk_sort(ESS_CERT_ID, (st))
-#define sk_ESS_CERT_ID_is_sorted(st) SKM_sk_is_sorted(ESS_CERT_ID, (st))
-
-#define sk_EVP_MD_new(cmp) SKM_sk_new(EVP_MD, (cmp))
-#define sk_EVP_MD_new_null() SKM_sk_new_null(EVP_MD)
-#define sk_EVP_MD_free(st) SKM_sk_free(EVP_MD, (st))
-#define sk_EVP_MD_num(st) SKM_sk_num(EVP_MD, (st))
-#define sk_EVP_MD_value(st, i) SKM_sk_value(EVP_MD, (st), (i))
-#define sk_EVP_MD_set(st, i, val) SKM_sk_set(EVP_MD, (st), (i), (val))
-#define sk_EVP_MD_zero(st) SKM_sk_zero(EVP_MD, (st))
-#define sk_EVP_MD_push(st, val) SKM_sk_push(EVP_MD, (st), (val))
-#define sk_EVP_MD_unshift(st, val) SKM_sk_unshift(EVP_MD, (st), (val))
-#define sk_EVP_MD_find(st, val) SKM_sk_find(EVP_MD, (st), (val))
-#define sk_EVP_MD_find_ex(st, val) SKM_sk_find_ex(EVP_MD, (st), (val))
-#define sk_EVP_MD_delete(st, i) SKM_sk_delete(EVP_MD, (st), (i))
-#define sk_EVP_MD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_MD, (st), (ptr))
-#define sk_EVP_MD_insert(st, val, i) SKM_sk_insert(EVP_MD, (st), (val), (i))
-#define sk_EVP_MD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_MD, (st), (cmp))
-#define sk_EVP_MD_dup(st) SKM_sk_dup(EVP_MD, st)
-#define sk_EVP_MD_pop_free(st, free_func) SKM_sk_pop_free(EVP_MD, (st), (free_func))
-#define sk_EVP_MD_shift(st) SKM_sk_shift(EVP_MD, (st))
-#define sk_EVP_MD_pop(st) SKM_sk_pop(EVP_MD, (st))
-#define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st))
-#define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st))
-
-#define sk_EVP_PBE_CTL_new(cmp) SKM_sk_new(EVP_PBE_CTL, (cmp))
-#define sk_EVP_PBE_CTL_new_null() SKM_sk_new_null(EVP_PBE_CTL)
-#define sk_EVP_PBE_CTL_free(st) SKM_sk_free(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_num(st) SKM_sk_num(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_value(st, i) SKM_sk_value(EVP_PBE_CTL, (st), (i))
-#define sk_EVP_PBE_CTL_set(st, i, val) SKM_sk_set(EVP_PBE_CTL, (st), (i), (val))
-#define sk_EVP_PBE_CTL_zero(st) SKM_sk_zero(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_push(st, val) SKM_sk_push(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_unshift(st, val) SKM_sk_unshift(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_find(st, val) SKM_sk_find(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_find_ex(st, val) SKM_sk_find_ex(EVP_PBE_CTL, (st), (val))
-#define sk_EVP_PBE_CTL_delete(st, i) SKM_sk_delete(EVP_PBE_CTL, (st), (i))
-#define sk_EVP_PBE_CTL_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PBE_CTL, (st), (ptr))
-#define sk_EVP_PBE_CTL_insert(st, val, i) SKM_sk_insert(EVP_PBE_CTL, (st), (val), (i))
-#define sk_EVP_PBE_CTL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PBE_CTL, (st), (cmp))
-#define sk_EVP_PBE_CTL_dup(st) SKM_sk_dup(EVP_PBE_CTL, st)
-#define sk_EVP_PBE_CTL_pop_free(st, free_func) SKM_sk_pop_free(EVP_PBE_CTL, (st), (free_func))
-#define sk_EVP_PBE_CTL_shift(st) SKM_sk_shift(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_pop(st) SKM_sk_pop(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_sort(st) SKM_sk_sort(EVP_PBE_CTL, (st))
-#define sk_EVP_PBE_CTL_is_sorted(st) SKM_sk_is_sorted(EVP_PBE_CTL, (st))
-
-#define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp))
-#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
-#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))
-#define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))
-#define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))
-#define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))
-#define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)
-#define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))
-#define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))
-#define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))
-
-#define sk_EVP_PKEY_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_METHOD, (cmp))
-#define sk_EVP_PKEY_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_METHOD)
-#define sk_EVP_PKEY_METHOD_free(st) SKM_sk_free(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_num(st) SKM_sk_num(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_METHOD, (st), (i))
-#define sk_EVP_PKEY_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_METHOD, (st), (i), (val))
-#define sk_EVP_PKEY_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_METHOD, (st), (val))
-#define sk_EVP_PKEY_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_METHOD, (st), (i))
-#define sk_EVP_PKEY_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_METHOD, (st), (ptr))
-#define sk_EVP_PKEY_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_METHOD, (st), (val), (i))
-#define sk_EVP_PKEY_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_METHOD, (st), (cmp))
-#define sk_EVP_PKEY_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_METHOD, st)
-#define sk_EVP_PKEY_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_METHOD, (st), (free_func))
-#define sk_EVP_PKEY_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_METHOD, (st))
-#define sk_EVP_PKEY_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_METHOD, (st))
-
-#define sk_GENERAL_NAME_new(cmp) SKM_sk_new(GENERAL_NAME, (cmp))
-#define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)
-#define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_num(st) SKM_sk_num(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_value(st, i) SKM_sk_value(GENERAL_NAME, (st), (i))
-#define sk_GENERAL_NAME_set(st, i, val) SKM_sk_set(GENERAL_NAME, (st), (i), (val))
-#define sk_GENERAL_NAME_zero(st) SKM_sk_zero(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_push(st, val) SKM_sk_push(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_unshift(st, val) SKM_sk_unshift(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_find(st, val) SKM_sk_find(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAME, (st), (val))
-#define sk_GENERAL_NAME_delete(st, i) SKM_sk_delete(GENERAL_NAME, (st), (i))
-#define sk_GENERAL_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAME, (st), (ptr))
-#define sk_GENERAL_NAME_insert(st, val, i) SKM_sk_insert(GENERAL_NAME, (st), (val), (i))
-#define sk_GENERAL_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAME, (st), (cmp))
-#define sk_GENERAL_NAME_dup(st) SKM_sk_dup(GENERAL_NAME, st)
-#define sk_GENERAL_NAME_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAME, (st), (free_func))
-#define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st))
-#define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st))
-
-#define sk_GENERAL_NAMES_new(cmp) SKM_sk_new(GENERAL_NAMES, (cmp))
-#define sk_GENERAL_NAMES_new_null() SKM_sk_new_null(GENERAL_NAMES)
-#define sk_GENERAL_NAMES_free(st) SKM_sk_free(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_num(st) SKM_sk_num(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_value(st, i) SKM_sk_value(GENERAL_NAMES, (st), (i))
-#define sk_GENERAL_NAMES_set(st, i, val) SKM_sk_set(GENERAL_NAMES, (st), (i), (val))
-#define sk_GENERAL_NAMES_zero(st) SKM_sk_zero(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_push(st, val) SKM_sk_push(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_unshift(st, val) SKM_sk_unshift(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_find(st, val) SKM_sk_find(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAMES, (st), (val))
-#define sk_GENERAL_NAMES_delete(st, i) SKM_sk_delete(GENERAL_NAMES, (st), (i))
-#define sk_GENERAL_NAMES_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAMES, (st), (ptr))
-#define sk_GENERAL_NAMES_insert(st, val, i) SKM_sk_insert(GENERAL_NAMES, (st), (val), (i))
-#define sk_GENERAL_NAMES_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAMES, (st), (cmp))
-#define sk_GENERAL_NAMES_dup(st) SKM_sk_dup(GENERAL_NAMES, st)
-#define sk_GENERAL_NAMES_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAMES, (st), (free_func))
-#define sk_GENERAL_NAMES_shift(st) SKM_sk_shift(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_pop(st) SKM_sk_pop(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_sort(st) SKM_sk_sort(GENERAL_NAMES, (st))
-#define sk_GENERAL_NAMES_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAMES, (st))
-
-#define sk_GENERAL_SUBTREE_new(cmp) SKM_sk_new(GENERAL_SUBTREE, (cmp))
-#define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE)
-#define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_num(st) SKM_sk_num(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_value(st, i) SKM_sk_value(GENERAL_SUBTREE, (st), (i))
-#define sk_GENERAL_SUBTREE_set(st, i, val) SKM_sk_set(GENERAL_SUBTREE, (st), (i), (val))
-#define sk_GENERAL_SUBTREE_zero(st) SKM_sk_zero(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_push(st, val) SKM_sk_push(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_unshift(st, val) SKM_sk_unshift(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_find(st, val) SKM_sk_find(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_find_ex(st, val) SKM_sk_find_ex(GENERAL_SUBTREE, (st), (val))
-#define sk_GENERAL_SUBTREE_delete(st, i) SKM_sk_delete(GENERAL_SUBTREE, (st), (i))
-#define sk_GENERAL_SUBTREE_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_SUBTREE, (st), (ptr))
-#define sk_GENERAL_SUBTREE_insert(st, val, i) SKM_sk_insert(GENERAL_SUBTREE, (st), (val), (i))
-#define sk_GENERAL_SUBTREE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_SUBTREE, (st), (cmp))
-#define sk_GENERAL_SUBTREE_dup(st) SKM_sk_dup(GENERAL_SUBTREE, st)
-#define sk_GENERAL_SUBTREE_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_SUBTREE, (st), (free_func))
-#define sk_GENERAL_SUBTREE_shift(st) SKM_sk_shift(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_pop(st) SKM_sk_pop(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))
-#define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))
-
-#define sk_IPAddressFamily_new(cmp) SKM_sk_new(IPAddressFamily, (cmp))
-#define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)
-#define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))
-#define sk_IPAddressFamily_num(st) SKM_sk_num(IPAddressFamily, (st))
-#define sk_IPAddressFamily_value(st, i) SKM_sk_value(IPAddressFamily, (st), (i))
-#define sk_IPAddressFamily_set(st, i, val) SKM_sk_set(IPAddressFamily, (st), (i), (val))
-#define sk_IPAddressFamily_zero(st) SKM_sk_zero(IPAddressFamily, (st))
-#define sk_IPAddressFamily_push(st, val) SKM_sk_push(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_unshift(st, val) SKM_sk_unshift(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_find(st, val) SKM_sk_find(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_find_ex(st, val) SKM_sk_find_ex(IPAddressFamily, (st), (val))
-#define sk_IPAddressFamily_delete(st, i) SKM_sk_delete(IPAddressFamily, (st), (i))
-#define sk_IPAddressFamily_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressFamily, (st), (ptr))
-#define sk_IPAddressFamily_insert(st, val, i) SKM_sk_insert(IPAddressFamily, (st), (val), (i))
-#define sk_IPAddressFamily_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressFamily, (st), (cmp))
-#define sk_IPAddressFamily_dup(st) SKM_sk_dup(IPAddressFamily, st)
-#define sk_IPAddressFamily_pop_free(st, free_func) SKM_sk_pop_free(IPAddressFamily, (st), (free_func))
-#define sk_IPAddressFamily_shift(st) SKM_sk_shift(IPAddressFamily, (st))
-#define sk_IPAddressFamily_pop(st) SKM_sk_pop(IPAddressFamily, (st))
-#define sk_IPAddressFamily_sort(st) SKM_sk_sort(IPAddressFamily, (st))
-#define sk_IPAddressFamily_is_sorted(st) SKM_sk_is_sorted(IPAddressFamily, (st))
-
-#define sk_IPAddressOrRange_new(cmp) SKM_sk_new(IPAddressOrRange, (cmp))
-#define sk_IPAddressOrRange_new_null() SKM_sk_new_null(IPAddressOrRange)
-#define sk_IPAddressOrRange_free(st) SKM_sk_free(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_num(st) SKM_sk_num(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_value(st, i) SKM_sk_value(IPAddressOrRange, (st), (i))
-#define sk_IPAddressOrRange_set(st, i, val) SKM_sk_set(IPAddressOrRange, (st), (i), (val))
-#define sk_IPAddressOrRange_zero(st) SKM_sk_zero(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_push(st, val) SKM_sk_push(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_unshift(st, val) SKM_sk_unshift(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_find(st, val) SKM_sk_find(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_find_ex(st, val) SKM_sk_find_ex(IPAddressOrRange, (st), (val))
-#define sk_IPAddressOrRange_delete(st, i) SKM_sk_delete(IPAddressOrRange, (st), (i))
-#define sk_IPAddressOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressOrRange, (st), (ptr))
-#define sk_IPAddressOrRange_insert(st, val, i) SKM_sk_insert(IPAddressOrRange, (st), (val), (i))
-#define sk_IPAddressOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressOrRange, (st), (cmp))
-#define sk_IPAddressOrRange_dup(st) SKM_sk_dup(IPAddressOrRange, st)
-#define sk_IPAddressOrRange_pop_free(st, free_func) SKM_sk_pop_free(IPAddressOrRange, (st), (free_func))
-#define sk_IPAddressOrRange_shift(st) SKM_sk_shift(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))
-#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))
-
-#define sk_KRB5_APREQBODY_new(cmp) SKM_sk_new(KRB5_APREQBODY, (cmp))
-#define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)
-#define sk_KRB5_APREQBODY_free(st) SKM_sk_free(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_num(st) SKM_sk_num(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_value(st, i) SKM_sk_value(KRB5_APREQBODY, (st), (i))
-#define sk_KRB5_APREQBODY_set(st, i, val) SKM_sk_set(KRB5_APREQBODY, (st), (i), (val))
-#define sk_KRB5_APREQBODY_zero(st) SKM_sk_zero(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_push(st, val) SKM_sk_push(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_unshift(st, val) SKM_sk_unshift(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_find(st, val) SKM_sk_find(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_APREQBODY, (st), (val))
-#define sk_KRB5_APREQBODY_delete(st, i) SKM_sk_delete(KRB5_APREQBODY, (st), (i))
-#define sk_KRB5_APREQBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_APREQBODY, (st), (ptr))
-#define sk_KRB5_APREQBODY_insert(st, val, i) SKM_sk_insert(KRB5_APREQBODY, (st), (val), (i))
-#define sk_KRB5_APREQBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_APREQBODY, (st), (cmp))
-#define sk_KRB5_APREQBODY_dup(st) SKM_sk_dup(KRB5_APREQBODY, st)
-#define sk_KRB5_APREQBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_APREQBODY, (st), (free_func))
-#define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st))
-#define sk_KRB5_APREQBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_APREQBODY, (st))
-
-#define sk_KRB5_AUTHDATA_new(cmp) SKM_sk_new(KRB5_AUTHDATA, (cmp))
-#define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA)
-#define sk_KRB5_AUTHDATA_free(st) SKM_sk_free(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_num(st) SKM_sk_num(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_value(st, i) SKM_sk_value(KRB5_AUTHDATA, (st), (i))
-#define sk_KRB5_AUTHDATA_set(st, i, val) SKM_sk_set(KRB5_AUTHDATA, (st), (i), (val))
-#define sk_KRB5_AUTHDATA_zero(st) SKM_sk_zero(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_push(st, val) SKM_sk_push(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_unshift(st, val) SKM_sk_unshift(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_find(st, val) SKM_sk_find(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHDATA, (st), (val))
-#define sk_KRB5_AUTHDATA_delete(st, i) SKM_sk_delete(KRB5_AUTHDATA, (st), (i))
-#define sk_KRB5_AUTHDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHDATA, (st), (ptr))
-#define sk_KRB5_AUTHDATA_insert(st, val, i) SKM_sk_insert(KRB5_AUTHDATA, (st), (val), (i))
-#define sk_KRB5_AUTHDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHDATA, (st), (cmp))
-#define sk_KRB5_AUTHDATA_dup(st) SKM_sk_dup(KRB5_AUTHDATA, st)
-#define sk_KRB5_AUTHDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHDATA, (st), (free_func))
-#define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st))
-#define sk_KRB5_AUTHDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHDATA, (st))
-
-#define sk_KRB5_AUTHENTBODY_new(cmp) SKM_sk_new(KRB5_AUTHENTBODY, (cmp))
-#define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY)
-#define sk_KRB5_AUTHENTBODY_free(st) SKM_sk_free(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_num(st) SKM_sk_num(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_value(st, i) SKM_sk_value(KRB5_AUTHENTBODY, (st), (i))
-#define sk_KRB5_AUTHENTBODY_set(st, i, val) SKM_sk_set(KRB5_AUTHENTBODY, (st), (i), (val))
-#define sk_KRB5_AUTHENTBODY_zero(st) SKM_sk_zero(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_push(st, val) SKM_sk_push(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_unshift(st, val) SKM_sk_unshift(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_find(st, val) SKM_sk_find(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHENTBODY, (st), (val))
-#define sk_KRB5_AUTHENTBODY_delete(st, i) SKM_sk_delete(KRB5_AUTHENTBODY, (st), (i))
-#define sk_KRB5_AUTHENTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHENTBODY, (st), (ptr))
-#define sk_KRB5_AUTHENTBODY_insert(st, val, i) SKM_sk_insert(KRB5_AUTHENTBODY, (st), (val), (i))
-#define sk_KRB5_AUTHENTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHENTBODY, (st), (cmp))
-#define sk_KRB5_AUTHENTBODY_dup(st) SKM_sk_dup(KRB5_AUTHENTBODY, st)
-#define sk_KRB5_AUTHENTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHENTBODY, (st), (free_func))
-#define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st))
-#define sk_KRB5_AUTHENTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHENTBODY, (st))
-
-#define sk_KRB5_CHECKSUM_new(cmp) SKM_sk_new(KRB5_CHECKSUM, (cmp))
-#define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM)
-#define sk_KRB5_CHECKSUM_free(st) SKM_sk_free(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_num(st) SKM_sk_num(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_value(st, i) SKM_sk_value(KRB5_CHECKSUM, (st), (i))
-#define sk_KRB5_CHECKSUM_set(st, i, val) SKM_sk_set(KRB5_CHECKSUM, (st), (i), (val))
-#define sk_KRB5_CHECKSUM_zero(st) SKM_sk_zero(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_push(st, val) SKM_sk_push(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_unshift(st, val) SKM_sk_unshift(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_find(st, val) SKM_sk_find(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_find_ex(st, val) SKM_sk_find_ex(KRB5_CHECKSUM, (st), (val))
-#define sk_KRB5_CHECKSUM_delete(st, i) SKM_sk_delete(KRB5_CHECKSUM, (st), (i))
-#define sk_KRB5_CHECKSUM_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_CHECKSUM, (st), (ptr))
-#define sk_KRB5_CHECKSUM_insert(st, val, i) SKM_sk_insert(KRB5_CHECKSUM, (st), (val), (i))
-#define sk_KRB5_CHECKSUM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_CHECKSUM, (st), (cmp))
-#define sk_KRB5_CHECKSUM_dup(st) SKM_sk_dup(KRB5_CHECKSUM, st)
-#define sk_KRB5_CHECKSUM_pop_free(st, free_func) SKM_sk_pop_free(KRB5_CHECKSUM, (st), (free_func))
-#define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st))
-#define sk_KRB5_CHECKSUM_is_sorted(st) SKM_sk_is_sorted(KRB5_CHECKSUM, (st))
-
-#define sk_KRB5_ENCDATA_new(cmp) SKM_sk_new(KRB5_ENCDATA, (cmp))
-#define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA)
-#define sk_KRB5_ENCDATA_free(st) SKM_sk_free(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_num(st) SKM_sk_num(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_value(st, i) SKM_sk_value(KRB5_ENCDATA, (st), (i))
-#define sk_KRB5_ENCDATA_set(st, i, val) SKM_sk_set(KRB5_ENCDATA, (st), (i), (val))
-#define sk_KRB5_ENCDATA_zero(st) SKM_sk_zero(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_push(st, val) SKM_sk_push(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_unshift(st, val) SKM_sk_unshift(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_find(st, val) SKM_sk_find(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCDATA, (st), (val))
-#define sk_KRB5_ENCDATA_delete(st, i) SKM_sk_delete(KRB5_ENCDATA, (st), (i))
-#define sk_KRB5_ENCDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCDATA, (st), (ptr))
-#define sk_KRB5_ENCDATA_insert(st, val, i) SKM_sk_insert(KRB5_ENCDATA, (st), (val), (i))
-#define sk_KRB5_ENCDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCDATA, (st), (cmp))
-#define sk_KRB5_ENCDATA_dup(st) SKM_sk_dup(KRB5_ENCDATA, st)
-#define sk_KRB5_ENCDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCDATA, (st), (free_func))
-#define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st))
-#define sk_KRB5_ENCDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCDATA, (st))
-
-#define sk_KRB5_ENCKEY_new(cmp) SKM_sk_new(KRB5_ENCKEY, (cmp))
-#define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY)
-#define sk_KRB5_ENCKEY_free(st) SKM_sk_free(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_num(st) SKM_sk_num(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_value(st, i) SKM_sk_value(KRB5_ENCKEY, (st), (i))
-#define sk_KRB5_ENCKEY_set(st, i, val) SKM_sk_set(KRB5_ENCKEY, (st), (i), (val))
-#define sk_KRB5_ENCKEY_zero(st) SKM_sk_zero(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_push(st, val) SKM_sk_push(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_unshift(st, val) SKM_sk_unshift(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_find(st, val) SKM_sk_find(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCKEY, (st), (val))
-#define sk_KRB5_ENCKEY_delete(st, i) SKM_sk_delete(KRB5_ENCKEY, (st), (i))
-#define sk_KRB5_ENCKEY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCKEY, (st), (ptr))
-#define sk_KRB5_ENCKEY_insert(st, val, i) SKM_sk_insert(KRB5_ENCKEY, (st), (val), (i))
-#define sk_KRB5_ENCKEY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCKEY, (st), (cmp))
-#define sk_KRB5_ENCKEY_dup(st) SKM_sk_dup(KRB5_ENCKEY, st)
-#define sk_KRB5_ENCKEY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCKEY, (st), (free_func))
-#define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st))
-#define sk_KRB5_ENCKEY_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCKEY, (st))
-
-#define sk_KRB5_PRINCNAME_new(cmp) SKM_sk_new(KRB5_PRINCNAME, (cmp))
-#define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME)
-#define sk_KRB5_PRINCNAME_free(st) SKM_sk_free(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_num(st) SKM_sk_num(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_value(st, i) SKM_sk_value(KRB5_PRINCNAME, (st), (i))
-#define sk_KRB5_PRINCNAME_set(st, i, val) SKM_sk_set(KRB5_PRINCNAME, (st), (i), (val))
-#define sk_KRB5_PRINCNAME_zero(st) SKM_sk_zero(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_push(st, val) SKM_sk_push(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_unshift(st, val) SKM_sk_unshift(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_find(st, val) SKM_sk_find(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_find_ex(st, val) SKM_sk_find_ex(KRB5_PRINCNAME, (st), (val))
-#define sk_KRB5_PRINCNAME_delete(st, i) SKM_sk_delete(KRB5_PRINCNAME, (st), (i))
-#define sk_KRB5_PRINCNAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_PRINCNAME, (st), (ptr))
-#define sk_KRB5_PRINCNAME_insert(st, val, i) SKM_sk_insert(KRB5_PRINCNAME, (st), (val), (i))
-#define sk_KRB5_PRINCNAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_PRINCNAME, (st), (cmp))
-#define sk_KRB5_PRINCNAME_dup(st) SKM_sk_dup(KRB5_PRINCNAME, st)
-#define sk_KRB5_PRINCNAME_pop_free(st, free_func) SKM_sk_pop_free(KRB5_PRINCNAME, (st), (free_func))
-#define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st))
-#define sk_KRB5_PRINCNAME_is_sorted(st) SKM_sk_is_sorted(KRB5_PRINCNAME, (st))
-
-#define sk_KRB5_TKTBODY_new(cmp) SKM_sk_new(KRB5_TKTBODY, (cmp))
-#define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY)
-#define sk_KRB5_TKTBODY_free(st) SKM_sk_free(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_num(st) SKM_sk_num(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_value(st, i) SKM_sk_value(KRB5_TKTBODY, (st), (i))
-#define sk_KRB5_TKTBODY_set(st, i, val) SKM_sk_set(KRB5_TKTBODY, (st), (i), (val))
-#define sk_KRB5_TKTBODY_zero(st) SKM_sk_zero(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_push(st, val) SKM_sk_push(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_unshift(st, val) SKM_sk_unshift(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_find(st, val) SKM_sk_find(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_TKTBODY, (st), (val))
-#define sk_KRB5_TKTBODY_delete(st, i) SKM_sk_delete(KRB5_TKTBODY, (st), (i))
-#define sk_KRB5_TKTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_TKTBODY, (st), (ptr))
-#define sk_KRB5_TKTBODY_insert(st, val, i) SKM_sk_insert(KRB5_TKTBODY, (st), (val), (i))
-#define sk_KRB5_TKTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_TKTBODY, (st), (cmp))
-#define sk_KRB5_TKTBODY_dup(st) SKM_sk_dup(KRB5_TKTBODY, st)
-#define sk_KRB5_TKTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_TKTBODY, (st), (free_func))
-#define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st))
-#define sk_KRB5_TKTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_TKTBODY, (st))
-
-#define sk_MEM_OBJECT_DATA_new(cmp) SKM_sk_new(MEM_OBJECT_DATA, (cmp))
-#define sk_MEM_OBJECT_DATA_new_null() SKM_sk_new_null(MEM_OBJECT_DATA)
-#define sk_MEM_OBJECT_DATA_free(st) SKM_sk_free(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_num(st) SKM_sk_num(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_value(st, i) SKM_sk_value(MEM_OBJECT_DATA, (st), (i))
-#define sk_MEM_OBJECT_DATA_set(st, i, val) SKM_sk_set(MEM_OBJECT_DATA, (st), (i), (val))
-#define sk_MEM_OBJECT_DATA_zero(st) SKM_sk_zero(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_push(st, val) SKM_sk_push(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_unshift(st, val) SKM_sk_unshift(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_find(st, val) SKM_sk_find(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_find_ex(st, val) SKM_sk_find_ex(MEM_OBJECT_DATA, (st), (val))
-#define sk_MEM_OBJECT_DATA_delete(st, i) SKM_sk_delete(MEM_OBJECT_DATA, (st), (i))
-#define sk_MEM_OBJECT_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(MEM_OBJECT_DATA, (st), (ptr))
-#define sk_MEM_OBJECT_DATA_insert(st, val, i) SKM_sk_insert(MEM_OBJECT_DATA, (st), (val), (i))
-#define sk_MEM_OBJECT_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MEM_OBJECT_DATA, (st), (cmp))
-#define sk_MEM_OBJECT_DATA_dup(st) SKM_sk_dup(MEM_OBJECT_DATA, st)
-#define sk_MEM_OBJECT_DATA_pop_free(st, free_func) SKM_sk_pop_free(MEM_OBJECT_DATA, (st), (free_func))
-#define sk_MEM_OBJECT_DATA_shift(st) SKM_sk_shift(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_pop(st) SKM_sk_pop(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_sort(st) SKM_sk_sort(MEM_OBJECT_DATA, (st))
-#define sk_MEM_OBJECT_DATA_is_sorted(st) SKM_sk_is_sorted(MEM_OBJECT_DATA, (st))
-
-#define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp))
-#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
-#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
-#define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
-#define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
-#define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
-#define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
-#define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
-#define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
-#define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
-#define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
-#define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
-#define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
-#define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
-#define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
-#define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
-#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
-#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
-
-#define sk_MIME_PARAM_new(cmp) SKM_sk_new(MIME_PARAM, (cmp))
-#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
-#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
-#define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
-#define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
-#define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
-#define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
-#define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
-#define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
-#define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
-#define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
-#define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
-#define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
-#define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
-#define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
-#define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
-#define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
-#define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))
-
-#define sk_NAME_FUNCS_new(cmp) SKM_sk_new(NAME_FUNCS, (cmp))
-#define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS)
-#define sk_NAME_FUNCS_free(st) SKM_sk_free(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_num(st) SKM_sk_num(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_value(st, i) SKM_sk_value(NAME_FUNCS, (st), (i))
-#define sk_NAME_FUNCS_set(st, i, val) SKM_sk_set(NAME_FUNCS, (st), (i), (val))
-#define sk_NAME_FUNCS_zero(st) SKM_sk_zero(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_push(st, val) SKM_sk_push(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_unshift(st, val) SKM_sk_unshift(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_find(st, val) SKM_sk_find(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_find_ex(st, val) SKM_sk_find_ex(NAME_FUNCS, (st), (val))
-#define sk_NAME_FUNCS_delete(st, i) SKM_sk_delete(NAME_FUNCS, (st), (i))
-#define sk_NAME_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(NAME_FUNCS, (st), (ptr))
-#define sk_NAME_FUNCS_insert(st, val, i) SKM_sk_insert(NAME_FUNCS, (st), (val), (i))
-#define sk_NAME_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(NAME_FUNCS, (st), (cmp))
-#define sk_NAME_FUNCS_dup(st) SKM_sk_dup(NAME_FUNCS, st)
-#define sk_NAME_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(NAME_FUNCS, (st), (free_func))
-#define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st))
-#define sk_NAME_FUNCS_is_sorted(st) SKM_sk_is_sorted(NAME_FUNCS, (st))
-
-#define sk_OCSP_CERTID_new(cmp) SKM_sk_new(OCSP_CERTID, (cmp))
-#define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID)
-#define sk_OCSP_CERTID_free(st) SKM_sk_free(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_num(st) SKM_sk_num(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_value(st, i) SKM_sk_value(OCSP_CERTID, (st), (i))
-#define sk_OCSP_CERTID_set(st, i, val) SKM_sk_set(OCSP_CERTID, (st), (i), (val))
-#define sk_OCSP_CERTID_zero(st) SKM_sk_zero(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_push(st, val) SKM_sk_push(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_unshift(st, val) SKM_sk_unshift(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_find(st, val) SKM_sk_find(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_find_ex(st, val) SKM_sk_find_ex(OCSP_CERTID, (st), (val))
-#define sk_OCSP_CERTID_delete(st, i) SKM_sk_delete(OCSP_CERTID, (st), (i))
-#define sk_OCSP_CERTID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_CERTID, (st), (ptr))
-#define sk_OCSP_CERTID_insert(st, val, i) SKM_sk_insert(OCSP_CERTID, (st), (val), (i))
-#define sk_OCSP_CERTID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_CERTID, (st), (cmp))
-#define sk_OCSP_CERTID_dup(st) SKM_sk_dup(OCSP_CERTID, st)
-#define sk_OCSP_CERTID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_CERTID, (st), (free_func))
-#define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st))
-#define sk_OCSP_CERTID_is_sorted(st) SKM_sk_is_sorted(OCSP_CERTID, (st))
-
-#define sk_OCSP_ONEREQ_new(cmp) SKM_sk_new(OCSP_ONEREQ, (cmp))
-#define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ)
-#define sk_OCSP_ONEREQ_free(st) SKM_sk_free(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_num(st) SKM_sk_num(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_value(st, i) SKM_sk_value(OCSP_ONEREQ, (st), (i))
-#define sk_OCSP_ONEREQ_set(st, i, val) SKM_sk_set(OCSP_ONEREQ, (st), (i), (val))
-#define sk_OCSP_ONEREQ_zero(st) SKM_sk_zero(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_push(st, val) SKM_sk_push(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_unshift(st, val) SKM_sk_unshift(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_find(st, val) SKM_sk_find(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_find_ex(st, val) SKM_sk_find_ex(OCSP_ONEREQ, (st), (val))
-#define sk_OCSP_ONEREQ_delete(st, i) SKM_sk_delete(OCSP_ONEREQ, (st), (i))
-#define sk_OCSP_ONEREQ_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_ONEREQ, (st), (ptr))
-#define sk_OCSP_ONEREQ_insert(st, val, i) SKM_sk_insert(OCSP_ONEREQ, (st), (val), (i))
-#define sk_OCSP_ONEREQ_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_ONEREQ, (st), (cmp))
-#define sk_OCSP_ONEREQ_dup(st) SKM_sk_dup(OCSP_ONEREQ, st)
-#define sk_OCSP_ONEREQ_pop_free(st, free_func) SKM_sk_pop_free(OCSP_ONEREQ, (st), (free_func))
-#define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st))
-#define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st))
-
-#define sk_OCSP_RESPID_new(cmp) SKM_sk_new(OCSP_RESPID, (cmp))
-#define sk_OCSP_RESPID_new_null() SKM_sk_new_null(OCSP_RESPID)
-#define sk_OCSP_RESPID_free(st) SKM_sk_free(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_num(st) SKM_sk_num(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_value(st, i) SKM_sk_value(OCSP_RESPID, (st), (i))
-#define sk_OCSP_RESPID_set(st, i, val) SKM_sk_set(OCSP_RESPID, (st), (i), (val))
-#define sk_OCSP_RESPID_zero(st) SKM_sk_zero(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_push(st, val) SKM_sk_push(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_unshift(st, val) SKM_sk_unshift(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_find(st, val) SKM_sk_find(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_find_ex(st, val) SKM_sk_find_ex(OCSP_RESPID, (st), (val))
-#define sk_OCSP_RESPID_delete(st, i) SKM_sk_delete(OCSP_RESPID, (st), (i))
-#define sk_OCSP_RESPID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_RESPID, (st), (ptr))
-#define sk_OCSP_RESPID_insert(st, val, i) SKM_sk_insert(OCSP_RESPID, (st), (val), (i))
-#define sk_OCSP_RESPID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_RESPID, (st), (cmp))
-#define sk_OCSP_RESPID_dup(st) SKM_sk_dup(OCSP_RESPID, st)
-#define sk_OCSP_RESPID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_RESPID, (st), (free_func))
-#define sk_OCSP_RESPID_shift(st) SKM_sk_shift(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_pop(st) SKM_sk_pop(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_sort(st) SKM_sk_sort(OCSP_RESPID, (st))
-#define sk_OCSP_RESPID_is_sorted(st) SKM_sk_is_sorted(OCSP_RESPID, (st))
-
-#define sk_OCSP_SINGLERESP_new(cmp) SKM_sk_new(OCSP_SINGLERESP, (cmp))
-#define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP)
-#define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_num(st) SKM_sk_num(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_value(st, i) SKM_sk_value(OCSP_SINGLERESP, (st), (i))
-#define sk_OCSP_SINGLERESP_set(st, i, val) SKM_sk_set(OCSP_SINGLERESP, (st), (i), (val))
-#define sk_OCSP_SINGLERESP_zero(st) SKM_sk_zero(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_push(st, val) SKM_sk_push(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_unshift(st, val) SKM_sk_unshift(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_find(st, val) SKM_sk_find(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_find_ex(st, val) SKM_sk_find_ex(OCSP_SINGLERESP, (st), (val))
-#define sk_OCSP_SINGLERESP_delete(st, i) SKM_sk_delete(OCSP_SINGLERESP, (st), (i))
-#define sk_OCSP_SINGLERESP_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_SINGLERESP, (st), (ptr))
-#define sk_OCSP_SINGLERESP_insert(st, val, i) SKM_sk_insert(OCSP_SINGLERESP, (st), (val), (i))
-#define sk_OCSP_SINGLERESP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_SINGLERESP, (st), (cmp))
-#define sk_OCSP_SINGLERESP_dup(st) SKM_sk_dup(OCSP_SINGLERESP, st)
-#define sk_OCSP_SINGLERESP_pop_free(st, free_func) SKM_sk_pop_free(OCSP_SINGLERESP, (st), (free_func))
-#define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st))
-#define sk_OCSP_SINGLERESP_is_sorted(st) SKM_sk_is_sorted(OCSP_SINGLERESP, (st))
-
-#define sk_PKCS12_SAFEBAG_new(cmp) SKM_sk_new(PKCS12_SAFEBAG, (cmp))
-#define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG)
-#define sk_PKCS12_SAFEBAG_free(st) SKM_sk_free(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_num(st) SKM_sk_num(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_value(st, i) SKM_sk_value(PKCS12_SAFEBAG, (st), (i))
-#define sk_PKCS12_SAFEBAG_set(st, i, val) SKM_sk_set(PKCS12_SAFEBAG, (st), (i), (val))
-#define sk_PKCS12_SAFEBAG_zero(st) SKM_sk_zero(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_push(st, val) SKM_sk_push(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_unshift(st, val) SKM_sk_unshift(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_find(st, val) SKM_sk_find(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_find_ex(st, val) SKM_sk_find_ex(PKCS12_SAFEBAG, (st), (val))
-#define sk_PKCS12_SAFEBAG_delete(st, i) SKM_sk_delete(PKCS12_SAFEBAG, (st), (i))
-#define sk_PKCS12_SAFEBAG_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS12_SAFEBAG, (st), (ptr))
-#define sk_PKCS12_SAFEBAG_insert(st, val, i) SKM_sk_insert(PKCS12_SAFEBAG, (st), (val), (i))
-#define sk_PKCS12_SAFEBAG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS12_SAFEBAG, (st), (cmp))
-#define sk_PKCS12_SAFEBAG_dup(st) SKM_sk_dup(PKCS12_SAFEBAG, st)
-#define sk_PKCS12_SAFEBAG_pop_free(st, free_func) SKM_sk_pop_free(PKCS12_SAFEBAG, (st), (free_func))
-#define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st))
-#define sk_PKCS12_SAFEBAG_is_sorted(st) SKM_sk_is_sorted(PKCS12_SAFEBAG, (st))
-
-#define sk_PKCS7_new(cmp) SKM_sk_new(PKCS7, (cmp))
-#define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7)
-#define sk_PKCS7_free(st) SKM_sk_free(PKCS7, (st))
-#define sk_PKCS7_num(st) SKM_sk_num(PKCS7, (st))
-#define sk_PKCS7_value(st, i) SKM_sk_value(PKCS7, (st), (i))
-#define sk_PKCS7_set(st, i, val) SKM_sk_set(PKCS7, (st), (i), (val))
-#define sk_PKCS7_zero(st) SKM_sk_zero(PKCS7, (st))
-#define sk_PKCS7_push(st, val) SKM_sk_push(PKCS7, (st), (val))
-#define sk_PKCS7_unshift(st, val) SKM_sk_unshift(PKCS7, (st), (val))
-#define sk_PKCS7_find(st, val) SKM_sk_find(PKCS7, (st), (val))
-#define sk_PKCS7_find_ex(st, val) SKM_sk_find_ex(PKCS7, (st), (val))
-#define sk_PKCS7_delete(st, i) SKM_sk_delete(PKCS7, (st), (i))
-#define sk_PKCS7_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7, (st), (ptr))
-#define sk_PKCS7_insert(st, val, i) SKM_sk_insert(PKCS7, (st), (val), (i))
-#define sk_PKCS7_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7, (st), (cmp))
-#define sk_PKCS7_dup(st) SKM_sk_dup(PKCS7, st)
-#define sk_PKCS7_pop_free(st, free_func) SKM_sk_pop_free(PKCS7, (st), (free_func))
-#define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st))
-#define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st))
-#define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st))
-#define sk_PKCS7_is_sorted(st) SKM_sk_is_sorted(PKCS7, (st))
-
-#define sk_PKCS7_RECIP_INFO_new(cmp) SKM_sk_new(PKCS7_RECIP_INFO, (cmp))
-#define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO)
-#define sk_PKCS7_RECIP_INFO_free(st) SKM_sk_free(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_num(st) SKM_sk_num(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_value(st, i) SKM_sk_value(PKCS7_RECIP_INFO, (st), (i))
-#define sk_PKCS7_RECIP_INFO_set(st, i, val) SKM_sk_set(PKCS7_RECIP_INFO, (st), (i), (val))
-#define sk_PKCS7_RECIP_INFO_zero(st) SKM_sk_zero(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_push(st, val) SKM_sk_push(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_find(st, val) SKM_sk_find(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_RECIP_INFO, (st), (val))
-#define sk_PKCS7_RECIP_INFO_delete(st, i) SKM_sk_delete(PKCS7_RECIP_INFO, (st), (i))
-#define sk_PKCS7_RECIP_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_RECIP_INFO, (st), (ptr))
-#define sk_PKCS7_RECIP_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_RECIP_INFO, (st), (val), (i))
-#define sk_PKCS7_RECIP_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_RECIP_INFO, (st), (cmp))
-#define sk_PKCS7_RECIP_INFO_dup(st) SKM_sk_dup(PKCS7_RECIP_INFO, st)
-#define sk_PKCS7_RECIP_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_RECIP_INFO, (st), (free_func))
-#define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st))
-#define sk_PKCS7_RECIP_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_RECIP_INFO, (st))
-
-#define sk_PKCS7_SIGNER_INFO_new(cmp) SKM_sk_new(PKCS7_SIGNER_INFO, (cmp))
-#define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO)
-#define sk_PKCS7_SIGNER_INFO_free(st) SKM_sk_free(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_num(st) SKM_sk_num(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_value(st, i) SKM_sk_value(PKCS7_SIGNER_INFO, (st), (i))
-#define sk_PKCS7_SIGNER_INFO_set(st, i, val) SKM_sk_set(PKCS7_SIGNER_INFO, (st), (i), (val))
-#define sk_PKCS7_SIGNER_INFO_zero(st) SKM_sk_zero(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_push(st, val) SKM_sk_push(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_find(st, val) SKM_sk_find(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_SIGNER_INFO, (st), (val))
-#define sk_PKCS7_SIGNER_INFO_delete(st, i) SKM_sk_delete(PKCS7_SIGNER_INFO, (st), (i))
-#define sk_PKCS7_SIGNER_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_SIGNER_INFO, (st), (ptr))
-#define sk_PKCS7_SIGNER_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_SIGNER_INFO, (st), (val), (i))
-#define sk_PKCS7_SIGNER_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_SIGNER_INFO, (st), (cmp))
-#define sk_PKCS7_SIGNER_INFO_dup(st) SKM_sk_dup(PKCS7_SIGNER_INFO, st)
-#define sk_PKCS7_SIGNER_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_SIGNER_INFO, (st), (free_func))
-#define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st))
-#define sk_PKCS7_SIGNER_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_SIGNER_INFO, (st))
-
-#define sk_POLICYINFO_new(cmp) SKM_sk_new(POLICYINFO, (cmp))
-#define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO)
-#define sk_POLICYINFO_free(st) SKM_sk_free(POLICYINFO, (st))
-#define sk_POLICYINFO_num(st) SKM_sk_num(POLICYINFO, (st))
-#define sk_POLICYINFO_value(st, i) SKM_sk_value(POLICYINFO, (st), (i))
-#define sk_POLICYINFO_set(st, i, val) SKM_sk_set(POLICYINFO, (st), (i), (val))
-#define sk_POLICYINFO_zero(st) SKM_sk_zero(POLICYINFO, (st))
-#define sk_POLICYINFO_push(st, val) SKM_sk_push(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_unshift(st, val) SKM_sk_unshift(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_find(st, val) SKM_sk_find(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_find_ex(st, val) SKM_sk_find_ex(POLICYINFO, (st), (val))
-#define sk_POLICYINFO_delete(st, i) SKM_sk_delete(POLICYINFO, (st), (i))
-#define sk_POLICYINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYINFO, (st), (ptr))
-#define sk_POLICYINFO_insert(st, val, i) SKM_sk_insert(POLICYINFO, (st), (val), (i))
-#define sk_POLICYINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYINFO, (st), (cmp))
-#define sk_POLICYINFO_dup(st) SKM_sk_dup(POLICYINFO, st)
-#define sk_POLICYINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYINFO, (st), (free_func))
-#define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st))
-#define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st))
-#define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st))
-#define sk_POLICYINFO_is_sorted(st) SKM_sk_is_sorted(POLICYINFO, (st))
-
-#define sk_POLICYQUALINFO_new(cmp) SKM_sk_new(POLICYQUALINFO, (cmp))
-#define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO)
-#define sk_POLICYQUALINFO_free(st) SKM_sk_free(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_num(st) SKM_sk_num(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_value(st, i) SKM_sk_value(POLICYQUALINFO, (st), (i))
-#define sk_POLICYQUALINFO_set(st, i, val) SKM_sk_set(POLICYQUALINFO, (st), (i), (val))
-#define sk_POLICYQUALINFO_zero(st) SKM_sk_zero(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_push(st, val) SKM_sk_push(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_unshift(st, val) SKM_sk_unshift(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_find(st, val) SKM_sk_find(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_find_ex(st, val) SKM_sk_find_ex(POLICYQUALINFO, (st), (val))
-#define sk_POLICYQUALINFO_delete(st, i) SKM_sk_delete(POLICYQUALINFO, (st), (i))
-#define sk_POLICYQUALINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYQUALINFO, (st), (ptr))
-#define sk_POLICYQUALINFO_insert(st, val, i) SKM_sk_insert(POLICYQUALINFO, (st), (val), (i))
-#define sk_POLICYQUALINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYQUALINFO, (st), (cmp))
-#define sk_POLICYQUALINFO_dup(st) SKM_sk_dup(POLICYQUALINFO, st)
-#define sk_POLICYQUALINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYQUALINFO, (st), (free_func))
-#define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))
-#define sk_POLICYQUALINFO_is_sorted(st) SKM_sk_is_sorted(POLICYQUALINFO, (st))
-
-#define sk_POLICY_MAPPING_new(cmp) SKM_sk_new(POLICY_MAPPING, (cmp))
-#define sk_POLICY_MAPPING_new_null() SKM_sk_new_null(POLICY_MAPPING)
-#define sk_POLICY_MAPPING_free(st) SKM_sk_free(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_num(st) SKM_sk_num(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_value(st, i) SKM_sk_value(POLICY_MAPPING, (st), (i))
-#define sk_POLICY_MAPPING_set(st, i, val) SKM_sk_set(POLICY_MAPPING, (st), (i), (val))
-#define sk_POLICY_MAPPING_zero(st) SKM_sk_zero(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_push(st, val) SKM_sk_push(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_unshift(st, val) SKM_sk_unshift(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_find(st, val) SKM_sk_find(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_find_ex(st, val) SKM_sk_find_ex(POLICY_MAPPING, (st), (val))
-#define sk_POLICY_MAPPING_delete(st, i) SKM_sk_delete(POLICY_MAPPING, (st), (i))
-#define sk_POLICY_MAPPING_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICY_MAPPING, (st), (ptr))
-#define sk_POLICY_MAPPING_insert(st, val, i) SKM_sk_insert(POLICY_MAPPING, (st), (val), (i))
-#define sk_POLICY_MAPPING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICY_MAPPING, (st), (cmp))
-#define sk_POLICY_MAPPING_dup(st) SKM_sk_dup(POLICY_MAPPING, st)
-#define sk_POLICY_MAPPING_pop_free(st, free_func) SKM_sk_pop_free(POLICY_MAPPING, (st), (free_func))
-#define sk_POLICY_MAPPING_shift(st) SKM_sk_shift(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_pop(st) SKM_sk_pop(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
-#define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
-
-#define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
-#define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
-#define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_num(st) SKM_sk_num(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_value(st, i) SKM_sk_value(SSL_CIPHER, (st), (i))
-#define sk_SSL_CIPHER_set(st, i, val) SKM_sk_set(SSL_CIPHER, (st), (i), (val))
-#define sk_SSL_CIPHER_zero(st) SKM_sk_zero(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_push(st, val) SKM_sk_push(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_unshift(st, val) SKM_sk_unshift(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_find(st, val) SKM_sk_find(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_find_ex(st, val) SKM_sk_find_ex(SSL_CIPHER, (st), (val))
-#define sk_SSL_CIPHER_delete(st, i) SKM_sk_delete(SSL_CIPHER, (st), (i))
-#define sk_SSL_CIPHER_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_CIPHER, (st), (ptr))
-#define sk_SSL_CIPHER_insert(st, val, i) SKM_sk_insert(SSL_CIPHER, (st), (val), (i))
-#define sk_SSL_CIPHER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_CIPHER, (st), (cmp))
-#define sk_SSL_CIPHER_dup(st) SKM_sk_dup(SSL_CIPHER, st)
-#define sk_SSL_CIPHER_pop_free(st, free_func) SKM_sk_pop_free(SSL_CIPHER, (st), (free_func))
-#define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st))
-#define sk_SSL_CIPHER_is_sorted(st) SKM_sk_is_sorted(SSL_CIPHER, (st))
-
-#define sk_SSL_COMP_new(cmp) SKM_sk_new(SSL_COMP, (cmp))
-#define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP)
-#define sk_SSL_COMP_free(st) SKM_sk_free(SSL_COMP, (st))
-#define sk_SSL_COMP_num(st) SKM_sk_num(SSL_COMP, (st))
-#define sk_SSL_COMP_value(st, i) SKM_sk_value(SSL_COMP, (st), (i))
-#define sk_SSL_COMP_set(st, i, val) SKM_sk_set(SSL_COMP, (st), (i), (val))
-#define sk_SSL_COMP_zero(st) SKM_sk_zero(SSL_COMP, (st))
-#define sk_SSL_COMP_push(st, val) SKM_sk_push(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_unshift(st, val) SKM_sk_unshift(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_find(st, val) SKM_sk_find(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_find_ex(st, val) SKM_sk_find_ex(SSL_COMP, (st), (val))
-#define sk_SSL_COMP_delete(st, i) SKM_sk_delete(SSL_COMP, (st), (i))
-#define sk_SSL_COMP_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_COMP, (st), (ptr))
-#define sk_SSL_COMP_insert(st, val, i) SKM_sk_insert(SSL_COMP, (st), (val), (i))
-#define sk_SSL_COMP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_COMP, (st), (cmp))
-#define sk_SSL_COMP_dup(st) SKM_sk_dup(SSL_COMP, st)
-#define sk_SSL_COMP_pop_free(st, free_func) SKM_sk_pop_free(SSL_COMP, (st), (free_func))
-#define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st))
-#define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st))
-#define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st))
-#define sk_SSL_COMP_is_sorted(st) SKM_sk_is_sorted(SSL_COMP, (st))
-
-#define sk_STACK_OF_X509_NAME_ENTRY_new(cmp) SKM_sk_new(STACK_OF_X509_NAME_ENTRY, (cmp))
-#define sk_STACK_OF_X509_NAME_ENTRY_new_null() SKM_sk_new_null(STACK_OF_X509_NAME_ENTRY)
-#define sk_STACK_OF_X509_NAME_ENTRY_free(st) SKM_sk_free(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_num(st) SKM_sk_num(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_value(st, i) SKM_sk_value(STACK_OF_X509_NAME_ENTRY, (st), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(STACK_OF_X509_NAME_ENTRY, (st), (i), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_zero(st) SKM_sk_zero(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_push(st, val) SKM_sk_push(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_find(st, val) SKM_sk_find(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(STACK_OF_X509_NAME_ENTRY, (st), (val))
-#define sk_STACK_OF_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(STACK_OF_X509_NAME_ENTRY, (st), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(STACK_OF_X509_NAME_ENTRY, (st), (ptr))
-#define sk_STACK_OF_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(STACK_OF_X509_NAME_ENTRY, (st), (val), (i))
-#define sk_STACK_OF_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STACK_OF_X509_NAME_ENTRY, (st), (cmp))
-#define sk_STACK_OF_X509_NAME_ENTRY_dup(st) SKM_sk_dup(STACK_OF_X509_NAME_ENTRY, st)
-#define sk_STACK_OF_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(STACK_OF_X509_NAME_ENTRY, (st), (free_func))
-#define sk_STACK_OF_X509_NAME_ENTRY_shift(st) SKM_sk_shift(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_pop(st) SKM_sk_pop(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_sort(st) SKM_sk_sort(STACK_OF_X509_NAME_ENTRY, (st))
-#define sk_STACK_OF_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(STACK_OF_X509_NAME_ENTRY, (st))
-
-#define sk_STORE_ATTR_INFO_new(cmp) SKM_sk_new(STORE_ATTR_INFO, (cmp))
-#define sk_STORE_ATTR_INFO_new_null() SKM_sk_new_null(STORE_ATTR_INFO)
-#define sk_STORE_ATTR_INFO_free(st) SKM_sk_free(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_num(st) SKM_sk_num(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_value(st, i) SKM_sk_value(STORE_ATTR_INFO, (st), (i))
-#define sk_STORE_ATTR_INFO_set(st, i, val) SKM_sk_set(STORE_ATTR_INFO, (st), (i), (val))
-#define sk_STORE_ATTR_INFO_zero(st) SKM_sk_zero(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_push(st, val) SKM_sk_push(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_unshift(st, val) SKM_sk_unshift(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_find(st, val) SKM_sk_find(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_find_ex(st, val) SKM_sk_find_ex(STORE_ATTR_INFO, (st), (val))
-#define sk_STORE_ATTR_INFO_delete(st, i) SKM_sk_delete(STORE_ATTR_INFO, (st), (i))
-#define sk_STORE_ATTR_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_ATTR_INFO, (st), (ptr))
-#define sk_STORE_ATTR_INFO_insert(st, val, i) SKM_sk_insert(STORE_ATTR_INFO, (st), (val), (i))
-#define sk_STORE_ATTR_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_ATTR_INFO, (st), (cmp))
-#define sk_STORE_ATTR_INFO_dup(st) SKM_sk_dup(STORE_ATTR_INFO, st)
-#define sk_STORE_ATTR_INFO_pop_free(st, free_func) SKM_sk_pop_free(STORE_ATTR_INFO, (st), (free_func))
-#define sk_STORE_ATTR_INFO_shift(st) SKM_sk_shift(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_pop(st) SKM_sk_pop(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_sort(st) SKM_sk_sort(STORE_ATTR_INFO, (st))
-#define sk_STORE_ATTR_INFO_is_sorted(st) SKM_sk_is_sorted(STORE_ATTR_INFO, (st))
-
-#define sk_STORE_OBJECT_new(cmp) SKM_sk_new(STORE_OBJECT, (cmp))
-#define sk_STORE_OBJECT_new_null() SKM_sk_new_null(STORE_OBJECT)
-#define sk_STORE_OBJECT_free(st) SKM_sk_free(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_num(st) SKM_sk_num(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_value(st, i) SKM_sk_value(STORE_OBJECT, (st), (i))
-#define sk_STORE_OBJECT_set(st, i, val) SKM_sk_set(STORE_OBJECT, (st), (i), (val))
-#define sk_STORE_OBJECT_zero(st) SKM_sk_zero(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_push(st, val) SKM_sk_push(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_unshift(st, val) SKM_sk_unshift(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_find(st, val) SKM_sk_find(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_find_ex(st, val) SKM_sk_find_ex(STORE_OBJECT, (st), (val))
-#define sk_STORE_OBJECT_delete(st, i) SKM_sk_delete(STORE_OBJECT, (st), (i))
-#define sk_STORE_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_OBJECT, (st), (ptr))
-#define sk_STORE_OBJECT_insert(st, val, i) SKM_sk_insert(STORE_OBJECT, (st), (val), (i))
-#define sk_STORE_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_OBJECT, (st), (cmp))
-#define sk_STORE_OBJECT_dup(st) SKM_sk_dup(STORE_OBJECT, st)
-#define sk_STORE_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(STORE_OBJECT, (st), (free_func))
-#define sk_STORE_OBJECT_shift(st) SKM_sk_shift(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_pop(st) SKM_sk_pop(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_sort(st) SKM_sk_sort(STORE_OBJECT, (st))
-#define sk_STORE_OBJECT_is_sorted(st) SKM_sk_is_sorted(STORE_OBJECT, (st))
-
-#define sk_SXNETID_new(cmp) SKM_sk_new(SXNETID, (cmp))
-#define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID)
-#define sk_SXNETID_free(st) SKM_sk_free(SXNETID, (st))
-#define sk_SXNETID_num(st) SKM_sk_num(SXNETID, (st))
-#define sk_SXNETID_value(st, i) SKM_sk_value(SXNETID, (st), (i))
-#define sk_SXNETID_set(st, i, val) SKM_sk_set(SXNETID, (st), (i), (val))
-#define sk_SXNETID_zero(st) SKM_sk_zero(SXNETID, (st))
-#define sk_SXNETID_push(st, val) SKM_sk_push(SXNETID, (st), (val))
-#define sk_SXNETID_unshift(st, val) SKM_sk_unshift(SXNETID, (st), (val))
-#define sk_SXNETID_find(st, val) SKM_sk_find(SXNETID, (st), (val))
-#define sk_SXNETID_find_ex(st, val) SKM_sk_find_ex(SXNETID, (st), (val))
-#define sk_SXNETID_delete(st, i) SKM_sk_delete(SXNETID, (st), (i))
-#define sk_SXNETID_delete_ptr(st, ptr) SKM_sk_delete_ptr(SXNETID, (st), (ptr))
-#define sk_SXNETID_insert(st, val, i) SKM_sk_insert(SXNETID, (st), (val), (i))
-#define sk_SXNETID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SXNETID, (st), (cmp))
-#define sk_SXNETID_dup(st) SKM_sk_dup(SXNETID, st)
-#define sk_SXNETID_pop_free(st, free_func) SKM_sk_pop_free(SXNETID, (st), (free_func))
-#define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st))
-#define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st))
-#define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st))
-#define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st))
-
-#define sk_UI_STRING_new(cmp) SKM_sk_new(UI_STRING, (cmp))
-#define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING)
-#define sk_UI_STRING_free(st) SKM_sk_free(UI_STRING, (st))
-#define sk_UI_STRING_num(st) SKM_sk_num(UI_STRING, (st))
-#define sk_UI_STRING_value(st, i) SKM_sk_value(UI_STRING, (st), (i))
-#define sk_UI_STRING_set(st, i, val) SKM_sk_set(UI_STRING, (st), (i), (val))
-#define sk_UI_STRING_zero(st) SKM_sk_zero(UI_STRING, (st))
-#define sk_UI_STRING_push(st, val) SKM_sk_push(UI_STRING, (st), (val))
-#define sk_UI_STRING_unshift(st, val) SKM_sk_unshift(UI_STRING, (st), (val))
-#define sk_UI_STRING_find(st, val) SKM_sk_find(UI_STRING, (st), (val))
-#define sk_UI_STRING_find_ex(st, val) SKM_sk_find_ex(UI_STRING, (st), (val))
-#define sk_UI_STRING_delete(st, i) SKM_sk_delete(UI_STRING, (st), (i))
-#define sk_UI_STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(UI_STRING, (st), (ptr))
-#define sk_UI_STRING_insert(st, val, i) SKM_sk_insert(UI_STRING, (st), (val), (i))
-#define sk_UI_STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(UI_STRING, (st), (cmp))
-#define sk_UI_STRING_dup(st) SKM_sk_dup(UI_STRING, st)
-#define sk_UI_STRING_pop_free(st, free_func) SKM_sk_pop_free(UI_STRING, (st), (free_func))
-#define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st))
-#define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st))
-#define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st))
-#define sk_UI_STRING_is_sorted(st) SKM_sk_is_sorted(UI_STRING, (st))
-
-#define sk_X509_new(cmp) SKM_sk_new(X509, (cmp))
-#define sk_X509_new_null() SKM_sk_new_null(X509)
-#define sk_X509_free(st) SKM_sk_free(X509, (st))
-#define sk_X509_num(st) SKM_sk_num(X509, (st))
-#define sk_X509_value(st, i) SKM_sk_value(X509, (st), (i))
-#define sk_X509_set(st, i, val) SKM_sk_set(X509, (st), (i), (val))
-#define sk_X509_zero(st) SKM_sk_zero(X509, (st))
-#define sk_X509_push(st, val) SKM_sk_push(X509, (st), (val))
-#define sk_X509_unshift(st, val) SKM_sk_unshift(X509, (st), (val))
-#define sk_X509_find(st, val) SKM_sk_find(X509, (st), (val))
-#define sk_X509_find_ex(st, val) SKM_sk_find_ex(X509, (st), (val))
-#define sk_X509_delete(st, i) SKM_sk_delete(X509, (st), (i))
-#define sk_X509_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509, (st), (ptr))
-#define sk_X509_insert(st, val, i) SKM_sk_insert(X509, (st), (val), (i))
-#define sk_X509_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509, (st), (cmp))
-#define sk_X509_dup(st) SKM_sk_dup(X509, st)
-#define sk_X509_pop_free(st, free_func) SKM_sk_pop_free(X509, (st), (free_func))
-#define sk_X509_shift(st) SKM_sk_shift(X509, (st))
-#define sk_X509_pop(st) SKM_sk_pop(X509, (st))
-#define sk_X509_sort(st) SKM_sk_sort(X509, (st))
-#define sk_X509_is_sorted(st) SKM_sk_is_sorted(X509, (st))
-
-#define sk_X509V3_EXT_METHOD_new(cmp) SKM_sk_new(X509V3_EXT_METHOD, (cmp))
-#define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD)
-#define sk_X509V3_EXT_METHOD_free(st) SKM_sk_free(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_num(st) SKM_sk_num(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_value(st, i) SKM_sk_value(X509V3_EXT_METHOD, (st), (i))
-#define sk_X509V3_EXT_METHOD_set(st, i, val) SKM_sk_set(X509V3_EXT_METHOD, (st), (i), (val))
-#define sk_X509V3_EXT_METHOD_zero(st) SKM_sk_zero(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_push(st, val) SKM_sk_push(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_unshift(st, val) SKM_sk_unshift(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_find(st, val) SKM_sk_find(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_find_ex(st, val) SKM_sk_find_ex(X509V3_EXT_METHOD, (st), (val))
-#define sk_X509V3_EXT_METHOD_delete(st, i) SKM_sk_delete(X509V3_EXT_METHOD, (st), (i))
-#define sk_X509V3_EXT_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509V3_EXT_METHOD, (st), (ptr))
-#define sk_X509V3_EXT_METHOD_insert(st, val, i) SKM_sk_insert(X509V3_EXT_METHOD, (st), (val), (i))
-#define sk_X509V3_EXT_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509V3_EXT_METHOD, (st), (cmp))
-#define sk_X509V3_EXT_METHOD_dup(st) SKM_sk_dup(X509V3_EXT_METHOD, st)
-#define sk_X509V3_EXT_METHOD_pop_free(st, free_func) SKM_sk_pop_free(X509V3_EXT_METHOD, (st), (free_func))
-#define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st))
-#define sk_X509V3_EXT_METHOD_is_sorted(st) SKM_sk_is_sorted(X509V3_EXT_METHOD, (st))
-
-#define sk_X509_ALGOR_new(cmp) SKM_sk_new(X509_ALGOR, (cmp))
-#define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR)
-#define sk_X509_ALGOR_free(st) SKM_sk_free(X509_ALGOR, (st))
-#define sk_X509_ALGOR_num(st) SKM_sk_num(X509_ALGOR, (st))
-#define sk_X509_ALGOR_value(st, i) SKM_sk_value(X509_ALGOR, (st), (i))
-#define sk_X509_ALGOR_set(st, i, val) SKM_sk_set(X509_ALGOR, (st), (i), (val))
-#define sk_X509_ALGOR_zero(st) SKM_sk_zero(X509_ALGOR, (st))
-#define sk_X509_ALGOR_push(st, val) SKM_sk_push(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_unshift(st, val) SKM_sk_unshift(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_find(st, val) SKM_sk_find(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_find_ex(st, val) SKM_sk_find_ex(X509_ALGOR, (st), (val))
-#define sk_X509_ALGOR_delete(st, i) SKM_sk_delete(X509_ALGOR, (st), (i))
-#define sk_X509_ALGOR_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ALGOR, (st), (ptr))
-#define sk_X509_ALGOR_insert(st, val, i) SKM_sk_insert(X509_ALGOR, (st), (val), (i))
-#define sk_X509_ALGOR_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ALGOR, (st), (cmp))
-#define sk_X509_ALGOR_dup(st) SKM_sk_dup(X509_ALGOR, st)
-#define sk_X509_ALGOR_pop_free(st, free_func) SKM_sk_pop_free(X509_ALGOR, (st), (free_func))
-#define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st))
-#define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st))
-#define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st))
-#define sk_X509_ALGOR_is_sorted(st) SKM_sk_is_sorted(X509_ALGOR, (st))
-
-#define sk_X509_ATTRIBUTE_new(cmp) SKM_sk_new(X509_ATTRIBUTE, (cmp))
-#define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE)
-#define sk_X509_ATTRIBUTE_free(st) SKM_sk_free(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_num(st) SKM_sk_num(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_value(st, i) SKM_sk_value(X509_ATTRIBUTE, (st), (i))
-#define sk_X509_ATTRIBUTE_set(st, i, val) SKM_sk_set(X509_ATTRIBUTE, (st), (i), (val))
-#define sk_X509_ATTRIBUTE_zero(st) SKM_sk_zero(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_push(st, val) SKM_sk_push(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_unshift(st, val) SKM_sk_unshift(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_find(st, val) SKM_sk_find(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_find_ex(st, val) SKM_sk_find_ex(X509_ATTRIBUTE, (st), (val))
-#define sk_X509_ATTRIBUTE_delete(st, i) SKM_sk_delete(X509_ATTRIBUTE, (st), (i))
-#define sk_X509_ATTRIBUTE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ATTRIBUTE, (st), (ptr))
-#define sk_X509_ATTRIBUTE_insert(st, val, i) SKM_sk_insert(X509_ATTRIBUTE, (st), (val), (i))
-#define sk_X509_ATTRIBUTE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ATTRIBUTE, (st), (cmp))
-#define sk_X509_ATTRIBUTE_dup(st) SKM_sk_dup(X509_ATTRIBUTE, st)
-#define sk_X509_ATTRIBUTE_pop_free(st, free_func) SKM_sk_pop_free(X509_ATTRIBUTE, (st), (free_func))
-#define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st))
-#define sk_X509_ATTRIBUTE_is_sorted(st) SKM_sk_is_sorted(X509_ATTRIBUTE, (st))
-
-#define sk_X509_CRL_new(cmp) SKM_sk_new(X509_CRL, (cmp))
-#define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL)
-#define sk_X509_CRL_free(st) SKM_sk_free(X509_CRL, (st))
-#define sk_X509_CRL_num(st) SKM_sk_num(X509_CRL, (st))
-#define sk_X509_CRL_value(st, i) SKM_sk_value(X509_CRL, (st), (i))
-#define sk_X509_CRL_set(st, i, val) SKM_sk_set(X509_CRL, (st), (i), (val))
-#define sk_X509_CRL_zero(st) SKM_sk_zero(X509_CRL, (st))
-#define sk_X509_CRL_push(st, val) SKM_sk_push(X509_CRL, (st), (val))
-#define sk_X509_CRL_unshift(st, val) SKM_sk_unshift(X509_CRL, (st), (val))
-#define sk_X509_CRL_find(st, val) SKM_sk_find(X509_CRL, (st), (val))
-#define sk_X509_CRL_find_ex(st, val) SKM_sk_find_ex(X509_CRL, (st), (val))
-#define sk_X509_CRL_delete(st, i) SKM_sk_delete(X509_CRL, (st), (i))
-#define sk_X509_CRL_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_CRL, (st), (ptr))
-#define sk_X509_CRL_insert(st, val, i) SKM_sk_insert(X509_CRL, (st), (val), (i))
-#define sk_X509_CRL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_CRL, (st), (cmp))
-#define sk_X509_CRL_dup(st) SKM_sk_dup(X509_CRL, st)
-#define sk_X509_CRL_pop_free(st, free_func) SKM_sk_pop_free(X509_CRL, (st), (free_func))
-#define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st))
-#define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st))
-#define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st))
-#define sk_X509_CRL_is_sorted(st) SKM_sk_is_sorted(X509_CRL, (st))
-
-#define sk_X509_EXTENSION_new(cmp) SKM_sk_new(X509_EXTENSION, (cmp))
-#define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION)
-#define sk_X509_EXTENSION_free(st) SKM_sk_free(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_num(st) SKM_sk_num(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_value(st, i) SKM_sk_value(X509_EXTENSION, (st), (i))
-#define sk_X509_EXTENSION_set(st, i, val) SKM_sk_set(X509_EXTENSION, (st), (i), (val))
-#define sk_X509_EXTENSION_zero(st) SKM_sk_zero(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_push(st, val) SKM_sk_push(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_unshift(st, val) SKM_sk_unshift(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_find(st, val) SKM_sk_find(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_find_ex(st, val) SKM_sk_find_ex(X509_EXTENSION, (st), (val))
-#define sk_X509_EXTENSION_delete(st, i) SKM_sk_delete(X509_EXTENSION, (st), (i))
-#define sk_X509_EXTENSION_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_EXTENSION, (st), (ptr))
-#define sk_X509_EXTENSION_insert(st, val, i) SKM_sk_insert(X509_EXTENSION, (st), (val), (i))
-#define sk_X509_EXTENSION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_EXTENSION, (st), (cmp))
-#define sk_X509_EXTENSION_dup(st) SKM_sk_dup(X509_EXTENSION, st)
-#define sk_X509_EXTENSION_pop_free(st, free_func) SKM_sk_pop_free(X509_EXTENSION, (st), (free_func))
-#define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st))
-#define sk_X509_EXTENSION_is_sorted(st) SKM_sk_is_sorted(X509_EXTENSION, (st))
-
-#define sk_X509_INFO_new(cmp) SKM_sk_new(X509_INFO, (cmp))
-#define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO)
-#define sk_X509_INFO_free(st) SKM_sk_free(X509_INFO, (st))
-#define sk_X509_INFO_num(st) SKM_sk_num(X509_INFO, (st))
-#define sk_X509_INFO_value(st, i) SKM_sk_value(X509_INFO, (st), (i))
-#define sk_X509_INFO_set(st, i, val) SKM_sk_set(X509_INFO, (st), (i), (val))
-#define sk_X509_INFO_zero(st) SKM_sk_zero(X509_INFO, (st))
-#define sk_X509_INFO_push(st, val) SKM_sk_push(X509_INFO, (st), (val))
-#define sk_X509_INFO_unshift(st, val) SKM_sk_unshift(X509_INFO, (st), (val))
-#define sk_X509_INFO_find(st, val) SKM_sk_find(X509_INFO, (st), (val))
-#define sk_X509_INFO_find_ex(st, val) SKM_sk_find_ex(X509_INFO, (st), (val))
-#define sk_X509_INFO_delete(st, i) SKM_sk_delete(X509_INFO, (st), (i))
-#define sk_X509_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_INFO, (st), (ptr))
-#define sk_X509_INFO_insert(st, val, i) SKM_sk_insert(X509_INFO, (st), (val), (i))
-#define sk_X509_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_INFO, (st), (cmp))
-#define sk_X509_INFO_dup(st) SKM_sk_dup(X509_INFO, st)
-#define sk_X509_INFO_pop_free(st, free_func) SKM_sk_pop_free(X509_INFO, (st), (free_func))
-#define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st))
-#define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st))
-#define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st))
-#define sk_X509_INFO_is_sorted(st) SKM_sk_is_sorted(X509_INFO, (st))
-
-#define sk_X509_LOOKUP_new(cmp) SKM_sk_new(X509_LOOKUP, (cmp))
-#define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP)
-#define sk_X509_LOOKUP_free(st) SKM_sk_free(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_num(st) SKM_sk_num(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_value(st, i) SKM_sk_value(X509_LOOKUP, (st), (i))
-#define sk_X509_LOOKUP_set(st, i, val) SKM_sk_set(X509_LOOKUP, (st), (i), (val))
-#define sk_X509_LOOKUP_zero(st) SKM_sk_zero(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_push(st, val) SKM_sk_push(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_unshift(st, val) SKM_sk_unshift(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_find(st, val) SKM_sk_find(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_find_ex(st, val) SKM_sk_find_ex(X509_LOOKUP, (st), (val))
-#define sk_X509_LOOKUP_delete(st, i) SKM_sk_delete(X509_LOOKUP, (st), (i))
-#define sk_X509_LOOKUP_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_LOOKUP, (st), (ptr))
-#define sk_X509_LOOKUP_insert(st, val, i) SKM_sk_insert(X509_LOOKUP, (st), (val), (i))
-#define sk_X509_LOOKUP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_LOOKUP, (st), (cmp))
-#define sk_X509_LOOKUP_dup(st) SKM_sk_dup(X509_LOOKUP, st)
-#define sk_X509_LOOKUP_pop_free(st, free_func) SKM_sk_pop_free(X509_LOOKUP, (st), (free_func))
-#define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st))
-#define sk_X509_LOOKUP_is_sorted(st) SKM_sk_is_sorted(X509_LOOKUP, (st))
-
-#define sk_X509_NAME_new(cmp) SKM_sk_new(X509_NAME, (cmp))
-#define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME)
-#define sk_X509_NAME_free(st) SKM_sk_free(X509_NAME, (st))
-#define sk_X509_NAME_num(st) SKM_sk_num(X509_NAME, (st))
-#define sk_X509_NAME_value(st, i) SKM_sk_value(X509_NAME, (st), (i))
-#define sk_X509_NAME_set(st, i, val) SKM_sk_set(X509_NAME, (st), (i), (val))
-#define sk_X509_NAME_zero(st) SKM_sk_zero(X509_NAME, (st))
-#define sk_X509_NAME_push(st, val) SKM_sk_push(X509_NAME, (st), (val))
-#define sk_X509_NAME_unshift(st, val) SKM_sk_unshift(X509_NAME, (st), (val))
-#define sk_X509_NAME_find(st, val) SKM_sk_find(X509_NAME, (st), (val))
-#define sk_X509_NAME_find_ex(st, val) SKM_sk_find_ex(X509_NAME, (st), (val))
-#define sk_X509_NAME_delete(st, i) SKM_sk_delete(X509_NAME, (st), (i))
-#define sk_X509_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME, (st), (ptr))
-#define sk_X509_NAME_insert(st, val, i) SKM_sk_insert(X509_NAME, (st), (val), (i))
-#define sk_X509_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME, (st), (cmp))
-#define sk_X509_NAME_dup(st) SKM_sk_dup(X509_NAME, st)
-#define sk_X509_NAME_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME, (st), (free_func))
-#define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st))
-#define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st))
-#define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st))
-#define sk_X509_NAME_is_sorted(st) SKM_sk_is_sorted(X509_NAME, (st))
-
-#define sk_X509_NAME_ENTRY_new(cmp) SKM_sk_new(X509_NAME_ENTRY, (cmp))
-#define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY)
-#define sk_X509_NAME_ENTRY_free(st) SKM_sk_free(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_num(st) SKM_sk_num(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_value(st, i) SKM_sk_value(X509_NAME_ENTRY, (st), (i))
-#define sk_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(X509_NAME_ENTRY, (st), (i), (val))
-#define sk_X509_NAME_ENTRY_zero(st) SKM_sk_zero(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_push(st, val) SKM_sk_push(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_find(st, val) SKM_sk_find(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(X509_NAME_ENTRY, (st), (val))
-#define sk_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(X509_NAME_ENTRY, (st), (i))
-#define sk_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME_ENTRY, (st), (ptr))
-#define sk_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(X509_NAME_ENTRY, (st), (val), (i))
-#define sk_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME_ENTRY, (st), (cmp))
-#define sk_X509_NAME_ENTRY_dup(st) SKM_sk_dup(X509_NAME_ENTRY, st)
-#define sk_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME_ENTRY, (st), (free_func))
-#define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st))
-#define sk_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(X509_NAME_ENTRY, (st))
-
-#define sk_X509_OBJECT_new(cmp) SKM_sk_new(X509_OBJECT, (cmp))
-#define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT)
-#define sk_X509_OBJECT_free(st) SKM_sk_free(X509_OBJECT, (st))
-#define sk_X509_OBJECT_num(st) SKM_sk_num(X509_OBJECT, (st))
-#define sk_X509_OBJECT_value(st, i) SKM_sk_value(X509_OBJECT, (st), (i))
-#define sk_X509_OBJECT_set(st, i, val) SKM_sk_set(X509_OBJECT, (st), (i), (val))
-#define sk_X509_OBJECT_zero(st) SKM_sk_zero(X509_OBJECT, (st))
-#define sk_X509_OBJECT_push(st, val) SKM_sk_push(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_unshift(st, val) SKM_sk_unshift(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_find(st, val) SKM_sk_find(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_find_ex(st, val) SKM_sk_find_ex(X509_OBJECT, (st), (val))
-#define sk_X509_OBJECT_delete(st, i) SKM_sk_delete(X509_OBJECT, (st), (i))
-#define sk_X509_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_OBJECT, (st), (ptr))
-#define sk_X509_OBJECT_insert(st, val, i) SKM_sk_insert(X509_OBJECT, (st), (val), (i))
-#define sk_X509_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_OBJECT, (st), (cmp))
-#define sk_X509_OBJECT_dup(st) SKM_sk_dup(X509_OBJECT, st)
-#define sk_X509_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(X509_OBJECT, (st), (free_func))
-#define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st))
-#define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st))
-#define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st))
-#define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st))
-
-#define sk_X509_POLICY_DATA_new(cmp) SKM_sk_new(X509_POLICY_DATA, (cmp))
-#define sk_X509_POLICY_DATA_new_null() SKM_sk_new_null(X509_POLICY_DATA)
-#define sk_X509_POLICY_DATA_free(st) SKM_sk_free(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_num(st) SKM_sk_num(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_value(st, i) SKM_sk_value(X509_POLICY_DATA, (st), (i))
-#define sk_X509_POLICY_DATA_set(st, i, val) SKM_sk_set(X509_POLICY_DATA, (st), (i), (val))
-#define sk_X509_POLICY_DATA_zero(st) SKM_sk_zero(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_push(st, val) SKM_sk_push(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_unshift(st, val) SKM_sk_unshift(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_find(st, val) SKM_sk_find(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_DATA, (st), (val))
-#define sk_X509_POLICY_DATA_delete(st, i) SKM_sk_delete(X509_POLICY_DATA, (st), (i))
-#define sk_X509_POLICY_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_DATA, (st), (ptr))
-#define sk_X509_POLICY_DATA_insert(st, val, i) SKM_sk_insert(X509_POLICY_DATA, (st), (val), (i))
-#define sk_X509_POLICY_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_DATA, (st), (cmp))
-#define sk_X509_POLICY_DATA_dup(st) SKM_sk_dup(X509_POLICY_DATA, st)
-#define sk_X509_POLICY_DATA_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_DATA, (st), (free_func))
-#define sk_X509_POLICY_DATA_shift(st) SKM_sk_shift(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_pop(st) SKM_sk_pop(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_sort(st) SKM_sk_sort(X509_POLICY_DATA, (st))
-#define sk_X509_POLICY_DATA_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_DATA, (st))
-
-#define sk_X509_POLICY_NODE_new(cmp) SKM_sk_new(X509_POLICY_NODE, (cmp))
-#define sk_X509_POLICY_NODE_new_null() SKM_sk_new_null(X509_POLICY_NODE)
-#define sk_X509_POLICY_NODE_free(st) SKM_sk_free(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_num(st) SKM_sk_num(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_value(st, i) SKM_sk_value(X509_POLICY_NODE, (st), (i))
-#define sk_X509_POLICY_NODE_set(st, i, val) SKM_sk_set(X509_POLICY_NODE, (st), (i), (val))
-#define sk_X509_POLICY_NODE_zero(st) SKM_sk_zero(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_push(st, val) SKM_sk_push(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_unshift(st, val) SKM_sk_unshift(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_find(st, val) SKM_sk_find(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_NODE, (st), (val))
-#define sk_X509_POLICY_NODE_delete(st, i) SKM_sk_delete(X509_POLICY_NODE, (st), (i))
-#define sk_X509_POLICY_NODE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_NODE, (st), (ptr))
-#define sk_X509_POLICY_NODE_insert(st, val, i) SKM_sk_insert(X509_POLICY_NODE, (st), (val), (i))
-#define sk_X509_POLICY_NODE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_NODE, (st), (cmp))
-#define sk_X509_POLICY_NODE_dup(st) SKM_sk_dup(X509_POLICY_NODE, st)
-#define sk_X509_POLICY_NODE_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_NODE, (st), (free_func))
-#define sk_X509_POLICY_NODE_shift(st) SKM_sk_shift(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_pop(st) SKM_sk_pop(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_sort(st) SKM_sk_sort(X509_POLICY_NODE, (st))
-#define sk_X509_POLICY_NODE_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_NODE, (st))
-
-#define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp))
-#define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE)
-#define sk_X509_PURPOSE_free(st) SKM_sk_free(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_num(st) SKM_sk_num(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_value(st, i) SKM_sk_value(X509_PURPOSE, (st), (i))
-#define sk_X509_PURPOSE_set(st, i, val) SKM_sk_set(X509_PURPOSE, (st), (i), (val))
-#define sk_X509_PURPOSE_zero(st) SKM_sk_zero(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_push(st, val) SKM_sk_push(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_unshift(st, val) SKM_sk_unshift(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_find(st, val) SKM_sk_find(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_find_ex(st, val) SKM_sk_find_ex(X509_PURPOSE, (st), (val))
-#define sk_X509_PURPOSE_delete(st, i) SKM_sk_delete(X509_PURPOSE, (st), (i))
-#define sk_X509_PURPOSE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_PURPOSE, (st), (ptr))
-#define sk_X509_PURPOSE_insert(st, val, i) SKM_sk_insert(X509_PURPOSE, (st), (val), (i))
-#define sk_X509_PURPOSE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_PURPOSE, (st), (cmp))
-#define sk_X509_PURPOSE_dup(st) SKM_sk_dup(X509_PURPOSE, st)
-#define sk_X509_PURPOSE_pop_free(st, free_func) SKM_sk_pop_free(X509_PURPOSE, (st), (free_func))
-#define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st))
-#define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st))
-
-#define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp))
-#define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)
-#define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st))
-#define sk_X509_REVOKED_num(st) SKM_sk_num(X509_REVOKED, (st))
-#define sk_X509_REVOKED_value(st, i) SKM_sk_value(X509_REVOKED, (st), (i))
-#define sk_X509_REVOKED_set(st, i, val) SKM_sk_set(X509_REVOKED, (st), (i), (val))
-#define sk_X509_REVOKED_zero(st) SKM_sk_zero(X509_REVOKED, (st))
-#define sk_X509_REVOKED_push(st, val) SKM_sk_push(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_unshift(st, val) SKM_sk_unshift(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_find(st, val) SKM_sk_find(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_find_ex(st, val) SKM_sk_find_ex(X509_REVOKED, (st), (val))
-#define sk_X509_REVOKED_delete(st, i) SKM_sk_delete(X509_REVOKED, (st), (i))
-#define sk_X509_REVOKED_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_REVOKED, (st), (ptr))
-#define sk_X509_REVOKED_insert(st, val, i) SKM_sk_insert(X509_REVOKED, (st), (val), (i))
-#define sk_X509_REVOKED_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_REVOKED, (st), (cmp))
-#define sk_X509_REVOKED_dup(st) SKM_sk_dup(X509_REVOKED, st)
-#define sk_X509_REVOKED_pop_free(st, free_func) SKM_sk_pop_free(X509_REVOKED, (st), (free_func))
-#define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st))
-#define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st))
-#define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st))
-#define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st))
-
-#define sk_X509_TRUST_new(cmp) SKM_sk_new(X509_TRUST, (cmp))
-#define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)
-#define sk_X509_TRUST_free(st) SKM_sk_free(X509_TRUST, (st))
-#define sk_X509_TRUST_num(st) SKM_sk_num(X509_TRUST, (st))
-#define sk_X509_TRUST_value(st, i) SKM_sk_value(X509_TRUST, (st), (i))
-#define sk_X509_TRUST_set(st, i, val) SKM_sk_set(X509_TRUST, (st), (i), (val))
-#define sk_X509_TRUST_zero(st) SKM_sk_zero(X509_TRUST, (st))
-#define sk_X509_TRUST_push(st, val) SKM_sk_push(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_unshift(st, val) SKM_sk_unshift(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_find(st, val) SKM_sk_find(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_find_ex(st, val) SKM_sk_find_ex(X509_TRUST, (st), (val))
-#define sk_X509_TRUST_delete(st, i) SKM_sk_delete(X509_TRUST, (st), (i))
-#define sk_X509_TRUST_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_TRUST, (st), (ptr))
-#define sk_X509_TRUST_insert(st, val, i) SKM_sk_insert(X509_TRUST, (st), (val), (i))
-#define sk_X509_TRUST_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_TRUST, (st), (cmp))
-#define sk_X509_TRUST_dup(st) SKM_sk_dup(X509_TRUST, st)
-#define sk_X509_TRUST_pop_free(st, free_func) SKM_sk_pop_free(X509_TRUST, (st), (free_func))
-#define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st))
-#define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st))
-#define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st))
-#define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st))
-
-#define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp))
-#define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM)
-#define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_num(st) SKM_sk_num(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_value(st, i) SKM_sk_value(X509_VERIFY_PARAM, (st), (i))
-#define sk_X509_VERIFY_PARAM_set(st, i, val) SKM_sk_set(X509_VERIFY_PARAM, (st), (i), (val))
-#define sk_X509_VERIFY_PARAM_zero(st) SKM_sk_zero(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_push(st, val) SKM_sk_push(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_unshift(st, val) SKM_sk_unshift(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_find(st, val) SKM_sk_find(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_find_ex(st, val) SKM_sk_find_ex(X509_VERIFY_PARAM, (st), (val))
-#define sk_X509_VERIFY_PARAM_delete(st, i) SKM_sk_delete(X509_VERIFY_PARAM, (st), (i))
-#define sk_X509_VERIFY_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_VERIFY_PARAM, (st), (ptr))
-#define sk_X509_VERIFY_PARAM_insert(st, val, i) SKM_sk_insert(X509_VERIFY_PARAM, (st), (val), (i))
-#define sk_X509_VERIFY_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_VERIFY_PARAM, (st), (cmp))
-#define sk_X509_VERIFY_PARAM_dup(st) SKM_sk_dup(X509_VERIFY_PARAM, st)
-#define sk_X509_VERIFY_PARAM_pop_free(st, free_func) SKM_sk_pop_free(X509_VERIFY_PARAM, (st), (free_func))
-#define sk_X509_VERIFY_PARAM_shift(st) SKM_sk_shift(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_pop(st) SKM_sk_pop(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_sort(st) SKM_sk_sort(X509_VERIFY_PARAM, (st))
-#define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st))
-
-#define sk_nid_triple_new(cmp) SKM_sk_new(nid_triple, (cmp))
-#define sk_nid_triple_new_null() SKM_sk_new_null(nid_triple)
-#define sk_nid_triple_free(st) SKM_sk_free(nid_triple, (st))
-#define sk_nid_triple_num(st) SKM_sk_num(nid_triple, (st))
-#define sk_nid_triple_value(st, i) SKM_sk_value(nid_triple, (st), (i))
-#define sk_nid_triple_set(st, i, val) SKM_sk_set(nid_triple, (st), (i), (val))
-#define sk_nid_triple_zero(st) SKM_sk_zero(nid_triple, (st))
-#define sk_nid_triple_push(st, val) SKM_sk_push(nid_triple, (st), (val))
-#define sk_nid_triple_unshift(st, val) SKM_sk_unshift(nid_triple, (st), (val))
-#define sk_nid_triple_find(st, val) SKM_sk_find(nid_triple, (st), (val))
-#define sk_nid_triple_find_ex(st, val) SKM_sk_find_ex(nid_triple, (st), (val))
-#define sk_nid_triple_delete(st, i) SKM_sk_delete(nid_triple, (st), (i))
-#define sk_nid_triple_delete_ptr(st, ptr) SKM_sk_delete_ptr(nid_triple, (st), (ptr))
-#define sk_nid_triple_insert(st, val, i) SKM_sk_insert(nid_triple, (st), (val), (i))
-#define sk_nid_triple_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(nid_triple, (st), (cmp))
-#define sk_nid_triple_dup(st) SKM_sk_dup(nid_triple, st)
-#define sk_nid_triple_pop_free(st, free_func) SKM_sk_pop_free(nid_triple, (st), (free_func))
-#define sk_nid_triple_shift(st) SKM_sk_shift(nid_triple, (st))
-#define sk_nid_triple_pop(st) SKM_sk_pop(nid_triple, (st))
-#define sk_nid_triple_sort(st) SKM_sk_sort(nid_triple, (st))
-#define sk_nid_triple_is_sorted(st) SKM_sk_is_sorted(nid_triple, (st))
-
-#define sk_void_new(cmp) SKM_sk_new(void, (cmp))
-#define sk_void_new_null() SKM_sk_new_null(void)
-#define sk_void_free(st) SKM_sk_free(void, (st))
-#define sk_void_num(st) SKM_sk_num(void, (st))
-#define sk_void_value(st, i) SKM_sk_value(void, (st), (i))
-#define sk_void_set(st, i, val) SKM_sk_set(void, (st), (i), (val))
-#define sk_void_zero(st) SKM_sk_zero(void, (st))
-#define sk_void_push(st, val) SKM_sk_push(void, (st), (val))
-#define sk_void_unshift(st, val) SKM_sk_unshift(void, (st), (val))
-#define sk_void_find(st, val) SKM_sk_find(void, (st), (val))
-#define sk_void_find_ex(st, val) SKM_sk_find_ex(void, (st), (val))
-#define sk_void_delete(st, i) SKM_sk_delete(void, (st), (i))
-#define sk_void_delete_ptr(st, ptr) SKM_sk_delete_ptr(void, (st), (ptr))
-#define sk_void_insert(st, val, i) SKM_sk_insert(void, (st), (val), (i))
-#define sk_void_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(void, (st), (cmp))
-#define sk_void_dup(st) SKM_sk_dup(void, st)
-#define sk_void_pop_free(st, free_func) SKM_sk_pop_free(void, (st), (free_func))
-#define sk_void_shift(st) SKM_sk_shift(void, (st))
-#define sk_void_pop(st) SKM_sk_pop(void, (st))
-#define sk_void_sort(st) SKM_sk_sort(void, (st))
-#define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
-
-#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
-#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i))
-#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
-#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val), i)
-#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i, CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
-#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, ptr))
-#define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
-	((int (*)(const char * const *,const char * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st))
-#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
-
-
-#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
-#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i))
-#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
-#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val), i)
-#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i, CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
-#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, ptr))
-#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
-	((int (*)(const void * const *,const void * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st))
-#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
-
-
-#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
-#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i))
-#define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
-#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
-#define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
-#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
-#define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \
-	((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
-	sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-#define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st))
-#define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
-
-
-#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ASN1_UTF8STRING, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ASN1_UTF8STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ASN1_UTF8STRING(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ASN1_UTF8STRING, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ASN1_UTF8STRING(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ASN1_UTF8STRING, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_ESS_CERT_ID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(ESS_CERT_ID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_ESS_CERT_ID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(ESS_CERT_ID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_ESS_CERT_ID(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(ESS_CERT_ID, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_ESS_CERT_ID(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(ESS_CERT_ID, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_EVP_MD(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(EVP_MD, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_EVP_MD(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(EVP_MD, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_EVP_MD(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(EVP_MD, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_EVP_MD(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(EVP_MD, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))
-
-#define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-	SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
-#define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-	SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-#define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \
-	SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))
-#define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \
-	SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))
-
-#define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
-#define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-	SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-
-#define lh_ADDED_OBJ_new() LHM_lh_new(ADDED_OBJ,added_obj)
-#define lh_ADDED_OBJ_insert(lh,inst) LHM_lh_insert(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_retrieve(lh,inst) LHM_lh_retrieve(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_delete(lh,inst) LHM_lh_delete(ADDED_OBJ,lh,inst)
-#define lh_ADDED_OBJ_doall(lh,fn) LHM_lh_doall(ADDED_OBJ,lh,fn)
-#define lh_ADDED_OBJ_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ADDED_OBJ,lh,fn,arg_type,arg)
-#define lh_ADDED_OBJ_error(lh) LHM_lh_error(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_num_items(lh) LHM_lh_num_items(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_down_load(lh) LHM_lh_down_load(ADDED_OBJ,lh)
-#define lh_ADDED_OBJ_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ADDED_OBJ,lh,out)
-#define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh)
-
-#define lh_APP_INFO_new() LHM_lh_new(APP_INFO,app_info)
-#define lh_APP_INFO_insert(lh,inst) LHM_lh_insert(APP_INFO,lh,inst)
-#define lh_APP_INFO_retrieve(lh,inst) LHM_lh_retrieve(APP_INFO,lh,inst)
-#define lh_APP_INFO_delete(lh,inst) LHM_lh_delete(APP_INFO,lh,inst)
-#define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn)
-#define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg)
-#define lh_APP_INFO_error(lh) LHM_lh_error(APP_INFO,lh)
-#define lh_APP_INFO_num_items(lh) LHM_lh_num_items(APP_INFO,lh)
-#define lh_APP_INFO_down_load(lh) LHM_lh_down_load(APP_INFO,lh)
-#define lh_APP_INFO_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_stats_bio(lh,out) \
-  LHM_lh_stats_bio(APP_INFO,lh,out)
-#define lh_APP_INFO_free(lh) LHM_lh_free(APP_INFO,lh)
-
-#define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value)
-#define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_delete(lh,inst) LHM_lh_delete(CONF_VALUE,lh,inst)
-#define lh_CONF_VALUE_doall(lh,fn) LHM_lh_doall(CONF_VALUE,lh,fn)
-#define lh_CONF_VALUE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(CONF_VALUE,lh,fn,arg_type,arg)
-#define lh_CONF_VALUE_error(lh) LHM_lh_error(CONF_VALUE,lh)
-#define lh_CONF_VALUE_num_items(lh) LHM_lh_num_items(CONF_VALUE,lh)
-#define lh_CONF_VALUE_down_load(lh) LHM_lh_down_load(CONF_VALUE,lh)
-#define lh_CONF_VALUE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(CONF_VALUE,lh,out)
-#define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
-
-#define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
-#define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_delete(lh,inst) LHM_lh_delete(ENGINE_PILE,lh,inst)
-#define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn)
-#define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg)
-#define lh_ENGINE_PILE_error(lh) LHM_lh_error(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_num_items(lh) LHM_lh_num_items(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_down_load(lh) LHM_lh_down_load(ENGINE_PILE,lh)
-#define lh_ENGINE_PILE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ENGINE_PILE,lh,out)
-#define lh_ENGINE_PILE_free(lh) LHM_lh_free(ENGINE_PILE,lh)
-
-#define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state)
-#define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_delete(lh,inst) LHM_lh_delete(ERR_STATE,lh,inst)
-#define lh_ERR_STATE_doall(lh,fn) LHM_lh_doall(ERR_STATE,lh,fn)
-#define lh_ERR_STATE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STATE,lh,fn,arg_type,arg)
-#define lh_ERR_STATE_error(lh) LHM_lh_error(ERR_STATE,lh)
-#define lh_ERR_STATE_num_items(lh) LHM_lh_num_items(ERR_STATE,lh)
-#define lh_ERR_STATE_down_load(lh) LHM_lh_down_load(ERR_STATE,lh)
-#define lh_ERR_STATE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STATE,lh,out)
-#define lh_ERR_STATE_free(lh) LHM_lh_free(ERR_STATE,lh)
-
-#define lh_ERR_STRING_DATA_new() LHM_lh_new(ERR_STRING_DATA,err_string_data)
-#define lh_ERR_STRING_DATA_insert(lh,inst) LHM_lh_insert(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_retrieve(lh,inst) LHM_lh_retrieve(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_delete(lh,inst) LHM_lh_delete(ERR_STRING_DATA,lh,inst)
-#define lh_ERR_STRING_DATA_doall(lh,fn) LHM_lh_doall(ERR_STRING_DATA,lh,fn)
-#define lh_ERR_STRING_DATA_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STRING_DATA,lh,fn,arg_type,arg)
-#define lh_ERR_STRING_DATA_error(lh) LHM_lh_error(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_num_items(lh) LHM_lh_num_items(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_down_load(lh) LHM_lh_down_load(ERR_STRING_DATA,lh)
-#define lh_ERR_STRING_DATA_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STRING_DATA,lh,out)
-#define lh_ERR_STRING_DATA_free(lh) LHM_lh_free(ERR_STRING_DATA,lh)
-
-#define lh_EX_CLASS_ITEM_new() LHM_lh_new(EX_CLASS_ITEM,ex_class_item)
-#define lh_EX_CLASS_ITEM_insert(lh,inst) LHM_lh_insert(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_retrieve(lh,inst) LHM_lh_retrieve(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_delete(lh,inst) LHM_lh_delete(EX_CLASS_ITEM,lh,inst)
-#define lh_EX_CLASS_ITEM_doall(lh,fn) LHM_lh_doall(EX_CLASS_ITEM,lh,fn)
-#define lh_EX_CLASS_ITEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(EX_CLASS_ITEM,lh,fn,arg_type,arg)
-#define lh_EX_CLASS_ITEM_error(lh) LHM_lh_error(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_num_items(lh) LHM_lh_num_items(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_down_load(lh) LHM_lh_down_load(EX_CLASS_ITEM,lh)
-#define lh_EX_CLASS_ITEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(EX_CLASS_ITEM,lh,out)
-#define lh_EX_CLASS_ITEM_free(lh) LHM_lh_free(EX_CLASS_ITEM,lh)
-
-#define lh_FUNCTION_new() LHM_lh_new(FUNCTION,function)
-#define lh_FUNCTION_insert(lh,inst) LHM_lh_insert(FUNCTION,lh,inst)
-#define lh_FUNCTION_retrieve(lh,inst) LHM_lh_retrieve(FUNCTION,lh,inst)
-#define lh_FUNCTION_delete(lh,inst) LHM_lh_delete(FUNCTION,lh,inst)
-#define lh_FUNCTION_doall(lh,fn) LHM_lh_doall(FUNCTION,lh,fn)
-#define lh_FUNCTION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(FUNCTION,lh,fn,arg_type,arg)
-#define lh_FUNCTION_error(lh) LHM_lh_error(FUNCTION,lh)
-#define lh_FUNCTION_num_items(lh) LHM_lh_num_items(FUNCTION,lh)
-#define lh_FUNCTION_down_load(lh) LHM_lh_down_load(FUNCTION,lh)
-#define lh_FUNCTION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(FUNCTION,lh,out)
-#define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh)
-
-#define lh_MEM_new() LHM_lh_new(MEM,mem)
-#define lh_MEM_insert(lh,inst) LHM_lh_insert(MEM,lh,inst)
-#define lh_MEM_retrieve(lh,inst) LHM_lh_retrieve(MEM,lh,inst)
-#define lh_MEM_delete(lh,inst) LHM_lh_delete(MEM,lh,inst)
-#define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn)
-#define lh_MEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg)
-#define lh_MEM_error(lh) LHM_lh_error(MEM,lh)
-#define lh_MEM_num_items(lh) LHM_lh_num_items(MEM,lh)
-#define lh_MEM_down_load(lh) LHM_lh_down_load(MEM,lh)
-#define lh_MEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(MEM,lh,out)
-#define lh_MEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(MEM,lh,out)
-#define lh_MEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(MEM,lh,out)
-#define lh_MEM_free(lh) LHM_lh_free(MEM,lh)
-
-#define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name)
-#define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_delete(lh,inst) LHM_lh_delete(OBJ_NAME,lh,inst)
-#define lh_OBJ_NAME_doall(lh,fn) LHM_lh_doall(OBJ_NAME,lh,fn)
-#define lh_OBJ_NAME_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OBJ_NAME,lh,fn,arg_type,arg)
-#define lh_OBJ_NAME_error(lh) LHM_lh_error(OBJ_NAME,lh)
-#define lh_OBJ_NAME_num_items(lh) LHM_lh_num_items(OBJ_NAME,lh)
-#define lh_OBJ_NAME_down_load(lh) LHM_lh_down_load(OBJ_NAME,lh)
-#define lh_OBJ_NAME_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OBJ_NAME,lh,out)
-#define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
-
-#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
-#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
-#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
-#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
-#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
-#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
-#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
-
-#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
-#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
-#define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
-#define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
-#define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
-#define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
-#define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
-
-#define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
-#define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_delete(lh,inst) LHM_lh_delete(SSL_SESSION,lh,inst)
-#define lh_SSL_SESSION_doall(lh,fn) LHM_lh_doall(SSL_SESSION,lh,fn)
-#define lh_SSL_SESSION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(SSL_SESSION,lh,fn,arg_type,arg)
-#define lh_SSL_SESSION_error(lh) LHM_lh_error(SSL_SESSION,lh)
-#define lh_SSL_SESSION_num_items(lh) LHM_lh_num_items(SSL_SESSION,lh)
-#define lh_SSL_SESSION_down_load(lh) LHM_lh_down_load(SSL_SESSION,lh)
-#define lh_SSL_SESSION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(SSL_SESSION,lh,out)
-#define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-/* End of util/mkstack.pl block, you may now edit :-) */
-
-#endif /* !defined HEADER_SAFESTACK_H */
+/* ====================================================================

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

+ *    openssl-core@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).

+ *

+ */

+

+#ifndef HEADER_SAFESTACK_H

+#define HEADER_SAFESTACK_H

+

+#include <openssl/stack.h>

+

+#ifndef CHECKED_PTR_OF

+#define CHECKED_PTR_OF(type, p) \

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

+#endif

+

+/* In C++ we get problems because an explicit cast is needed from (void *)

+ * we use CHECKED_STACK_OF to ensure the correct type is passed in the macros

+ * below. 

+ */

+

+#define CHECKED_STACK_OF(type, p) \

+    ((_STACK*) (1 ? p : (STACK_OF(type)*)0))

+

+#define CHECKED_SK_FREE_FUNC(type, p) \

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

+

+#define CHECKED_SK_FREE_FUNC2(type, p) \

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

+

+#define CHECKED_SK_CMP_FUNC(type, p) \

+    ((int (*)(const void *, const void *)) \

+	((1 ? p : (int (*)(const type * const *, const type * const *))0)))

+

+#define STACK_OF(type) struct stack_st_##type

+#define PREDECLARE_STACK_OF(type) STACK_OF(type);

+

+#define DECLARE_STACK_OF(type) \

+STACK_OF(type) \

+    { \

+    _STACK stack; \

+    };

+#define DECLARE_SPECIAL_STACK_OF(type, type2) \

+STACK_OF(type) \

+    { \

+    _STACK stack; \

+    };

+

+#define IMPLEMENT_STACK_OF(type) /* nada (obsolete in new safestack approach)*/

+

+

+/* Strings are special: normally an lhash entry will point to a single

+ * (somewhat) mutable object. In the case of strings:

+ *

+ * a) Instead of a single char, there is an array of chars, NUL-terminated.

+ * b) The string may have be immutable.

+ *

+ * So, they need their own declarations. Especially important for

+ * type-checking tools, such as Deputy.

+ *

+o * In practice, however, it appears to be hard to have a const

+ * string. For now, I'm settling for dealing with the fact it is a

+ * string at all.

+ */

+typedef char *OPENSSL_STRING;

+

+typedef const char *OPENSSL_CSTRING;

+

+/* Confusingly, LHASH_OF(STRING) deals with char ** throughout, but

+ * STACK_OF(STRING) is really more like STACK_OF(char), only, as

+ * mentioned above, instead of a single char each entry is a

+ * NUL-terminated array of chars. So, we have to implement STRING

+ * specially for STACK_OF. This is dealt with in the autogenerated

+ * macros below.

+ */

+

+DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)

+

+/* Similarly, we sometimes use a block of characters, NOT

+ * nul-terminated. These should also be distinguished from "normal"

+ * stacks. */

+

+typedef void *OPENSSL_BLOCK;

+DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)

+

+/* SKM_sk_... stack macros are internal to safestack.h:

+ * never use them directly, use sk_<type>_... instead */

+#define SKM_sk_new(type, cmp) \

+	((STACK_OF(type) *)sk_new(CHECKED_SK_CMP_FUNC(type, cmp)))

+#define SKM_sk_new_null(type) \

+	((STACK_OF(type) *)sk_new_null())

+#define SKM_sk_free(type, st) \

+	sk_free(CHECKED_STACK_OF(type, st))

+#define SKM_sk_num(type, st) \

+	sk_num(CHECKED_STACK_OF(type, st))

+#define SKM_sk_value(type, st,i) \

+	((type *)sk_value(CHECKED_STACK_OF(type, st), i))

+#define SKM_sk_set(type, st,i,val) \

+	sk_set(CHECKED_STACK_OF(type, st), i, CHECKED_PTR_OF(type, val))

+#define SKM_sk_zero(type, st) \

+	sk_zero(CHECKED_STACK_OF(type, st))

+#define SKM_sk_push(type, st, val) \

+	sk_push(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))

+#define SKM_sk_unshift(type, st, val) \

+	sk_unshift(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))

+#define SKM_sk_find(type, st, val) \

+	sk_find(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))

+#define SKM_sk_find_ex(type, st, val) \

+	sk_find_ex(CHECKED_STACK_OF(type, st), \

+		   CHECKED_PTR_OF(type, val))

+#define SKM_sk_delete(type, st, i) \

+	(type *)sk_delete(CHECKED_STACK_OF(type, st), i)

+#define SKM_sk_delete_ptr(type, st, ptr) \

+	(type *)sk_delete_ptr(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, ptr))

+#define SKM_sk_insert(type, st,val, i) \

+	sk_insert(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val), i)

+#define SKM_sk_set_cmp_func(type, st, cmp) \

+	((int (*)(const type * const *,const type * const *)) \

+	sk_set_cmp_func(CHECKED_STACK_OF(type, st), CHECKED_SK_CMP_FUNC(type, cmp)))

+#define SKM_sk_dup(type, st) \

+	(STACK_OF(type) *)sk_dup(CHECKED_STACK_OF(type, st))

+#define SKM_sk_pop_free(type, st, free_func) \

+	sk_pop_free(CHECKED_STACK_OF(type, st), CHECKED_SK_FREE_FUNC(type, free_func))

+#define SKM_sk_shift(type, st) \

+	(type *)sk_shift(CHECKED_STACK_OF(type, st))

+#define SKM_sk_pop(type, st) \

+	(type *)sk_pop(CHECKED_STACK_OF(type, st))

+#define SKM_sk_sort(type, st) \

+	sk_sort(CHECKED_STACK_OF(type, st))

+#define SKM_sk_is_sorted(type, st) \

+	sk_is_sorted(CHECKED_STACK_OF(type, st))

+

+#define	SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+  (STACK_OF(type) *)d2i_ASN1_SET( \

+				(STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \

+				pp, length, \

+				CHECKED_D2I_OF(type, d2i_func), \

+				CHECKED_SK_FREE_FUNC(type, free_func), \

+				ex_tag, ex_class)

+

+#define	SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \

+  i2d_ASN1_SET((STACK_OF(OPENSSL_BLOCK) *)CHECKED_STACK_OF(type, st), pp, \

+				CHECKED_I2D_OF(type, i2d_func), \

+				ex_tag, ex_class, is_set)

+

+#define	SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \

+	ASN1_seq_pack(CHECKED_PTR_OF(STACK_OF(type), st), \

+			CHECKED_I2D_OF(type, i2d_func), buf, len)

+

+#define	SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \

+	(STACK_OF(type) *)ASN1_seq_unpack(buf, len, CHECKED_D2I_OF(type, d2i_func), CHECKED_SK_FREE_FUNC(type, free_func))

+

+#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \

+	(STACK_OF(type) *)PKCS12_decrypt_d2i(algor, \

+				CHECKED_D2I_OF(type, d2i_func), \

+				CHECKED_SK_FREE_FUNC(type, free_func), \

+				pass, passlen, oct, seq)

+

+/* This block of defines is updated by util/mkstack.pl, please do not touch! */

+#define sk_ACCESS_DESCRIPTION_new(cmp) SKM_sk_new(ACCESS_DESCRIPTION, (cmp))

+#define sk_ACCESS_DESCRIPTION_new_null() SKM_sk_new_null(ACCESS_DESCRIPTION)

+#define sk_ACCESS_DESCRIPTION_free(st) SKM_sk_free(ACCESS_DESCRIPTION, (st))

+#define sk_ACCESS_DESCRIPTION_num(st) SKM_sk_num(ACCESS_DESCRIPTION, (st))

+#define sk_ACCESS_DESCRIPTION_value(st, i) SKM_sk_value(ACCESS_DESCRIPTION, (st), (i))

+#define sk_ACCESS_DESCRIPTION_set(st, i, val) SKM_sk_set(ACCESS_DESCRIPTION, (st), (i), (val))

+#define sk_ACCESS_DESCRIPTION_zero(st) SKM_sk_zero(ACCESS_DESCRIPTION, (st))

+#define sk_ACCESS_DESCRIPTION_push(st, val) SKM_sk_push(ACCESS_DESCRIPTION, (st), (val))

+#define sk_ACCESS_DESCRIPTION_unshift(st, val) SKM_sk_unshift(ACCESS_DESCRIPTION, (st), (val))

+#define sk_ACCESS_DESCRIPTION_find(st, val) SKM_sk_find(ACCESS_DESCRIPTION, (st), (val))

+#define sk_ACCESS_DESCRIPTION_find_ex(st, val) SKM_sk_find_ex(ACCESS_DESCRIPTION, (st), (val))

+#define sk_ACCESS_DESCRIPTION_delete(st, i) SKM_sk_delete(ACCESS_DESCRIPTION, (st), (i))

+#define sk_ACCESS_DESCRIPTION_delete_ptr(st, ptr) SKM_sk_delete_ptr(ACCESS_DESCRIPTION, (st), (ptr))

+#define sk_ACCESS_DESCRIPTION_insert(st, val, i) SKM_sk_insert(ACCESS_DESCRIPTION, (st), (val), (i))

+#define sk_ACCESS_DESCRIPTION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ACCESS_DESCRIPTION, (st), (cmp))

+#define sk_ACCESS_DESCRIPTION_dup(st) SKM_sk_dup(ACCESS_DESCRIPTION, st)

+#define sk_ACCESS_DESCRIPTION_pop_free(st, free_func) SKM_sk_pop_free(ACCESS_DESCRIPTION, (st), (free_func))

+#define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st))

+#define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st))

+#define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))

+#define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))

+

+#define sk_ASIdOrRange_new(cmp) SKM_sk_new(ASIdOrRange, (cmp))

+#define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)

+#define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))

+#define sk_ASIdOrRange_num(st) SKM_sk_num(ASIdOrRange, (st))

+#define sk_ASIdOrRange_value(st, i) SKM_sk_value(ASIdOrRange, (st), (i))

+#define sk_ASIdOrRange_set(st, i, val) SKM_sk_set(ASIdOrRange, (st), (i), (val))

+#define sk_ASIdOrRange_zero(st) SKM_sk_zero(ASIdOrRange, (st))

+#define sk_ASIdOrRange_push(st, val) SKM_sk_push(ASIdOrRange, (st), (val))

+#define sk_ASIdOrRange_unshift(st, val) SKM_sk_unshift(ASIdOrRange, (st), (val))

+#define sk_ASIdOrRange_find(st, val) SKM_sk_find(ASIdOrRange, (st), (val))

+#define sk_ASIdOrRange_find_ex(st, val) SKM_sk_find_ex(ASIdOrRange, (st), (val))

+#define sk_ASIdOrRange_delete(st, i) SKM_sk_delete(ASIdOrRange, (st), (i))

+#define sk_ASIdOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASIdOrRange, (st), (ptr))

+#define sk_ASIdOrRange_insert(st, val, i) SKM_sk_insert(ASIdOrRange, (st), (val), (i))

+#define sk_ASIdOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASIdOrRange, (st), (cmp))

+#define sk_ASIdOrRange_dup(st) SKM_sk_dup(ASIdOrRange, st)

+#define sk_ASIdOrRange_pop_free(st, free_func) SKM_sk_pop_free(ASIdOrRange, (st), (free_func))

+#define sk_ASIdOrRange_shift(st) SKM_sk_shift(ASIdOrRange, (st))

+#define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))

+#define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))

+#define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))

+

+#define sk_ASN1_GENERALSTRING_new(cmp) SKM_sk_new(ASN1_GENERALSTRING, (cmp))

+#define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)

+#define sk_ASN1_GENERALSTRING_free(st) SKM_sk_free(ASN1_GENERALSTRING, (st))

+#define sk_ASN1_GENERALSTRING_num(st) SKM_sk_num(ASN1_GENERALSTRING, (st))

+#define sk_ASN1_GENERALSTRING_value(st, i) SKM_sk_value(ASN1_GENERALSTRING, (st), (i))

+#define sk_ASN1_GENERALSTRING_set(st, i, val) SKM_sk_set(ASN1_GENERALSTRING, (st), (i), (val))

+#define sk_ASN1_GENERALSTRING_zero(st) SKM_sk_zero(ASN1_GENERALSTRING, (st))

+#define sk_ASN1_GENERALSTRING_push(st, val) SKM_sk_push(ASN1_GENERALSTRING, (st), (val))

+#define sk_ASN1_GENERALSTRING_unshift(st, val) SKM_sk_unshift(ASN1_GENERALSTRING, (st), (val))

+#define sk_ASN1_GENERALSTRING_find(st, val) SKM_sk_find(ASN1_GENERALSTRING, (st), (val))

+#define sk_ASN1_GENERALSTRING_find_ex(st, val) SKM_sk_find_ex(ASN1_GENERALSTRING, (st), (val))

+#define sk_ASN1_GENERALSTRING_delete(st, i) SKM_sk_delete(ASN1_GENERALSTRING, (st), (i))

+#define sk_ASN1_GENERALSTRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_GENERALSTRING, (st), (ptr))

+#define sk_ASN1_GENERALSTRING_insert(st, val, i) SKM_sk_insert(ASN1_GENERALSTRING, (st), (val), (i))

+#define sk_ASN1_GENERALSTRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_GENERALSTRING, (st), (cmp))

+#define sk_ASN1_GENERALSTRING_dup(st) SKM_sk_dup(ASN1_GENERALSTRING, st)

+#define sk_ASN1_GENERALSTRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_GENERALSTRING, (st), (free_func))

+#define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st))

+#define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st))

+#define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st))

+#define sk_ASN1_GENERALSTRING_is_sorted(st) SKM_sk_is_sorted(ASN1_GENERALSTRING, (st))

+

+#define sk_ASN1_INTEGER_new(cmp) SKM_sk_new(ASN1_INTEGER, (cmp))

+#define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER)

+#define sk_ASN1_INTEGER_free(st) SKM_sk_free(ASN1_INTEGER, (st))

+#define sk_ASN1_INTEGER_num(st) SKM_sk_num(ASN1_INTEGER, (st))

+#define sk_ASN1_INTEGER_value(st, i) SKM_sk_value(ASN1_INTEGER, (st), (i))

+#define sk_ASN1_INTEGER_set(st, i, val) SKM_sk_set(ASN1_INTEGER, (st), (i), (val))

+#define sk_ASN1_INTEGER_zero(st) SKM_sk_zero(ASN1_INTEGER, (st))

+#define sk_ASN1_INTEGER_push(st, val) SKM_sk_push(ASN1_INTEGER, (st), (val))

+#define sk_ASN1_INTEGER_unshift(st, val) SKM_sk_unshift(ASN1_INTEGER, (st), (val))

+#define sk_ASN1_INTEGER_find(st, val) SKM_sk_find(ASN1_INTEGER, (st), (val))

+#define sk_ASN1_INTEGER_find_ex(st, val) SKM_sk_find_ex(ASN1_INTEGER, (st), (val))

+#define sk_ASN1_INTEGER_delete(st, i) SKM_sk_delete(ASN1_INTEGER, (st), (i))

+#define sk_ASN1_INTEGER_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_INTEGER, (st), (ptr))

+#define sk_ASN1_INTEGER_insert(st, val, i) SKM_sk_insert(ASN1_INTEGER, (st), (val), (i))

+#define sk_ASN1_INTEGER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_INTEGER, (st), (cmp))

+#define sk_ASN1_INTEGER_dup(st) SKM_sk_dup(ASN1_INTEGER, st)

+#define sk_ASN1_INTEGER_pop_free(st, free_func) SKM_sk_pop_free(ASN1_INTEGER, (st), (free_func))

+#define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st))

+#define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st))

+#define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st))

+#define sk_ASN1_INTEGER_is_sorted(st) SKM_sk_is_sorted(ASN1_INTEGER, (st))

+

+#define sk_ASN1_OBJECT_new(cmp) SKM_sk_new(ASN1_OBJECT, (cmp))

+#define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT)

+#define sk_ASN1_OBJECT_free(st) SKM_sk_free(ASN1_OBJECT, (st))

+#define sk_ASN1_OBJECT_num(st) SKM_sk_num(ASN1_OBJECT, (st))

+#define sk_ASN1_OBJECT_value(st, i) SKM_sk_value(ASN1_OBJECT, (st), (i))

+#define sk_ASN1_OBJECT_set(st, i, val) SKM_sk_set(ASN1_OBJECT, (st), (i), (val))

+#define sk_ASN1_OBJECT_zero(st) SKM_sk_zero(ASN1_OBJECT, (st))

+#define sk_ASN1_OBJECT_push(st, val) SKM_sk_push(ASN1_OBJECT, (st), (val))

+#define sk_ASN1_OBJECT_unshift(st, val) SKM_sk_unshift(ASN1_OBJECT, (st), (val))

+#define sk_ASN1_OBJECT_find(st, val) SKM_sk_find(ASN1_OBJECT, (st), (val))

+#define sk_ASN1_OBJECT_find_ex(st, val) SKM_sk_find_ex(ASN1_OBJECT, (st), (val))

+#define sk_ASN1_OBJECT_delete(st, i) SKM_sk_delete(ASN1_OBJECT, (st), (i))

+#define sk_ASN1_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_OBJECT, (st), (ptr))

+#define sk_ASN1_OBJECT_insert(st, val, i) SKM_sk_insert(ASN1_OBJECT, (st), (val), (i))

+#define sk_ASN1_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_OBJECT, (st), (cmp))

+#define sk_ASN1_OBJECT_dup(st) SKM_sk_dup(ASN1_OBJECT, st)

+#define sk_ASN1_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(ASN1_OBJECT, (st), (free_func))

+#define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st))

+#define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st))

+#define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st))

+#define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st))

+

+#define sk_ASN1_STRING_TABLE_new(cmp) SKM_sk_new(ASN1_STRING_TABLE, (cmp))

+#define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)

+#define sk_ASN1_STRING_TABLE_free(st) SKM_sk_free(ASN1_STRING_TABLE, (st))

+#define sk_ASN1_STRING_TABLE_num(st) SKM_sk_num(ASN1_STRING_TABLE, (st))

+#define sk_ASN1_STRING_TABLE_value(st, i) SKM_sk_value(ASN1_STRING_TABLE, (st), (i))

+#define sk_ASN1_STRING_TABLE_set(st, i, val) SKM_sk_set(ASN1_STRING_TABLE, (st), (i), (val))

+#define sk_ASN1_STRING_TABLE_zero(st) SKM_sk_zero(ASN1_STRING_TABLE, (st))

+#define sk_ASN1_STRING_TABLE_push(st, val) SKM_sk_push(ASN1_STRING_TABLE, (st), (val))

+#define sk_ASN1_STRING_TABLE_unshift(st, val) SKM_sk_unshift(ASN1_STRING_TABLE, (st), (val))

+#define sk_ASN1_STRING_TABLE_find(st, val) SKM_sk_find(ASN1_STRING_TABLE, (st), (val))

+#define sk_ASN1_STRING_TABLE_find_ex(st, val) SKM_sk_find_ex(ASN1_STRING_TABLE, (st), (val))

+#define sk_ASN1_STRING_TABLE_delete(st, i) SKM_sk_delete(ASN1_STRING_TABLE, (st), (i))

+#define sk_ASN1_STRING_TABLE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (st), (ptr))

+#define sk_ASN1_STRING_TABLE_insert(st, val, i) SKM_sk_insert(ASN1_STRING_TABLE, (st), (val), (i))

+#define sk_ASN1_STRING_TABLE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (st), (cmp))

+#define sk_ASN1_STRING_TABLE_dup(st) SKM_sk_dup(ASN1_STRING_TABLE, st)

+#define sk_ASN1_STRING_TABLE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_STRING_TABLE, (st), (free_func))

+#define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st))

+#define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st))

+#define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st))

+#define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st))

+

+#define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp))

+#define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)

+#define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st))

+#define sk_ASN1_TYPE_num(st) SKM_sk_num(ASN1_TYPE, (st))

+#define sk_ASN1_TYPE_value(st, i) SKM_sk_value(ASN1_TYPE, (st), (i))

+#define sk_ASN1_TYPE_set(st, i, val) SKM_sk_set(ASN1_TYPE, (st), (i), (val))

+#define sk_ASN1_TYPE_zero(st) SKM_sk_zero(ASN1_TYPE, (st))

+#define sk_ASN1_TYPE_push(st, val) SKM_sk_push(ASN1_TYPE, (st), (val))

+#define sk_ASN1_TYPE_unshift(st, val) SKM_sk_unshift(ASN1_TYPE, (st), (val))

+#define sk_ASN1_TYPE_find(st, val) SKM_sk_find(ASN1_TYPE, (st), (val))

+#define sk_ASN1_TYPE_find_ex(st, val) SKM_sk_find_ex(ASN1_TYPE, (st), (val))

+#define sk_ASN1_TYPE_delete(st, i) SKM_sk_delete(ASN1_TYPE, (st), (i))

+#define sk_ASN1_TYPE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_TYPE, (st), (ptr))

+#define sk_ASN1_TYPE_insert(st, val, i) SKM_sk_insert(ASN1_TYPE, (st), (val), (i))

+#define sk_ASN1_TYPE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_TYPE, (st), (cmp))

+#define sk_ASN1_TYPE_dup(st) SKM_sk_dup(ASN1_TYPE, st)

+#define sk_ASN1_TYPE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_TYPE, (st), (free_func))

+#define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st))

+#define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st))

+#define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st))

+#define sk_ASN1_TYPE_is_sorted(st) SKM_sk_is_sorted(ASN1_TYPE, (st))

+

+#define sk_ASN1_UTF8STRING_new(cmp) SKM_sk_new(ASN1_UTF8STRING, (cmp))

+#define sk_ASN1_UTF8STRING_new_null() SKM_sk_new_null(ASN1_UTF8STRING)

+#define sk_ASN1_UTF8STRING_free(st) SKM_sk_free(ASN1_UTF8STRING, (st))

+#define sk_ASN1_UTF8STRING_num(st) SKM_sk_num(ASN1_UTF8STRING, (st))

+#define sk_ASN1_UTF8STRING_value(st, i) SKM_sk_value(ASN1_UTF8STRING, (st), (i))

+#define sk_ASN1_UTF8STRING_set(st, i, val) SKM_sk_set(ASN1_UTF8STRING, (st), (i), (val))

+#define sk_ASN1_UTF8STRING_zero(st) SKM_sk_zero(ASN1_UTF8STRING, (st))

+#define sk_ASN1_UTF8STRING_push(st, val) SKM_sk_push(ASN1_UTF8STRING, (st), (val))

+#define sk_ASN1_UTF8STRING_unshift(st, val) SKM_sk_unshift(ASN1_UTF8STRING, (st), (val))

+#define sk_ASN1_UTF8STRING_find(st, val) SKM_sk_find(ASN1_UTF8STRING, (st), (val))

+#define sk_ASN1_UTF8STRING_find_ex(st, val) SKM_sk_find_ex(ASN1_UTF8STRING, (st), (val))

+#define sk_ASN1_UTF8STRING_delete(st, i) SKM_sk_delete(ASN1_UTF8STRING, (st), (i))

+#define sk_ASN1_UTF8STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_UTF8STRING, (st), (ptr))

+#define sk_ASN1_UTF8STRING_insert(st, val, i) SKM_sk_insert(ASN1_UTF8STRING, (st), (val), (i))

+#define sk_ASN1_UTF8STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_UTF8STRING, (st), (cmp))

+#define sk_ASN1_UTF8STRING_dup(st) SKM_sk_dup(ASN1_UTF8STRING, st)

+#define sk_ASN1_UTF8STRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_UTF8STRING, (st), (free_func))

+#define sk_ASN1_UTF8STRING_shift(st) SKM_sk_shift(ASN1_UTF8STRING, (st))

+#define sk_ASN1_UTF8STRING_pop(st) SKM_sk_pop(ASN1_UTF8STRING, (st))

+#define sk_ASN1_UTF8STRING_sort(st) SKM_sk_sort(ASN1_UTF8STRING, (st))

+#define sk_ASN1_UTF8STRING_is_sorted(st) SKM_sk_is_sorted(ASN1_UTF8STRING, (st))

+

+#define sk_ASN1_VALUE_new(cmp) SKM_sk_new(ASN1_VALUE, (cmp))

+#define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE)

+#define sk_ASN1_VALUE_free(st) SKM_sk_free(ASN1_VALUE, (st))

+#define sk_ASN1_VALUE_num(st) SKM_sk_num(ASN1_VALUE, (st))

+#define sk_ASN1_VALUE_value(st, i) SKM_sk_value(ASN1_VALUE, (st), (i))

+#define sk_ASN1_VALUE_set(st, i, val) SKM_sk_set(ASN1_VALUE, (st), (i), (val))

+#define sk_ASN1_VALUE_zero(st) SKM_sk_zero(ASN1_VALUE, (st))

+#define sk_ASN1_VALUE_push(st, val) SKM_sk_push(ASN1_VALUE, (st), (val))

+#define sk_ASN1_VALUE_unshift(st, val) SKM_sk_unshift(ASN1_VALUE, (st), (val))

+#define sk_ASN1_VALUE_find(st, val) SKM_sk_find(ASN1_VALUE, (st), (val))

+#define sk_ASN1_VALUE_find_ex(st, val) SKM_sk_find_ex(ASN1_VALUE, (st), (val))

+#define sk_ASN1_VALUE_delete(st, i) SKM_sk_delete(ASN1_VALUE, (st), (i))

+#define sk_ASN1_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_VALUE, (st), (ptr))

+#define sk_ASN1_VALUE_insert(st, val, i) SKM_sk_insert(ASN1_VALUE, (st), (val), (i))

+#define sk_ASN1_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_VALUE, (st), (cmp))

+#define sk_ASN1_VALUE_dup(st) SKM_sk_dup(ASN1_VALUE, st)

+#define sk_ASN1_VALUE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_VALUE, (st), (free_func))

+#define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st))

+#define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st))

+#define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st))

+#define sk_ASN1_VALUE_is_sorted(st) SKM_sk_is_sorted(ASN1_VALUE, (st))

+

+#define sk_BIO_new(cmp) SKM_sk_new(BIO, (cmp))

+#define sk_BIO_new_null() SKM_sk_new_null(BIO)

+#define sk_BIO_free(st) SKM_sk_free(BIO, (st))

+#define sk_BIO_num(st) SKM_sk_num(BIO, (st))

+#define sk_BIO_value(st, i) SKM_sk_value(BIO, (st), (i))

+#define sk_BIO_set(st, i, val) SKM_sk_set(BIO, (st), (i), (val))

+#define sk_BIO_zero(st) SKM_sk_zero(BIO, (st))

+#define sk_BIO_push(st, val) SKM_sk_push(BIO, (st), (val))

+#define sk_BIO_unshift(st, val) SKM_sk_unshift(BIO, (st), (val))

+#define sk_BIO_find(st, val) SKM_sk_find(BIO, (st), (val))

+#define sk_BIO_find_ex(st, val) SKM_sk_find_ex(BIO, (st), (val))

+#define sk_BIO_delete(st, i) SKM_sk_delete(BIO, (st), (i))

+#define sk_BIO_delete_ptr(st, ptr) SKM_sk_delete_ptr(BIO, (st), (ptr))

+#define sk_BIO_insert(st, val, i) SKM_sk_insert(BIO, (st), (val), (i))

+#define sk_BIO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BIO, (st), (cmp))

+#define sk_BIO_dup(st) SKM_sk_dup(BIO, st)

+#define sk_BIO_pop_free(st, free_func) SKM_sk_pop_free(BIO, (st), (free_func))

+#define sk_BIO_shift(st) SKM_sk_shift(BIO, (st))

+#define sk_BIO_pop(st) SKM_sk_pop(BIO, (st))

+#define sk_BIO_sort(st) SKM_sk_sort(BIO, (st))

+#define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st))

+

+#define sk_BY_DIR_ENTRY_new(cmp) SKM_sk_new(BY_DIR_ENTRY, (cmp))

+#define sk_BY_DIR_ENTRY_new_null() SKM_sk_new_null(BY_DIR_ENTRY)

+#define sk_BY_DIR_ENTRY_free(st) SKM_sk_free(BY_DIR_ENTRY, (st))

+#define sk_BY_DIR_ENTRY_num(st) SKM_sk_num(BY_DIR_ENTRY, (st))

+#define sk_BY_DIR_ENTRY_value(st, i) SKM_sk_value(BY_DIR_ENTRY, (st), (i))

+#define sk_BY_DIR_ENTRY_set(st, i, val) SKM_sk_set(BY_DIR_ENTRY, (st), (i), (val))

+#define sk_BY_DIR_ENTRY_zero(st) SKM_sk_zero(BY_DIR_ENTRY, (st))

+#define sk_BY_DIR_ENTRY_push(st, val) SKM_sk_push(BY_DIR_ENTRY, (st), (val))

+#define sk_BY_DIR_ENTRY_unshift(st, val) SKM_sk_unshift(BY_DIR_ENTRY, (st), (val))

+#define sk_BY_DIR_ENTRY_find(st, val) SKM_sk_find(BY_DIR_ENTRY, (st), (val))

+#define sk_BY_DIR_ENTRY_find_ex(st, val) SKM_sk_find_ex(BY_DIR_ENTRY, (st), (val))

+#define sk_BY_DIR_ENTRY_delete(st, i) SKM_sk_delete(BY_DIR_ENTRY, (st), (i))

+#define sk_BY_DIR_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_ENTRY, (st), (ptr))

+#define sk_BY_DIR_ENTRY_insert(st, val, i) SKM_sk_insert(BY_DIR_ENTRY, (st), (val), (i))

+#define sk_BY_DIR_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_ENTRY, (st), (cmp))

+#define sk_BY_DIR_ENTRY_dup(st) SKM_sk_dup(BY_DIR_ENTRY, st)

+#define sk_BY_DIR_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_ENTRY, (st), (free_func))

+#define sk_BY_DIR_ENTRY_shift(st) SKM_sk_shift(BY_DIR_ENTRY, (st))

+#define sk_BY_DIR_ENTRY_pop(st) SKM_sk_pop(BY_DIR_ENTRY, (st))

+#define sk_BY_DIR_ENTRY_sort(st) SKM_sk_sort(BY_DIR_ENTRY, (st))

+#define sk_BY_DIR_ENTRY_is_sorted(st) SKM_sk_is_sorted(BY_DIR_ENTRY, (st))

+

+#define sk_BY_DIR_HASH_new(cmp) SKM_sk_new(BY_DIR_HASH, (cmp))

+#define sk_BY_DIR_HASH_new_null() SKM_sk_new_null(BY_DIR_HASH)

+#define sk_BY_DIR_HASH_free(st) SKM_sk_free(BY_DIR_HASH, (st))

+#define sk_BY_DIR_HASH_num(st) SKM_sk_num(BY_DIR_HASH, (st))

+#define sk_BY_DIR_HASH_value(st, i) SKM_sk_value(BY_DIR_HASH, (st), (i))

+#define sk_BY_DIR_HASH_set(st, i, val) SKM_sk_set(BY_DIR_HASH, (st), (i), (val))

+#define sk_BY_DIR_HASH_zero(st) SKM_sk_zero(BY_DIR_HASH, (st))

+#define sk_BY_DIR_HASH_push(st, val) SKM_sk_push(BY_DIR_HASH, (st), (val))

+#define sk_BY_DIR_HASH_unshift(st, val) SKM_sk_unshift(BY_DIR_HASH, (st), (val))

+#define sk_BY_DIR_HASH_find(st, val) SKM_sk_find(BY_DIR_HASH, (st), (val))

+#define sk_BY_DIR_HASH_find_ex(st, val) SKM_sk_find_ex(BY_DIR_HASH, (st), (val))

+#define sk_BY_DIR_HASH_delete(st, i) SKM_sk_delete(BY_DIR_HASH, (st), (i))

+#define sk_BY_DIR_HASH_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_HASH, (st), (ptr))

+#define sk_BY_DIR_HASH_insert(st, val, i) SKM_sk_insert(BY_DIR_HASH, (st), (val), (i))

+#define sk_BY_DIR_HASH_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_HASH, (st), (cmp))

+#define sk_BY_DIR_HASH_dup(st) SKM_sk_dup(BY_DIR_HASH, st)

+#define sk_BY_DIR_HASH_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_HASH, (st), (free_func))

+#define sk_BY_DIR_HASH_shift(st) SKM_sk_shift(BY_DIR_HASH, (st))

+#define sk_BY_DIR_HASH_pop(st) SKM_sk_pop(BY_DIR_HASH, (st))

+#define sk_BY_DIR_HASH_sort(st) SKM_sk_sort(BY_DIR_HASH, (st))

+#define sk_BY_DIR_HASH_is_sorted(st) SKM_sk_is_sorted(BY_DIR_HASH, (st))

+

+#define sk_CMS_CertificateChoices_new(cmp) SKM_sk_new(CMS_CertificateChoices, (cmp))

+#define sk_CMS_CertificateChoices_new_null() SKM_sk_new_null(CMS_CertificateChoices)

+#define sk_CMS_CertificateChoices_free(st) SKM_sk_free(CMS_CertificateChoices, (st))

+#define sk_CMS_CertificateChoices_num(st) SKM_sk_num(CMS_CertificateChoices, (st))

+#define sk_CMS_CertificateChoices_value(st, i) SKM_sk_value(CMS_CertificateChoices, (st), (i))

+#define sk_CMS_CertificateChoices_set(st, i, val) SKM_sk_set(CMS_CertificateChoices, (st), (i), (val))

+#define sk_CMS_CertificateChoices_zero(st) SKM_sk_zero(CMS_CertificateChoices, (st))

+#define sk_CMS_CertificateChoices_push(st, val) SKM_sk_push(CMS_CertificateChoices, (st), (val))

+#define sk_CMS_CertificateChoices_unshift(st, val) SKM_sk_unshift(CMS_CertificateChoices, (st), (val))

+#define sk_CMS_CertificateChoices_find(st, val) SKM_sk_find(CMS_CertificateChoices, (st), (val))

+#define sk_CMS_CertificateChoices_find_ex(st, val) SKM_sk_find_ex(CMS_CertificateChoices, (st), (val))

+#define sk_CMS_CertificateChoices_delete(st, i) SKM_sk_delete(CMS_CertificateChoices, (st), (i))

+#define sk_CMS_CertificateChoices_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_CertificateChoices, (st), (ptr))

+#define sk_CMS_CertificateChoices_insert(st, val, i) SKM_sk_insert(CMS_CertificateChoices, (st), (val), (i))

+#define sk_CMS_CertificateChoices_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_CertificateChoices, (st), (cmp))

+#define sk_CMS_CertificateChoices_dup(st) SKM_sk_dup(CMS_CertificateChoices, st)

+#define sk_CMS_CertificateChoices_pop_free(st, free_func) SKM_sk_pop_free(CMS_CertificateChoices, (st), (free_func))

+#define sk_CMS_CertificateChoices_shift(st) SKM_sk_shift(CMS_CertificateChoices, (st))

+#define sk_CMS_CertificateChoices_pop(st) SKM_sk_pop(CMS_CertificateChoices, (st))

+#define sk_CMS_CertificateChoices_sort(st) SKM_sk_sort(CMS_CertificateChoices, (st))

+#define sk_CMS_CertificateChoices_is_sorted(st) SKM_sk_is_sorted(CMS_CertificateChoices, (st))

+

+#define sk_CMS_RecipientInfo_new(cmp) SKM_sk_new(CMS_RecipientInfo, (cmp))

+#define sk_CMS_RecipientInfo_new_null() SKM_sk_new_null(CMS_RecipientInfo)

+#define sk_CMS_RecipientInfo_free(st) SKM_sk_free(CMS_RecipientInfo, (st))

+#define sk_CMS_RecipientInfo_num(st) SKM_sk_num(CMS_RecipientInfo, (st))

+#define sk_CMS_RecipientInfo_value(st, i) SKM_sk_value(CMS_RecipientInfo, (st), (i))

+#define sk_CMS_RecipientInfo_set(st, i, val) SKM_sk_set(CMS_RecipientInfo, (st), (i), (val))

+#define sk_CMS_RecipientInfo_zero(st) SKM_sk_zero(CMS_RecipientInfo, (st))

+#define sk_CMS_RecipientInfo_push(st, val) SKM_sk_push(CMS_RecipientInfo, (st), (val))

+#define sk_CMS_RecipientInfo_unshift(st, val) SKM_sk_unshift(CMS_RecipientInfo, (st), (val))

+#define sk_CMS_RecipientInfo_find(st, val) SKM_sk_find(CMS_RecipientInfo, (st), (val))

+#define sk_CMS_RecipientInfo_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientInfo, (st), (val))

+#define sk_CMS_RecipientInfo_delete(st, i) SKM_sk_delete(CMS_RecipientInfo, (st), (i))

+#define sk_CMS_RecipientInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientInfo, (st), (ptr))

+#define sk_CMS_RecipientInfo_insert(st, val, i) SKM_sk_insert(CMS_RecipientInfo, (st), (val), (i))

+#define sk_CMS_RecipientInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientInfo, (st), (cmp))

+#define sk_CMS_RecipientInfo_dup(st) SKM_sk_dup(CMS_RecipientInfo, st)

+#define sk_CMS_RecipientInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientInfo, (st), (free_func))

+#define sk_CMS_RecipientInfo_shift(st) SKM_sk_shift(CMS_RecipientInfo, (st))

+#define sk_CMS_RecipientInfo_pop(st) SKM_sk_pop(CMS_RecipientInfo, (st))

+#define sk_CMS_RecipientInfo_sort(st) SKM_sk_sort(CMS_RecipientInfo, (st))

+#define sk_CMS_RecipientInfo_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientInfo, (st))

+

+#define sk_CMS_RevocationInfoChoice_new(cmp) SKM_sk_new(CMS_RevocationInfoChoice, (cmp))

+#define sk_CMS_RevocationInfoChoice_new_null() SKM_sk_new_null(CMS_RevocationInfoChoice)

+#define sk_CMS_RevocationInfoChoice_free(st) SKM_sk_free(CMS_RevocationInfoChoice, (st))

+#define sk_CMS_RevocationInfoChoice_num(st) SKM_sk_num(CMS_RevocationInfoChoice, (st))

+#define sk_CMS_RevocationInfoChoice_value(st, i) SKM_sk_value(CMS_RevocationInfoChoice, (st), (i))

+#define sk_CMS_RevocationInfoChoice_set(st, i, val) SKM_sk_set(CMS_RevocationInfoChoice, (st), (i), (val))

+#define sk_CMS_RevocationInfoChoice_zero(st) SKM_sk_zero(CMS_RevocationInfoChoice, (st))

+#define sk_CMS_RevocationInfoChoice_push(st, val) SKM_sk_push(CMS_RevocationInfoChoice, (st), (val))

+#define sk_CMS_RevocationInfoChoice_unshift(st, val) SKM_sk_unshift(CMS_RevocationInfoChoice, (st), (val))

+#define sk_CMS_RevocationInfoChoice_find(st, val) SKM_sk_find(CMS_RevocationInfoChoice, (st), (val))

+#define sk_CMS_RevocationInfoChoice_find_ex(st, val) SKM_sk_find_ex(CMS_RevocationInfoChoice, (st), (val))

+#define sk_CMS_RevocationInfoChoice_delete(st, i) SKM_sk_delete(CMS_RevocationInfoChoice, (st), (i))

+#define sk_CMS_RevocationInfoChoice_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RevocationInfoChoice, (st), (ptr))

+#define sk_CMS_RevocationInfoChoice_insert(st, val, i) SKM_sk_insert(CMS_RevocationInfoChoice, (st), (val), (i))

+#define sk_CMS_RevocationInfoChoice_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RevocationInfoChoice, (st), (cmp))

+#define sk_CMS_RevocationInfoChoice_dup(st) SKM_sk_dup(CMS_RevocationInfoChoice, st)

+#define sk_CMS_RevocationInfoChoice_pop_free(st, free_func) SKM_sk_pop_free(CMS_RevocationInfoChoice, (st), (free_func))

+#define sk_CMS_RevocationInfoChoice_shift(st) SKM_sk_shift(CMS_RevocationInfoChoice, (st))

+#define sk_CMS_RevocationInfoChoice_pop(st) SKM_sk_pop(CMS_RevocationInfoChoice, (st))

+#define sk_CMS_RevocationInfoChoice_sort(st) SKM_sk_sort(CMS_RevocationInfoChoice, (st))

+#define sk_CMS_RevocationInfoChoice_is_sorted(st) SKM_sk_is_sorted(CMS_RevocationInfoChoice, (st))

+

+#define sk_CMS_SignerInfo_new(cmp) SKM_sk_new(CMS_SignerInfo, (cmp))

+#define sk_CMS_SignerInfo_new_null() SKM_sk_new_null(CMS_SignerInfo)

+#define sk_CMS_SignerInfo_free(st) SKM_sk_free(CMS_SignerInfo, (st))

+#define sk_CMS_SignerInfo_num(st) SKM_sk_num(CMS_SignerInfo, (st))

+#define sk_CMS_SignerInfo_value(st, i) SKM_sk_value(CMS_SignerInfo, (st), (i))

+#define sk_CMS_SignerInfo_set(st, i, val) SKM_sk_set(CMS_SignerInfo, (st), (i), (val))

+#define sk_CMS_SignerInfo_zero(st) SKM_sk_zero(CMS_SignerInfo, (st))

+#define sk_CMS_SignerInfo_push(st, val) SKM_sk_push(CMS_SignerInfo, (st), (val))

+#define sk_CMS_SignerInfo_unshift(st, val) SKM_sk_unshift(CMS_SignerInfo, (st), (val))

+#define sk_CMS_SignerInfo_find(st, val) SKM_sk_find(CMS_SignerInfo, (st), (val))

+#define sk_CMS_SignerInfo_find_ex(st, val) SKM_sk_find_ex(CMS_SignerInfo, (st), (val))

+#define sk_CMS_SignerInfo_delete(st, i) SKM_sk_delete(CMS_SignerInfo, (st), (i))

+#define sk_CMS_SignerInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_SignerInfo, (st), (ptr))

+#define sk_CMS_SignerInfo_insert(st, val, i) SKM_sk_insert(CMS_SignerInfo, (st), (val), (i))

+#define sk_CMS_SignerInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_SignerInfo, (st), (cmp))

+#define sk_CMS_SignerInfo_dup(st) SKM_sk_dup(CMS_SignerInfo, st)

+#define sk_CMS_SignerInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_SignerInfo, (st), (free_func))

+#define sk_CMS_SignerInfo_shift(st) SKM_sk_shift(CMS_SignerInfo, (st))

+#define sk_CMS_SignerInfo_pop(st) SKM_sk_pop(CMS_SignerInfo, (st))

+#define sk_CMS_SignerInfo_sort(st) SKM_sk_sort(CMS_SignerInfo, (st))

+#define sk_CMS_SignerInfo_is_sorted(st) SKM_sk_is_sorted(CMS_SignerInfo, (st))

+

+#define sk_CONF_IMODULE_new(cmp) SKM_sk_new(CONF_IMODULE, (cmp))

+#define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE)

+#define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st))

+#define sk_CONF_IMODULE_num(st) SKM_sk_num(CONF_IMODULE, (st))

+#define sk_CONF_IMODULE_value(st, i) SKM_sk_value(CONF_IMODULE, (st), (i))

+#define sk_CONF_IMODULE_set(st, i, val) SKM_sk_set(CONF_IMODULE, (st), (i), (val))

+#define sk_CONF_IMODULE_zero(st) SKM_sk_zero(CONF_IMODULE, (st))

+#define sk_CONF_IMODULE_push(st, val) SKM_sk_push(CONF_IMODULE, (st), (val))

+#define sk_CONF_IMODULE_unshift(st, val) SKM_sk_unshift(CONF_IMODULE, (st), (val))

+#define sk_CONF_IMODULE_find(st, val) SKM_sk_find(CONF_IMODULE, (st), (val))

+#define sk_CONF_IMODULE_find_ex(st, val) SKM_sk_find_ex(CONF_IMODULE, (st), (val))

+#define sk_CONF_IMODULE_delete(st, i) SKM_sk_delete(CONF_IMODULE, (st), (i))

+#define sk_CONF_IMODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_IMODULE, (st), (ptr))

+#define sk_CONF_IMODULE_insert(st, val, i) SKM_sk_insert(CONF_IMODULE, (st), (val), (i))

+#define sk_CONF_IMODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_IMODULE, (st), (cmp))

+#define sk_CONF_IMODULE_dup(st) SKM_sk_dup(CONF_IMODULE, st)

+#define sk_CONF_IMODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_IMODULE, (st), (free_func))

+#define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st))

+#define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st))

+#define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st))

+#define sk_CONF_IMODULE_is_sorted(st) SKM_sk_is_sorted(CONF_IMODULE, (st))

+

+#define sk_CONF_MODULE_new(cmp) SKM_sk_new(CONF_MODULE, (cmp))

+#define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE)

+#define sk_CONF_MODULE_free(st) SKM_sk_free(CONF_MODULE, (st))

+#define sk_CONF_MODULE_num(st) SKM_sk_num(CONF_MODULE, (st))

+#define sk_CONF_MODULE_value(st, i) SKM_sk_value(CONF_MODULE, (st), (i))

+#define sk_CONF_MODULE_set(st, i, val) SKM_sk_set(CONF_MODULE, (st), (i), (val))

+#define sk_CONF_MODULE_zero(st) SKM_sk_zero(CONF_MODULE, (st))

+#define sk_CONF_MODULE_push(st, val) SKM_sk_push(CONF_MODULE, (st), (val))

+#define sk_CONF_MODULE_unshift(st, val) SKM_sk_unshift(CONF_MODULE, (st), (val))

+#define sk_CONF_MODULE_find(st, val) SKM_sk_find(CONF_MODULE, (st), (val))

+#define sk_CONF_MODULE_find_ex(st, val) SKM_sk_find_ex(CONF_MODULE, (st), (val))

+#define sk_CONF_MODULE_delete(st, i) SKM_sk_delete(CONF_MODULE, (st), (i))

+#define sk_CONF_MODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_MODULE, (st), (ptr))

+#define sk_CONF_MODULE_insert(st, val, i) SKM_sk_insert(CONF_MODULE, (st), (val), (i))

+#define sk_CONF_MODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_MODULE, (st), (cmp))

+#define sk_CONF_MODULE_dup(st) SKM_sk_dup(CONF_MODULE, st)

+#define sk_CONF_MODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_MODULE, (st), (free_func))

+#define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st))

+#define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st))

+#define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st))

+#define sk_CONF_MODULE_is_sorted(st) SKM_sk_is_sorted(CONF_MODULE, (st))

+

+#define sk_CONF_VALUE_new(cmp) SKM_sk_new(CONF_VALUE, (cmp))

+#define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE)

+#define sk_CONF_VALUE_free(st) SKM_sk_free(CONF_VALUE, (st))

+#define sk_CONF_VALUE_num(st) SKM_sk_num(CONF_VALUE, (st))

+#define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))

+#define sk_CONF_VALUE_set(st, i, val) SKM_sk_set(CONF_VALUE, (st), (i), (val))

+#define sk_CONF_VALUE_zero(st) SKM_sk_zero(CONF_VALUE, (st))

+#define sk_CONF_VALUE_push(st, val) SKM_sk_push(CONF_VALUE, (st), (val))

+#define sk_CONF_VALUE_unshift(st, val) SKM_sk_unshift(CONF_VALUE, (st), (val))

+#define sk_CONF_VALUE_find(st, val) SKM_sk_find(CONF_VALUE, (st), (val))

+#define sk_CONF_VALUE_find_ex(st, val) SKM_sk_find_ex(CONF_VALUE, (st), (val))

+#define sk_CONF_VALUE_delete(st, i) SKM_sk_delete(CONF_VALUE, (st), (i))

+#define sk_CONF_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_VALUE, (st), (ptr))

+#define sk_CONF_VALUE_insert(st, val, i) SKM_sk_insert(CONF_VALUE, (st), (val), (i))

+#define sk_CONF_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_VALUE, (st), (cmp))

+#define sk_CONF_VALUE_dup(st) SKM_sk_dup(CONF_VALUE, st)

+#define sk_CONF_VALUE_pop_free(st, free_func) SKM_sk_pop_free(CONF_VALUE, (st), (free_func))

+#define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st))

+#define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st))

+#define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st))

+#define sk_CONF_VALUE_is_sorted(st) SKM_sk_is_sorted(CONF_VALUE, (st))

+

+#define sk_CRYPTO_EX_DATA_FUNCS_new(cmp) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (cmp))

+#define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS)

+#define sk_CRYPTO_EX_DATA_FUNCS_free(st) SKM_sk_free(CRYPTO_EX_DATA_FUNCS, (st))

+#define sk_CRYPTO_EX_DATA_FUNCS_num(st) SKM_sk_num(CRYPTO_EX_DATA_FUNCS, (st))

+#define sk_CRYPTO_EX_DATA_FUNCS_value(st, i) SKM_sk_value(CRYPTO_EX_DATA_FUNCS, (st), (i))

+#define sk_CRYPTO_EX_DATA_FUNCS_set(st, i, val) SKM_sk_set(CRYPTO_EX_DATA_FUNCS, (st), (i), (val))

+#define sk_CRYPTO_EX_DATA_FUNCS_zero(st) SKM_sk_zero(CRYPTO_EX_DATA_FUNCS, (st))

+#define sk_CRYPTO_EX_DATA_FUNCS_push(st, val) SKM_sk_push(CRYPTO_EX_DATA_FUNCS, (st), (val))

+#define sk_CRYPTO_EX_DATA_FUNCS_unshift(st, val) SKM_sk_unshift(CRYPTO_EX_DATA_FUNCS, (st), (val))

+#define sk_CRYPTO_EX_DATA_FUNCS_find(st, val) SKM_sk_find(CRYPTO_EX_DATA_FUNCS, (st), (val))

+#define sk_CRYPTO_EX_DATA_FUNCS_find_ex(st, val) SKM_sk_find_ex(CRYPTO_EX_DATA_FUNCS, (st), (val))

+#define sk_CRYPTO_EX_DATA_FUNCS_delete(st, i) SKM_sk_delete(CRYPTO_EX_DATA_FUNCS, (st), (i))

+#define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_EX_DATA_FUNCS, (st), (ptr))

+#define sk_CRYPTO_EX_DATA_FUNCS_insert(st, val, i) SKM_sk_insert(CRYPTO_EX_DATA_FUNCS, (st), (val), (i))

+#define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_EX_DATA_FUNCS, (st), (cmp))

+#define sk_CRYPTO_EX_DATA_FUNCS_dup(st) SKM_sk_dup(CRYPTO_EX_DATA_FUNCS, st)

+#define sk_CRYPTO_EX_DATA_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_EX_DATA_FUNCS, (st), (free_func))

+#define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st))

+#define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st))

+#define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st))

+#define sk_CRYPTO_EX_DATA_FUNCS_is_sorted(st) SKM_sk_is_sorted(CRYPTO_EX_DATA_FUNCS, (st))

+

+#define sk_CRYPTO_dynlock_new(cmp) SKM_sk_new(CRYPTO_dynlock, (cmp))

+#define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock)

+#define sk_CRYPTO_dynlock_free(st) SKM_sk_free(CRYPTO_dynlock, (st))

+#define sk_CRYPTO_dynlock_num(st) SKM_sk_num(CRYPTO_dynlock, (st))

+#define sk_CRYPTO_dynlock_value(st, i) SKM_sk_value(CRYPTO_dynlock, (st), (i))

+#define sk_CRYPTO_dynlock_set(st, i, val) SKM_sk_set(CRYPTO_dynlock, (st), (i), (val))

+#define sk_CRYPTO_dynlock_zero(st) SKM_sk_zero(CRYPTO_dynlock, (st))

+#define sk_CRYPTO_dynlock_push(st, val) SKM_sk_push(CRYPTO_dynlock, (st), (val))

+#define sk_CRYPTO_dynlock_unshift(st, val) SKM_sk_unshift(CRYPTO_dynlock, (st), (val))

+#define sk_CRYPTO_dynlock_find(st, val) SKM_sk_find(CRYPTO_dynlock, (st), (val))

+#define sk_CRYPTO_dynlock_find_ex(st, val) SKM_sk_find_ex(CRYPTO_dynlock, (st), (val))

+#define sk_CRYPTO_dynlock_delete(st, i) SKM_sk_delete(CRYPTO_dynlock, (st), (i))

+#define sk_CRYPTO_dynlock_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_dynlock, (st), (ptr))

+#define sk_CRYPTO_dynlock_insert(st, val, i) SKM_sk_insert(CRYPTO_dynlock, (st), (val), (i))

+#define sk_CRYPTO_dynlock_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_dynlock, (st), (cmp))

+#define sk_CRYPTO_dynlock_dup(st) SKM_sk_dup(CRYPTO_dynlock, st)

+#define sk_CRYPTO_dynlock_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_dynlock, (st), (free_func))

+#define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st))

+#define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st))

+#define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st))

+#define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st))

+

+#define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp))

+#define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT)

+#define sk_DIST_POINT_free(st) SKM_sk_free(DIST_POINT, (st))

+#define sk_DIST_POINT_num(st) SKM_sk_num(DIST_POINT, (st))

+#define sk_DIST_POINT_value(st, i) SKM_sk_value(DIST_POINT, (st), (i))

+#define sk_DIST_POINT_set(st, i, val) SKM_sk_set(DIST_POINT, (st), (i), (val))

+#define sk_DIST_POINT_zero(st) SKM_sk_zero(DIST_POINT, (st))

+#define sk_DIST_POINT_push(st, val) SKM_sk_push(DIST_POINT, (st), (val))

+#define sk_DIST_POINT_unshift(st, val) SKM_sk_unshift(DIST_POINT, (st), (val))

+#define sk_DIST_POINT_find(st, val) SKM_sk_find(DIST_POINT, (st), (val))

+#define sk_DIST_POINT_find_ex(st, val) SKM_sk_find_ex(DIST_POINT, (st), (val))

+#define sk_DIST_POINT_delete(st, i) SKM_sk_delete(DIST_POINT, (st), (i))

+#define sk_DIST_POINT_delete_ptr(st, ptr) SKM_sk_delete_ptr(DIST_POINT, (st), (ptr))

+#define sk_DIST_POINT_insert(st, val, i) SKM_sk_insert(DIST_POINT, (st), (val), (i))

+#define sk_DIST_POINT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(DIST_POINT, (st), (cmp))

+#define sk_DIST_POINT_dup(st) SKM_sk_dup(DIST_POINT, st)

+#define sk_DIST_POINT_pop_free(st, free_func) SKM_sk_pop_free(DIST_POINT, (st), (free_func))

+#define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st))

+#define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st))

+#define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))

+#define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st))

+

+#define sk_ENGINE_new(cmp) SKM_sk_new(ENGINE, (cmp))

+#define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)

+#define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))

+#define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))

+#define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))

+#define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))

+#define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))

+#define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))

+#define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))

+#define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))

+#define sk_ENGINE_find_ex(st, val) SKM_sk_find_ex(ENGINE, (st), (val))

+#define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))

+#define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))

+#define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))

+#define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))

+#define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)

+#define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))

+#define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))

+#define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))

+#define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))

+#define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st))

+

+#define sk_ENGINE_CLEANUP_ITEM_new(cmp) SKM_sk_new(ENGINE_CLEANUP_ITEM, (cmp))

+#define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM)

+#define sk_ENGINE_CLEANUP_ITEM_free(st) SKM_sk_free(ENGINE_CLEANUP_ITEM, (st))

+#define sk_ENGINE_CLEANUP_ITEM_num(st) SKM_sk_num(ENGINE_CLEANUP_ITEM, (st))

+#define sk_ENGINE_CLEANUP_ITEM_value(st, i) SKM_sk_value(ENGINE_CLEANUP_ITEM, (st), (i))

+#define sk_ENGINE_CLEANUP_ITEM_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_ITEM, (st), (i), (val))

+#define sk_ENGINE_CLEANUP_ITEM_zero(st) SKM_sk_zero(ENGINE_CLEANUP_ITEM, (st))

+#define sk_ENGINE_CLEANUP_ITEM_push(st, val) SKM_sk_push(ENGINE_CLEANUP_ITEM, (st), (val))

+#define sk_ENGINE_CLEANUP_ITEM_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_ITEM, (st), (val))

+#define sk_ENGINE_CLEANUP_ITEM_find(st, val) SKM_sk_find(ENGINE_CLEANUP_ITEM, (st), (val))

+#define sk_ENGINE_CLEANUP_ITEM_find_ex(st, val) SKM_sk_find_ex(ENGINE_CLEANUP_ITEM, (st), (val))

+#define sk_ENGINE_CLEANUP_ITEM_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_ITEM, (st), (i))

+#define sk_ENGINE_CLEANUP_ITEM_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_ITEM, (st), (ptr))

+#define sk_ENGINE_CLEANUP_ITEM_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_ITEM, (st), (val), (i))

+#define sk_ENGINE_CLEANUP_ITEM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_ITEM, (st), (cmp))

+#define sk_ENGINE_CLEANUP_ITEM_dup(st) SKM_sk_dup(ENGINE_CLEANUP_ITEM, st)

+#define sk_ENGINE_CLEANUP_ITEM_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_ITEM, (st), (free_func))

+#define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st))

+#define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st))

+#define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))

+#define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))

+

+#define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp))

+#define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID)

+#define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st))

+#define sk_ESS_CERT_ID_num(st) SKM_sk_num(ESS_CERT_ID, (st))

+#define sk_ESS_CERT_ID_value(st, i) SKM_sk_value(ESS_CERT_ID, (st), (i))

+#define sk_ESS_CERT_ID_set(st, i, val) SKM_sk_set(ESS_CERT_ID, (st), (i), (val))

+#define sk_ESS_CERT_ID_zero(st) SKM_sk_zero(ESS_CERT_ID, (st))

+#define sk_ESS_CERT_ID_push(st, val) SKM_sk_push(ESS_CERT_ID, (st), (val))

+#define sk_ESS_CERT_ID_unshift(st, val) SKM_sk_unshift(ESS_CERT_ID, (st), (val))

+#define sk_ESS_CERT_ID_find(st, val) SKM_sk_find(ESS_CERT_ID, (st), (val))

+#define sk_ESS_CERT_ID_find_ex(st, val) SKM_sk_find_ex(ESS_CERT_ID, (st), (val))

+#define sk_ESS_CERT_ID_delete(st, i) SKM_sk_delete(ESS_CERT_ID, (st), (i))

+#define sk_ESS_CERT_ID_delete_ptr(st, ptr) SKM_sk_delete_ptr(ESS_CERT_ID, (st), (ptr))

+#define sk_ESS_CERT_ID_insert(st, val, i) SKM_sk_insert(ESS_CERT_ID, (st), (val), (i))

+#define sk_ESS_CERT_ID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ESS_CERT_ID, (st), (cmp))

+#define sk_ESS_CERT_ID_dup(st) SKM_sk_dup(ESS_CERT_ID, st)

+#define sk_ESS_CERT_ID_pop_free(st, free_func) SKM_sk_pop_free(ESS_CERT_ID, (st), (free_func))

+#define sk_ESS_CERT_ID_shift(st) SKM_sk_shift(ESS_CERT_ID, (st))

+#define sk_ESS_CERT_ID_pop(st) SKM_sk_pop(ESS_CERT_ID, (st))

+#define sk_ESS_CERT_ID_sort(st) SKM_sk_sort(ESS_CERT_ID, (st))

+#define sk_ESS_CERT_ID_is_sorted(st) SKM_sk_is_sorted(ESS_CERT_ID, (st))

+

+#define sk_EVP_MD_new(cmp) SKM_sk_new(EVP_MD, (cmp))

+#define sk_EVP_MD_new_null() SKM_sk_new_null(EVP_MD)

+#define sk_EVP_MD_free(st) SKM_sk_free(EVP_MD, (st))

+#define sk_EVP_MD_num(st) SKM_sk_num(EVP_MD, (st))

+#define sk_EVP_MD_value(st, i) SKM_sk_value(EVP_MD, (st), (i))

+#define sk_EVP_MD_set(st, i, val) SKM_sk_set(EVP_MD, (st), (i), (val))

+#define sk_EVP_MD_zero(st) SKM_sk_zero(EVP_MD, (st))

+#define sk_EVP_MD_push(st, val) SKM_sk_push(EVP_MD, (st), (val))

+#define sk_EVP_MD_unshift(st, val) SKM_sk_unshift(EVP_MD, (st), (val))

+#define sk_EVP_MD_find(st, val) SKM_sk_find(EVP_MD, (st), (val))

+#define sk_EVP_MD_find_ex(st, val) SKM_sk_find_ex(EVP_MD, (st), (val))

+#define sk_EVP_MD_delete(st, i) SKM_sk_delete(EVP_MD, (st), (i))

+#define sk_EVP_MD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_MD, (st), (ptr))

+#define sk_EVP_MD_insert(st, val, i) SKM_sk_insert(EVP_MD, (st), (val), (i))

+#define sk_EVP_MD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_MD, (st), (cmp))

+#define sk_EVP_MD_dup(st) SKM_sk_dup(EVP_MD, st)

+#define sk_EVP_MD_pop_free(st, free_func) SKM_sk_pop_free(EVP_MD, (st), (free_func))

+#define sk_EVP_MD_shift(st) SKM_sk_shift(EVP_MD, (st))

+#define sk_EVP_MD_pop(st) SKM_sk_pop(EVP_MD, (st))

+#define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st))

+#define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st))

+

+#define sk_EVP_PBE_CTL_new(cmp) SKM_sk_new(EVP_PBE_CTL, (cmp))

+#define sk_EVP_PBE_CTL_new_null() SKM_sk_new_null(EVP_PBE_CTL)

+#define sk_EVP_PBE_CTL_free(st) SKM_sk_free(EVP_PBE_CTL, (st))

+#define sk_EVP_PBE_CTL_num(st) SKM_sk_num(EVP_PBE_CTL, (st))

+#define sk_EVP_PBE_CTL_value(st, i) SKM_sk_value(EVP_PBE_CTL, (st), (i))

+#define sk_EVP_PBE_CTL_set(st, i, val) SKM_sk_set(EVP_PBE_CTL, (st), (i), (val))

+#define sk_EVP_PBE_CTL_zero(st) SKM_sk_zero(EVP_PBE_CTL, (st))

+#define sk_EVP_PBE_CTL_push(st, val) SKM_sk_push(EVP_PBE_CTL, (st), (val))

+#define sk_EVP_PBE_CTL_unshift(st, val) SKM_sk_unshift(EVP_PBE_CTL, (st), (val))

+#define sk_EVP_PBE_CTL_find(st, val) SKM_sk_find(EVP_PBE_CTL, (st), (val))

+#define sk_EVP_PBE_CTL_find_ex(st, val) SKM_sk_find_ex(EVP_PBE_CTL, (st), (val))

+#define sk_EVP_PBE_CTL_delete(st, i) SKM_sk_delete(EVP_PBE_CTL, (st), (i))

+#define sk_EVP_PBE_CTL_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PBE_CTL, (st), (ptr))

+#define sk_EVP_PBE_CTL_insert(st, val, i) SKM_sk_insert(EVP_PBE_CTL, (st), (val), (i))

+#define sk_EVP_PBE_CTL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PBE_CTL, (st), (cmp))

+#define sk_EVP_PBE_CTL_dup(st) SKM_sk_dup(EVP_PBE_CTL, st)

+#define sk_EVP_PBE_CTL_pop_free(st, free_func) SKM_sk_pop_free(EVP_PBE_CTL, (st), (free_func))

+#define sk_EVP_PBE_CTL_shift(st) SKM_sk_shift(EVP_PBE_CTL, (st))

+#define sk_EVP_PBE_CTL_pop(st) SKM_sk_pop(EVP_PBE_CTL, (st))

+#define sk_EVP_PBE_CTL_sort(st) SKM_sk_sort(EVP_PBE_CTL, (st))

+#define sk_EVP_PBE_CTL_is_sorted(st) SKM_sk_is_sorted(EVP_PBE_CTL, (st))

+

+#define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp))

+#define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)

+#define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))

+#define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))

+#define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))

+#define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))

+#define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))

+#define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))

+#define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))

+#define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))

+#define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))

+#define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))

+#define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))

+#define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))

+#define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))

+#define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)

+#define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))

+#define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))

+#define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))

+#define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))

+#define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))

+

+#define sk_EVP_PKEY_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_METHOD, (cmp))

+#define sk_EVP_PKEY_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_METHOD)

+#define sk_EVP_PKEY_METHOD_free(st) SKM_sk_free(EVP_PKEY_METHOD, (st))

+#define sk_EVP_PKEY_METHOD_num(st) SKM_sk_num(EVP_PKEY_METHOD, (st))

+#define sk_EVP_PKEY_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_METHOD, (st), (i))

+#define sk_EVP_PKEY_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_METHOD, (st), (i), (val))

+#define sk_EVP_PKEY_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_METHOD, (st))

+#define sk_EVP_PKEY_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_METHOD, (st), (val))

+#define sk_EVP_PKEY_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_METHOD, (st), (val))

+#define sk_EVP_PKEY_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_METHOD, (st), (val))

+#define sk_EVP_PKEY_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_METHOD, (st), (val))

+#define sk_EVP_PKEY_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_METHOD, (st), (i))

+#define sk_EVP_PKEY_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_METHOD, (st), (ptr))

+#define sk_EVP_PKEY_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_METHOD, (st), (val), (i))

+#define sk_EVP_PKEY_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_METHOD, (st), (cmp))

+#define sk_EVP_PKEY_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_METHOD, st)

+#define sk_EVP_PKEY_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_METHOD, (st), (free_func))

+#define sk_EVP_PKEY_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_METHOD, (st))

+#define sk_EVP_PKEY_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_METHOD, (st))

+#define sk_EVP_PKEY_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_METHOD, (st))

+#define sk_EVP_PKEY_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_METHOD, (st))

+

+#define sk_GENERAL_NAME_new(cmp) SKM_sk_new(GENERAL_NAME, (cmp))

+#define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)

+#define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))

+#define sk_GENERAL_NAME_num(st) SKM_sk_num(GENERAL_NAME, (st))

+#define sk_GENERAL_NAME_value(st, i) SKM_sk_value(GENERAL_NAME, (st), (i))

+#define sk_GENERAL_NAME_set(st, i, val) SKM_sk_set(GENERAL_NAME, (st), (i), (val))

+#define sk_GENERAL_NAME_zero(st) SKM_sk_zero(GENERAL_NAME, (st))

+#define sk_GENERAL_NAME_push(st, val) SKM_sk_push(GENERAL_NAME, (st), (val))

+#define sk_GENERAL_NAME_unshift(st, val) SKM_sk_unshift(GENERAL_NAME, (st), (val))

+#define sk_GENERAL_NAME_find(st, val) SKM_sk_find(GENERAL_NAME, (st), (val))

+#define sk_GENERAL_NAME_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAME, (st), (val))

+#define sk_GENERAL_NAME_delete(st, i) SKM_sk_delete(GENERAL_NAME, (st), (i))

+#define sk_GENERAL_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAME, (st), (ptr))

+#define sk_GENERAL_NAME_insert(st, val, i) SKM_sk_insert(GENERAL_NAME, (st), (val), (i))

+#define sk_GENERAL_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAME, (st), (cmp))

+#define sk_GENERAL_NAME_dup(st) SKM_sk_dup(GENERAL_NAME, st)

+#define sk_GENERAL_NAME_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAME, (st), (free_func))

+#define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st))

+#define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st))

+#define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st))

+#define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st))

+

+#define sk_GENERAL_NAMES_new(cmp) SKM_sk_new(GENERAL_NAMES, (cmp))

+#define sk_GENERAL_NAMES_new_null() SKM_sk_new_null(GENERAL_NAMES)

+#define sk_GENERAL_NAMES_free(st) SKM_sk_free(GENERAL_NAMES, (st))

+#define sk_GENERAL_NAMES_num(st) SKM_sk_num(GENERAL_NAMES, (st))

+#define sk_GENERAL_NAMES_value(st, i) SKM_sk_value(GENERAL_NAMES, (st), (i))

+#define sk_GENERAL_NAMES_set(st, i, val) SKM_sk_set(GENERAL_NAMES, (st), (i), (val))

+#define sk_GENERAL_NAMES_zero(st) SKM_sk_zero(GENERAL_NAMES, (st))

+#define sk_GENERAL_NAMES_push(st, val) SKM_sk_push(GENERAL_NAMES, (st), (val))

+#define sk_GENERAL_NAMES_unshift(st, val) SKM_sk_unshift(GENERAL_NAMES, (st), (val))

+#define sk_GENERAL_NAMES_find(st, val) SKM_sk_find(GENERAL_NAMES, (st), (val))

+#define sk_GENERAL_NAMES_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAMES, (st), (val))

+#define sk_GENERAL_NAMES_delete(st, i) SKM_sk_delete(GENERAL_NAMES, (st), (i))

+#define sk_GENERAL_NAMES_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAMES, (st), (ptr))

+#define sk_GENERAL_NAMES_insert(st, val, i) SKM_sk_insert(GENERAL_NAMES, (st), (val), (i))

+#define sk_GENERAL_NAMES_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAMES, (st), (cmp))

+#define sk_GENERAL_NAMES_dup(st) SKM_sk_dup(GENERAL_NAMES, st)

+#define sk_GENERAL_NAMES_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAMES, (st), (free_func))

+#define sk_GENERAL_NAMES_shift(st) SKM_sk_shift(GENERAL_NAMES, (st))

+#define sk_GENERAL_NAMES_pop(st) SKM_sk_pop(GENERAL_NAMES, (st))

+#define sk_GENERAL_NAMES_sort(st) SKM_sk_sort(GENERAL_NAMES, (st))

+#define sk_GENERAL_NAMES_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAMES, (st))

+

+#define sk_GENERAL_SUBTREE_new(cmp) SKM_sk_new(GENERAL_SUBTREE, (cmp))

+#define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE)

+#define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st))

+#define sk_GENERAL_SUBTREE_num(st) SKM_sk_num(GENERAL_SUBTREE, (st))

+#define sk_GENERAL_SUBTREE_value(st, i) SKM_sk_value(GENERAL_SUBTREE, (st), (i))

+#define sk_GENERAL_SUBTREE_set(st, i, val) SKM_sk_set(GENERAL_SUBTREE, (st), (i), (val))

+#define sk_GENERAL_SUBTREE_zero(st) SKM_sk_zero(GENERAL_SUBTREE, (st))

+#define sk_GENERAL_SUBTREE_push(st, val) SKM_sk_push(GENERAL_SUBTREE, (st), (val))

+#define sk_GENERAL_SUBTREE_unshift(st, val) SKM_sk_unshift(GENERAL_SUBTREE, (st), (val))

+#define sk_GENERAL_SUBTREE_find(st, val) SKM_sk_find(GENERAL_SUBTREE, (st), (val))

+#define sk_GENERAL_SUBTREE_find_ex(st, val) SKM_sk_find_ex(GENERAL_SUBTREE, (st), (val))

+#define sk_GENERAL_SUBTREE_delete(st, i) SKM_sk_delete(GENERAL_SUBTREE, (st), (i))

+#define sk_GENERAL_SUBTREE_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_SUBTREE, (st), (ptr))

+#define sk_GENERAL_SUBTREE_insert(st, val, i) SKM_sk_insert(GENERAL_SUBTREE, (st), (val), (i))

+#define sk_GENERAL_SUBTREE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_SUBTREE, (st), (cmp))

+#define sk_GENERAL_SUBTREE_dup(st) SKM_sk_dup(GENERAL_SUBTREE, st)

+#define sk_GENERAL_SUBTREE_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_SUBTREE, (st), (free_func))

+#define sk_GENERAL_SUBTREE_shift(st) SKM_sk_shift(GENERAL_SUBTREE, (st))

+#define sk_GENERAL_SUBTREE_pop(st) SKM_sk_pop(GENERAL_SUBTREE, (st))

+#define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))

+#define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))

+

+#define sk_IPAddressFamily_new(cmp) SKM_sk_new(IPAddressFamily, (cmp))

+#define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)

+#define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))

+#define sk_IPAddressFamily_num(st) SKM_sk_num(IPAddressFamily, (st))

+#define sk_IPAddressFamily_value(st, i) SKM_sk_value(IPAddressFamily, (st), (i))

+#define sk_IPAddressFamily_set(st, i, val) SKM_sk_set(IPAddressFamily, (st), (i), (val))

+#define sk_IPAddressFamily_zero(st) SKM_sk_zero(IPAddressFamily, (st))

+#define sk_IPAddressFamily_push(st, val) SKM_sk_push(IPAddressFamily, (st), (val))

+#define sk_IPAddressFamily_unshift(st, val) SKM_sk_unshift(IPAddressFamily, (st), (val))

+#define sk_IPAddressFamily_find(st, val) SKM_sk_find(IPAddressFamily, (st), (val))

+#define sk_IPAddressFamily_find_ex(st, val) SKM_sk_find_ex(IPAddressFamily, (st), (val))

+#define sk_IPAddressFamily_delete(st, i) SKM_sk_delete(IPAddressFamily, (st), (i))

+#define sk_IPAddressFamily_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressFamily, (st), (ptr))

+#define sk_IPAddressFamily_insert(st, val, i) SKM_sk_insert(IPAddressFamily, (st), (val), (i))

+#define sk_IPAddressFamily_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressFamily, (st), (cmp))

+#define sk_IPAddressFamily_dup(st) SKM_sk_dup(IPAddressFamily, st)

+#define sk_IPAddressFamily_pop_free(st, free_func) SKM_sk_pop_free(IPAddressFamily, (st), (free_func))

+#define sk_IPAddressFamily_shift(st) SKM_sk_shift(IPAddressFamily, (st))

+#define sk_IPAddressFamily_pop(st) SKM_sk_pop(IPAddressFamily, (st))

+#define sk_IPAddressFamily_sort(st) SKM_sk_sort(IPAddressFamily, (st))

+#define sk_IPAddressFamily_is_sorted(st) SKM_sk_is_sorted(IPAddressFamily, (st))

+

+#define sk_IPAddressOrRange_new(cmp) SKM_sk_new(IPAddressOrRange, (cmp))

+#define sk_IPAddressOrRange_new_null() SKM_sk_new_null(IPAddressOrRange)

+#define sk_IPAddressOrRange_free(st) SKM_sk_free(IPAddressOrRange, (st))

+#define sk_IPAddressOrRange_num(st) SKM_sk_num(IPAddressOrRange, (st))

+#define sk_IPAddressOrRange_value(st, i) SKM_sk_value(IPAddressOrRange, (st), (i))

+#define sk_IPAddressOrRange_set(st, i, val) SKM_sk_set(IPAddressOrRange, (st), (i), (val))

+#define sk_IPAddressOrRange_zero(st) SKM_sk_zero(IPAddressOrRange, (st))

+#define sk_IPAddressOrRange_push(st, val) SKM_sk_push(IPAddressOrRange, (st), (val))

+#define sk_IPAddressOrRange_unshift(st, val) SKM_sk_unshift(IPAddressOrRange, (st), (val))

+#define sk_IPAddressOrRange_find(st, val) SKM_sk_find(IPAddressOrRange, (st), (val))

+#define sk_IPAddressOrRange_find_ex(st, val) SKM_sk_find_ex(IPAddressOrRange, (st), (val))

+#define sk_IPAddressOrRange_delete(st, i) SKM_sk_delete(IPAddressOrRange, (st), (i))

+#define sk_IPAddressOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressOrRange, (st), (ptr))

+#define sk_IPAddressOrRange_insert(st, val, i) SKM_sk_insert(IPAddressOrRange, (st), (val), (i))

+#define sk_IPAddressOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressOrRange, (st), (cmp))

+#define sk_IPAddressOrRange_dup(st) SKM_sk_dup(IPAddressOrRange, st)

+#define sk_IPAddressOrRange_pop_free(st, free_func) SKM_sk_pop_free(IPAddressOrRange, (st), (free_func))

+#define sk_IPAddressOrRange_shift(st) SKM_sk_shift(IPAddressOrRange, (st))

+#define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))

+#define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))

+#define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))

+

+#define sk_KRB5_APREQBODY_new(cmp) SKM_sk_new(KRB5_APREQBODY, (cmp))

+#define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)

+#define sk_KRB5_APREQBODY_free(st) SKM_sk_free(KRB5_APREQBODY, (st))

+#define sk_KRB5_APREQBODY_num(st) SKM_sk_num(KRB5_APREQBODY, (st))

+#define sk_KRB5_APREQBODY_value(st, i) SKM_sk_value(KRB5_APREQBODY, (st), (i))

+#define sk_KRB5_APREQBODY_set(st, i, val) SKM_sk_set(KRB5_APREQBODY, (st), (i), (val))

+#define sk_KRB5_APREQBODY_zero(st) SKM_sk_zero(KRB5_APREQBODY, (st))

+#define sk_KRB5_APREQBODY_push(st, val) SKM_sk_push(KRB5_APREQBODY, (st), (val))

+#define sk_KRB5_APREQBODY_unshift(st, val) SKM_sk_unshift(KRB5_APREQBODY, (st), (val))

+#define sk_KRB5_APREQBODY_find(st, val) SKM_sk_find(KRB5_APREQBODY, (st), (val))

+#define sk_KRB5_APREQBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_APREQBODY, (st), (val))

+#define sk_KRB5_APREQBODY_delete(st, i) SKM_sk_delete(KRB5_APREQBODY, (st), (i))

+#define sk_KRB5_APREQBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_APREQBODY, (st), (ptr))

+#define sk_KRB5_APREQBODY_insert(st, val, i) SKM_sk_insert(KRB5_APREQBODY, (st), (val), (i))

+#define sk_KRB5_APREQBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_APREQBODY, (st), (cmp))

+#define sk_KRB5_APREQBODY_dup(st) SKM_sk_dup(KRB5_APREQBODY, st)

+#define sk_KRB5_APREQBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_APREQBODY, (st), (free_func))

+#define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st))

+#define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st))

+#define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st))

+#define sk_KRB5_APREQBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_APREQBODY, (st))

+

+#define sk_KRB5_AUTHDATA_new(cmp) SKM_sk_new(KRB5_AUTHDATA, (cmp))

+#define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA)

+#define sk_KRB5_AUTHDATA_free(st) SKM_sk_free(KRB5_AUTHDATA, (st))

+#define sk_KRB5_AUTHDATA_num(st) SKM_sk_num(KRB5_AUTHDATA, (st))

+#define sk_KRB5_AUTHDATA_value(st, i) SKM_sk_value(KRB5_AUTHDATA, (st), (i))

+#define sk_KRB5_AUTHDATA_set(st, i, val) SKM_sk_set(KRB5_AUTHDATA, (st), (i), (val))

+#define sk_KRB5_AUTHDATA_zero(st) SKM_sk_zero(KRB5_AUTHDATA, (st))

+#define sk_KRB5_AUTHDATA_push(st, val) SKM_sk_push(KRB5_AUTHDATA, (st), (val))

+#define sk_KRB5_AUTHDATA_unshift(st, val) SKM_sk_unshift(KRB5_AUTHDATA, (st), (val))

+#define sk_KRB5_AUTHDATA_find(st, val) SKM_sk_find(KRB5_AUTHDATA, (st), (val))

+#define sk_KRB5_AUTHDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHDATA, (st), (val))

+#define sk_KRB5_AUTHDATA_delete(st, i) SKM_sk_delete(KRB5_AUTHDATA, (st), (i))

+#define sk_KRB5_AUTHDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHDATA, (st), (ptr))

+#define sk_KRB5_AUTHDATA_insert(st, val, i) SKM_sk_insert(KRB5_AUTHDATA, (st), (val), (i))

+#define sk_KRB5_AUTHDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHDATA, (st), (cmp))

+#define sk_KRB5_AUTHDATA_dup(st) SKM_sk_dup(KRB5_AUTHDATA, st)

+#define sk_KRB5_AUTHDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHDATA, (st), (free_func))

+#define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st))

+#define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st))

+#define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st))

+#define sk_KRB5_AUTHDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHDATA, (st))

+

+#define sk_KRB5_AUTHENTBODY_new(cmp) SKM_sk_new(KRB5_AUTHENTBODY, (cmp))

+#define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY)

+#define sk_KRB5_AUTHENTBODY_free(st) SKM_sk_free(KRB5_AUTHENTBODY, (st))

+#define sk_KRB5_AUTHENTBODY_num(st) SKM_sk_num(KRB5_AUTHENTBODY, (st))

+#define sk_KRB5_AUTHENTBODY_value(st, i) SKM_sk_value(KRB5_AUTHENTBODY, (st), (i))

+#define sk_KRB5_AUTHENTBODY_set(st, i, val) SKM_sk_set(KRB5_AUTHENTBODY, (st), (i), (val))

+#define sk_KRB5_AUTHENTBODY_zero(st) SKM_sk_zero(KRB5_AUTHENTBODY, (st))

+#define sk_KRB5_AUTHENTBODY_push(st, val) SKM_sk_push(KRB5_AUTHENTBODY, (st), (val))

+#define sk_KRB5_AUTHENTBODY_unshift(st, val) SKM_sk_unshift(KRB5_AUTHENTBODY, (st), (val))

+#define sk_KRB5_AUTHENTBODY_find(st, val) SKM_sk_find(KRB5_AUTHENTBODY, (st), (val))

+#define sk_KRB5_AUTHENTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHENTBODY, (st), (val))

+#define sk_KRB5_AUTHENTBODY_delete(st, i) SKM_sk_delete(KRB5_AUTHENTBODY, (st), (i))

+#define sk_KRB5_AUTHENTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHENTBODY, (st), (ptr))

+#define sk_KRB5_AUTHENTBODY_insert(st, val, i) SKM_sk_insert(KRB5_AUTHENTBODY, (st), (val), (i))

+#define sk_KRB5_AUTHENTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHENTBODY, (st), (cmp))

+#define sk_KRB5_AUTHENTBODY_dup(st) SKM_sk_dup(KRB5_AUTHENTBODY, st)

+#define sk_KRB5_AUTHENTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHENTBODY, (st), (free_func))

+#define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st))

+#define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st))

+#define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st))

+#define sk_KRB5_AUTHENTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHENTBODY, (st))

+

+#define sk_KRB5_CHECKSUM_new(cmp) SKM_sk_new(KRB5_CHECKSUM, (cmp))

+#define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM)

+#define sk_KRB5_CHECKSUM_free(st) SKM_sk_free(KRB5_CHECKSUM, (st))

+#define sk_KRB5_CHECKSUM_num(st) SKM_sk_num(KRB5_CHECKSUM, (st))

+#define sk_KRB5_CHECKSUM_value(st, i) SKM_sk_value(KRB5_CHECKSUM, (st), (i))

+#define sk_KRB5_CHECKSUM_set(st, i, val) SKM_sk_set(KRB5_CHECKSUM, (st), (i), (val))

+#define sk_KRB5_CHECKSUM_zero(st) SKM_sk_zero(KRB5_CHECKSUM, (st))

+#define sk_KRB5_CHECKSUM_push(st, val) SKM_sk_push(KRB5_CHECKSUM, (st), (val))

+#define sk_KRB5_CHECKSUM_unshift(st, val) SKM_sk_unshift(KRB5_CHECKSUM, (st), (val))

+#define sk_KRB5_CHECKSUM_find(st, val) SKM_sk_find(KRB5_CHECKSUM, (st), (val))

+#define sk_KRB5_CHECKSUM_find_ex(st, val) SKM_sk_find_ex(KRB5_CHECKSUM, (st), (val))

+#define sk_KRB5_CHECKSUM_delete(st, i) SKM_sk_delete(KRB5_CHECKSUM, (st), (i))

+#define sk_KRB5_CHECKSUM_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_CHECKSUM, (st), (ptr))

+#define sk_KRB5_CHECKSUM_insert(st, val, i) SKM_sk_insert(KRB5_CHECKSUM, (st), (val), (i))

+#define sk_KRB5_CHECKSUM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_CHECKSUM, (st), (cmp))

+#define sk_KRB5_CHECKSUM_dup(st) SKM_sk_dup(KRB5_CHECKSUM, st)

+#define sk_KRB5_CHECKSUM_pop_free(st, free_func) SKM_sk_pop_free(KRB5_CHECKSUM, (st), (free_func))

+#define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st))

+#define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st))

+#define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st))

+#define sk_KRB5_CHECKSUM_is_sorted(st) SKM_sk_is_sorted(KRB5_CHECKSUM, (st))

+

+#define sk_KRB5_ENCDATA_new(cmp) SKM_sk_new(KRB5_ENCDATA, (cmp))

+#define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA)

+#define sk_KRB5_ENCDATA_free(st) SKM_sk_free(KRB5_ENCDATA, (st))

+#define sk_KRB5_ENCDATA_num(st) SKM_sk_num(KRB5_ENCDATA, (st))

+#define sk_KRB5_ENCDATA_value(st, i) SKM_sk_value(KRB5_ENCDATA, (st), (i))

+#define sk_KRB5_ENCDATA_set(st, i, val) SKM_sk_set(KRB5_ENCDATA, (st), (i), (val))

+#define sk_KRB5_ENCDATA_zero(st) SKM_sk_zero(KRB5_ENCDATA, (st))

+#define sk_KRB5_ENCDATA_push(st, val) SKM_sk_push(KRB5_ENCDATA, (st), (val))

+#define sk_KRB5_ENCDATA_unshift(st, val) SKM_sk_unshift(KRB5_ENCDATA, (st), (val))

+#define sk_KRB5_ENCDATA_find(st, val) SKM_sk_find(KRB5_ENCDATA, (st), (val))

+#define sk_KRB5_ENCDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCDATA, (st), (val))

+#define sk_KRB5_ENCDATA_delete(st, i) SKM_sk_delete(KRB5_ENCDATA, (st), (i))

+#define sk_KRB5_ENCDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCDATA, (st), (ptr))

+#define sk_KRB5_ENCDATA_insert(st, val, i) SKM_sk_insert(KRB5_ENCDATA, (st), (val), (i))

+#define sk_KRB5_ENCDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCDATA, (st), (cmp))

+#define sk_KRB5_ENCDATA_dup(st) SKM_sk_dup(KRB5_ENCDATA, st)

+#define sk_KRB5_ENCDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCDATA, (st), (free_func))

+#define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st))

+#define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st))

+#define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st))

+#define sk_KRB5_ENCDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCDATA, (st))

+

+#define sk_KRB5_ENCKEY_new(cmp) SKM_sk_new(KRB5_ENCKEY, (cmp))

+#define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY)

+#define sk_KRB5_ENCKEY_free(st) SKM_sk_free(KRB5_ENCKEY, (st))

+#define sk_KRB5_ENCKEY_num(st) SKM_sk_num(KRB5_ENCKEY, (st))

+#define sk_KRB5_ENCKEY_value(st, i) SKM_sk_value(KRB5_ENCKEY, (st), (i))

+#define sk_KRB5_ENCKEY_set(st, i, val) SKM_sk_set(KRB5_ENCKEY, (st), (i), (val))

+#define sk_KRB5_ENCKEY_zero(st) SKM_sk_zero(KRB5_ENCKEY, (st))

+#define sk_KRB5_ENCKEY_push(st, val) SKM_sk_push(KRB5_ENCKEY, (st), (val))

+#define sk_KRB5_ENCKEY_unshift(st, val) SKM_sk_unshift(KRB5_ENCKEY, (st), (val))

+#define sk_KRB5_ENCKEY_find(st, val) SKM_sk_find(KRB5_ENCKEY, (st), (val))

+#define sk_KRB5_ENCKEY_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCKEY, (st), (val))

+#define sk_KRB5_ENCKEY_delete(st, i) SKM_sk_delete(KRB5_ENCKEY, (st), (i))

+#define sk_KRB5_ENCKEY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCKEY, (st), (ptr))

+#define sk_KRB5_ENCKEY_insert(st, val, i) SKM_sk_insert(KRB5_ENCKEY, (st), (val), (i))

+#define sk_KRB5_ENCKEY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCKEY, (st), (cmp))

+#define sk_KRB5_ENCKEY_dup(st) SKM_sk_dup(KRB5_ENCKEY, st)

+#define sk_KRB5_ENCKEY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCKEY, (st), (free_func))

+#define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st))

+#define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st))

+#define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st))

+#define sk_KRB5_ENCKEY_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCKEY, (st))

+

+#define sk_KRB5_PRINCNAME_new(cmp) SKM_sk_new(KRB5_PRINCNAME, (cmp))

+#define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME)

+#define sk_KRB5_PRINCNAME_free(st) SKM_sk_free(KRB5_PRINCNAME, (st))

+#define sk_KRB5_PRINCNAME_num(st) SKM_sk_num(KRB5_PRINCNAME, (st))

+#define sk_KRB5_PRINCNAME_value(st, i) SKM_sk_value(KRB5_PRINCNAME, (st), (i))

+#define sk_KRB5_PRINCNAME_set(st, i, val) SKM_sk_set(KRB5_PRINCNAME, (st), (i), (val))

+#define sk_KRB5_PRINCNAME_zero(st) SKM_sk_zero(KRB5_PRINCNAME, (st))

+#define sk_KRB5_PRINCNAME_push(st, val) SKM_sk_push(KRB5_PRINCNAME, (st), (val))

+#define sk_KRB5_PRINCNAME_unshift(st, val) SKM_sk_unshift(KRB5_PRINCNAME, (st), (val))

+#define sk_KRB5_PRINCNAME_find(st, val) SKM_sk_find(KRB5_PRINCNAME, (st), (val))

+#define sk_KRB5_PRINCNAME_find_ex(st, val) SKM_sk_find_ex(KRB5_PRINCNAME, (st), (val))

+#define sk_KRB5_PRINCNAME_delete(st, i) SKM_sk_delete(KRB5_PRINCNAME, (st), (i))

+#define sk_KRB5_PRINCNAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_PRINCNAME, (st), (ptr))

+#define sk_KRB5_PRINCNAME_insert(st, val, i) SKM_sk_insert(KRB5_PRINCNAME, (st), (val), (i))

+#define sk_KRB5_PRINCNAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_PRINCNAME, (st), (cmp))

+#define sk_KRB5_PRINCNAME_dup(st) SKM_sk_dup(KRB5_PRINCNAME, st)

+#define sk_KRB5_PRINCNAME_pop_free(st, free_func) SKM_sk_pop_free(KRB5_PRINCNAME, (st), (free_func))

+#define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st))

+#define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st))

+#define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st))

+#define sk_KRB5_PRINCNAME_is_sorted(st) SKM_sk_is_sorted(KRB5_PRINCNAME, (st))

+

+#define sk_KRB5_TKTBODY_new(cmp) SKM_sk_new(KRB5_TKTBODY, (cmp))

+#define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY)

+#define sk_KRB5_TKTBODY_free(st) SKM_sk_free(KRB5_TKTBODY, (st))

+#define sk_KRB5_TKTBODY_num(st) SKM_sk_num(KRB5_TKTBODY, (st))

+#define sk_KRB5_TKTBODY_value(st, i) SKM_sk_value(KRB5_TKTBODY, (st), (i))

+#define sk_KRB5_TKTBODY_set(st, i, val) SKM_sk_set(KRB5_TKTBODY, (st), (i), (val))

+#define sk_KRB5_TKTBODY_zero(st) SKM_sk_zero(KRB5_TKTBODY, (st))

+#define sk_KRB5_TKTBODY_push(st, val) SKM_sk_push(KRB5_TKTBODY, (st), (val))

+#define sk_KRB5_TKTBODY_unshift(st, val) SKM_sk_unshift(KRB5_TKTBODY, (st), (val))

+#define sk_KRB5_TKTBODY_find(st, val) SKM_sk_find(KRB5_TKTBODY, (st), (val))

+#define sk_KRB5_TKTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_TKTBODY, (st), (val))

+#define sk_KRB5_TKTBODY_delete(st, i) SKM_sk_delete(KRB5_TKTBODY, (st), (i))

+#define sk_KRB5_TKTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_TKTBODY, (st), (ptr))

+#define sk_KRB5_TKTBODY_insert(st, val, i) SKM_sk_insert(KRB5_TKTBODY, (st), (val), (i))

+#define sk_KRB5_TKTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_TKTBODY, (st), (cmp))

+#define sk_KRB5_TKTBODY_dup(st) SKM_sk_dup(KRB5_TKTBODY, st)

+#define sk_KRB5_TKTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_TKTBODY, (st), (free_func))

+#define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st))

+#define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st))

+#define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st))

+#define sk_KRB5_TKTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_TKTBODY, (st))

+

+#define sk_MEM_OBJECT_DATA_new(cmp) SKM_sk_new(MEM_OBJECT_DATA, (cmp))

+#define sk_MEM_OBJECT_DATA_new_null() SKM_sk_new_null(MEM_OBJECT_DATA)

+#define sk_MEM_OBJECT_DATA_free(st) SKM_sk_free(MEM_OBJECT_DATA, (st))

+#define sk_MEM_OBJECT_DATA_num(st) SKM_sk_num(MEM_OBJECT_DATA, (st))

+#define sk_MEM_OBJECT_DATA_value(st, i) SKM_sk_value(MEM_OBJECT_DATA, (st), (i))

+#define sk_MEM_OBJECT_DATA_set(st, i, val) SKM_sk_set(MEM_OBJECT_DATA, (st), (i), (val))

+#define sk_MEM_OBJECT_DATA_zero(st) SKM_sk_zero(MEM_OBJECT_DATA, (st))

+#define sk_MEM_OBJECT_DATA_push(st, val) SKM_sk_push(MEM_OBJECT_DATA, (st), (val))

+#define sk_MEM_OBJECT_DATA_unshift(st, val) SKM_sk_unshift(MEM_OBJECT_DATA, (st), (val))

+#define sk_MEM_OBJECT_DATA_find(st, val) SKM_sk_find(MEM_OBJECT_DATA, (st), (val))

+#define sk_MEM_OBJECT_DATA_find_ex(st, val) SKM_sk_find_ex(MEM_OBJECT_DATA, (st), (val))

+#define sk_MEM_OBJECT_DATA_delete(st, i) SKM_sk_delete(MEM_OBJECT_DATA, (st), (i))

+#define sk_MEM_OBJECT_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(MEM_OBJECT_DATA, (st), (ptr))

+#define sk_MEM_OBJECT_DATA_insert(st, val, i) SKM_sk_insert(MEM_OBJECT_DATA, (st), (val), (i))

+#define sk_MEM_OBJECT_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MEM_OBJECT_DATA, (st), (cmp))

+#define sk_MEM_OBJECT_DATA_dup(st) SKM_sk_dup(MEM_OBJECT_DATA, st)

+#define sk_MEM_OBJECT_DATA_pop_free(st, free_func) SKM_sk_pop_free(MEM_OBJECT_DATA, (st), (free_func))

+#define sk_MEM_OBJECT_DATA_shift(st) SKM_sk_shift(MEM_OBJECT_DATA, (st))

+#define sk_MEM_OBJECT_DATA_pop(st) SKM_sk_pop(MEM_OBJECT_DATA, (st))

+#define sk_MEM_OBJECT_DATA_sort(st) SKM_sk_sort(MEM_OBJECT_DATA, (st))

+#define sk_MEM_OBJECT_DATA_is_sorted(st) SKM_sk_is_sorted(MEM_OBJECT_DATA, (st))

+

+#define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp))

+#define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)

+#define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))

+#define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))

+#define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))

+#define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))

+#define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))

+#define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))

+#define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))

+#define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))

+#define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))

+#define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))

+#define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))

+#define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))

+#define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))

+#define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)

+#define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))

+#define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))

+#define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))

+#define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))

+#define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))

+

+#define sk_MIME_PARAM_new(cmp) SKM_sk_new(MIME_PARAM, (cmp))

+#define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)

+#define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))

+#define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))

+#define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))

+#define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))

+#define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))

+#define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))

+#define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))

+#define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))

+#define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))

+#define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))

+#define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))

+#define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))

+#define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))

+#define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)

+#define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))

+#define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))

+#define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))

+#define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))

+#define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))

+

+#define sk_NAME_FUNCS_new(cmp) SKM_sk_new(NAME_FUNCS, (cmp))

+#define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS)

+#define sk_NAME_FUNCS_free(st) SKM_sk_free(NAME_FUNCS, (st))

+#define sk_NAME_FUNCS_num(st) SKM_sk_num(NAME_FUNCS, (st))

+#define sk_NAME_FUNCS_value(st, i) SKM_sk_value(NAME_FUNCS, (st), (i))

+#define sk_NAME_FUNCS_set(st, i, val) SKM_sk_set(NAME_FUNCS, (st), (i), (val))

+#define sk_NAME_FUNCS_zero(st) SKM_sk_zero(NAME_FUNCS, (st))

+#define sk_NAME_FUNCS_push(st, val) SKM_sk_push(NAME_FUNCS, (st), (val))

+#define sk_NAME_FUNCS_unshift(st, val) SKM_sk_unshift(NAME_FUNCS, (st), (val))

+#define sk_NAME_FUNCS_find(st, val) SKM_sk_find(NAME_FUNCS, (st), (val))

+#define sk_NAME_FUNCS_find_ex(st, val) SKM_sk_find_ex(NAME_FUNCS, (st), (val))

+#define sk_NAME_FUNCS_delete(st, i) SKM_sk_delete(NAME_FUNCS, (st), (i))

+#define sk_NAME_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(NAME_FUNCS, (st), (ptr))

+#define sk_NAME_FUNCS_insert(st, val, i) SKM_sk_insert(NAME_FUNCS, (st), (val), (i))

+#define sk_NAME_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(NAME_FUNCS, (st), (cmp))

+#define sk_NAME_FUNCS_dup(st) SKM_sk_dup(NAME_FUNCS, st)

+#define sk_NAME_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(NAME_FUNCS, (st), (free_func))

+#define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st))

+#define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st))

+#define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st))

+#define sk_NAME_FUNCS_is_sorted(st) SKM_sk_is_sorted(NAME_FUNCS, (st))

+

+#define sk_OCSP_CERTID_new(cmp) SKM_sk_new(OCSP_CERTID, (cmp))

+#define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID)

+#define sk_OCSP_CERTID_free(st) SKM_sk_free(OCSP_CERTID, (st))

+#define sk_OCSP_CERTID_num(st) SKM_sk_num(OCSP_CERTID, (st))

+#define sk_OCSP_CERTID_value(st, i) SKM_sk_value(OCSP_CERTID, (st), (i))

+#define sk_OCSP_CERTID_set(st, i, val) SKM_sk_set(OCSP_CERTID, (st), (i), (val))

+#define sk_OCSP_CERTID_zero(st) SKM_sk_zero(OCSP_CERTID, (st))

+#define sk_OCSP_CERTID_push(st, val) SKM_sk_push(OCSP_CERTID, (st), (val))

+#define sk_OCSP_CERTID_unshift(st, val) SKM_sk_unshift(OCSP_CERTID, (st), (val))

+#define sk_OCSP_CERTID_find(st, val) SKM_sk_find(OCSP_CERTID, (st), (val))

+#define sk_OCSP_CERTID_find_ex(st, val) SKM_sk_find_ex(OCSP_CERTID, (st), (val))

+#define sk_OCSP_CERTID_delete(st, i) SKM_sk_delete(OCSP_CERTID, (st), (i))

+#define sk_OCSP_CERTID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_CERTID, (st), (ptr))

+#define sk_OCSP_CERTID_insert(st, val, i) SKM_sk_insert(OCSP_CERTID, (st), (val), (i))

+#define sk_OCSP_CERTID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_CERTID, (st), (cmp))

+#define sk_OCSP_CERTID_dup(st) SKM_sk_dup(OCSP_CERTID, st)

+#define sk_OCSP_CERTID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_CERTID, (st), (free_func))

+#define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st))

+#define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st))

+#define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st))

+#define sk_OCSP_CERTID_is_sorted(st) SKM_sk_is_sorted(OCSP_CERTID, (st))

+

+#define sk_OCSP_ONEREQ_new(cmp) SKM_sk_new(OCSP_ONEREQ, (cmp))

+#define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ)

+#define sk_OCSP_ONEREQ_free(st) SKM_sk_free(OCSP_ONEREQ, (st))

+#define sk_OCSP_ONEREQ_num(st) SKM_sk_num(OCSP_ONEREQ, (st))

+#define sk_OCSP_ONEREQ_value(st, i) SKM_sk_value(OCSP_ONEREQ, (st), (i))

+#define sk_OCSP_ONEREQ_set(st, i, val) SKM_sk_set(OCSP_ONEREQ, (st), (i), (val))

+#define sk_OCSP_ONEREQ_zero(st) SKM_sk_zero(OCSP_ONEREQ, (st))

+#define sk_OCSP_ONEREQ_push(st, val) SKM_sk_push(OCSP_ONEREQ, (st), (val))

+#define sk_OCSP_ONEREQ_unshift(st, val) SKM_sk_unshift(OCSP_ONEREQ, (st), (val))

+#define sk_OCSP_ONEREQ_find(st, val) SKM_sk_find(OCSP_ONEREQ, (st), (val))

+#define sk_OCSP_ONEREQ_find_ex(st, val) SKM_sk_find_ex(OCSP_ONEREQ, (st), (val))

+#define sk_OCSP_ONEREQ_delete(st, i) SKM_sk_delete(OCSP_ONEREQ, (st), (i))

+#define sk_OCSP_ONEREQ_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_ONEREQ, (st), (ptr))

+#define sk_OCSP_ONEREQ_insert(st, val, i) SKM_sk_insert(OCSP_ONEREQ, (st), (val), (i))

+#define sk_OCSP_ONEREQ_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_ONEREQ, (st), (cmp))

+#define sk_OCSP_ONEREQ_dup(st) SKM_sk_dup(OCSP_ONEREQ, st)

+#define sk_OCSP_ONEREQ_pop_free(st, free_func) SKM_sk_pop_free(OCSP_ONEREQ, (st), (free_func))

+#define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st))

+#define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st))

+#define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st))

+#define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st))

+

+#define sk_OCSP_RESPID_new(cmp) SKM_sk_new(OCSP_RESPID, (cmp))

+#define sk_OCSP_RESPID_new_null() SKM_sk_new_null(OCSP_RESPID)

+#define sk_OCSP_RESPID_free(st) SKM_sk_free(OCSP_RESPID, (st))

+#define sk_OCSP_RESPID_num(st) SKM_sk_num(OCSP_RESPID, (st))

+#define sk_OCSP_RESPID_value(st, i) SKM_sk_value(OCSP_RESPID, (st), (i))

+#define sk_OCSP_RESPID_set(st, i, val) SKM_sk_set(OCSP_RESPID, (st), (i), (val))

+#define sk_OCSP_RESPID_zero(st) SKM_sk_zero(OCSP_RESPID, (st))

+#define sk_OCSP_RESPID_push(st, val) SKM_sk_push(OCSP_RESPID, (st), (val))

+#define sk_OCSP_RESPID_unshift(st, val) SKM_sk_unshift(OCSP_RESPID, (st), (val))

+#define sk_OCSP_RESPID_find(st, val) SKM_sk_find(OCSP_RESPID, (st), (val))

+#define sk_OCSP_RESPID_find_ex(st, val) SKM_sk_find_ex(OCSP_RESPID, (st), (val))

+#define sk_OCSP_RESPID_delete(st, i) SKM_sk_delete(OCSP_RESPID, (st), (i))

+#define sk_OCSP_RESPID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_RESPID, (st), (ptr))

+#define sk_OCSP_RESPID_insert(st, val, i) SKM_sk_insert(OCSP_RESPID, (st), (val), (i))

+#define sk_OCSP_RESPID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_RESPID, (st), (cmp))

+#define sk_OCSP_RESPID_dup(st) SKM_sk_dup(OCSP_RESPID, st)

+#define sk_OCSP_RESPID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_RESPID, (st), (free_func))

+#define sk_OCSP_RESPID_shift(st) SKM_sk_shift(OCSP_RESPID, (st))

+#define sk_OCSP_RESPID_pop(st) SKM_sk_pop(OCSP_RESPID, (st))

+#define sk_OCSP_RESPID_sort(st) SKM_sk_sort(OCSP_RESPID, (st))

+#define sk_OCSP_RESPID_is_sorted(st) SKM_sk_is_sorted(OCSP_RESPID, (st))

+

+#define sk_OCSP_SINGLERESP_new(cmp) SKM_sk_new(OCSP_SINGLERESP, (cmp))

+#define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP)

+#define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st))

+#define sk_OCSP_SINGLERESP_num(st) SKM_sk_num(OCSP_SINGLERESP, (st))

+#define sk_OCSP_SINGLERESP_value(st, i) SKM_sk_value(OCSP_SINGLERESP, (st), (i))

+#define sk_OCSP_SINGLERESP_set(st, i, val) SKM_sk_set(OCSP_SINGLERESP, (st), (i), (val))

+#define sk_OCSP_SINGLERESP_zero(st) SKM_sk_zero(OCSP_SINGLERESP, (st))

+#define sk_OCSP_SINGLERESP_push(st, val) SKM_sk_push(OCSP_SINGLERESP, (st), (val))

+#define sk_OCSP_SINGLERESP_unshift(st, val) SKM_sk_unshift(OCSP_SINGLERESP, (st), (val))

+#define sk_OCSP_SINGLERESP_find(st, val) SKM_sk_find(OCSP_SINGLERESP, (st), (val))

+#define sk_OCSP_SINGLERESP_find_ex(st, val) SKM_sk_find_ex(OCSP_SINGLERESP, (st), (val))

+#define sk_OCSP_SINGLERESP_delete(st, i) SKM_sk_delete(OCSP_SINGLERESP, (st), (i))

+#define sk_OCSP_SINGLERESP_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_SINGLERESP, (st), (ptr))

+#define sk_OCSP_SINGLERESP_insert(st, val, i) SKM_sk_insert(OCSP_SINGLERESP, (st), (val), (i))

+#define sk_OCSP_SINGLERESP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_SINGLERESP, (st), (cmp))

+#define sk_OCSP_SINGLERESP_dup(st) SKM_sk_dup(OCSP_SINGLERESP, st)

+#define sk_OCSP_SINGLERESP_pop_free(st, free_func) SKM_sk_pop_free(OCSP_SINGLERESP, (st), (free_func))

+#define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st))

+#define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st))

+#define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st))

+#define sk_OCSP_SINGLERESP_is_sorted(st) SKM_sk_is_sorted(OCSP_SINGLERESP, (st))

+

+#define sk_PKCS12_SAFEBAG_new(cmp) SKM_sk_new(PKCS12_SAFEBAG, (cmp))

+#define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG)

+#define sk_PKCS12_SAFEBAG_free(st) SKM_sk_free(PKCS12_SAFEBAG, (st))

+#define sk_PKCS12_SAFEBAG_num(st) SKM_sk_num(PKCS12_SAFEBAG, (st))

+#define sk_PKCS12_SAFEBAG_value(st, i) SKM_sk_value(PKCS12_SAFEBAG, (st), (i))

+#define sk_PKCS12_SAFEBAG_set(st, i, val) SKM_sk_set(PKCS12_SAFEBAG, (st), (i), (val))

+#define sk_PKCS12_SAFEBAG_zero(st) SKM_sk_zero(PKCS12_SAFEBAG, (st))

+#define sk_PKCS12_SAFEBAG_push(st, val) SKM_sk_push(PKCS12_SAFEBAG, (st), (val))

+#define sk_PKCS12_SAFEBAG_unshift(st, val) SKM_sk_unshift(PKCS12_SAFEBAG, (st), (val))

+#define sk_PKCS12_SAFEBAG_find(st, val) SKM_sk_find(PKCS12_SAFEBAG, (st), (val))

+#define sk_PKCS12_SAFEBAG_find_ex(st, val) SKM_sk_find_ex(PKCS12_SAFEBAG, (st), (val))

+#define sk_PKCS12_SAFEBAG_delete(st, i) SKM_sk_delete(PKCS12_SAFEBAG, (st), (i))

+#define sk_PKCS12_SAFEBAG_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS12_SAFEBAG, (st), (ptr))

+#define sk_PKCS12_SAFEBAG_insert(st, val, i) SKM_sk_insert(PKCS12_SAFEBAG, (st), (val), (i))

+#define sk_PKCS12_SAFEBAG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS12_SAFEBAG, (st), (cmp))

+#define sk_PKCS12_SAFEBAG_dup(st) SKM_sk_dup(PKCS12_SAFEBAG, st)

+#define sk_PKCS12_SAFEBAG_pop_free(st, free_func) SKM_sk_pop_free(PKCS12_SAFEBAG, (st), (free_func))

+#define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st))

+#define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st))

+#define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st))

+#define sk_PKCS12_SAFEBAG_is_sorted(st) SKM_sk_is_sorted(PKCS12_SAFEBAG, (st))

+

+#define sk_PKCS7_new(cmp) SKM_sk_new(PKCS7, (cmp))

+#define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7)

+#define sk_PKCS7_free(st) SKM_sk_free(PKCS7, (st))

+#define sk_PKCS7_num(st) SKM_sk_num(PKCS7, (st))

+#define sk_PKCS7_value(st, i) SKM_sk_value(PKCS7, (st), (i))

+#define sk_PKCS7_set(st, i, val) SKM_sk_set(PKCS7, (st), (i), (val))

+#define sk_PKCS7_zero(st) SKM_sk_zero(PKCS7, (st))

+#define sk_PKCS7_push(st, val) SKM_sk_push(PKCS7, (st), (val))

+#define sk_PKCS7_unshift(st, val) SKM_sk_unshift(PKCS7, (st), (val))

+#define sk_PKCS7_find(st, val) SKM_sk_find(PKCS7, (st), (val))

+#define sk_PKCS7_find_ex(st, val) SKM_sk_find_ex(PKCS7, (st), (val))

+#define sk_PKCS7_delete(st, i) SKM_sk_delete(PKCS7, (st), (i))

+#define sk_PKCS7_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7, (st), (ptr))

+#define sk_PKCS7_insert(st, val, i) SKM_sk_insert(PKCS7, (st), (val), (i))

+#define sk_PKCS7_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7, (st), (cmp))

+#define sk_PKCS7_dup(st) SKM_sk_dup(PKCS7, st)

+#define sk_PKCS7_pop_free(st, free_func) SKM_sk_pop_free(PKCS7, (st), (free_func))

+#define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st))

+#define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st))

+#define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st))

+#define sk_PKCS7_is_sorted(st) SKM_sk_is_sorted(PKCS7, (st))

+

+#define sk_PKCS7_RECIP_INFO_new(cmp) SKM_sk_new(PKCS7_RECIP_INFO, (cmp))

+#define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO)

+#define sk_PKCS7_RECIP_INFO_free(st) SKM_sk_free(PKCS7_RECIP_INFO, (st))

+#define sk_PKCS7_RECIP_INFO_num(st) SKM_sk_num(PKCS7_RECIP_INFO, (st))

+#define sk_PKCS7_RECIP_INFO_value(st, i) SKM_sk_value(PKCS7_RECIP_INFO, (st), (i))

+#define sk_PKCS7_RECIP_INFO_set(st, i, val) SKM_sk_set(PKCS7_RECIP_INFO, (st), (i), (val))

+#define sk_PKCS7_RECIP_INFO_zero(st) SKM_sk_zero(PKCS7_RECIP_INFO, (st))

+#define sk_PKCS7_RECIP_INFO_push(st, val) SKM_sk_push(PKCS7_RECIP_INFO, (st), (val))

+#define sk_PKCS7_RECIP_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_RECIP_INFO, (st), (val))

+#define sk_PKCS7_RECIP_INFO_find(st, val) SKM_sk_find(PKCS7_RECIP_INFO, (st), (val))

+#define sk_PKCS7_RECIP_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_RECIP_INFO, (st), (val))

+#define sk_PKCS7_RECIP_INFO_delete(st, i) SKM_sk_delete(PKCS7_RECIP_INFO, (st), (i))

+#define sk_PKCS7_RECIP_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_RECIP_INFO, (st), (ptr))

+#define sk_PKCS7_RECIP_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_RECIP_INFO, (st), (val), (i))

+#define sk_PKCS7_RECIP_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_RECIP_INFO, (st), (cmp))

+#define sk_PKCS7_RECIP_INFO_dup(st) SKM_sk_dup(PKCS7_RECIP_INFO, st)

+#define sk_PKCS7_RECIP_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_RECIP_INFO, (st), (free_func))

+#define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st))

+#define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st))

+#define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st))

+#define sk_PKCS7_RECIP_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_RECIP_INFO, (st))

+

+#define sk_PKCS7_SIGNER_INFO_new(cmp) SKM_sk_new(PKCS7_SIGNER_INFO, (cmp))

+#define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO)

+#define sk_PKCS7_SIGNER_INFO_free(st) SKM_sk_free(PKCS7_SIGNER_INFO, (st))

+#define sk_PKCS7_SIGNER_INFO_num(st) SKM_sk_num(PKCS7_SIGNER_INFO, (st))

+#define sk_PKCS7_SIGNER_INFO_value(st, i) SKM_sk_value(PKCS7_SIGNER_INFO, (st), (i))

+#define sk_PKCS7_SIGNER_INFO_set(st, i, val) SKM_sk_set(PKCS7_SIGNER_INFO, (st), (i), (val))

+#define sk_PKCS7_SIGNER_INFO_zero(st) SKM_sk_zero(PKCS7_SIGNER_INFO, (st))

+#define sk_PKCS7_SIGNER_INFO_push(st, val) SKM_sk_push(PKCS7_SIGNER_INFO, (st), (val))

+#define sk_PKCS7_SIGNER_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_SIGNER_INFO, (st), (val))

+#define sk_PKCS7_SIGNER_INFO_find(st, val) SKM_sk_find(PKCS7_SIGNER_INFO, (st), (val))

+#define sk_PKCS7_SIGNER_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_SIGNER_INFO, (st), (val))

+#define sk_PKCS7_SIGNER_INFO_delete(st, i) SKM_sk_delete(PKCS7_SIGNER_INFO, (st), (i))

+#define sk_PKCS7_SIGNER_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_SIGNER_INFO, (st), (ptr))

+#define sk_PKCS7_SIGNER_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_SIGNER_INFO, (st), (val), (i))

+#define sk_PKCS7_SIGNER_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_SIGNER_INFO, (st), (cmp))

+#define sk_PKCS7_SIGNER_INFO_dup(st) SKM_sk_dup(PKCS7_SIGNER_INFO, st)

+#define sk_PKCS7_SIGNER_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_SIGNER_INFO, (st), (free_func))

+#define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st))

+#define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st))

+#define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st))

+#define sk_PKCS7_SIGNER_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_SIGNER_INFO, (st))

+

+#define sk_POLICYINFO_new(cmp) SKM_sk_new(POLICYINFO, (cmp))

+#define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO)

+#define sk_POLICYINFO_free(st) SKM_sk_free(POLICYINFO, (st))

+#define sk_POLICYINFO_num(st) SKM_sk_num(POLICYINFO, (st))

+#define sk_POLICYINFO_value(st, i) SKM_sk_value(POLICYINFO, (st), (i))

+#define sk_POLICYINFO_set(st, i, val) SKM_sk_set(POLICYINFO, (st), (i), (val))

+#define sk_POLICYINFO_zero(st) SKM_sk_zero(POLICYINFO, (st))

+#define sk_POLICYINFO_push(st, val) SKM_sk_push(POLICYINFO, (st), (val))

+#define sk_POLICYINFO_unshift(st, val) SKM_sk_unshift(POLICYINFO, (st), (val))

+#define sk_POLICYINFO_find(st, val) SKM_sk_find(POLICYINFO, (st), (val))

+#define sk_POLICYINFO_find_ex(st, val) SKM_sk_find_ex(POLICYINFO, (st), (val))

+#define sk_POLICYINFO_delete(st, i) SKM_sk_delete(POLICYINFO, (st), (i))

+#define sk_POLICYINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYINFO, (st), (ptr))

+#define sk_POLICYINFO_insert(st, val, i) SKM_sk_insert(POLICYINFO, (st), (val), (i))

+#define sk_POLICYINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYINFO, (st), (cmp))

+#define sk_POLICYINFO_dup(st) SKM_sk_dup(POLICYINFO, st)

+#define sk_POLICYINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYINFO, (st), (free_func))

+#define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st))

+#define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st))

+#define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st))

+#define sk_POLICYINFO_is_sorted(st) SKM_sk_is_sorted(POLICYINFO, (st))

+

+#define sk_POLICYQUALINFO_new(cmp) SKM_sk_new(POLICYQUALINFO, (cmp))

+#define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO)

+#define sk_POLICYQUALINFO_free(st) SKM_sk_free(POLICYQUALINFO, (st))

+#define sk_POLICYQUALINFO_num(st) SKM_sk_num(POLICYQUALINFO, (st))

+#define sk_POLICYQUALINFO_value(st, i) SKM_sk_value(POLICYQUALINFO, (st), (i))

+#define sk_POLICYQUALINFO_set(st, i, val) SKM_sk_set(POLICYQUALINFO, (st), (i), (val))

+#define sk_POLICYQUALINFO_zero(st) SKM_sk_zero(POLICYQUALINFO, (st))

+#define sk_POLICYQUALINFO_push(st, val) SKM_sk_push(POLICYQUALINFO, (st), (val))

+#define sk_POLICYQUALINFO_unshift(st, val) SKM_sk_unshift(POLICYQUALINFO, (st), (val))

+#define sk_POLICYQUALINFO_find(st, val) SKM_sk_find(POLICYQUALINFO, (st), (val))

+#define sk_POLICYQUALINFO_find_ex(st, val) SKM_sk_find_ex(POLICYQUALINFO, (st), (val))

+#define sk_POLICYQUALINFO_delete(st, i) SKM_sk_delete(POLICYQUALINFO, (st), (i))

+#define sk_POLICYQUALINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYQUALINFO, (st), (ptr))

+#define sk_POLICYQUALINFO_insert(st, val, i) SKM_sk_insert(POLICYQUALINFO, (st), (val), (i))

+#define sk_POLICYQUALINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYQUALINFO, (st), (cmp))

+#define sk_POLICYQUALINFO_dup(st) SKM_sk_dup(POLICYQUALINFO, st)

+#define sk_POLICYQUALINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYQUALINFO, (st), (free_func))

+#define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st))

+#define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))

+#define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))

+#define sk_POLICYQUALINFO_is_sorted(st) SKM_sk_is_sorted(POLICYQUALINFO, (st))

+

+#define sk_POLICY_MAPPING_new(cmp) SKM_sk_new(POLICY_MAPPING, (cmp))

+#define sk_POLICY_MAPPING_new_null() SKM_sk_new_null(POLICY_MAPPING)

+#define sk_POLICY_MAPPING_free(st) SKM_sk_free(POLICY_MAPPING, (st))

+#define sk_POLICY_MAPPING_num(st) SKM_sk_num(POLICY_MAPPING, (st))

+#define sk_POLICY_MAPPING_value(st, i) SKM_sk_value(POLICY_MAPPING, (st), (i))

+#define sk_POLICY_MAPPING_set(st, i, val) SKM_sk_set(POLICY_MAPPING, (st), (i), (val))

+#define sk_POLICY_MAPPING_zero(st) SKM_sk_zero(POLICY_MAPPING, (st))

+#define sk_POLICY_MAPPING_push(st, val) SKM_sk_push(POLICY_MAPPING, (st), (val))

+#define sk_POLICY_MAPPING_unshift(st, val) SKM_sk_unshift(POLICY_MAPPING, (st), (val))

+#define sk_POLICY_MAPPING_find(st, val) SKM_sk_find(POLICY_MAPPING, (st), (val))

+#define sk_POLICY_MAPPING_find_ex(st, val) SKM_sk_find_ex(POLICY_MAPPING, (st), (val))

+#define sk_POLICY_MAPPING_delete(st, i) SKM_sk_delete(POLICY_MAPPING, (st), (i))

+#define sk_POLICY_MAPPING_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICY_MAPPING, (st), (ptr))

+#define sk_POLICY_MAPPING_insert(st, val, i) SKM_sk_insert(POLICY_MAPPING, (st), (val), (i))

+#define sk_POLICY_MAPPING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICY_MAPPING, (st), (cmp))

+#define sk_POLICY_MAPPING_dup(st) SKM_sk_dup(POLICY_MAPPING, st)

+#define sk_POLICY_MAPPING_pop_free(st, free_func) SKM_sk_pop_free(POLICY_MAPPING, (st), (free_func))

+#define sk_POLICY_MAPPING_shift(st) SKM_sk_shift(POLICY_MAPPING, (st))

+#define sk_POLICY_MAPPING_pop(st) SKM_sk_pop(POLICY_MAPPING, (st))

+#define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))

+#define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))

+

+#define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))

+#define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)

+#define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))

+#define sk_SSL_CIPHER_num(st) SKM_sk_num(SSL_CIPHER, (st))

+#define sk_SSL_CIPHER_value(st, i) SKM_sk_value(SSL_CIPHER, (st), (i))

+#define sk_SSL_CIPHER_set(st, i, val) SKM_sk_set(SSL_CIPHER, (st), (i), (val))

+#define sk_SSL_CIPHER_zero(st) SKM_sk_zero(SSL_CIPHER, (st))

+#define sk_SSL_CIPHER_push(st, val) SKM_sk_push(SSL_CIPHER, (st), (val))

+#define sk_SSL_CIPHER_unshift(st, val) SKM_sk_unshift(SSL_CIPHER, (st), (val))

+#define sk_SSL_CIPHER_find(st, val) SKM_sk_find(SSL_CIPHER, (st), (val))

+#define sk_SSL_CIPHER_find_ex(st, val) SKM_sk_find_ex(SSL_CIPHER, (st), (val))

+#define sk_SSL_CIPHER_delete(st, i) SKM_sk_delete(SSL_CIPHER, (st), (i))

+#define sk_SSL_CIPHER_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_CIPHER, (st), (ptr))

+#define sk_SSL_CIPHER_insert(st, val, i) SKM_sk_insert(SSL_CIPHER, (st), (val), (i))

+#define sk_SSL_CIPHER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_CIPHER, (st), (cmp))

+#define sk_SSL_CIPHER_dup(st) SKM_sk_dup(SSL_CIPHER, st)

+#define sk_SSL_CIPHER_pop_free(st, free_func) SKM_sk_pop_free(SSL_CIPHER, (st), (free_func))

+#define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st))

+#define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st))

+#define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st))

+#define sk_SSL_CIPHER_is_sorted(st) SKM_sk_is_sorted(SSL_CIPHER, (st))

+

+#define sk_SSL_COMP_new(cmp) SKM_sk_new(SSL_COMP, (cmp))

+#define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP)

+#define sk_SSL_COMP_free(st) SKM_sk_free(SSL_COMP, (st))

+#define sk_SSL_COMP_num(st) SKM_sk_num(SSL_COMP, (st))

+#define sk_SSL_COMP_value(st, i) SKM_sk_value(SSL_COMP, (st), (i))

+#define sk_SSL_COMP_set(st, i, val) SKM_sk_set(SSL_COMP, (st), (i), (val))

+#define sk_SSL_COMP_zero(st) SKM_sk_zero(SSL_COMP, (st))

+#define sk_SSL_COMP_push(st, val) SKM_sk_push(SSL_COMP, (st), (val))

+#define sk_SSL_COMP_unshift(st, val) SKM_sk_unshift(SSL_COMP, (st), (val))

+#define sk_SSL_COMP_find(st, val) SKM_sk_find(SSL_COMP, (st), (val))

+#define sk_SSL_COMP_find_ex(st, val) SKM_sk_find_ex(SSL_COMP, (st), (val))

+#define sk_SSL_COMP_delete(st, i) SKM_sk_delete(SSL_COMP, (st), (i))

+#define sk_SSL_COMP_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_COMP, (st), (ptr))

+#define sk_SSL_COMP_insert(st, val, i) SKM_sk_insert(SSL_COMP, (st), (val), (i))

+#define sk_SSL_COMP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_COMP, (st), (cmp))

+#define sk_SSL_COMP_dup(st) SKM_sk_dup(SSL_COMP, st)

+#define sk_SSL_COMP_pop_free(st, free_func) SKM_sk_pop_free(SSL_COMP, (st), (free_func))

+#define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st))

+#define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st))

+#define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st))

+#define sk_SSL_COMP_is_sorted(st) SKM_sk_is_sorted(SSL_COMP, (st))

+

+#define sk_STACK_OF_X509_NAME_ENTRY_new(cmp) SKM_sk_new(STACK_OF_X509_NAME_ENTRY, (cmp))

+#define sk_STACK_OF_X509_NAME_ENTRY_new_null() SKM_sk_new_null(STACK_OF_X509_NAME_ENTRY)

+#define sk_STACK_OF_X509_NAME_ENTRY_free(st) SKM_sk_free(STACK_OF_X509_NAME_ENTRY, (st))

+#define sk_STACK_OF_X509_NAME_ENTRY_num(st) SKM_sk_num(STACK_OF_X509_NAME_ENTRY, (st))

+#define sk_STACK_OF_X509_NAME_ENTRY_value(st, i) SKM_sk_value(STACK_OF_X509_NAME_ENTRY, (st), (i))

+#define sk_STACK_OF_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(STACK_OF_X509_NAME_ENTRY, (st), (i), (val))

+#define sk_STACK_OF_X509_NAME_ENTRY_zero(st) SKM_sk_zero(STACK_OF_X509_NAME_ENTRY, (st))

+#define sk_STACK_OF_X509_NAME_ENTRY_push(st, val) SKM_sk_push(STACK_OF_X509_NAME_ENTRY, (st), (val))

+#define sk_STACK_OF_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(STACK_OF_X509_NAME_ENTRY, (st), (val))

+#define sk_STACK_OF_X509_NAME_ENTRY_find(st, val) SKM_sk_find(STACK_OF_X509_NAME_ENTRY, (st), (val))

+#define sk_STACK_OF_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(STACK_OF_X509_NAME_ENTRY, (st), (val))

+#define sk_STACK_OF_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(STACK_OF_X509_NAME_ENTRY, (st), (i))

+#define sk_STACK_OF_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(STACK_OF_X509_NAME_ENTRY, (st), (ptr))

+#define sk_STACK_OF_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(STACK_OF_X509_NAME_ENTRY, (st), (val), (i))

+#define sk_STACK_OF_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STACK_OF_X509_NAME_ENTRY, (st), (cmp))

+#define sk_STACK_OF_X509_NAME_ENTRY_dup(st) SKM_sk_dup(STACK_OF_X509_NAME_ENTRY, st)

+#define sk_STACK_OF_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(STACK_OF_X509_NAME_ENTRY, (st), (free_func))

+#define sk_STACK_OF_X509_NAME_ENTRY_shift(st) SKM_sk_shift(STACK_OF_X509_NAME_ENTRY, (st))

+#define sk_STACK_OF_X509_NAME_ENTRY_pop(st) SKM_sk_pop(STACK_OF_X509_NAME_ENTRY, (st))

+#define sk_STACK_OF_X509_NAME_ENTRY_sort(st) SKM_sk_sort(STACK_OF_X509_NAME_ENTRY, (st))

+#define sk_STACK_OF_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(STACK_OF_X509_NAME_ENTRY, (st))

+

+#define sk_STORE_ATTR_INFO_new(cmp) SKM_sk_new(STORE_ATTR_INFO, (cmp))

+#define sk_STORE_ATTR_INFO_new_null() SKM_sk_new_null(STORE_ATTR_INFO)

+#define sk_STORE_ATTR_INFO_free(st) SKM_sk_free(STORE_ATTR_INFO, (st))

+#define sk_STORE_ATTR_INFO_num(st) SKM_sk_num(STORE_ATTR_INFO, (st))

+#define sk_STORE_ATTR_INFO_value(st, i) SKM_sk_value(STORE_ATTR_INFO, (st), (i))

+#define sk_STORE_ATTR_INFO_set(st, i, val) SKM_sk_set(STORE_ATTR_INFO, (st), (i), (val))

+#define sk_STORE_ATTR_INFO_zero(st) SKM_sk_zero(STORE_ATTR_INFO, (st))

+#define sk_STORE_ATTR_INFO_push(st, val) SKM_sk_push(STORE_ATTR_INFO, (st), (val))

+#define sk_STORE_ATTR_INFO_unshift(st, val) SKM_sk_unshift(STORE_ATTR_INFO, (st), (val))

+#define sk_STORE_ATTR_INFO_find(st, val) SKM_sk_find(STORE_ATTR_INFO, (st), (val))

+#define sk_STORE_ATTR_INFO_find_ex(st, val) SKM_sk_find_ex(STORE_ATTR_INFO, (st), (val))

+#define sk_STORE_ATTR_INFO_delete(st, i) SKM_sk_delete(STORE_ATTR_INFO, (st), (i))

+#define sk_STORE_ATTR_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_ATTR_INFO, (st), (ptr))

+#define sk_STORE_ATTR_INFO_insert(st, val, i) SKM_sk_insert(STORE_ATTR_INFO, (st), (val), (i))

+#define sk_STORE_ATTR_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_ATTR_INFO, (st), (cmp))

+#define sk_STORE_ATTR_INFO_dup(st) SKM_sk_dup(STORE_ATTR_INFO, st)

+#define sk_STORE_ATTR_INFO_pop_free(st, free_func) SKM_sk_pop_free(STORE_ATTR_INFO, (st), (free_func))

+#define sk_STORE_ATTR_INFO_shift(st) SKM_sk_shift(STORE_ATTR_INFO, (st))

+#define sk_STORE_ATTR_INFO_pop(st) SKM_sk_pop(STORE_ATTR_INFO, (st))

+#define sk_STORE_ATTR_INFO_sort(st) SKM_sk_sort(STORE_ATTR_INFO, (st))

+#define sk_STORE_ATTR_INFO_is_sorted(st) SKM_sk_is_sorted(STORE_ATTR_INFO, (st))

+

+#define sk_STORE_OBJECT_new(cmp) SKM_sk_new(STORE_OBJECT, (cmp))

+#define sk_STORE_OBJECT_new_null() SKM_sk_new_null(STORE_OBJECT)

+#define sk_STORE_OBJECT_free(st) SKM_sk_free(STORE_OBJECT, (st))

+#define sk_STORE_OBJECT_num(st) SKM_sk_num(STORE_OBJECT, (st))

+#define sk_STORE_OBJECT_value(st, i) SKM_sk_value(STORE_OBJECT, (st), (i))

+#define sk_STORE_OBJECT_set(st, i, val) SKM_sk_set(STORE_OBJECT, (st), (i), (val))

+#define sk_STORE_OBJECT_zero(st) SKM_sk_zero(STORE_OBJECT, (st))

+#define sk_STORE_OBJECT_push(st, val) SKM_sk_push(STORE_OBJECT, (st), (val))

+#define sk_STORE_OBJECT_unshift(st, val) SKM_sk_unshift(STORE_OBJECT, (st), (val))

+#define sk_STORE_OBJECT_find(st, val) SKM_sk_find(STORE_OBJECT, (st), (val))

+#define sk_STORE_OBJECT_find_ex(st, val) SKM_sk_find_ex(STORE_OBJECT, (st), (val))

+#define sk_STORE_OBJECT_delete(st, i) SKM_sk_delete(STORE_OBJECT, (st), (i))

+#define sk_STORE_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_OBJECT, (st), (ptr))

+#define sk_STORE_OBJECT_insert(st, val, i) SKM_sk_insert(STORE_OBJECT, (st), (val), (i))

+#define sk_STORE_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_OBJECT, (st), (cmp))

+#define sk_STORE_OBJECT_dup(st) SKM_sk_dup(STORE_OBJECT, st)

+#define sk_STORE_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(STORE_OBJECT, (st), (free_func))

+#define sk_STORE_OBJECT_shift(st) SKM_sk_shift(STORE_OBJECT, (st))

+#define sk_STORE_OBJECT_pop(st) SKM_sk_pop(STORE_OBJECT, (st))

+#define sk_STORE_OBJECT_sort(st) SKM_sk_sort(STORE_OBJECT, (st))

+#define sk_STORE_OBJECT_is_sorted(st) SKM_sk_is_sorted(STORE_OBJECT, (st))

+

+#define sk_SXNETID_new(cmp) SKM_sk_new(SXNETID, (cmp))

+#define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID)

+#define sk_SXNETID_free(st) SKM_sk_free(SXNETID, (st))

+#define sk_SXNETID_num(st) SKM_sk_num(SXNETID, (st))

+#define sk_SXNETID_value(st, i) SKM_sk_value(SXNETID, (st), (i))

+#define sk_SXNETID_set(st, i, val) SKM_sk_set(SXNETID, (st), (i), (val))

+#define sk_SXNETID_zero(st) SKM_sk_zero(SXNETID, (st))

+#define sk_SXNETID_push(st, val) SKM_sk_push(SXNETID, (st), (val))

+#define sk_SXNETID_unshift(st, val) SKM_sk_unshift(SXNETID, (st), (val))

+#define sk_SXNETID_find(st, val) SKM_sk_find(SXNETID, (st), (val))

+#define sk_SXNETID_find_ex(st, val) SKM_sk_find_ex(SXNETID, (st), (val))

+#define sk_SXNETID_delete(st, i) SKM_sk_delete(SXNETID, (st), (i))

+#define sk_SXNETID_delete_ptr(st, ptr) SKM_sk_delete_ptr(SXNETID, (st), (ptr))

+#define sk_SXNETID_insert(st, val, i) SKM_sk_insert(SXNETID, (st), (val), (i))

+#define sk_SXNETID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SXNETID, (st), (cmp))

+#define sk_SXNETID_dup(st) SKM_sk_dup(SXNETID, st)

+#define sk_SXNETID_pop_free(st, free_func) SKM_sk_pop_free(SXNETID, (st), (free_func))

+#define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st))

+#define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st))

+#define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st))

+#define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st))

+

+#define sk_UI_STRING_new(cmp) SKM_sk_new(UI_STRING, (cmp))

+#define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING)

+#define sk_UI_STRING_free(st) SKM_sk_free(UI_STRING, (st))

+#define sk_UI_STRING_num(st) SKM_sk_num(UI_STRING, (st))

+#define sk_UI_STRING_value(st, i) SKM_sk_value(UI_STRING, (st), (i))

+#define sk_UI_STRING_set(st, i, val) SKM_sk_set(UI_STRING, (st), (i), (val))

+#define sk_UI_STRING_zero(st) SKM_sk_zero(UI_STRING, (st))

+#define sk_UI_STRING_push(st, val) SKM_sk_push(UI_STRING, (st), (val))

+#define sk_UI_STRING_unshift(st, val) SKM_sk_unshift(UI_STRING, (st), (val))

+#define sk_UI_STRING_find(st, val) SKM_sk_find(UI_STRING, (st), (val))

+#define sk_UI_STRING_find_ex(st, val) SKM_sk_find_ex(UI_STRING, (st), (val))

+#define sk_UI_STRING_delete(st, i) SKM_sk_delete(UI_STRING, (st), (i))

+#define sk_UI_STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(UI_STRING, (st), (ptr))

+#define sk_UI_STRING_insert(st, val, i) SKM_sk_insert(UI_STRING, (st), (val), (i))

+#define sk_UI_STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(UI_STRING, (st), (cmp))

+#define sk_UI_STRING_dup(st) SKM_sk_dup(UI_STRING, st)

+#define sk_UI_STRING_pop_free(st, free_func) SKM_sk_pop_free(UI_STRING, (st), (free_func))

+#define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st))

+#define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st))

+#define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st))

+#define sk_UI_STRING_is_sorted(st) SKM_sk_is_sorted(UI_STRING, (st))

+

+#define sk_X509_new(cmp) SKM_sk_new(X509, (cmp))

+#define sk_X509_new_null() SKM_sk_new_null(X509)

+#define sk_X509_free(st) SKM_sk_free(X509, (st))

+#define sk_X509_num(st) SKM_sk_num(X509, (st))

+#define sk_X509_value(st, i) SKM_sk_value(X509, (st), (i))

+#define sk_X509_set(st, i, val) SKM_sk_set(X509, (st), (i), (val))

+#define sk_X509_zero(st) SKM_sk_zero(X509, (st))

+#define sk_X509_push(st, val) SKM_sk_push(X509, (st), (val))

+#define sk_X509_unshift(st, val) SKM_sk_unshift(X509, (st), (val))

+#define sk_X509_find(st, val) SKM_sk_find(X509, (st), (val))

+#define sk_X509_find_ex(st, val) SKM_sk_find_ex(X509, (st), (val))

+#define sk_X509_delete(st, i) SKM_sk_delete(X509, (st), (i))

+#define sk_X509_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509, (st), (ptr))

+#define sk_X509_insert(st, val, i) SKM_sk_insert(X509, (st), (val), (i))

+#define sk_X509_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509, (st), (cmp))

+#define sk_X509_dup(st) SKM_sk_dup(X509, st)

+#define sk_X509_pop_free(st, free_func) SKM_sk_pop_free(X509, (st), (free_func))

+#define sk_X509_shift(st) SKM_sk_shift(X509, (st))

+#define sk_X509_pop(st) SKM_sk_pop(X509, (st))

+#define sk_X509_sort(st) SKM_sk_sort(X509, (st))

+#define sk_X509_is_sorted(st) SKM_sk_is_sorted(X509, (st))

+

+#define sk_X509V3_EXT_METHOD_new(cmp) SKM_sk_new(X509V3_EXT_METHOD, (cmp))

+#define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD)

+#define sk_X509V3_EXT_METHOD_free(st) SKM_sk_free(X509V3_EXT_METHOD, (st))

+#define sk_X509V3_EXT_METHOD_num(st) SKM_sk_num(X509V3_EXT_METHOD, (st))

+#define sk_X509V3_EXT_METHOD_value(st, i) SKM_sk_value(X509V3_EXT_METHOD, (st), (i))

+#define sk_X509V3_EXT_METHOD_set(st, i, val) SKM_sk_set(X509V3_EXT_METHOD, (st), (i), (val))

+#define sk_X509V3_EXT_METHOD_zero(st) SKM_sk_zero(X509V3_EXT_METHOD, (st))

+#define sk_X509V3_EXT_METHOD_push(st, val) SKM_sk_push(X509V3_EXT_METHOD, (st), (val))

+#define sk_X509V3_EXT_METHOD_unshift(st, val) SKM_sk_unshift(X509V3_EXT_METHOD, (st), (val))

+#define sk_X509V3_EXT_METHOD_find(st, val) SKM_sk_find(X509V3_EXT_METHOD, (st), (val))

+#define sk_X509V3_EXT_METHOD_find_ex(st, val) SKM_sk_find_ex(X509V3_EXT_METHOD, (st), (val))

+#define sk_X509V3_EXT_METHOD_delete(st, i) SKM_sk_delete(X509V3_EXT_METHOD, (st), (i))

+#define sk_X509V3_EXT_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509V3_EXT_METHOD, (st), (ptr))

+#define sk_X509V3_EXT_METHOD_insert(st, val, i) SKM_sk_insert(X509V3_EXT_METHOD, (st), (val), (i))

+#define sk_X509V3_EXT_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509V3_EXT_METHOD, (st), (cmp))

+#define sk_X509V3_EXT_METHOD_dup(st) SKM_sk_dup(X509V3_EXT_METHOD, st)

+#define sk_X509V3_EXT_METHOD_pop_free(st, free_func) SKM_sk_pop_free(X509V3_EXT_METHOD, (st), (free_func))

+#define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st))

+#define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st))

+#define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st))

+#define sk_X509V3_EXT_METHOD_is_sorted(st) SKM_sk_is_sorted(X509V3_EXT_METHOD, (st))

+

+#define sk_X509_ALGOR_new(cmp) SKM_sk_new(X509_ALGOR, (cmp))

+#define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR)

+#define sk_X509_ALGOR_free(st) SKM_sk_free(X509_ALGOR, (st))

+#define sk_X509_ALGOR_num(st) SKM_sk_num(X509_ALGOR, (st))

+#define sk_X509_ALGOR_value(st, i) SKM_sk_value(X509_ALGOR, (st), (i))

+#define sk_X509_ALGOR_set(st, i, val) SKM_sk_set(X509_ALGOR, (st), (i), (val))

+#define sk_X509_ALGOR_zero(st) SKM_sk_zero(X509_ALGOR, (st))

+#define sk_X509_ALGOR_push(st, val) SKM_sk_push(X509_ALGOR, (st), (val))

+#define sk_X509_ALGOR_unshift(st, val) SKM_sk_unshift(X509_ALGOR, (st), (val))

+#define sk_X509_ALGOR_find(st, val) SKM_sk_find(X509_ALGOR, (st), (val))

+#define sk_X509_ALGOR_find_ex(st, val) SKM_sk_find_ex(X509_ALGOR, (st), (val))

+#define sk_X509_ALGOR_delete(st, i) SKM_sk_delete(X509_ALGOR, (st), (i))

+#define sk_X509_ALGOR_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ALGOR, (st), (ptr))

+#define sk_X509_ALGOR_insert(st, val, i) SKM_sk_insert(X509_ALGOR, (st), (val), (i))

+#define sk_X509_ALGOR_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ALGOR, (st), (cmp))

+#define sk_X509_ALGOR_dup(st) SKM_sk_dup(X509_ALGOR, st)

+#define sk_X509_ALGOR_pop_free(st, free_func) SKM_sk_pop_free(X509_ALGOR, (st), (free_func))

+#define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st))

+#define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st))

+#define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st))

+#define sk_X509_ALGOR_is_sorted(st) SKM_sk_is_sorted(X509_ALGOR, (st))

+

+#define sk_X509_ATTRIBUTE_new(cmp) SKM_sk_new(X509_ATTRIBUTE, (cmp))

+#define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE)

+#define sk_X509_ATTRIBUTE_free(st) SKM_sk_free(X509_ATTRIBUTE, (st))

+#define sk_X509_ATTRIBUTE_num(st) SKM_sk_num(X509_ATTRIBUTE, (st))

+#define sk_X509_ATTRIBUTE_value(st, i) SKM_sk_value(X509_ATTRIBUTE, (st), (i))

+#define sk_X509_ATTRIBUTE_set(st, i, val) SKM_sk_set(X509_ATTRIBUTE, (st), (i), (val))

+#define sk_X509_ATTRIBUTE_zero(st) SKM_sk_zero(X509_ATTRIBUTE, (st))

+#define sk_X509_ATTRIBUTE_push(st, val) SKM_sk_push(X509_ATTRIBUTE, (st), (val))

+#define sk_X509_ATTRIBUTE_unshift(st, val) SKM_sk_unshift(X509_ATTRIBUTE, (st), (val))

+#define sk_X509_ATTRIBUTE_find(st, val) SKM_sk_find(X509_ATTRIBUTE, (st), (val))

+#define sk_X509_ATTRIBUTE_find_ex(st, val) SKM_sk_find_ex(X509_ATTRIBUTE, (st), (val))

+#define sk_X509_ATTRIBUTE_delete(st, i) SKM_sk_delete(X509_ATTRIBUTE, (st), (i))

+#define sk_X509_ATTRIBUTE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ATTRIBUTE, (st), (ptr))

+#define sk_X509_ATTRIBUTE_insert(st, val, i) SKM_sk_insert(X509_ATTRIBUTE, (st), (val), (i))

+#define sk_X509_ATTRIBUTE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ATTRIBUTE, (st), (cmp))

+#define sk_X509_ATTRIBUTE_dup(st) SKM_sk_dup(X509_ATTRIBUTE, st)

+#define sk_X509_ATTRIBUTE_pop_free(st, free_func) SKM_sk_pop_free(X509_ATTRIBUTE, (st), (free_func))

+#define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st))

+#define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st))

+#define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st))

+#define sk_X509_ATTRIBUTE_is_sorted(st) SKM_sk_is_sorted(X509_ATTRIBUTE, (st))

+

+#define sk_X509_CRL_new(cmp) SKM_sk_new(X509_CRL, (cmp))

+#define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL)

+#define sk_X509_CRL_free(st) SKM_sk_free(X509_CRL, (st))

+#define sk_X509_CRL_num(st) SKM_sk_num(X509_CRL, (st))

+#define sk_X509_CRL_value(st, i) SKM_sk_value(X509_CRL, (st), (i))

+#define sk_X509_CRL_set(st, i, val) SKM_sk_set(X509_CRL, (st), (i), (val))

+#define sk_X509_CRL_zero(st) SKM_sk_zero(X509_CRL, (st))

+#define sk_X509_CRL_push(st, val) SKM_sk_push(X509_CRL, (st), (val))

+#define sk_X509_CRL_unshift(st, val) SKM_sk_unshift(X509_CRL, (st), (val))

+#define sk_X509_CRL_find(st, val) SKM_sk_find(X509_CRL, (st), (val))

+#define sk_X509_CRL_find_ex(st, val) SKM_sk_find_ex(X509_CRL, (st), (val))

+#define sk_X509_CRL_delete(st, i) SKM_sk_delete(X509_CRL, (st), (i))

+#define sk_X509_CRL_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_CRL, (st), (ptr))

+#define sk_X509_CRL_insert(st, val, i) SKM_sk_insert(X509_CRL, (st), (val), (i))

+#define sk_X509_CRL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_CRL, (st), (cmp))

+#define sk_X509_CRL_dup(st) SKM_sk_dup(X509_CRL, st)

+#define sk_X509_CRL_pop_free(st, free_func) SKM_sk_pop_free(X509_CRL, (st), (free_func))

+#define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st))

+#define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st))

+#define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st))

+#define sk_X509_CRL_is_sorted(st) SKM_sk_is_sorted(X509_CRL, (st))

+

+#define sk_X509_EXTENSION_new(cmp) SKM_sk_new(X509_EXTENSION, (cmp))

+#define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION)

+#define sk_X509_EXTENSION_free(st) SKM_sk_free(X509_EXTENSION, (st))

+#define sk_X509_EXTENSION_num(st) SKM_sk_num(X509_EXTENSION, (st))

+#define sk_X509_EXTENSION_value(st, i) SKM_sk_value(X509_EXTENSION, (st), (i))

+#define sk_X509_EXTENSION_set(st, i, val) SKM_sk_set(X509_EXTENSION, (st), (i), (val))

+#define sk_X509_EXTENSION_zero(st) SKM_sk_zero(X509_EXTENSION, (st))

+#define sk_X509_EXTENSION_push(st, val) SKM_sk_push(X509_EXTENSION, (st), (val))

+#define sk_X509_EXTENSION_unshift(st, val) SKM_sk_unshift(X509_EXTENSION, (st), (val))

+#define sk_X509_EXTENSION_find(st, val) SKM_sk_find(X509_EXTENSION, (st), (val))

+#define sk_X509_EXTENSION_find_ex(st, val) SKM_sk_find_ex(X509_EXTENSION, (st), (val))

+#define sk_X509_EXTENSION_delete(st, i) SKM_sk_delete(X509_EXTENSION, (st), (i))

+#define sk_X509_EXTENSION_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_EXTENSION, (st), (ptr))

+#define sk_X509_EXTENSION_insert(st, val, i) SKM_sk_insert(X509_EXTENSION, (st), (val), (i))

+#define sk_X509_EXTENSION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_EXTENSION, (st), (cmp))

+#define sk_X509_EXTENSION_dup(st) SKM_sk_dup(X509_EXTENSION, st)

+#define sk_X509_EXTENSION_pop_free(st, free_func) SKM_sk_pop_free(X509_EXTENSION, (st), (free_func))

+#define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st))

+#define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st))

+#define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st))

+#define sk_X509_EXTENSION_is_sorted(st) SKM_sk_is_sorted(X509_EXTENSION, (st))

+

+#define sk_X509_INFO_new(cmp) SKM_sk_new(X509_INFO, (cmp))

+#define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO)

+#define sk_X509_INFO_free(st) SKM_sk_free(X509_INFO, (st))

+#define sk_X509_INFO_num(st) SKM_sk_num(X509_INFO, (st))

+#define sk_X509_INFO_value(st, i) SKM_sk_value(X509_INFO, (st), (i))

+#define sk_X509_INFO_set(st, i, val) SKM_sk_set(X509_INFO, (st), (i), (val))

+#define sk_X509_INFO_zero(st) SKM_sk_zero(X509_INFO, (st))

+#define sk_X509_INFO_push(st, val) SKM_sk_push(X509_INFO, (st), (val))

+#define sk_X509_INFO_unshift(st, val) SKM_sk_unshift(X509_INFO, (st), (val))

+#define sk_X509_INFO_find(st, val) SKM_sk_find(X509_INFO, (st), (val))

+#define sk_X509_INFO_find_ex(st, val) SKM_sk_find_ex(X509_INFO, (st), (val))

+#define sk_X509_INFO_delete(st, i) SKM_sk_delete(X509_INFO, (st), (i))

+#define sk_X509_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_INFO, (st), (ptr))

+#define sk_X509_INFO_insert(st, val, i) SKM_sk_insert(X509_INFO, (st), (val), (i))

+#define sk_X509_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_INFO, (st), (cmp))

+#define sk_X509_INFO_dup(st) SKM_sk_dup(X509_INFO, st)

+#define sk_X509_INFO_pop_free(st, free_func) SKM_sk_pop_free(X509_INFO, (st), (free_func))

+#define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st))

+#define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st))

+#define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st))

+#define sk_X509_INFO_is_sorted(st) SKM_sk_is_sorted(X509_INFO, (st))

+

+#define sk_X509_LOOKUP_new(cmp) SKM_sk_new(X509_LOOKUP, (cmp))

+#define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP)

+#define sk_X509_LOOKUP_free(st) SKM_sk_free(X509_LOOKUP, (st))

+#define sk_X509_LOOKUP_num(st) SKM_sk_num(X509_LOOKUP, (st))

+#define sk_X509_LOOKUP_value(st, i) SKM_sk_value(X509_LOOKUP, (st), (i))

+#define sk_X509_LOOKUP_set(st, i, val) SKM_sk_set(X509_LOOKUP, (st), (i), (val))

+#define sk_X509_LOOKUP_zero(st) SKM_sk_zero(X509_LOOKUP, (st))

+#define sk_X509_LOOKUP_push(st, val) SKM_sk_push(X509_LOOKUP, (st), (val))

+#define sk_X509_LOOKUP_unshift(st, val) SKM_sk_unshift(X509_LOOKUP, (st), (val))

+#define sk_X509_LOOKUP_find(st, val) SKM_sk_find(X509_LOOKUP, (st), (val))

+#define sk_X509_LOOKUP_find_ex(st, val) SKM_sk_find_ex(X509_LOOKUP, (st), (val))

+#define sk_X509_LOOKUP_delete(st, i) SKM_sk_delete(X509_LOOKUP, (st), (i))

+#define sk_X509_LOOKUP_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_LOOKUP, (st), (ptr))

+#define sk_X509_LOOKUP_insert(st, val, i) SKM_sk_insert(X509_LOOKUP, (st), (val), (i))

+#define sk_X509_LOOKUP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_LOOKUP, (st), (cmp))

+#define sk_X509_LOOKUP_dup(st) SKM_sk_dup(X509_LOOKUP, st)

+#define sk_X509_LOOKUP_pop_free(st, free_func) SKM_sk_pop_free(X509_LOOKUP, (st), (free_func))

+#define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st))

+#define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st))

+#define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st))

+#define sk_X509_LOOKUP_is_sorted(st) SKM_sk_is_sorted(X509_LOOKUP, (st))

+

+#define sk_X509_NAME_new(cmp) SKM_sk_new(X509_NAME, (cmp))

+#define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME)

+#define sk_X509_NAME_free(st) SKM_sk_free(X509_NAME, (st))

+#define sk_X509_NAME_num(st) SKM_sk_num(X509_NAME, (st))

+#define sk_X509_NAME_value(st, i) SKM_sk_value(X509_NAME, (st), (i))

+#define sk_X509_NAME_set(st, i, val) SKM_sk_set(X509_NAME, (st), (i), (val))

+#define sk_X509_NAME_zero(st) SKM_sk_zero(X509_NAME, (st))

+#define sk_X509_NAME_push(st, val) SKM_sk_push(X509_NAME, (st), (val))

+#define sk_X509_NAME_unshift(st, val) SKM_sk_unshift(X509_NAME, (st), (val))

+#define sk_X509_NAME_find(st, val) SKM_sk_find(X509_NAME, (st), (val))

+#define sk_X509_NAME_find_ex(st, val) SKM_sk_find_ex(X509_NAME, (st), (val))

+#define sk_X509_NAME_delete(st, i) SKM_sk_delete(X509_NAME, (st), (i))

+#define sk_X509_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME, (st), (ptr))

+#define sk_X509_NAME_insert(st, val, i) SKM_sk_insert(X509_NAME, (st), (val), (i))

+#define sk_X509_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME, (st), (cmp))

+#define sk_X509_NAME_dup(st) SKM_sk_dup(X509_NAME, st)

+#define sk_X509_NAME_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME, (st), (free_func))

+#define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st))

+#define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st))

+#define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st))

+#define sk_X509_NAME_is_sorted(st) SKM_sk_is_sorted(X509_NAME, (st))

+

+#define sk_X509_NAME_ENTRY_new(cmp) SKM_sk_new(X509_NAME_ENTRY, (cmp))

+#define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY)

+#define sk_X509_NAME_ENTRY_free(st) SKM_sk_free(X509_NAME_ENTRY, (st))

+#define sk_X509_NAME_ENTRY_num(st) SKM_sk_num(X509_NAME_ENTRY, (st))

+#define sk_X509_NAME_ENTRY_value(st, i) SKM_sk_value(X509_NAME_ENTRY, (st), (i))

+#define sk_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(X509_NAME_ENTRY, (st), (i), (val))

+#define sk_X509_NAME_ENTRY_zero(st) SKM_sk_zero(X509_NAME_ENTRY, (st))

+#define sk_X509_NAME_ENTRY_push(st, val) SKM_sk_push(X509_NAME_ENTRY, (st), (val))

+#define sk_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(X509_NAME_ENTRY, (st), (val))

+#define sk_X509_NAME_ENTRY_find(st, val) SKM_sk_find(X509_NAME_ENTRY, (st), (val))

+#define sk_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(X509_NAME_ENTRY, (st), (val))

+#define sk_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(X509_NAME_ENTRY, (st), (i))

+#define sk_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME_ENTRY, (st), (ptr))

+#define sk_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(X509_NAME_ENTRY, (st), (val), (i))

+#define sk_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME_ENTRY, (st), (cmp))

+#define sk_X509_NAME_ENTRY_dup(st) SKM_sk_dup(X509_NAME_ENTRY, st)

+#define sk_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME_ENTRY, (st), (free_func))

+#define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st))

+#define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st))

+#define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st))

+#define sk_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(X509_NAME_ENTRY, (st))

+

+#define sk_X509_OBJECT_new(cmp) SKM_sk_new(X509_OBJECT, (cmp))

+#define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT)

+#define sk_X509_OBJECT_free(st) SKM_sk_free(X509_OBJECT, (st))

+#define sk_X509_OBJECT_num(st) SKM_sk_num(X509_OBJECT, (st))

+#define sk_X509_OBJECT_value(st, i) SKM_sk_value(X509_OBJECT, (st), (i))

+#define sk_X509_OBJECT_set(st, i, val) SKM_sk_set(X509_OBJECT, (st), (i), (val))

+#define sk_X509_OBJECT_zero(st) SKM_sk_zero(X509_OBJECT, (st))

+#define sk_X509_OBJECT_push(st, val) SKM_sk_push(X509_OBJECT, (st), (val))

+#define sk_X509_OBJECT_unshift(st, val) SKM_sk_unshift(X509_OBJECT, (st), (val))

+#define sk_X509_OBJECT_find(st, val) SKM_sk_find(X509_OBJECT, (st), (val))

+#define sk_X509_OBJECT_find_ex(st, val) SKM_sk_find_ex(X509_OBJECT, (st), (val))

+#define sk_X509_OBJECT_delete(st, i) SKM_sk_delete(X509_OBJECT, (st), (i))

+#define sk_X509_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_OBJECT, (st), (ptr))

+#define sk_X509_OBJECT_insert(st, val, i) SKM_sk_insert(X509_OBJECT, (st), (val), (i))

+#define sk_X509_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_OBJECT, (st), (cmp))

+#define sk_X509_OBJECT_dup(st) SKM_sk_dup(X509_OBJECT, st)

+#define sk_X509_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(X509_OBJECT, (st), (free_func))

+#define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st))

+#define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st))

+#define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st))

+#define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st))

+

+#define sk_X509_POLICY_DATA_new(cmp) SKM_sk_new(X509_POLICY_DATA, (cmp))

+#define sk_X509_POLICY_DATA_new_null() SKM_sk_new_null(X509_POLICY_DATA)

+#define sk_X509_POLICY_DATA_free(st) SKM_sk_free(X509_POLICY_DATA, (st))

+#define sk_X509_POLICY_DATA_num(st) SKM_sk_num(X509_POLICY_DATA, (st))

+#define sk_X509_POLICY_DATA_value(st, i) SKM_sk_value(X509_POLICY_DATA, (st), (i))

+#define sk_X509_POLICY_DATA_set(st, i, val) SKM_sk_set(X509_POLICY_DATA, (st), (i), (val))

+#define sk_X509_POLICY_DATA_zero(st) SKM_sk_zero(X509_POLICY_DATA, (st))

+#define sk_X509_POLICY_DATA_push(st, val) SKM_sk_push(X509_POLICY_DATA, (st), (val))

+#define sk_X509_POLICY_DATA_unshift(st, val) SKM_sk_unshift(X509_POLICY_DATA, (st), (val))

+#define sk_X509_POLICY_DATA_find(st, val) SKM_sk_find(X509_POLICY_DATA, (st), (val))

+#define sk_X509_POLICY_DATA_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_DATA, (st), (val))

+#define sk_X509_POLICY_DATA_delete(st, i) SKM_sk_delete(X509_POLICY_DATA, (st), (i))

+#define sk_X509_POLICY_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_DATA, (st), (ptr))

+#define sk_X509_POLICY_DATA_insert(st, val, i) SKM_sk_insert(X509_POLICY_DATA, (st), (val), (i))

+#define sk_X509_POLICY_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_DATA, (st), (cmp))

+#define sk_X509_POLICY_DATA_dup(st) SKM_sk_dup(X509_POLICY_DATA, st)

+#define sk_X509_POLICY_DATA_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_DATA, (st), (free_func))

+#define sk_X509_POLICY_DATA_shift(st) SKM_sk_shift(X509_POLICY_DATA, (st))

+#define sk_X509_POLICY_DATA_pop(st) SKM_sk_pop(X509_POLICY_DATA, (st))

+#define sk_X509_POLICY_DATA_sort(st) SKM_sk_sort(X509_POLICY_DATA, (st))

+#define sk_X509_POLICY_DATA_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_DATA, (st))

+

+#define sk_X509_POLICY_NODE_new(cmp) SKM_sk_new(X509_POLICY_NODE, (cmp))

+#define sk_X509_POLICY_NODE_new_null() SKM_sk_new_null(X509_POLICY_NODE)

+#define sk_X509_POLICY_NODE_free(st) SKM_sk_free(X509_POLICY_NODE, (st))

+#define sk_X509_POLICY_NODE_num(st) SKM_sk_num(X509_POLICY_NODE, (st))

+#define sk_X509_POLICY_NODE_value(st, i) SKM_sk_value(X509_POLICY_NODE, (st), (i))

+#define sk_X509_POLICY_NODE_set(st, i, val) SKM_sk_set(X509_POLICY_NODE, (st), (i), (val))

+#define sk_X509_POLICY_NODE_zero(st) SKM_sk_zero(X509_POLICY_NODE, (st))

+#define sk_X509_POLICY_NODE_push(st, val) SKM_sk_push(X509_POLICY_NODE, (st), (val))

+#define sk_X509_POLICY_NODE_unshift(st, val) SKM_sk_unshift(X509_POLICY_NODE, (st), (val))

+#define sk_X509_POLICY_NODE_find(st, val) SKM_sk_find(X509_POLICY_NODE, (st), (val))

+#define sk_X509_POLICY_NODE_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_NODE, (st), (val))

+#define sk_X509_POLICY_NODE_delete(st, i) SKM_sk_delete(X509_POLICY_NODE, (st), (i))

+#define sk_X509_POLICY_NODE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_NODE, (st), (ptr))

+#define sk_X509_POLICY_NODE_insert(st, val, i) SKM_sk_insert(X509_POLICY_NODE, (st), (val), (i))

+#define sk_X509_POLICY_NODE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_NODE, (st), (cmp))

+#define sk_X509_POLICY_NODE_dup(st) SKM_sk_dup(X509_POLICY_NODE, st)

+#define sk_X509_POLICY_NODE_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_NODE, (st), (free_func))

+#define sk_X509_POLICY_NODE_shift(st) SKM_sk_shift(X509_POLICY_NODE, (st))

+#define sk_X509_POLICY_NODE_pop(st) SKM_sk_pop(X509_POLICY_NODE, (st))

+#define sk_X509_POLICY_NODE_sort(st) SKM_sk_sort(X509_POLICY_NODE, (st))

+#define sk_X509_POLICY_NODE_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_NODE, (st))

+

+#define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp))

+#define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE)

+#define sk_X509_PURPOSE_free(st) SKM_sk_free(X509_PURPOSE, (st))

+#define sk_X509_PURPOSE_num(st) SKM_sk_num(X509_PURPOSE, (st))

+#define sk_X509_PURPOSE_value(st, i) SKM_sk_value(X509_PURPOSE, (st), (i))

+#define sk_X509_PURPOSE_set(st, i, val) SKM_sk_set(X509_PURPOSE, (st), (i), (val))

+#define sk_X509_PURPOSE_zero(st) SKM_sk_zero(X509_PURPOSE, (st))

+#define sk_X509_PURPOSE_push(st, val) SKM_sk_push(X509_PURPOSE, (st), (val))

+#define sk_X509_PURPOSE_unshift(st, val) SKM_sk_unshift(X509_PURPOSE, (st), (val))

+#define sk_X509_PURPOSE_find(st, val) SKM_sk_find(X509_PURPOSE, (st), (val))

+#define sk_X509_PURPOSE_find_ex(st, val) SKM_sk_find_ex(X509_PURPOSE, (st), (val))

+#define sk_X509_PURPOSE_delete(st, i) SKM_sk_delete(X509_PURPOSE, (st), (i))

+#define sk_X509_PURPOSE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_PURPOSE, (st), (ptr))

+#define sk_X509_PURPOSE_insert(st, val, i) SKM_sk_insert(X509_PURPOSE, (st), (val), (i))

+#define sk_X509_PURPOSE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_PURPOSE, (st), (cmp))

+#define sk_X509_PURPOSE_dup(st) SKM_sk_dup(X509_PURPOSE, st)

+#define sk_X509_PURPOSE_pop_free(st, free_func) SKM_sk_pop_free(X509_PURPOSE, (st), (free_func))

+#define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st))

+#define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st))

+#define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st))

+#define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st))

+

+#define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp))

+#define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)

+#define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st))

+#define sk_X509_REVOKED_num(st) SKM_sk_num(X509_REVOKED, (st))

+#define sk_X509_REVOKED_value(st, i) SKM_sk_value(X509_REVOKED, (st), (i))

+#define sk_X509_REVOKED_set(st, i, val) SKM_sk_set(X509_REVOKED, (st), (i), (val))

+#define sk_X509_REVOKED_zero(st) SKM_sk_zero(X509_REVOKED, (st))

+#define sk_X509_REVOKED_push(st, val) SKM_sk_push(X509_REVOKED, (st), (val))

+#define sk_X509_REVOKED_unshift(st, val) SKM_sk_unshift(X509_REVOKED, (st), (val))

+#define sk_X509_REVOKED_find(st, val) SKM_sk_find(X509_REVOKED, (st), (val))

+#define sk_X509_REVOKED_find_ex(st, val) SKM_sk_find_ex(X509_REVOKED, (st), (val))

+#define sk_X509_REVOKED_delete(st, i) SKM_sk_delete(X509_REVOKED, (st), (i))

+#define sk_X509_REVOKED_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_REVOKED, (st), (ptr))

+#define sk_X509_REVOKED_insert(st, val, i) SKM_sk_insert(X509_REVOKED, (st), (val), (i))

+#define sk_X509_REVOKED_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_REVOKED, (st), (cmp))

+#define sk_X509_REVOKED_dup(st) SKM_sk_dup(X509_REVOKED, st)

+#define sk_X509_REVOKED_pop_free(st, free_func) SKM_sk_pop_free(X509_REVOKED, (st), (free_func))

+#define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st))

+#define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st))

+#define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st))

+#define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st))

+

+#define sk_X509_TRUST_new(cmp) SKM_sk_new(X509_TRUST, (cmp))

+#define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)

+#define sk_X509_TRUST_free(st) SKM_sk_free(X509_TRUST, (st))

+#define sk_X509_TRUST_num(st) SKM_sk_num(X509_TRUST, (st))

+#define sk_X509_TRUST_value(st, i) SKM_sk_value(X509_TRUST, (st), (i))

+#define sk_X509_TRUST_set(st, i, val) SKM_sk_set(X509_TRUST, (st), (i), (val))

+#define sk_X509_TRUST_zero(st) SKM_sk_zero(X509_TRUST, (st))

+#define sk_X509_TRUST_push(st, val) SKM_sk_push(X509_TRUST, (st), (val))

+#define sk_X509_TRUST_unshift(st, val) SKM_sk_unshift(X509_TRUST, (st), (val))

+#define sk_X509_TRUST_find(st, val) SKM_sk_find(X509_TRUST, (st), (val))

+#define sk_X509_TRUST_find_ex(st, val) SKM_sk_find_ex(X509_TRUST, (st), (val))

+#define sk_X509_TRUST_delete(st, i) SKM_sk_delete(X509_TRUST, (st), (i))

+#define sk_X509_TRUST_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_TRUST, (st), (ptr))

+#define sk_X509_TRUST_insert(st, val, i) SKM_sk_insert(X509_TRUST, (st), (val), (i))

+#define sk_X509_TRUST_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_TRUST, (st), (cmp))

+#define sk_X509_TRUST_dup(st) SKM_sk_dup(X509_TRUST, st)

+#define sk_X509_TRUST_pop_free(st, free_func) SKM_sk_pop_free(X509_TRUST, (st), (free_func))

+#define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st))

+#define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st))

+#define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st))

+#define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st))

+

+#define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp))

+#define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM)

+#define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st))

+#define sk_X509_VERIFY_PARAM_num(st) SKM_sk_num(X509_VERIFY_PARAM, (st))

+#define sk_X509_VERIFY_PARAM_value(st, i) SKM_sk_value(X509_VERIFY_PARAM, (st), (i))

+#define sk_X509_VERIFY_PARAM_set(st, i, val) SKM_sk_set(X509_VERIFY_PARAM, (st), (i), (val))

+#define sk_X509_VERIFY_PARAM_zero(st) SKM_sk_zero(X509_VERIFY_PARAM, (st))

+#define sk_X509_VERIFY_PARAM_push(st, val) SKM_sk_push(X509_VERIFY_PARAM, (st), (val))

+#define sk_X509_VERIFY_PARAM_unshift(st, val) SKM_sk_unshift(X509_VERIFY_PARAM, (st), (val))

+#define sk_X509_VERIFY_PARAM_find(st, val) SKM_sk_find(X509_VERIFY_PARAM, (st), (val))

+#define sk_X509_VERIFY_PARAM_find_ex(st, val) SKM_sk_find_ex(X509_VERIFY_PARAM, (st), (val))

+#define sk_X509_VERIFY_PARAM_delete(st, i) SKM_sk_delete(X509_VERIFY_PARAM, (st), (i))

+#define sk_X509_VERIFY_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_VERIFY_PARAM, (st), (ptr))

+#define sk_X509_VERIFY_PARAM_insert(st, val, i) SKM_sk_insert(X509_VERIFY_PARAM, (st), (val), (i))

+#define sk_X509_VERIFY_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_VERIFY_PARAM, (st), (cmp))

+#define sk_X509_VERIFY_PARAM_dup(st) SKM_sk_dup(X509_VERIFY_PARAM, st)

+#define sk_X509_VERIFY_PARAM_pop_free(st, free_func) SKM_sk_pop_free(X509_VERIFY_PARAM, (st), (free_func))

+#define sk_X509_VERIFY_PARAM_shift(st) SKM_sk_shift(X509_VERIFY_PARAM, (st))

+#define sk_X509_VERIFY_PARAM_pop(st) SKM_sk_pop(X509_VERIFY_PARAM, (st))

+#define sk_X509_VERIFY_PARAM_sort(st) SKM_sk_sort(X509_VERIFY_PARAM, (st))

+#define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st))

+

+#define sk_nid_triple_new(cmp) SKM_sk_new(nid_triple, (cmp))

+#define sk_nid_triple_new_null() SKM_sk_new_null(nid_triple)

+#define sk_nid_triple_free(st) SKM_sk_free(nid_triple, (st))

+#define sk_nid_triple_num(st) SKM_sk_num(nid_triple, (st))

+#define sk_nid_triple_value(st, i) SKM_sk_value(nid_triple, (st), (i))

+#define sk_nid_triple_set(st, i, val) SKM_sk_set(nid_triple, (st), (i), (val))

+#define sk_nid_triple_zero(st) SKM_sk_zero(nid_triple, (st))

+#define sk_nid_triple_push(st, val) SKM_sk_push(nid_triple, (st), (val))

+#define sk_nid_triple_unshift(st, val) SKM_sk_unshift(nid_triple, (st), (val))

+#define sk_nid_triple_find(st, val) SKM_sk_find(nid_triple, (st), (val))

+#define sk_nid_triple_find_ex(st, val) SKM_sk_find_ex(nid_triple, (st), (val))

+#define sk_nid_triple_delete(st, i) SKM_sk_delete(nid_triple, (st), (i))

+#define sk_nid_triple_delete_ptr(st, ptr) SKM_sk_delete_ptr(nid_triple, (st), (ptr))

+#define sk_nid_triple_insert(st, val, i) SKM_sk_insert(nid_triple, (st), (val), (i))

+#define sk_nid_triple_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(nid_triple, (st), (cmp))

+#define sk_nid_triple_dup(st) SKM_sk_dup(nid_triple, st)

+#define sk_nid_triple_pop_free(st, free_func) SKM_sk_pop_free(nid_triple, (st), (free_func))

+#define sk_nid_triple_shift(st) SKM_sk_shift(nid_triple, (st))

+#define sk_nid_triple_pop(st) SKM_sk_pop(nid_triple, (st))

+#define sk_nid_triple_sort(st) SKM_sk_sort(nid_triple, (st))

+#define sk_nid_triple_is_sorted(st) SKM_sk_is_sorted(nid_triple, (st))

+

+#define sk_void_new(cmp) SKM_sk_new(void, (cmp))

+#define sk_void_new_null() SKM_sk_new_null(void)

+#define sk_void_free(st) SKM_sk_free(void, (st))

+#define sk_void_num(st) SKM_sk_num(void, (st))

+#define sk_void_value(st, i) SKM_sk_value(void, (st), (i))

+#define sk_void_set(st, i, val) SKM_sk_set(void, (st), (i), (val))

+#define sk_void_zero(st) SKM_sk_zero(void, (st))

+#define sk_void_push(st, val) SKM_sk_push(void, (st), (val))

+#define sk_void_unshift(st, val) SKM_sk_unshift(void, (st), (val))

+#define sk_void_find(st, val) SKM_sk_find(void, (st), (val))

+#define sk_void_find_ex(st, val) SKM_sk_find_ex(void, (st), (val))

+#define sk_void_delete(st, i) SKM_sk_delete(void, (st), (i))

+#define sk_void_delete_ptr(st, ptr) SKM_sk_delete_ptr(void, (st), (ptr))

+#define sk_void_insert(st, val, i) SKM_sk_insert(void, (st), (val), (i))

+#define sk_void_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(void, (st), (cmp))

+#define sk_void_dup(st) SKM_sk_dup(void, st)

+#define sk_void_pop_free(st, free_func) SKM_sk_pop_free(void, (st), (free_func))

+#define sk_void_shift(st) SKM_sk_shift(void, (st))

+#define sk_void_pop(st) SKM_sk_pop(void, (st))

+#define sk_void_sort(st) SKM_sk_sort(void, (st))

+#define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))

+

+#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))

+#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())

+#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))

+#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))

+#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_STACK_OF(OPENSSL_STRING, st), i))

+#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)

+#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))

+#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val), i)

+#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)

+#define sk_OPENSSL_STRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_STRING, st), i, CHECKED_PTR_OF(char, val))

+#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))

+#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))

+#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))

+#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))

+#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, ptr))

+#define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \

+	((int (*)(const char * const *,const char * const *)) \

+	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_CMP_FUNC(char, cmp)))

+#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)

+#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))

+#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop(CHECKED_STACK_OF(OPENSSL_STRING, st))

+#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))

+#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))

+

+

+#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))

+#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())

+#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))

+#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))

+#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i))

+#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)

+#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))

+#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val), i)

+#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)

+#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i, CHECKED_PTR_OF(void, val))

+#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))

+#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))

+#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))

+#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))

+#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, ptr))

+#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \

+	((int (*)(const void * const *,const void * const *)) \

+	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_CMP_FUNC(void, cmp)))

+#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)

+#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))

+#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop(CHECKED_STACK_OF(OPENSSL_BLOCK, st))

+#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))

+#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))

+

+

+#define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))

+#define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())

+#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))

+#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))

+#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i))

+#define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)

+#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))

+#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)

+#define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)

+#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))

+#define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))

+#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))

+#define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))

+#define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))

+#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))

+#define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \

+	((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \

+	sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))

+#define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)

+#define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))

+#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop(CHECKED_STACK_OF(OPENSSL_PSTRING, st))

+#define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))

+#define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))

+

+

+#define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(ASN1_UTF8STRING, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(ASN1_UTF8STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_ASN1_UTF8STRING(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(ASN1_UTF8STRING, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_ASN1_UTF8STRING(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(ASN1_UTF8STRING, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_ESS_CERT_ID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(ESS_CERT_ID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_ESS_CERT_ID(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(ESS_CERT_ID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_ESS_CERT_ID(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(ESS_CERT_ID, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_ESS_CERT_ID(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(ESS_CERT_ID, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_EVP_MD(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(EVP_MD, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_EVP_MD(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(EVP_MD, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_EVP_MD(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(EVP_MD, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_EVP_MD(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(EVP_MD, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_X509(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))

+

+#define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

+	SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

+#define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \

+	SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

+#define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \

+	SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))

+#define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \

+	SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))

+

+#define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \

+	SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))

+

+#define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \

+	SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))

+

+#define lh_ADDED_OBJ_new() LHM_lh_new(ADDED_OBJ,added_obj)

+#define lh_ADDED_OBJ_insert(lh,inst) LHM_lh_insert(ADDED_OBJ,lh,inst)

+#define lh_ADDED_OBJ_retrieve(lh,inst) LHM_lh_retrieve(ADDED_OBJ,lh,inst)

+#define lh_ADDED_OBJ_delete(lh,inst) LHM_lh_delete(ADDED_OBJ,lh,inst)

+#define lh_ADDED_OBJ_doall(lh,fn) LHM_lh_doall(ADDED_OBJ,lh,fn)

+#define lh_ADDED_OBJ_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(ADDED_OBJ,lh,fn,arg_type,arg)

+#define lh_ADDED_OBJ_error(lh) LHM_lh_error(ADDED_OBJ,lh)

+#define lh_ADDED_OBJ_num_items(lh) LHM_lh_num_items(ADDED_OBJ,lh)

+#define lh_ADDED_OBJ_down_load(lh) LHM_lh_down_load(ADDED_OBJ,lh)

+#define lh_ADDED_OBJ_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(ADDED_OBJ,lh,out)

+#define lh_ADDED_OBJ_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(ADDED_OBJ,lh,out)

+#define lh_ADDED_OBJ_stats_bio(lh,out) \

+  LHM_lh_stats_bio(ADDED_OBJ,lh,out)

+#define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh)

+

+#define lh_APP_INFO_new() LHM_lh_new(APP_INFO,app_info)

+#define lh_APP_INFO_insert(lh,inst) LHM_lh_insert(APP_INFO,lh,inst)

+#define lh_APP_INFO_retrieve(lh,inst) LHM_lh_retrieve(APP_INFO,lh,inst)

+#define lh_APP_INFO_delete(lh,inst) LHM_lh_delete(APP_INFO,lh,inst)

+#define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn)

+#define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg)

+#define lh_APP_INFO_error(lh) LHM_lh_error(APP_INFO,lh)

+#define lh_APP_INFO_num_items(lh) LHM_lh_num_items(APP_INFO,lh)

+#define lh_APP_INFO_down_load(lh) LHM_lh_down_load(APP_INFO,lh)

+#define lh_APP_INFO_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(APP_INFO,lh,out)

+#define lh_APP_INFO_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(APP_INFO,lh,out)

+#define lh_APP_INFO_stats_bio(lh,out) \

+  LHM_lh_stats_bio(APP_INFO,lh,out)

+#define lh_APP_INFO_free(lh) LHM_lh_free(APP_INFO,lh)

+

+#define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value)

+#define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst)

+#define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst)

+#define lh_CONF_VALUE_delete(lh,inst) LHM_lh_delete(CONF_VALUE,lh,inst)

+#define lh_CONF_VALUE_doall(lh,fn) LHM_lh_doall(CONF_VALUE,lh,fn)

+#define lh_CONF_VALUE_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(CONF_VALUE,lh,fn,arg_type,arg)

+#define lh_CONF_VALUE_error(lh) LHM_lh_error(CONF_VALUE,lh)

+#define lh_CONF_VALUE_num_items(lh) LHM_lh_num_items(CONF_VALUE,lh)

+#define lh_CONF_VALUE_down_load(lh) LHM_lh_down_load(CONF_VALUE,lh)

+#define lh_CONF_VALUE_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(CONF_VALUE,lh,out)

+#define lh_CONF_VALUE_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(CONF_VALUE,lh,out)

+#define lh_CONF_VALUE_stats_bio(lh,out) \

+  LHM_lh_stats_bio(CONF_VALUE,lh,out)

+#define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)

+

+#define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)

+#define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)

+#define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)

+#define lh_ENGINE_PILE_delete(lh,inst) LHM_lh_delete(ENGINE_PILE,lh,inst)

+#define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn)

+#define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg)

+#define lh_ENGINE_PILE_error(lh) LHM_lh_error(ENGINE_PILE,lh)

+#define lh_ENGINE_PILE_num_items(lh) LHM_lh_num_items(ENGINE_PILE,lh)

+#define lh_ENGINE_PILE_down_load(lh) LHM_lh_down_load(ENGINE_PILE,lh)

+#define lh_ENGINE_PILE_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(ENGINE_PILE,lh,out)

+#define lh_ENGINE_PILE_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(ENGINE_PILE,lh,out)

+#define lh_ENGINE_PILE_stats_bio(lh,out) \

+  LHM_lh_stats_bio(ENGINE_PILE,lh,out)

+#define lh_ENGINE_PILE_free(lh) LHM_lh_free(ENGINE_PILE,lh)

+

+#define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state)

+#define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst)

+#define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst)

+#define lh_ERR_STATE_delete(lh,inst) LHM_lh_delete(ERR_STATE,lh,inst)

+#define lh_ERR_STATE_doall(lh,fn) LHM_lh_doall(ERR_STATE,lh,fn)

+#define lh_ERR_STATE_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(ERR_STATE,lh,fn,arg_type,arg)

+#define lh_ERR_STATE_error(lh) LHM_lh_error(ERR_STATE,lh)

+#define lh_ERR_STATE_num_items(lh) LHM_lh_num_items(ERR_STATE,lh)

+#define lh_ERR_STATE_down_load(lh) LHM_lh_down_load(ERR_STATE,lh)

+#define lh_ERR_STATE_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(ERR_STATE,lh,out)

+#define lh_ERR_STATE_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(ERR_STATE,lh,out)

+#define lh_ERR_STATE_stats_bio(lh,out) \

+  LHM_lh_stats_bio(ERR_STATE,lh,out)

+#define lh_ERR_STATE_free(lh) LHM_lh_free(ERR_STATE,lh)

+

+#define lh_ERR_STRING_DATA_new() LHM_lh_new(ERR_STRING_DATA,err_string_data)

+#define lh_ERR_STRING_DATA_insert(lh,inst) LHM_lh_insert(ERR_STRING_DATA,lh,inst)

+#define lh_ERR_STRING_DATA_retrieve(lh,inst) LHM_lh_retrieve(ERR_STRING_DATA,lh,inst)

+#define lh_ERR_STRING_DATA_delete(lh,inst) LHM_lh_delete(ERR_STRING_DATA,lh,inst)

+#define lh_ERR_STRING_DATA_doall(lh,fn) LHM_lh_doall(ERR_STRING_DATA,lh,fn)

+#define lh_ERR_STRING_DATA_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(ERR_STRING_DATA,lh,fn,arg_type,arg)

+#define lh_ERR_STRING_DATA_error(lh) LHM_lh_error(ERR_STRING_DATA,lh)

+#define lh_ERR_STRING_DATA_num_items(lh) LHM_lh_num_items(ERR_STRING_DATA,lh)

+#define lh_ERR_STRING_DATA_down_load(lh) LHM_lh_down_load(ERR_STRING_DATA,lh)

+#define lh_ERR_STRING_DATA_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(ERR_STRING_DATA,lh,out)

+#define lh_ERR_STRING_DATA_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(ERR_STRING_DATA,lh,out)

+#define lh_ERR_STRING_DATA_stats_bio(lh,out) \

+  LHM_lh_stats_bio(ERR_STRING_DATA,lh,out)

+#define lh_ERR_STRING_DATA_free(lh) LHM_lh_free(ERR_STRING_DATA,lh)

+

+#define lh_EX_CLASS_ITEM_new() LHM_lh_new(EX_CLASS_ITEM,ex_class_item)

+#define lh_EX_CLASS_ITEM_insert(lh,inst) LHM_lh_insert(EX_CLASS_ITEM,lh,inst)

+#define lh_EX_CLASS_ITEM_retrieve(lh,inst) LHM_lh_retrieve(EX_CLASS_ITEM,lh,inst)

+#define lh_EX_CLASS_ITEM_delete(lh,inst) LHM_lh_delete(EX_CLASS_ITEM,lh,inst)

+#define lh_EX_CLASS_ITEM_doall(lh,fn) LHM_lh_doall(EX_CLASS_ITEM,lh,fn)

+#define lh_EX_CLASS_ITEM_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(EX_CLASS_ITEM,lh,fn,arg_type,arg)

+#define lh_EX_CLASS_ITEM_error(lh) LHM_lh_error(EX_CLASS_ITEM,lh)

+#define lh_EX_CLASS_ITEM_num_items(lh) LHM_lh_num_items(EX_CLASS_ITEM,lh)

+#define lh_EX_CLASS_ITEM_down_load(lh) LHM_lh_down_load(EX_CLASS_ITEM,lh)

+#define lh_EX_CLASS_ITEM_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(EX_CLASS_ITEM,lh,out)

+#define lh_EX_CLASS_ITEM_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(EX_CLASS_ITEM,lh,out)

+#define lh_EX_CLASS_ITEM_stats_bio(lh,out) \

+  LHM_lh_stats_bio(EX_CLASS_ITEM,lh,out)

+#define lh_EX_CLASS_ITEM_free(lh) LHM_lh_free(EX_CLASS_ITEM,lh)

+

+#define lh_FUNCTION_new() LHM_lh_new(FUNCTION,function)

+#define lh_FUNCTION_insert(lh,inst) LHM_lh_insert(FUNCTION,lh,inst)

+#define lh_FUNCTION_retrieve(lh,inst) LHM_lh_retrieve(FUNCTION,lh,inst)

+#define lh_FUNCTION_delete(lh,inst) LHM_lh_delete(FUNCTION,lh,inst)

+#define lh_FUNCTION_doall(lh,fn) LHM_lh_doall(FUNCTION,lh,fn)

+#define lh_FUNCTION_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(FUNCTION,lh,fn,arg_type,arg)

+#define lh_FUNCTION_error(lh) LHM_lh_error(FUNCTION,lh)

+#define lh_FUNCTION_num_items(lh) LHM_lh_num_items(FUNCTION,lh)

+#define lh_FUNCTION_down_load(lh) LHM_lh_down_load(FUNCTION,lh)

+#define lh_FUNCTION_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(FUNCTION,lh,out)

+#define lh_FUNCTION_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(FUNCTION,lh,out)

+#define lh_FUNCTION_stats_bio(lh,out) \

+  LHM_lh_stats_bio(FUNCTION,lh,out)

+#define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh)

+

+#define lh_MEM_new() LHM_lh_new(MEM,mem)

+#define lh_MEM_insert(lh,inst) LHM_lh_insert(MEM,lh,inst)

+#define lh_MEM_retrieve(lh,inst) LHM_lh_retrieve(MEM,lh,inst)

+#define lh_MEM_delete(lh,inst) LHM_lh_delete(MEM,lh,inst)

+#define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn)

+#define lh_MEM_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg)

+#define lh_MEM_error(lh) LHM_lh_error(MEM,lh)

+#define lh_MEM_num_items(lh) LHM_lh_num_items(MEM,lh)

+#define lh_MEM_down_load(lh) LHM_lh_down_load(MEM,lh)

+#define lh_MEM_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(MEM,lh,out)

+#define lh_MEM_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(MEM,lh,out)

+#define lh_MEM_stats_bio(lh,out) \

+  LHM_lh_stats_bio(MEM,lh,out)

+#define lh_MEM_free(lh) LHM_lh_free(MEM,lh)

+

+#define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name)

+#define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst)

+#define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst)

+#define lh_OBJ_NAME_delete(lh,inst) LHM_lh_delete(OBJ_NAME,lh,inst)

+#define lh_OBJ_NAME_doall(lh,fn) LHM_lh_doall(OBJ_NAME,lh,fn)

+#define lh_OBJ_NAME_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(OBJ_NAME,lh,fn,arg_type,arg)

+#define lh_OBJ_NAME_error(lh) LHM_lh_error(OBJ_NAME,lh)

+#define lh_OBJ_NAME_num_items(lh) LHM_lh_num_items(OBJ_NAME,lh)

+#define lh_OBJ_NAME_down_load(lh) LHM_lh_down_load(OBJ_NAME,lh)

+#define lh_OBJ_NAME_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(OBJ_NAME,lh,out)

+#define lh_OBJ_NAME_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(OBJ_NAME,lh,out)

+#define lh_OBJ_NAME_stats_bio(lh,out) \

+  LHM_lh_stats_bio(OBJ_NAME,lh,out)

+#define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)

+

+#define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)

+#define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)

+#define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)

+#define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)

+#define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)

+#define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)

+#define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)

+#define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)

+#define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)

+#define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)

+#define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)

+#define lh_OPENSSL_CSTRING_stats_bio(lh,out) \

+  LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)

+#define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)

+

+#define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)

+#define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)

+#define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)

+#define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)

+#define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)

+#define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)

+#define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)

+#define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)

+#define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)

+#define lh_OPENSSL_STRING_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)

+#define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)

+#define lh_OPENSSL_STRING_stats_bio(lh,out) \

+  LHM_lh_stats_bio(OPENSSL_STRING,lh,out)

+#define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)

+

+#define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)

+#define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)

+#define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)

+#define lh_SSL_SESSION_delete(lh,inst) LHM_lh_delete(SSL_SESSION,lh,inst)

+#define lh_SSL_SESSION_doall(lh,fn) LHM_lh_doall(SSL_SESSION,lh,fn)

+#define lh_SSL_SESSION_doall_arg(lh,fn,arg_type,arg) \

+  LHM_lh_doall_arg(SSL_SESSION,lh,fn,arg_type,arg)

+#define lh_SSL_SESSION_error(lh) LHM_lh_error(SSL_SESSION,lh)

+#define lh_SSL_SESSION_num_items(lh) LHM_lh_num_items(SSL_SESSION,lh)

+#define lh_SSL_SESSION_down_load(lh) LHM_lh_down_load(SSL_SESSION,lh)

+#define lh_SSL_SESSION_node_stats_bio(lh,out) \

+  LHM_lh_node_stats_bio(SSL_SESSION,lh,out)

+#define lh_SSL_SESSION_node_usage_stats_bio(lh,out) \

+  LHM_lh_node_usage_stats_bio(SSL_SESSION,lh,out)

+#define lh_SSL_SESSION_stats_bio(lh,out) \

+  LHM_lh_stats_bio(SSL_SESSION,lh,out)

+#define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)

+/* End of util/mkstack.pl block, you may now edit :-) */

+

+#endif /* !defined HEADER_SAFESTACK_H */

diff --git a/openssl/crypto/ts/ts_verify_ctx.c b/openssl/crypto/ts/ts_verify_ctx.c
index b079b50fc..b008687a2 100644
--- a/openssl/crypto/ts/ts_verify_ctx.c
+++ b/openssl/crypto/ts/ts_verify_ctx.c
@@ -1,160 +1,159 @@
-/* crypto/ts/ts_verify_ctx.c */
-/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
- * project 2003.
- */
-/* ====================================================================
- * 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 <assert.h>
-#include "cryptlib.h"
-#include <openssl/objects.h>
-#include <openssl/ts.h>
-
-TS_VERIFY_CTX *TS_VERIFY_CTX_new(void)
-	{
-	TS_VERIFY_CTX *ctx = 
-		(TS_VERIFY_CTX *) OPENSSL_malloc(sizeof(TS_VERIFY_CTX));
-	if (ctx)
-		memset(ctx, 0, sizeof(TS_VERIFY_CTX));
-	else
-		TSerr(TS_F_TS_VERIFY_CTX_NEW, ERR_R_MALLOC_FAILURE);
-	return ctx;
-	}
-
-void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx)
-	{
-	assert(ctx != NULL);
-	memset(ctx, 0, sizeof(TS_VERIFY_CTX));
-	}
-
-void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx)
-	{
-	if (!ctx) return;
-
-	TS_VERIFY_CTX_cleanup(ctx);
-	OPENSSL_free(ctx);
-	}
-
-void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx)
-	{
-	if (!ctx) return;
-
-	X509_STORE_free(ctx->store);
-	sk_X509_pop_free(ctx->certs, X509_free);
-
-	ASN1_OBJECT_free(ctx->policy);
-
-	X509_ALGOR_free(ctx->md_alg);
-	OPENSSL_free(ctx->imprint);
-	
-	BIO_free_all(ctx->data);
-
-	ASN1_INTEGER_free(ctx->nonce);
-
-	GENERAL_NAME_free(ctx->tsa_name);
-
-	TS_VERIFY_CTX_init(ctx);
-	}
-
-TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx)
-	{
-	TS_VERIFY_CTX *ret = ctx;
-	ASN1_OBJECT *policy;
-	TS_MSG_IMPRINT *imprint;
-	X509_ALGOR *md_alg;
-	ASN1_OCTET_STRING *msg;
-	const ASN1_INTEGER *nonce;
-
-	assert(req != NULL);
-	if (ret)
-		TS_VERIFY_CTX_cleanup(ret);
-	else
-		if (!(ret = TS_VERIFY_CTX_new())) return NULL;
-
-	/* Setting flags. */
-	ret->flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE);
-
-	/* Setting policy. */
-	if ((policy = TS_REQ_get_policy_id(req)) != NULL)
-		{
-		if (!(ret->policy = OBJ_dup(policy))) goto err;
-		}
-	else
-		ret->flags &= ~TS_VFY_POLICY;
-
-	/* Setting md_alg, imprint and imprint_len. */
-	imprint = TS_REQ_get_msg_imprint(req);
-	md_alg = TS_MSG_IMPRINT_get_algo(imprint);
-	if (!(ret->md_alg = X509_ALGOR_dup(md_alg))) goto err;
-	msg = TS_MSG_IMPRINT_get_msg(imprint);
-	ret->imprint_len = ASN1_STRING_length(msg);
-	if (!(ret->imprint = OPENSSL_malloc(ret->imprint_len))) goto err;
-	memcpy(ret->imprint, ASN1_STRING_data(msg), ret->imprint_len);
-
-	/* Setting nonce. */
-	if ((nonce = TS_REQ_get_nonce(req)) != NULL)
-		{
-		if (!(ret->nonce = ASN1_INTEGER_dup(nonce))) goto err;
-		}
-	else
-		ret->flags &= ~TS_VFY_NONCE;
-
-	return ret;
- err:
-	if (ctx)
-		TS_VERIFY_CTX_cleanup(ctx);
-	else
-		TS_VERIFY_CTX_free(ret);
-	return NULL;
-	}
+/* crypto/ts/ts_verify_ctx.c */

+/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL

+ * project 2003.

+ */

+/* ====================================================================

+ * 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 "cryptlib.h"

+#include <openssl/objects.h>

+#include <openssl/ts.h>

+

+TS_VERIFY_CTX *TS_VERIFY_CTX_new(void)

+	{

+	TS_VERIFY_CTX *ctx = 

+		(TS_VERIFY_CTX *) OPENSSL_malloc(sizeof(TS_VERIFY_CTX));

+	if (ctx)

+		memset(ctx, 0, sizeof(TS_VERIFY_CTX));

+	else

+		TSerr(TS_F_TS_VERIFY_CTX_NEW, ERR_R_MALLOC_FAILURE);

+	return ctx;

+	}

+

+void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx)

+	{

+	OPENSSL_assert(ctx != NULL);

+	memset(ctx, 0, sizeof(TS_VERIFY_CTX));

+	}

+

+void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx)

+	{

+	if (!ctx) return;

+

+	TS_VERIFY_CTX_cleanup(ctx);

+	OPENSSL_free(ctx);

+	}

+

+void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx)

+	{

+	if (!ctx) return;

+

+	X509_STORE_free(ctx->store);

+	sk_X509_pop_free(ctx->certs, X509_free);

+

+	ASN1_OBJECT_free(ctx->policy);

+

+	X509_ALGOR_free(ctx->md_alg);

+	OPENSSL_free(ctx->imprint);

+	

+	BIO_free_all(ctx->data);

+

+	ASN1_INTEGER_free(ctx->nonce);

+

+	GENERAL_NAME_free(ctx->tsa_name);

+

+	TS_VERIFY_CTX_init(ctx);

+	}

+

+TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx)

+	{

+	TS_VERIFY_CTX *ret = ctx;

+	ASN1_OBJECT *policy;

+	TS_MSG_IMPRINT *imprint;

+	X509_ALGOR *md_alg;

+	ASN1_OCTET_STRING *msg;

+	const ASN1_INTEGER *nonce;

+

+	OPENSSL_assert(req != NULL);

+	if (ret)

+		TS_VERIFY_CTX_cleanup(ret);

+	else

+		if (!(ret = TS_VERIFY_CTX_new())) return NULL;

+

+	/* Setting flags. */

+	ret->flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE);

+

+	/* Setting policy. */

+	if ((policy = TS_REQ_get_policy_id(req)) != NULL)

+		{

+		if (!(ret->policy = OBJ_dup(policy))) goto err;

+		}

+	else

+		ret->flags &= ~TS_VFY_POLICY;

+

+	/* Setting md_alg, imprint and imprint_len. */

+	imprint = TS_REQ_get_msg_imprint(req);

+	md_alg = TS_MSG_IMPRINT_get_algo(imprint);

+	if (!(ret->md_alg = X509_ALGOR_dup(md_alg))) goto err;

+	msg = TS_MSG_IMPRINT_get_msg(imprint);

+	ret->imprint_len = ASN1_STRING_length(msg);

+	if (!(ret->imprint = OPENSSL_malloc(ret->imprint_len))) goto err;

+	memcpy(ret->imprint, ASN1_STRING_data(msg), ret->imprint_len);

+

+	/* Setting nonce. */

+	if ((nonce = TS_REQ_get_nonce(req)) != NULL)

+		{

+		if (!(ret->nonce = ASN1_INTEGER_dup(nonce))) goto err;

+		}

+	else

+		ret->flags &= ~TS_VFY_NONCE;

+

+	return ret;

+ err:

+	if (ctx)

+		TS_VERIFY_CTX_cleanup(ctx);

+	else

+		TS_VERIFY_CTX_free(ret);

+	return NULL;

+	}

diff --git a/openssl/crypto/x509v3/v3_addr.c b/openssl/crypto/x509v3/v3_addr.c
index 9087d66e0..247d671a8 100644
--- a/openssl/crypto/x509v3/v3_addr.c
+++ b/openssl/crypto/x509v3/v3_addr.c
@@ -1,1287 +1,1293 @@
-/*
- * Contributed to the OpenSSL Project by the American Registry for
- * Internet Numbers ("ARIN").
- */
-/* ====================================================================
- * 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).
- */
-
-/*
- * Implementation of RFC 3779 section 2.2.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/buffer.h>
-#include <openssl/x509v3.h>
-
-#ifndef OPENSSL_NO_RFC3779
-
-/*
- * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.
- */
-
-ASN1_SEQUENCE(IPAddressRange) = {
-  ASN1_SIMPLE(IPAddressRange, min, ASN1_BIT_STRING),
-  ASN1_SIMPLE(IPAddressRange, max, ASN1_BIT_STRING)
-} ASN1_SEQUENCE_END(IPAddressRange)
-
-ASN1_CHOICE(IPAddressOrRange) = {
-  ASN1_SIMPLE(IPAddressOrRange, u.addressPrefix, ASN1_BIT_STRING),
-  ASN1_SIMPLE(IPAddressOrRange, u.addressRange,  IPAddressRange)
-} ASN1_CHOICE_END(IPAddressOrRange)
-
-ASN1_CHOICE(IPAddressChoice) = {
-  ASN1_SIMPLE(IPAddressChoice,      u.inherit,           ASN1_NULL),
-  ASN1_SEQUENCE_OF(IPAddressChoice, u.addressesOrRanges, IPAddressOrRange)
-} ASN1_CHOICE_END(IPAddressChoice)
-
-ASN1_SEQUENCE(IPAddressFamily) = {
-  ASN1_SIMPLE(IPAddressFamily, addressFamily,   ASN1_OCTET_STRING),
-  ASN1_SIMPLE(IPAddressFamily, ipAddressChoice, IPAddressChoice)
-} ASN1_SEQUENCE_END(IPAddressFamily)
-
-ASN1_ITEM_TEMPLATE(IPAddrBlocks) = 
-  ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-			IPAddrBlocks, IPAddressFamily)
-ASN1_ITEM_TEMPLATE_END(IPAddrBlocks)
-
-IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)
-IMPLEMENT_ASN1_FUNCTIONS(IPAddressOrRange)
-IMPLEMENT_ASN1_FUNCTIONS(IPAddressChoice)
-IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)
-
-/*
- * How much buffer space do we need for a raw address?
- */
-#define ADDR_RAW_BUF_LEN	16
-
-/*
- * What's the address length associated with this AFI?
- */
-static int length_from_afi(const unsigned afi)
-{
-  switch (afi) {
-  case IANA_AFI_IPV4:
-    return 4;
-  case IANA_AFI_IPV6:
-    return 16;
-  default:
-    return 0;
-  }
-}
-
-/*
- * Extract the AFI from an IPAddressFamily.
- */
-unsigned int v3_addr_get_afi(const IPAddressFamily *f)
-{
-  return ((f != NULL &&
-	   f->addressFamily != NULL &&
-	   f->addressFamily->data != NULL)
-	  ? ((f->addressFamily->data[0] << 8) |
-	     (f->addressFamily->data[1]))
-	  : 0);
-}
-
-/*
- * Expand the bitstring form of an address into a raw byte array.
- * At the moment this is coded for simplicity, not speed.
- */
-static void addr_expand(unsigned char *addr,
-			const ASN1_BIT_STRING *bs,
-			const int length,
-			const unsigned char fill)
-{
-  OPENSSL_assert(bs->length >= 0 && bs->length <= length);
-  if (bs->length > 0) {
-    memcpy(addr, bs->data, bs->length);
-    if ((bs->flags & 7) != 0) {
-      unsigned char mask = 0xFF >> (8 - (bs->flags & 7));
-      if (fill == 0)
-	addr[bs->length - 1] &= ~mask;
-      else
-	addr[bs->length - 1] |= mask;
-    }
-  }
-  memset(addr + bs->length, fill, length - bs->length);
-}
-
-/*
- * Extract the prefix length from a bitstring.
- */
-#define addr_prefixlen(bs) ((int) ((bs)->length * 8 - ((bs)->flags & 7)))
-
-/*
- * i2r handler for one address bitstring.
- */
-static int i2r_address(BIO *out,
-		       const unsigned afi,
-		       const unsigned char fill,
-		       const ASN1_BIT_STRING *bs)
-{
-  unsigned char addr[ADDR_RAW_BUF_LEN];
-  int i, n;
-
-  switch (afi) {
-  case IANA_AFI_IPV4:
-    addr_expand(addr, bs, 4, fill);
-    BIO_printf(out, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
-    break;
-  case IANA_AFI_IPV6:
-    addr_expand(addr, bs, 16, fill);
-    for (n = 16; n > 1 && addr[n-1] == 0x00 && addr[n-2] == 0x00; n -= 2)
-      ;
-    for (i = 0; i < n; i += 2)
-      BIO_printf(out, "%x%s", (addr[i] << 8) | addr[i+1], (i < 14 ? ":" : ""));
-    if (i < 16)
-      BIO_puts(out, ":");
-    if (i == 0)
-      BIO_puts(out, ":");
-    break;
-  default:
-    for (i = 0; i < bs->length; i++)
-      BIO_printf(out, "%s%02x", (i > 0 ? ":" : ""), bs->data[i]);
-    BIO_printf(out, "[%d]", (int) (bs->flags & 7));
-    break;
-  }
-  return 1;
-}
-
-/*
- * i2r handler for a sequence of addresses and ranges.
- */
-static int i2r_IPAddressOrRanges(BIO *out,
-				 const int indent,
-				 const IPAddressOrRanges *aors,
-				 const unsigned afi)
-{
-  int i;
-  for (i = 0; i < sk_IPAddressOrRange_num(aors); i++) {
-    const IPAddressOrRange *aor = sk_IPAddressOrRange_value(aors, i);
-    BIO_printf(out, "%*s", indent, "");
-    switch (aor->type) {
-    case IPAddressOrRange_addressPrefix:
-      if (!i2r_address(out, afi, 0x00, aor->u.addressPrefix))
-	return 0;
-      BIO_printf(out, "/%d\n", addr_prefixlen(aor->u.addressPrefix));
-      continue;
-    case IPAddressOrRange_addressRange:
-      if (!i2r_address(out, afi, 0x00, aor->u.addressRange->min))
-	return 0;
-      BIO_puts(out, "-");
-      if (!i2r_address(out, afi, 0xFF, aor->u.addressRange->max))
-	return 0;
-      BIO_puts(out, "\n");
-      continue;
-    }
-  }
-  return 1;
-}
-
-/*
- * i2r handler for an IPAddrBlocks extension.
- */
-static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
-			    void *ext,
-			    BIO *out,
-			    int indent)
-{
-  const IPAddrBlocks *addr = ext;
-  int i;
-  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
-    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
-    const unsigned int afi = v3_addr_get_afi(f);
-    switch (afi) {
-    case IANA_AFI_IPV4:
-      BIO_printf(out, "%*sIPv4", indent, "");
-      break;
-    case IANA_AFI_IPV6:
-      BIO_printf(out, "%*sIPv6", indent, "");
-      break;
-    default:
-      BIO_printf(out, "%*sUnknown AFI %u", indent, "", afi);
-      break;
-    }
-    if (f->addressFamily->length > 2) {
-      switch (f->addressFamily->data[2]) {
-      case   1:
-	BIO_puts(out, " (Unicast)");
-	break;
-      case   2:
-	BIO_puts(out, " (Multicast)");
-	break;
-      case   3:
-	BIO_puts(out, " (Unicast/Multicast)");
-	break;
-      case   4:
-	BIO_puts(out, " (MPLS)");
-	break;
-      case  64:
-	BIO_puts(out, " (Tunnel)");
-	break;
-      case  65:
-	BIO_puts(out, " (VPLS)");
-	break;
-      case  66:
-	BIO_puts(out, " (BGP MDT)");
-	break;
-      case 128:
-	BIO_puts(out, " (MPLS-labeled VPN)");
-	break;
-      default:  
-	BIO_printf(out, " (Unknown SAFI %u)",
-		   (unsigned) f->addressFamily->data[2]);
-	break;
-      }
-    }
-    switch (f->ipAddressChoice->type) {
-    case IPAddressChoice_inherit:
-      BIO_puts(out, ": inherit\n");
-      break;
-    case IPAddressChoice_addressesOrRanges:
-      BIO_puts(out, ":\n");
-      if (!i2r_IPAddressOrRanges(out,
-				 indent + 2,
-				 f->ipAddressChoice->u.addressesOrRanges,
-				 afi))
-	return 0;
-      break;
-    }
-  }
-  return 1;
-}
-
-/*
- * Sort comparison function for a sequence of IPAddressOrRange
- * elements.
- */
-static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
-				const IPAddressOrRange *b,
-				const int length)
-{
-  unsigned char addr_a[ADDR_RAW_BUF_LEN], addr_b[ADDR_RAW_BUF_LEN];
-  int prefixlen_a = 0, prefixlen_b = 0;
-  int r;
-
-  switch (a->type) {
-  case IPAddressOrRange_addressPrefix:
-    addr_expand(addr_a, a->u.addressPrefix, length, 0x00);
-    prefixlen_a = addr_prefixlen(a->u.addressPrefix);
-    break;
-  case IPAddressOrRange_addressRange:
-    addr_expand(addr_a, a->u.addressRange->min, length, 0x00);
-    prefixlen_a = length * 8;
-    break;
-  }
-
-  switch (b->type) {
-  case IPAddressOrRange_addressPrefix:
-    addr_expand(addr_b, b->u.addressPrefix, length, 0x00);
-    prefixlen_b = addr_prefixlen(b->u.addressPrefix);
-    break;
-  case IPAddressOrRange_addressRange:
-    addr_expand(addr_b, b->u.addressRange->min, length, 0x00);
-    prefixlen_b = length * 8;
-    break;
-  }
-
-  if ((r = memcmp(addr_a, addr_b, length)) != 0)
-    return r;
-  else
-    return prefixlen_a - prefixlen_b;
-}
-
-/*
- * IPv4-specific closure over IPAddressOrRange_cmp, since sk_sort()
- * comparision routines are only allowed two arguments.
- */
-static int v4IPAddressOrRange_cmp(const IPAddressOrRange * const *a,
-				  const IPAddressOrRange * const *b)
-{
-  return IPAddressOrRange_cmp(*a, *b, 4);
-}
-
-/*
- * IPv6-specific closure over IPAddressOrRange_cmp, since sk_sort()
- * comparision routines are only allowed two arguments.
- */
-static int v6IPAddressOrRange_cmp(const IPAddressOrRange * const *a,
-				  const IPAddressOrRange * const *b)
-{
-  return IPAddressOrRange_cmp(*a, *b, 16);
-}
-
-/*
- * Calculate whether a range collapses to a prefix.
- * See last paragraph of RFC 3779 2.2.3.7.
- */
-static int range_should_be_prefix(const unsigned char *min,
-				  const unsigned char *max,
-				  const int length)
-{
-  unsigned char mask;
-  int i, j;
-
-  for (i = 0; i < length && min[i] == max[i]; i++)
-    ;
-  for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--)
-    ;
-  if (i < j)
-    return -1;
-  if (i > j)
-    return i * 8;
-  mask = min[i] ^ max[i];
-  switch (mask) {
-  case 0x01: j = 7; break;
-  case 0x03: j = 6; break;
-  case 0x07: j = 5; break;
-  case 0x0F: j = 4; break;
-  case 0x1F: j = 3; break;
-  case 0x3F: j = 2; break;
-  case 0x7F: j = 1; break;
-  default:   return -1;
-  }
-  if ((min[i] & mask) != 0 || (max[i] & mask) != mask)
-    return -1;
-  else
-    return i * 8 + j;
-}
-
-/*
- * Construct a prefix.
- */
-static int make_addressPrefix(IPAddressOrRange **result,
-			      unsigned char *addr,
-			      const int prefixlen)
-{
-  int bytelen = (prefixlen + 7) / 8, bitlen = prefixlen % 8;
-  IPAddressOrRange *aor = IPAddressOrRange_new();
-
-  if (aor == NULL)
-    return 0;
-  aor->type = IPAddressOrRange_addressPrefix;
-  if (aor->u.addressPrefix == NULL &&
-      (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)
-    goto err;
-  if (!ASN1_BIT_STRING_set(aor->u.addressPrefix, addr, bytelen))
-    goto err;
-  aor->u.addressPrefix->flags &= ~7;
-  aor->u.addressPrefix->flags |= ASN1_STRING_FLAG_BITS_LEFT;
-  if (bitlen > 0) {
-    aor->u.addressPrefix->data[bytelen - 1] &= ~(0xFF >> bitlen);
-    aor->u.addressPrefix->flags |= 8 - bitlen;
-  }
-  
-  *result = aor;
-  return 1;
-
- err:
-  IPAddressOrRange_free(aor);
-  return 0;
-}
-
-/*
- * Construct a range.  If it can be expressed as a prefix,
- * return a prefix instead.  Doing this here simplifies
- * the rest of the code considerably.
- */
-static int make_addressRange(IPAddressOrRange **result,
-			     unsigned char *min,
-			     unsigned char *max,
-			     const int length)
-{
-  IPAddressOrRange *aor;
-  int i, prefixlen;
-
-  if ((prefixlen = range_should_be_prefix(min, max, length)) >= 0)
-    return make_addressPrefix(result, min, prefixlen);
-
-  if ((aor = IPAddressOrRange_new()) == NULL)
-    return 0;
-  aor->type = IPAddressOrRange_addressRange;
-  OPENSSL_assert(aor->u.addressRange == NULL);
-  if ((aor->u.addressRange = IPAddressRange_new()) == NULL)
-    goto err;
-  if (aor->u.addressRange->min == NULL &&
-      (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)
-    goto err;
-  if (aor->u.addressRange->max == NULL &&
-      (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)
-    goto err;
-
-  for (i = length; i > 0 && min[i - 1] == 0x00; --i)
-    ;
-  if (!ASN1_BIT_STRING_set(aor->u.addressRange->min, min, i))
-    goto err;
-  aor->u.addressRange->min->flags &= ~7;
-  aor->u.addressRange->min->flags |= ASN1_STRING_FLAG_BITS_LEFT;
-  if (i > 0) {
-    unsigned char b = min[i - 1];
-    int j = 1;
-    while ((b & (0xFFU >> j)) != 0) 
-      ++j;
-    aor->u.addressRange->min->flags |= 8 - j;
-  }
-
-  for (i = length; i > 0 && max[i - 1] == 0xFF; --i)
-    ;
-  if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i))
-    goto err;
-  aor->u.addressRange->max->flags &= ~7;
-  aor->u.addressRange->max->flags |= ASN1_STRING_FLAG_BITS_LEFT;
-  if (i > 0) {
-    unsigned char b = max[i - 1];
-    int j = 1;
-    while ((b & (0xFFU >> j)) != (0xFFU >> j))
-      ++j;
-    aor->u.addressRange->max->flags |= 8 - j;
-  }
-
-  *result = aor;
-  return 1;
-
- err:
-  IPAddressOrRange_free(aor);
-  return 0;
-}
-
-/*
- * Construct a new address family or find an existing one.
- */
-static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
-					     const unsigned afi,
-					     const unsigned *safi)
-{
-  IPAddressFamily *f;
-  unsigned char key[3];
-  unsigned keylen;
-  int i;
-
-  key[0] = (afi >> 8) & 0xFF;
-  key[1] = afi & 0xFF;
-  if (safi != NULL) {
-    key[2] = *safi & 0xFF;
-    keylen = 3;
-  } else {
-    keylen = 2;
-  }
-
-  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
-    f = sk_IPAddressFamily_value(addr, i);
-    OPENSSL_assert(f->addressFamily->data != NULL);
-    if (f->addressFamily->length == keylen &&
-	!memcmp(f->addressFamily->data, key, keylen))
-      return f;
-  }
-
-  if ((f = IPAddressFamily_new()) == NULL)
-    goto err;
-  if (f->ipAddressChoice == NULL &&
-      (f->ipAddressChoice = IPAddressChoice_new()) == NULL)
-    goto err;
-  if (f->addressFamily == NULL && 
-      (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
-    goto err;
-  if (!ASN1_OCTET_STRING_set(f->addressFamily, key, keylen))
-    goto err;
-  if (!sk_IPAddressFamily_push(addr, f))
-    goto err;
-
-  return f;
-
- err:
-  IPAddressFamily_free(f);
-  return NULL;
-}
-
-/*
- * Add an inheritance element.
- */
-int v3_addr_add_inherit(IPAddrBlocks *addr,
-			const unsigned afi,
-			const unsigned *safi)
-{
-  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
-  if (f == NULL ||
-      f->ipAddressChoice == NULL ||
-      (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
-       f->ipAddressChoice->u.addressesOrRanges != NULL))
-    return 0;
-  if (f->ipAddressChoice->type == IPAddressChoice_inherit &&
-      f->ipAddressChoice->u.inherit != NULL)
-    return 1;
-  if (f->ipAddressChoice->u.inherit == NULL &&
-      (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)
-    return 0;
-  f->ipAddressChoice->type = IPAddressChoice_inherit;
-  return 1;
-}
-
-/*
- * Construct an IPAddressOrRange sequence, or return an existing one.
- */
-static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
-					       const unsigned afi,
-					       const unsigned *safi)
-{
-  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
-  IPAddressOrRanges *aors = NULL;
-
-  if (f == NULL ||
-      f->ipAddressChoice == NULL ||
-      (f->ipAddressChoice->type == IPAddressChoice_inherit &&
-       f->ipAddressChoice->u.inherit != NULL))
-    return NULL;
-  if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges)
-    aors = f->ipAddressChoice->u.addressesOrRanges;
-  if (aors != NULL)
-    return aors;
-  if ((aors = sk_IPAddressOrRange_new_null()) == NULL)
-    return NULL;
-  switch (afi) {
-  case IANA_AFI_IPV4:
-    sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp);
-    break;
-  case IANA_AFI_IPV6:
-    sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp);
-    break;
-  }
-  f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges;
-  f->ipAddressChoice->u.addressesOrRanges = aors;
-  return aors;
-}
-
-/*
- * Add a prefix.
- */
-int v3_addr_add_prefix(IPAddrBlocks *addr,
-		       const unsigned afi,
-		       const unsigned *safi,
-		       unsigned char *a,
-		       const int prefixlen)
-{
-  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
-  IPAddressOrRange *aor;
-  if (aors == NULL || !make_addressPrefix(&aor, a, prefixlen))
-    return 0;
-  if (sk_IPAddressOrRange_push(aors, aor))
-    return 1;
-  IPAddressOrRange_free(aor);
-  return 0;
-}
-
-/*
- * Add a range.
- */
-int v3_addr_add_range(IPAddrBlocks *addr,
-		      const unsigned afi,
-		      const unsigned *safi,
-		      unsigned char *min,
-		      unsigned char *max)
-{
-  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
-  IPAddressOrRange *aor;
-  int length = length_from_afi(afi);
-  if (aors == NULL)
-    return 0;
-  if (!make_addressRange(&aor, min, max, length))
-    return 0;
-  if (sk_IPAddressOrRange_push(aors, aor))
-    return 1;
-  IPAddressOrRange_free(aor);
-  return 0;
-}
-
-/*
- * Extract min and max values from an IPAddressOrRange.
- */
-static void extract_min_max(IPAddressOrRange *aor,
-			    unsigned char *min,
-			    unsigned char *max,
-			    int length)
-{
-  OPENSSL_assert(aor != NULL && min != NULL && max != NULL);
-  switch (aor->type) {
-  case IPAddressOrRange_addressPrefix:
-    addr_expand(min, aor->u.addressPrefix, length, 0x00);
-    addr_expand(max, aor->u.addressPrefix, length, 0xFF);
-    return;
-  case IPAddressOrRange_addressRange:
-    addr_expand(min, aor->u.addressRange->min, length, 0x00);
-    addr_expand(max, aor->u.addressRange->max, length, 0xFF);
-    return;
-  }
-}
-
-/*
- * Public wrapper for extract_min_max().
- */
-int v3_addr_get_range(IPAddressOrRange *aor,
-		      const unsigned afi,
-		      unsigned char *min,
-		      unsigned char *max,
-		      const int length)
-{
-  int afi_length = length_from_afi(afi);
-  if (aor == NULL || min == NULL || max == NULL ||
-      afi_length == 0 || length < afi_length ||
-      (aor->type != IPAddressOrRange_addressPrefix &&
-       aor->type != IPAddressOrRange_addressRange))
-    return 0;
-  extract_min_max(aor, min, max, afi_length);
-  return afi_length;
-}
-
-/*
- * Sort comparision function for a sequence of IPAddressFamily.
- *
- * The last paragraph of RFC 3779 2.2.3.3 is slightly ambiguous about
- * the ordering: I can read it as meaning that IPv6 without a SAFI
- * comes before IPv4 with a SAFI, which seems pretty weird.  The
- * examples in appendix B suggest that the author intended the
- * null-SAFI rule to apply only within a single AFI, which is what I
- * would have expected and is what the following code implements.
- */
-static int IPAddressFamily_cmp(const IPAddressFamily * const *a_,
-			       const IPAddressFamily * const *b_)
-{
-  const ASN1_OCTET_STRING *a = (*a_)->addressFamily;
-  const ASN1_OCTET_STRING *b = (*b_)->addressFamily;
-  int len = ((a->length <= b->length) ? a->length : b->length);
-  int cmp = memcmp(a->data, b->data, len);
-  return cmp ? cmp : a->length - b->length;
-}
-
-/*
- * Check whether an IPAddrBLocks is in canonical form.
- */
-int v3_addr_is_canonical(IPAddrBlocks *addr)
-{
-  unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
-  unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
-  IPAddressOrRanges *aors;
-  int i, j, k;
-
-  /*
-   * Empty extension is cannonical.
-   */
-  if (addr == NULL)
-    return 1;
-
-  /*
-   * Check whether the top-level list is in order.
-   */
-  for (i = 0; i < sk_IPAddressFamily_num(addr) - 1; i++) {
-    const IPAddressFamily *a = sk_IPAddressFamily_value(addr, i);
-    const IPAddressFamily *b = sk_IPAddressFamily_value(addr, i + 1);
-    if (IPAddressFamily_cmp(&a, &b) >= 0)
-      return 0;
-  }
-
-  /*
-   * Top level's ok, now check each address family.
-   */
-  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
-    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
-    int length = length_from_afi(v3_addr_get_afi(f));
-
-    /*
-     * Inheritance is canonical.  Anything other than inheritance or
-     * a SEQUENCE OF IPAddressOrRange is an ASN.1 error or something.
-     */
-    if (f == NULL || f->ipAddressChoice == NULL)
-      return 0;
-    switch (f->ipAddressChoice->type) {
-    case IPAddressChoice_inherit:
-      continue;
-    case IPAddressChoice_addressesOrRanges:
-      break;
-    default:
-      return 0;
-    }
-
-    /*
-     * It's an IPAddressOrRanges sequence, check it.
-     */
-    aors = f->ipAddressChoice->u.addressesOrRanges;
-    if (sk_IPAddressOrRange_num(aors) == 0)
-      return 0;
-    for (j = 0; j < sk_IPAddressOrRange_num(aors) - 1; j++) {
-      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
-      IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, j + 1);
-
-      extract_min_max(a, a_min, a_max, length);
-      extract_min_max(b, b_min, b_max, length);
-
-      /*
-       * Punt misordered list, overlapping start, or inverted range.
-       */
-      if (memcmp(a_min, b_min, length) >= 0 ||
-	  memcmp(a_min, a_max, length) > 0 ||
-	  memcmp(b_min, b_max, length) > 0)
-	return 0;
-
-      /*
-       * Punt if adjacent or overlapping.  Check for adjacency by
-       * subtracting one from b_min first.
-       */
-      for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--)
-	;
-      if (memcmp(a_max, b_min, length) >= 0)
-	return 0;
-
-      /*
-       * Check for range that should be expressed as a prefix.
-       */
-      if (a->type == IPAddressOrRange_addressRange &&
-	  range_should_be_prefix(a_min, a_max, length) >= 0)
-	return 0;
-    }
-
-    /*
-     * Check final range to see if it should be a prefix.
-     */
-    j = sk_IPAddressOrRange_num(aors) - 1;
-    {
-      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
-      if (a->type == IPAddressOrRange_addressRange) {
-	extract_min_max(a, a_min, a_max, length);
-	if (range_should_be_prefix(a_min, a_max, length) >= 0)
-	  return 0;
-      }
-    }
-  }
-
-  /*
-   * If we made it through all that, we're happy.
-   */
-  return 1;
-}
-
-/*
- * Whack an IPAddressOrRanges into canonical form.
- */
-static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
-				      const unsigned afi)
-{
-  int i, j, length = length_from_afi(afi);
-
-  /*
-   * Sort the IPAddressOrRanges sequence.
-   */
-  sk_IPAddressOrRange_sort(aors);
-
-  /*
-   * Clean up representation issues, punt on duplicates or overlaps.
-   */
-  for (i = 0; i < sk_IPAddressOrRange_num(aors) - 1; i++) {
-    IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, i);
-    IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, i + 1);
-    unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
-    unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
-
-    extract_min_max(a, a_min, a_max, length);
-    extract_min_max(b, b_min, b_max, length);
-
-    /*
-     * Punt overlaps.
-     */
-    if (memcmp(a_max, b_min, length) >= 0)
-      return 0;
-
-    /*
-     * Merge if a and b are adjacent.  We check for
-     * adjacency by subtracting one from b_min first.
-     */
-    for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--)
-      ;
-    if (memcmp(a_max, b_min, length) == 0) {
-      IPAddressOrRange *merged;
-      if (!make_addressRange(&merged, a_min, b_max, length))
-	return 0;
-      sk_IPAddressOrRange_set(aors, i, merged);
-      sk_IPAddressOrRange_delete(aors, i + 1);
-      IPAddressOrRange_free(a);
-      IPAddressOrRange_free(b);
-      --i;
-      continue;
-    }
-  }
-
-  return 1;
-}
-
-/*
- * Whack an IPAddrBlocks extension into canonical form.
- */
-int v3_addr_canonize(IPAddrBlocks *addr)
-{
-  int i;
-  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
-    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
-    if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
-	!IPAddressOrRanges_canonize(f->ipAddressChoice->u.addressesOrRanges,
-				    v3_addr_get_afi(f)))
-      return 0;
-  }
-  sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
-  sk_IPAddressFamily_sort(addr);
-  OPENSSL_assert(v3_addr_is_canonical(addr));
-  return 1;
-}
-
-/*
- * v2i handler for the IPAddrBlocks extension.
- */
-static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
-			      struct v3_ext_ctx *ctx,
-			      STACK_OF(CONF_VALUE) *values)
-{
-  static const char v4addr_chars[] = "0123456789.";
-  static const char v6addr_chars[] = "0123456789.:abcdefABCDEF";
-  IPAddrBlocks *addr = NULL;
-  char *s = NULL, *t;
-  int i;
-  
-  if ((addr = sk_IPAddressFamily_new(IPAddressFamily_cmp)) == NULL) {
-    X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
-    return NULL;
-  }
-
-  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
-    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);
-    unsigned char min[ADDR_RAW_BUF_LEN], max[ADDR_RAW_BUF_LEN];
-    unsigned afi, *safi = NULL, safi_;
-    const char *addr_chars;
-    int prefixlen, i1, i2, delim, length;
-
-    if (       !name_cmp(val->name, "IPv4")) {
-      afi = IANA_AFI_IPV4;
-    } else if (!name_cmp(val->name, "IPv6")) {
-      afi = IANA_AFI_IPV6;
-    } else if (!name_cmp(val->name, "IPv4-SAFI")) {
-      afi = IANA_AFI_IPV4;
-      safi = &safi_;
-    } else if (!name_cmp(val->name, "IPv6-SAFI")) {
-      afi = IANA_AFI_IPV6;
-      safi = &safi_;
-    } else {
-      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_NAME_ERROR);
-      X509V3_conf_err(val);
-      goto err;
-    }
-
-    switch (afi) {
-    case IANA_AFI_IPV4:
-      addr_chars = v4addr_chars;
-      break;
-    case IANA_AFI_IPV6:
-      addr_chars = v6addr_chars;
-      break;
-    }
-
-    length = length_from_afi(afi);
-
-    /*
-     * Handle SAFI, if any, and BUF_strdup() so we can null-terminate
-     * the other input values.
-     */
-    if (safi != NULL) {
-      *safi = strtoul(val->value, &t, 0);
-      t += strspn(t, " \t");
-      if (*safi > 0xFF || *t++ != ':') {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_SAFI);
-	X509V3_conf_err(val);
-	goto err;
-      }
-      t += strspn(t, " \t");
-      s = BUF_strdup(t);
-    } else {
-      s = BUF_strdup(val->value);
-    }
-    if (s == NULL) {
-      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
-      goto err;
-    }
-
-    /*
-     * Check for inheritance.  Not worth additional complexity to
-     * optimize this (seldom-used) case.
-     */
-    if (!strcmp(s, "inherit")) {
-      if (!v3_addr_add_inherit(addr, afi, safi)) {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_INHERITANCE);
-	X509V3_conf_err(val);
-	goto err;
-      }
-      OPENSSL_free(s);
-      s = NULL;
-      continue;
-    }
-
-    i1 = strspn(s, addr_chars);
-    i2 = i1 + strspn(s + i1, " \t");
-    delim = s[i2++];
-    s[i1] = '\0';
-
-    if (a2i_ipadd(min, s) != length) {
-      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);
-      X509V3_conf_err(val);
-      goto err;
-    }
-
-    switch (delim) {
-    case '/':
-      prefixlen = (int) strtoul(s + i2, &t, 10);
-      if (t == s + i2 || *t != '\0') {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
-	X509V3_conf_err(val);
-	goto err;
-      }
-      if (!v3_addr_add_prefix(addr, afi, safi, min, prefixlen)) {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
-	goto err;
-      }
-      break;
-    case '-':
-      i1 = i2 + strspn(s + i2, " \t");
-      i2 = i1 + strspn(s + i1, addr_chars);
-      if (i1 == i2 || s[i2] != '\0') {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
-	X509V3_conf_err(val);
-	goto err;
-      }
-      if (a2i_ipadd(max, s + i1) != length) {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);
-	X509V3_conf_err(val);
-	goto err;
-      }
-      if (!v3_addr_add_range(addr, afi, safi, min, max)) {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
-	goto err;
-      }
-      break;
-    case '\0':
-      if (!v3_addr_add_prefix(addr, afi, safi, min, length * 8)) {
-	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
-	goto err;
-      }
-      break;
-    default:
-      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
-      X509V3_conf_err(val);
-      goto err;
-    }
-
-    OPENSSL_free(s);
-    s = NULL;
-  }
-
-  /*
-   * Canonize the result, then we're done.
-   */
-  if (!v3_addr_canonize(addr))
-    goto err;    
-  return addr;
-
- err:
-  OPENSSL_free(s);
-  sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
-  return NULL;
-}
-
-/*
- * OpenSSL dispatch
- */
-const X509V3_EXT_METHOD v3_addr = {
-  NID_sbgp_ipAddrBlock,		/* nid */
-  0,				/* flags */
-  ASN1_ITEM_ref(IPAddrBlocks),	/* template */
-  0, 0, 0, 0,			/* old functions, ignored */
-  0,				/* i2s */
-  0,				/* s2i */
-  0,				/* i2v */
-  v2i_IPAddrBlocks,		/* v2i */
-  i2r_IPAddrBlocks,		/* i2r */
-  0,				/* r2i */
-  NULL				/* extension-specific data */
-};
-
-/*
- * Figure out whether extension sues inheritance.
- */
-int v3_addr_inherits(IPAddrBlocks *addr)
-{
-  int i;
-  if (addr == NULL)
-    return 0;
-  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
-    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
-    if (f->ipAddressChoice->type == IPAddressChoice_inherit)
-      return 1;
-  }
-  return 0;
-}
-
-/*
- * Figure out whether parent contains child.
- */
-static int addr_contains(IPAddressOrRanges *parent,
-			 IPAddressOrRanges *child,
-			 int length)
-{
-  unsigned char p_min[ADDR_RAW_BUF_LEN], p_max[ADDR_RAW_BUF_LEN];
-  unsigned char c_min[ADDR_RAW_BUF_LEN], c_max[ADDR_RAW_BUF_LEN];
-  int p, c;
-
-  if (child == NULL || parent == child)
-    return 1;
-  if (parent == NULL)
-    return 0;
-
-  p = 0;
-  for (c = 0; c < sk_IPAddressOrRange_num(child); c++) {
-    extract_min_max(sk_IPAddressOrRange_value(child, c),
-		    c_min, c_max, length);
-    for (;; p++) {
-      if (p >= sk_IPAddressOrRange_num(parent))
-	return 0;
-      extract_min_max(sk_IPAddressOrRange_value(parent, p),
-		      p_min, p_max, length);
-      if (memcmp(p_max, c_max, length) < 0)
-	continue;
-      if (memcmp(p_min, c_min, length) > 0)
-	return 0;
-      break;
-    }
-  }
-
-  return 1;
-}
-
-/*
- * Test whether a is a subset of b.
- */
-int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
-{
-  int i;
-  if (a == NULL || a == b)
-    return 1;
-  if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b))
-    return 0;
-  sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp);
-  for (i = 0; i < sk_IPAddressFamily_num(a); i++) {
-    IPAddressFamily *fa = sk_IPAddressFamily_value(a, i);
-    int j = sk_IPAddressFamily_find(b, fa);
-    IPAddressFamily *fb;
-    fb = sk_IPAddressFamily_value(b, j);
-    if (fb == NULL)
-       return 0;
-    if (!addr_contains(fb->ipAddressChoice->u.addressesOrRanges, 
-		       fa->ipAddressChoice->u.addressesOrRanges,
-		       length_from_afi(v3_addr_get_afi(fb))))
-      return 0;
-  }
-  return 1;
-}
-
-/*
- * Validation error handling via callback.
- */
-#define validation_err(_err_)		\
-  do {					\
-    if (ctx != NULL) {			\
-      ctx->error = _err_;		\
-      ctx->error_depth = i;		\
-      ctx->current_cert = x;		\
-      ret = ctx->verify_cb(0, ctx);	\
-    } else {				\
-      ret = 0;				\
-    }					\
-    if (!ret)				\
-      goto done;			\
-  } while (0)
-
-/*
- * Core code for RFC 3779 2.3 path validation.
- */
-static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
-					  STACK_OF(X509) *chain,
-					  IPAddrBlocks *ext)
-{
-  IPAddrBlocks *child = NULL;
-  int i, j, ret = 1;
-  X509 *x;
-
-  OPENSSL_assert(chain != NULL && sk_X509_num(chain) > 0);
-  OPENSSL_assert(ctx != NULL || ext != NULL);
-  OPENSSL_assert(ctx == NULL || ctx->verify_cb != NULL);
-
-  /*
-   * Figure out where to start.  If we don't have an extension to
-   * check, we're done.  Otherwise, check canonical form and
-   * set up for walking up the chain.
-   */
-  if (ext != NULL) {
-    i = -1;
-    x = NULL;
-  } else {
-    i = 0;
-    x = sk_X509_value(chain, i);
-    OPENSSL_assert(x != NULL);
-    if ((ext = x->rfc3779_addr) == NULL)
-      goto done;
-  }
-  if (!v3_addr_is_canonical(ext))
-    validation_err(X509_V_ERR_INVALID_EXTENSION);
-  sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp);
-  if ((child = sk_IPAddressFamily_dup(ext)) == NULL) {
-    X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE);
-    ret = 0;
-    goto done;
-  }
-
-  /*
-   * Now walk up the chain.  No cert may list resources that its
-   * parent doesn't list.
-   */
-  for (i++; i < sk_X509_num(chain); i++) {
-    x = sk_X509_value(chain, i);
-    OPENSSL_assert(x != NULL);
-    if (!v3_addr_is_canonical(x->rfc3779_addr))
-      validation_err(X509_V_ERR_INVALID_EXTENSION);
-    if (x->rfc3779_addr == NULL) {
-      for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
-	IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
-	if (fc->ipAddressChoice->type != IPAddressChoice_inherit) {
-	  validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-	  break;
-	}
-      }
-      continue;
-    }
-    sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp);
-    for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
-      IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
-      int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);
-      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, k);
-      if (fp == NULL) {
-	if (fc->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
-	  validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-	  break;
-	}
-	continue;
-      }
-      if (fp->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
-	if (fc->ipAddressChoice->type == IPAddressChoice_inherit ||
-	    addr_contains(fp->ipAddressChoice->u.addressesOrRanges, 
-			  fc->ipAddressChoice->u.addressesOrRanges,
-			  length_from_afi(v3_addr_get_afi(fc))))
-	  sk_IPAddressFamily_set(child, j, fp);
-	else
-	  validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-      }
-    }
-  }
-
-  /*
-   * Trust anchor can't inherit.
-   */
-  OPENSSL_assert(x != NULL);
-  if (x->rfc3779_addr != NULL) {
-    for (j = 0; j < sk_IPAddressFamily_num(x->rfc3779_addr); j++) {
-      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, j);
-      if (fp->ipAddressChoice->type == IPAddressChoice_inherit &&
-	  sk_IPAddressFamily_find(child, fp) >= 0)
-	validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-    }
-  }
-
- done:
-  sk_IPAddressFamily_free(child);
-  return ret;
-}
-
-#undef validation_err
-
-/*
- * RFC 3779 2.3 path validation -- called from X509_verify_cert().
- */
-int v3_addr_validate_path(X509_STORE_CTX *ctx)
-{
-  return v3_addr_validate_path_internal(ctx, ctx->chain, NULL);
-}
-
-/*
- * RFC 3779 2.3 path validation of an extension.
- * Test whether chain covers extension.
- */
-int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
-				  IPAddrBlocks *ext,
-				  int allow_inheritance)
-{
-  if (ext == NULL)
-    return 1;
-  if (chain == NULL || sk_X509_num(chain) == 0)
-    return 0;
-  if (!allow_inheritance && v3_addr_inherits(ext))
-    return 0;
-  return v3_addr_validate_path_internal(NULL, chain, ext);
-}
-
-#endif /* OPENSSL_NO_RFC3779 */
+/*

+ * Contributed to the OpenSSL Project by the American Registry for

+ * Internet Numbers ("ARIN").

+ */

+/* ====================================================================

+ * 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).

+ */

+

+/*

+ * Implementation of RFC 3779 section 2.2.

+ */

+

+#include <stdio.h>

+#include <stdlib.h>

+

+#include "cryptlib.h"

+#include <openssl/conf.h>

+#include <openssl/asn1.h>

+#include <openssl/asn1t.h>

+#include <openssl/buffer.h>

+#include <openssl/x509v3.h>

+

+#ifndef OPENSSL_NO_RFC3779

+

+/*

+ * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.

+ */

+

+ASN1_SEQUENCE(IPAddressRange) = {

+  ASN1_SIMPLE(IPAddressRange, min, ASN1_BIT_STRING),

+  ASN1_SIMPLE(IPAddressRange, max, ASN1_BIT_STRING)

+} ASN1_SEQUENCE_END(IPAddressRange)

+

+ASN1_CHOICE(IPAddressOrRange) = {

+  ASN1_SIMPLE(IPAddressOrRange, u.addressPrefix, ASN1_BIT_STRING),

+  ASN1_SIMPLE(IPAddressOrRange, u.addressRange,  IPAddressRange)

+} ASN1_CHOICE_END(IPAddressOrRange)

+

+ASN1_CHOICE(IPAddressChoice) = {

+  ASN1_SIMPLE(IPAddressChoice,      u.inherit,           ASN1_NULL),

+  ASN1_SEQUENCE_OF(IPAddressChoice, u.addressesOrRanges, IPAddressOrRange)

+} ASN1_CHOICE_END(IPAddressChoice)

+

+ASN1_SEQUENCE(IPAddressFamily) = {

+  ASN1_SIMPLE(IPAddressFamily, addressFamily,   ASN1_OCTET_STRING),

+  ASN1_SIMPLE(IPAddressFamily, ipAddressChoice, IPAddressChoice)

+} ASN1_SEQUENCE_END(IPAddressFamily)

+

+ASN1_ITEM_TEMPLATE(IPAddrBlocks) = 

+  ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,

+			IPAddrBlocks, IPAddressFamily)

+ASN1_ITEM_TEMPLATE_END(IPAddrBlocks)

+

+IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)

+IMPLEMENT_ASN1_FUNCTIONS(IPAddressOrRange)

+IMPLEMENT_ASN1_FUNCTIONS(IPAddressChoice)

+IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)

+

+/*

+ * How much buffer space do we need for a raw address?

+ */

+#define ADDR_RAW_BUF_LEN	16

+

+/*

+ * What's the address length associated with this AFI?

+ */

+static int length_from_afi(const unsigned afi)

+{

+  switch (afi) {

+  case IANA_AFI_IPV4:

+    return 4;

+  case IANA_AFI_IPV6:

+    return 16;

+  default:

+    return 0;

+  }

+}

+

+/*

+ * Extract the AFI from an IPAddressFamily.

+ */

+unsigned int v3_addr_get_afi(const IPAddressFamily *f)

+{

+  return ((f != NULL &&

+	   f->addressFamily != NULL &&

+	   f->addressFamily->data != NULL)

+	  ? ((f->addressFamily->data[0] << 8) |

+	     (f->addressFamily->data[1]))

+	  : 0);

+}

+

+/*

+ * Expand the bitstring form of an address into a raw byte array.

+ * At the moment this is coded for simplicity, not speed.

+ */

+static void addr_expand(unsigned char *addr,

+			const ASN1_BIT_STRING *bs,

+			const int length,

+			const unsigned char fill)

+{

+  OPENSSL_assert(bs->length >= 0 && bs->length <= length);

+  if (bs->length > 0) {

+    memcpy(addr, bs->data, bs->length);

+    if ((bs->flags & 7) != 0) {

+      unsigned char mask = 0xFF >> (8 - (bs->flags & 7));

+      if (fill == 0)

+	addr[bs->length - 1] &= ~mask;

+      else

+	addr[bs->length - 1] |= mask;

+    }

+  }

+  memset(addr + bs->length, fill, length - bs->length);

+}

+

+/*

+ * Extract the prefix length from a bitstring.

+ */

+#define addr_prefixlen(bs) ((int) ((bs)->length * 8 - ((bs)->flags & 7)))

+

+/*

+ * i2r handler for one address bitstring.

+ */

+static int i2r_address(BIO *out,

+		       const unsigned afi,

+		       const unsigned char fill,

+		       const ASN1_BIT_STRING *bs)

+{

+  unsigned char addr[ADDR_RAW_BUF_LEN];

+  int i, n;

+

+  if (bs->length < 0)

+    return 0;

+  switch (afi) {

+  case IANA_AFI_IPV4:

+    if (bs->length > 4)

+      return 0;

+    addr_expand(addr, bs, 4, fill);

+    BIO_printf(out, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);

+    break;

+  case IANA_AFI_IPV6:

+    if (bs->length > 16)

+      return 0;

+    addr_expand(addr, bs, 16, fill);

+    for (n = 16; n > 1 && addr[n-1] == 0x00 && addr[n-2] == 0x00; n -= 2)

+      ;

+    for (i = 0; i < n; i += 2)

+      BIO_printf(out, "%x%s", (addr[i] << 8) | addr[i+1], (i < 14 ? ":" : ""));

+    if (i < 16)

+      BIO_puts(out, ":");

+    if (i == 0)

+      BIO_puts(out, ":");

+    break;

+  default:

+    for (i = 0; i < bs->length; i++)

+      BIO_printf(out, "%s%02x", (i > 0 ? ":" : ""), bs->data[i]);

+    BIO_printf(out, "[%d]", (int) (bs->flags & 7));

+    break;

+  }

+  return 1;

+}

+

+/*

+ * i2r handler for a sequence of addresses and ranges.

+ */

+static int i2r_IPAddressOrRanges(BIO *out,

+				 const int indent,

+				 const IPAddressOrRanges *aors,

+				 const unsigned afi)

+{

+  int i;

+  for (i = 0; i < sk_IPAddressOrRange_num(aors); i++) {

+    const IPAddressOrRange *aor = sk_IPAddressOrRange_value(aors, i);

+    BIO_printf(out, "%*s", indent, "");

+    switch (aor->type) {

+    case IPAddressOrRange_addressPrefix:

+      if (!i2r_address(out, afi, 0x00, aor->u.addressPrefix))

+	return 0;

+      BIO_printf(out, "/%d\n", addr_prefixlen(aor->u.addressPrefix));

+      continue;

+    case IPAddressOrRange_addressRange:

+      if (!i2r_address(out, afi, 0x00, aor->u.addressRange->min))

+	return 0;

+      BIO_puts(out, "-");

+      if (!i2r_address(out, afi, 0xFF, aor->u.addressRange->max))

+	return 0;

+      BIO_puts(out, "\n");

+      continue;

+    }

+  }

+  return 1;

+}

+

+/*

+ * i2r handler for an IPAddrBlocks extension.

+ */

+static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,

+			    void *ext,

+			    BIO *out,

+			    int indent)

+{

+  const IPAddrBlocks *addr = ext;

+  int i;

+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {

+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);

+    const unsigned int afi = v3_addr_get_afi(f);

+    switch (afi) {

+    case IANA_AFI_IPV4:

+      BIO_printf(out, "%*sIPv4", indent, "");

+      break;

+    case IANA_AFI_IPV6:

+      BIO_printf(out, "%*sIPv6", indent, "");

+      break;

+    default:

+      BIO_printf(out, "%*sUnknown AFI %u", indent, "", afi);

+      break;

+    }

+    if (f->addressFamily->length > 2) {

+      switch (f->addressFamily->data[2]) {

+      case   1:

+	BIO_puts(out, " (Unicast)");

+	break;

+      case   2:

+	BIO_puts(out, " (Multicast)");

+	break;

+      case   3:

+	BIO_puts(out, " (Unicast/Multicast)");

+	break;

+      case   4:

+	BIO_puts(out, " (MPLS)");

+	break;

+      case  64:

+	BIO_puts(out, " (Tunnel)");

+	break;

+      case  65:

+	BIO_puts(out, " (VPLS)");

+	break;

+      case  66:

+	BIO_puts(out, " (BGP MDT)");

+	break;

+      case 128:

+	BIO_puts(out, " (MPLS-labeled VPN)");

+	break;

+      default:  

+	BIO_printf(out, " (Unknown SAFI %u)",

+		   (unsigned) f->addressFamily->data[2]);

+	break;

+      }

+    }

+    switch (f->ipAddressChoice->type) {

+    case IPAddressChoice_inherit:

+      BIO_puts(out, ": inherit\n");

+      break;

+    case IPAddressChoice_addressesOrRanges:

+      BIO_puts(out, ":\n");

+      if (!i2r_IPAddressOrRanges(out,

+				 indent + 2,

+				 f->ipAddressChoice->u.addressesOrRanges,

+				 afi))

+	return 0;

+      break;

+    }

+  }

+  return 1;

+}

+

+/*

+ * Sort comparison function for a sequence of IPAddressOrRange

+ * elements.

+ */

+static int IPAddressOrRange_cmp(const IPAddressOrRange *a,

+				const IPAddressOrRange *b,

+				const int length)

+{

+  unsigned char addr_a[ADDR_RAW_BUF_LEN], addr_b[ADDR_RAW_BUF_LEN];

+  int prefixlen_a = 0, prefixlen_b = 0;

+  int r;

+

+  switch (a->type) {

+  case IPAddressOrRange_addressPrefix:

+    addr_expand(addr_a, a->u.addressPrefix, length, 0x00);

+    prefixlen_a = addr_prefixlen(a->u.addressPrefix);

+    break;

+  case IPAddressOrRange_addressRange:

+    addr_expand(addr_a, a->u.addressRange->min, length, 0x00);

+    prefixlen_a = length * 8;

+    break;

+  }

+

+  switch (b->type) {

+  case IPAddressOrRange_addressPrefix:

+    addr_expand(addr_b, b->u.addressPrefix, length, 0x00);

+    prefixlen_b = addr_prefixlen(b->u.addressPrefix);

+    break;

+  case IPAddressOrRange_addressRange:

+    addr_expand(addr_b, b->u.addressRange->min, length, 0x00);

+    prefixlen_b = length * 8;

+    break;

+  }

+

+  if ((r = memcmp(addr_a, addr_b, length)) != 0)

+    return r;

+  else

+    return prefixlen_a - prefixlen_b;

+}

+

+/*

+ * IPv4-specific closure over IPAddressOrRange_cmp, since sk_sort()

+ * comparision routines are only allowed two arguments.

+ */

+static int v4IPAddressOrRange_cmp(const IPAddressOrRange * const *a,

+				  const IPAddressOrRange * const *b)

+{

+  return IPAddressOrRange_cmp(*a, *b, 4);

+}

+

+/*

+ * IPv6-specific closure over IPAddressOrRange_cmp, since sk_sort()

+ * comparision routines are only allowed two arguments.

+ */

+static int v6IPAddressOrRange_cmp(const IPAddressOrRange * const *a,

+				  const IPAddressOrRange * const *b)

+{

+  return IPAddressOrRange_cmp(*a, *b, 16);

+}

+

+/*

+ * Calculate whether a range collapses to a prefix.

+ * See last paragraph of RFC 3779 2.2.3.7.

+ */

+static int range_should_be_prefix(const unsigned char *min,

+				  const unsigned char *max,

+				  const int length)

+{

+  unsigned char mask;

+  int i, j;

+

+  for (i = 0; i < length && min[i] == max[i]; i++)

+    ;

+  for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--)

+    ;

+  if (i < j)

+    return -1;

+  if (i > j)

+    return i * 8;

+  mask = min[i] ^ max[i];

+  switch (mask) {

+  case 0x01: j = 7; break;

+  case 0x03: j = 6; break;

+  case 0x07: j = 5; break;

+  case 0x0F: j = 4; break;

+  case 0x1F: j = 3; break;

+  case 0x3F: j = 2; break;

+  case 0x7F: j = 1; break;

+  default:   return -1;

+  }

+  if ((min[i] & mask) != 0 || (max[i] & mask) != mask)

+    return -1;

+  else

+    return i * 8 + j;

+}

+

+/*

+ * Construct a prefix.

+ */

+static int make_addressPrefix(IPAddressOrRange **result,

+			      unsigned char *addr,

+			      const int prefixlen)

+{

+  int bytelen = (prefixlen + 7) / 8, bitlen = prefixlen % 8;

+  IPAddressOrRange *aor = IPAddressOrRange_new();

+

+  if (aor == NULL)

+    return 0;

+  aor->type = IPAddressOrRange_addressPrefix;

+  if (aor->u.addressPrefix == NULL &&

+      (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)

+    goto err;

+  if (!ASN1_BIT_STRING_set(aor->u.addressPrefix, addr, bytelen))

+    goto err;

+  aor->u.addressPrefix->flags &= ~7;

+  aor->u.addressPrefix->flags |= ASN1_STRING_FLAG_BITS_LEFT;

+  if (bitlen > 0) {

+    aor->u.addressPrefix->data[bytelen - 1] &= ~(0xFF >> bitlen);

+    aor->u.addressPrefix->flags |= 8 - bitlen;

+  }

+  

+  *result = aor;

+  return 1;

+

+ err:

+  IPAddressOrRange_free(aor);

+  return 0;

+}

+

+/*

+ * Construct a range.  If it can be expressed as a prefix,

+ * return a prefix instead.  Doing this here simplifies

+ * the rest of the code considerably.

+ */

+static int make_addressRange(IPAddressOrRange **result,

+			     unsigned char *min,

+			     unsigned char *max,

+			     const int length)

+{

+  IPAddressOrRange *aor;

+  int i, prefixlen;

+

+  if ((prefixlen = range_should_be_prefix(min, max, length)) >= 0)

+    return make_addressPrefix(result, min, prefixlen);

+

+  if ((aor = IPAddressOrRange_new()) == NULL)

+    return 0;

+  aor->type = IPAddressOrRange_addressRange;

+  OPENSSL_assert(aor->u.addressRange == NULL);

+  if ((aor->u.addressRange = IPAddressRange_new()) == NULL)

+    goto err;

+  if (aor->u.addressRange->min == NULL &&

+      (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)

+    goto err;

+  if (aor->u.addressRange->max == NULL &&

+      (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)

+    goto err;

+

+  for (i = length; i > 0 && min[i - 1] == 0x00; --i)

+    ;

+  if (!ASN1_BIT_STRING_set(aor->u.addressRange->min, min, i))

+    goto err;

+  aor->u.addressRange->min->flags &= ~7;

+  aor->u.addressRange->min->flags |= ASN1_STRING_FLAG_BITS_LEFT;

+  if (i > 0) {

+    unsigned char b = min[i - 1];

+    int j = 1;

+    while ((b & (0xFFU >> j)) != 0) 

+      ++j;

+    aor->u.addressRange->min->flags |= 8 - j;

+  }

+

+  for (i = length; i > 0 && max[i - 1] == 0xFF; --i)

+    ;

+  if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i))

+    goto err;

+  aor->u.addressRange->max->flags &= ~7;

+  aor->u.addressRange->max->flags |= ASN1_STRING_FLAG_BITS_LEFT;

+  if (i > 0) {

+    unsigned char b = max[i - 1];

+    int j = 1;

+    while ((b & (0xFFU >> j)) != (0xFFU >> j))

+      ++j;

+    aor->u.addressRange->max->flags |= 8 - j;

+  }

+

+  *result = aor;

+  return 1;

+

+ err:

+  IPAddressOrRange_free(aor);

+  return 0;

+}

+

+/*

+ * Construct a new address family or find an existing one.

+ */

+static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,

+					     const unsigned afi,

+					     const unsigned *safi)

+{

+  IPAddressFamily *f;

+  unsigned char key[3];

+  unsigned keylen;

+  int i;

+

+  key[0] = (afi >> 8) & 0xFF;

+  key[1] = afi & 0xFF;

+  if (safi != NULL) {

+    key[2] = *safi & 0xFF;

+    keylen = 3;

+  } else {

+    keylen = 2;

+  }

+

+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {

+    f = sk_IPAddressFamily_value(addr, i);

+    OPENSSL_assert(f->addressFamily->data != NULL);

+    if (f->addressFamily->length == keylen &&

+	!memcmp(f->addressFamily->data, key, keylen))

+      return f;

+  }

+

+  if ((f = IPAddressFamily_new()) == NULL)

+    goto err;

+  if (f->ipAddressChoice == NULL &&

+      (f->ipAddressChoice = IPAddressChoice_new()) == NULL)

+    goto err;

+  if (f->addressFamily == NULL && 

+      (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)

+    goto err;

+  if (!ASN1_OCTET_STRING_set(f->addressFamily, key, keylen))

+    goto err;

+  if (!sk_IPAddressFamily_push(addr, f))

+    goto err;

+

+  return f;

+

+ err:

+  IPAddressFamily_free(f);

+  return NULL;

+}

+

+/*

+ * Add an inheritance element.

+ */

+int v3_addr_add_inherit(IPAddrBlocks *addr,

+			const unsigned afi,

+			const unsigned *safi)

+{

+  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);

+  if (f == NULL ||

+      f->ipAddressChoice == NULL ||

+      (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&

+       f->ipAddressChoice->u.addressesOrRanges != NULL))

+    return 0;

+  if (f->ipAddressChoice->type == IPAddressChoice_inherit &&

+      f->ipAddressChoice->u.inherit != NULL)

+    return 1;

+  if (f->ipAddressChoice->u.inherit == NULL &&

+      (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)

+    return 0;

+  f->ipAddressChoice->type = IPAddressChoice_inherit;

+  return 1;

+}

+

+/*

+ * Construct an IPAddressOrRange sequence, or return an existing one.

+ */

+static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,

+					       const unsigned afi,

+					       const unsigned *safi)

+{

+  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);

+  IPAddressOrRanges *aors = NULL;

+

+  if (f == NULL ||

+      f->ipAddressChoice == NULL ||

+      (f->ipAddressChoice->type == IPAddressChoice_inherit &&

+       f->ipAddressChoice->u.inherit != NULL))

+    return NULL;

+  if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges)

+    aors = f->ipAddressChoice->u.addressesOrRanges;

+  if (aors != NULL)

+    return aors;

+  if ((aors = sk_IPAddressOrRange_new_null()) == NULL)

+    return NULL;

+  switch (afi) {

+  case IANA_AFI_IPV4:

+    sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp);

+    break;

+  case IANA_AFI_IPV6:

+    sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp);

+    break;

+  }

+  f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges;

+  f->ipAddressChoice->u.addressesOrRanges = aors;

+  return aors;

+}

+

+/*

+ * Add a prefix.

+ */

+int v3_addr_add_prefix(IPAddrBlocks *addr,

+		       const unsigned afi,

+		       const unsigned *safi,

+		       unsigned char *a,

+		       const int prefixlen)

+{

+  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);

+  IPAddressOrRange *aor;

+  if (aors == NULL || !make_addressPrefix(&aor, a, prefixlen))

+    return 0;

+  if (sk_IPAddressOrRange_push(aors, aor))

+    return 1;

+  IPAddressOrRange_free(aor);

+  return 0;

+}

+

+/*

+ * Add a range.

+ */

+int v3_addr_add_range(IPAddrBlocks *addr,

+		      const unsigned afi,

+		      const unsigned *safi,

+		      unsigned char *min,

+		      unsigned char *max)

+{

+  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);

+  IPAddressOrRange *aor;

+  int length = length_from_afi(afi);

+  if (aors == NULL)

+    return 0;

+  if (!make_addressRange(&aor, min, max, length))

+    return 0;

+  if (sk_IPAddressOrRange_push(aors, aor))

+    return 1;

+  IPAddressOrRange_free(aor);

+  return 0;

+}

+

+/*

+ * Extract min and max values from an IPAddressOrRange.

+ */

+static void extract_min_max(IPAddressOrRange *aor,

+			    unsigned char *min,

+			    unsigned char *max,

+			    int length)

+{

+  OPENSSL_assert(aor != NULL && min != NULL && max != NULL);

+  switch (aor->type) {

+  case IPAddressOrRange_addressPrefix:

+    addr_expand(min, aor->u.addressPrefix, length, 0x00);

+    addr_expand(max, aor->u.addressPrefix, length, 0xFF);

+    return;

+  case IPAddressOrRange_addressRange:

+    addr_expand(min, aor->u.addressRange->min, length, 0x00);

+    addr_expand(max, aor->u.addressRange->max, length, 0xFF);

+    return;

+  }

+}

+

+/*

+ * Public wrapper for extract_min_max().

+ */

+int v3_addr_get_range(IPAddressOrRange *aor,

+		      const unsigned afi,

+		      unsigned char *min,

+		      unsigned char *max,

+		      const int length)

+{

+  int afi_length = length_from_afi(afi);

+  if (aor == NULL || min == NULL || max == NULL ||

+      afi_length == 0 || length < afi_length ||

+      (aor->type != IPAddressOrRange_addressPrefix &&

+       aor->type != IPAddressOrRange_addressRange))

+    return 0;

+  extract_min_max(aor, min, max, afi_length);

+  return afi_length;

+}

+

+/*

+ * Sort comparision function for a sequence of IPAddressFamily.

+ *

+ * The last paragraph of RFC 3779 2.2.3.3 is slightly ambiguous about

+ * the ordering: I can read it as meaning that IPv6 without a SAFI

+ * comes before IPv4 with a SAFI, which seems pretty weird.  The

+ * examples in appendix B suggest that the author intended the

+ * null-SAFI rule to apply only within a single AFI, which is what I

+ * would have expected and is what the following code implements.

+ */

+static int IPAddressFamily_cmp(const IPAddressFamily * const *a_,

+			       const IPAddressFamily * const *b_)

+{

+  const ASN1_OCTET_STRING *a = (*a_)->addressFamily;

+  const ASN1_OCTET_STRING *b = (*b_)->addressFamily;

+  int len = ((a->length <= b->length) ? a->length : b->length);

+  int cmp = memcmp(a->data, b->data, len);

+  return cmp ? cmp : a->length - b->length;

+}

+

+/*

+ * Check whether an IPAddrBLocks is in canonical form.

+ */

+int v3_addr_is_canonical(IPAddrBlocks *addr)

+{

+  unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];

+  unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];

+  IPAddressOrRanges *aors;

+  int i, j, k;

+

+  /*

+   * Empty extension is cannonical.

+   */

+  if (addr == NULL)

+    return 1;

+

+  /*

+   * Check whether the top-level list is in order.

+   */

+  for (i = 0; i < sk_IPAddressFamily_num(addr) - 1; i++) {

+    const IPAddressFamily *a = sk_IPAddressFamily_value(addr, i);

+    const IPAddressFamily *b = sk_IPAddressFamily_value(addr, i + 1);

+    if (IPAddressFamily_cmp(&a, &b) >= 0)

+      return 0;

+  }

+

+  /*

+   * Top level's ok, now check each address family.

+   */

+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {

+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);

+    int length = length_from_afi(v3_addr_get_afi(f));

+

+    /*

+     * Inheritance is canonical.  Anything other than inheritance or

+     * a SEQUENCE OF IPAddressOrRange is an ASN.1 error or something.

+     */

+    if (f == NULL || f->ipAddressChoice == NULL)

+      return 0;

+    switch (f->ipAddressChoice->type) {

+    case IPAddressChoice_inherit:

+      continue;

+    case IPAddressChoice_addressesOrRanges:

+      break;

+    default:

+      return 0;

+    }

+

+    /*

+     * It's an IPAddressOrRanges sequence, check it.

+     */

+    aors = f->ipAddressChoice->u.addressesOrRanges;

+    if (sk_IPAddressOrRange_num(aors) == 0)

+      return 0;

+    for (j = 0; j < sk_IPAddressOrRange_num(aors) - 1; j++) {

+      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);

+      IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, j + 1);

+

+      extract_min_max(a, a_min, a_max, length);

+      extract_min_max(b, b_min, b_max, length);

+

+      /*

+       * Punt misordered list, overlapping start, or inverted range.

+       */

+      if (memcmp(a_min, b_min, length) >= 0 ||

+	  memcmp(a_min, a_max, length) > 0 ||

+	  memcmp(b_min, b_max, length) > 0)

+	return 0;

+

+      /*

+       * Punt if adjacent or overlapping.  Check for adjacency by

+       * subtracting one from b_min first.

+       */

+      for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--)

+	;

+      if (memcmp(a_max, b_min, length) >= 0)

+	return 0;

+

+      /*

+       * Check for range that should be expressed as a prefix.

+       */

+      if (a->type == IPAddressOrRange_addressRange &&

+	  range_should_be_prefix(a_min, a_max, length) >= 0)

+	return 0;

+    }

+

+    /*

+     * Check final range to see if it should be a prefix.

+     */

+    j = sk_IPAddressOrRange_num(aors) - 1;

+    {

+      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);

+      if (a->type == IPAddressOrRange_addressRange) {

+	extract_min_max(a, a_min, a_max, length);

+	if (range_should_be_prefix(a_min, a_max, length) >= 0)

+	  return 0;

+      }

+    }

+  }

+

+  /*

+   * If we made it through all that, we're happy.

+   */

+  return 1;

+}

+

+/*

+ * Whack an IPAddressOrRanges into canonical form.

+ */

+static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,

+				      const unsigned afi)

+{

+  int i, j, length = length_from_afi(afi);

+

+  /*

+   * Sort the IPAddressOrRanges sequence.

+   */

+  sk_IPAddressOrRange_sort(aors);

+

+  /*

+   * Clean up representation issues, punt on duplicates or overlaps.

+   */

+  for (i = 0; i < sk_IPAddressOrRange_num(aors) - 1; i++) {

+    IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, i);

+    IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, i + 1);

+    unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];

+    unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];

+

+    extract_min_max(a, a_min, a_max, length);

+    extract_min_max(b, b_min, b_max, length);

+

+    /*

+     * Punt overlaps.

+     */

+    if (memcmp(a_max, b_min, length) >= 0)

+      return 0;

+

+    /*

+     * Merge if a and b are adjacent.  We check for

+     * adjacency by subtracting one from b_min first.

+     */

+    for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--)

+      ;

+    if (memcmp(a_max, b_min, length) == 0) {

+      IPAddressOrRange *merged;

+      if (!make_addressRange(&merged, a_min, b_max, length))

+	return 0;

+      sk_IPAddressOrRange_set(aors, i, merged);

+      sk_IPAddressOrRange_delete(aors, i + 1);

+      IPAddressOrRange_free(a);

+      IPAddressOrRange_free(b);

+      --i;

+      continue;

+    }

+  }

+

+  return 1;

+}

+

+/*

+ * Whack an IPAddrBlocks extension into canonical form.

+ */

+int v3_addr_canonize(IPAddrBlocks *addr)

+{

+  int i;

+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {

+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);

+    if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&

+	!IPAddressOrRanges_canonize(f->ipAddressChoice->u.addressesOrRanges,

+				    v3_addr_get_afi(f)))

+      return 0;

+  }

+  sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);

+  sk_IPAddressFamily_sort(addr);

+  OPENSSL_assert(v3_addr_is_canonical(addr));

+  return 1;

+}

+

+/*

+ * v2i handler for the IPAddrBlocks extension.

+ */

+static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,

+			      struct v3_ext_ctx *ctx,

+			      STACK_OF(CONF_VALUE) *values)

+{

+  static const char v4addr_chars[] = "0123456789.";

+  static const char v6addr_chars[] = "0123456789.:abcdefABCDEF";

+  IPAddrBlocks *addr = NULL;

+  char *s = NULL, *t;

+  int i;

+  

+  if ((addr = sk_IPAddressFamily_new(IPAddressFamily_cmp)) == NULL) {

+    X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);

+    return NULL;

+  }

+

+  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {

+    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);

+    unsigned char min[ADDR_RAW_BUF_LEN], max[ADDR_RAW_BUF_LEN];

+    unsigned afi, *safi = NULL, safi_;

+    const char *addr_chars;

+    int prefixlen, i1, i2, delim, length;

+

+    if (       !name_cmp(val->name, "IPv4")) {

+      afi = IANA_AFI_IPV4;

+    } else if (!name_cmp(val->name, "IPv6")) {

+      afi = IANA_AFI_IPV6;

+    } else if (!name_cmp(val->name, "IPv4-SAFI")) {

+      afi = IANA_AFI_IPV4;

+      safi = &safi_;

+    } else if (!name_cmp(val->name, "IPv6-SAFI")) {

+      afi = IANA_AFI_IPV6;

+      safi = &safi_;

+    } else {

+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_NAME_ERROR);

+      X509V3_conf_err(val);

+      goto err;

+    }

+

+    switch (afi) {

+    case IANA_AFI_IPV4:

+      addr_chars = v4addr_chars;

+      break;

+    case IANA_AFI_IPV6:

+      addr_chars = v6addr_chars;

+      break;

+    }

+

+    length = length_from_afi(afi);

+

+    /*

+     * Handle SAFI, if any, and BUF_strdup() so we can null-terminate

+     * the other input values.

+     */

+    if (safi != NULL) {

+      *safi = strtoul(val->value, &t, 0);

+      t += strspn(t, " \t");

+      if (*safi > 0xFF || *t++ != ':') {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_SAFI);

+	X509V3_conf_err(val);

+	goto err;

+      }

+      t += strspn(t, " \t");

+      s = BUF_strdup(t);

+    } else {

+      s = BUF_strdup(val->value);

+    }

+    if (s == NULL) {

+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);

+      goto err;

+    }

+

+    /*

+     * Check for inheritance.  Not worth additional complexity to

+     * optimize this (seldom-used) case.

+     */

+    if (!strcmp(s, "inherit")) {

+      if (!v3_addr_add_inherit(addr, afi, safi)) {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_INHERITANCE);

+	X509V3_conf_err(val);

+	goto err;

+      }

+      OPENSSL_free(s);

+      s = NULL;

+      continue;

+    }

+

+    i1 = strspn(s, addr_chars);

+    i2 = i1 + strspn(s + i1, " \t");

+    delim = s[i2++];

+    s[i1] = '\0';

+

+    if (a2i_ipadd(min, s) != length) {

+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);

+      X509V3_conf_err(val);

+      goto err;

+    }

+

+    switch (delim) {

+    case '/':

+      prefixlen = (int) strtoul(s + i2, &t, 10);

+      if (t == s + i2 || *t != '\0') {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);

+	X509V3_conf_err(val);

+	goto err;

+      }

+      if (!v3_addr_add_prefix(addr, afi, safi, min, prefixlen)) {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);

+	goto err;

+      }

+      break;

+    case '-':

+      i1 = i2 + strspn(s + i2, " \t");

+      i2 = i1 + strspn(s + i1, addr_chars);

+      if (i1 == i2 || s[i2] != '\0') {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);

+	X509V3_conf_err(val);

+	goto err;

+      }

+      if (a2i_ipadd(max, s + i1) != length) {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);

+	X509V3_conf_err(val);

+	goto err;

+      }

+      if (!v3_addr_add_range(addr, afi, safi, min, max)) {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);

+	goto err;

+      }

+      break;

+    case '\0':

+      if (!v3_addr_add_prefix(addr, afi, safi, min, length * 8)) {

+	X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);

+	goto err;

+      }

+      break;

+    default:

+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);

+      X509V3_conf_err(val);

+      goto err;

+    }

+

+    OPENSSL_free(s);

+    s = NULL;

+  }

+

+  /*

+   * Canonize the result, then we're done.

+   */

+  if (!v3_addr_canonize(addr))

+    goto err;    

+  return addr;

+

+ err:

+  OPENSSL_free(s);

+  sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);

+  return NULL;

+}

+

+/*

+ * OpenSSL dispatch

+ */

+const X509V3_EXT_METHOD v3_addr = {

+  NID_sbgp_ipAddrBlock,		/* nid */

+  0,				/* flags */

+  ASN1_ITEM_ref(IPAddrBlocks),	/* template */

+  0, 0, 0, 0,			/* old functions, ignored */

+  0,				/* i2s */

+  0,				/* s2i */

+  0,				/* i2v */

+  v2i_IPAddrBlocks,		/* v2i */

+  i2r_IPAddrBlocks,		/* i2r */

+  0,				/* r2i */

+  NULL				/* extension-specific data */

+};

+

+/*

+ * Figure out whether extension sues inheritance.

+ */

+int v3_addr_inherits(IPAddrBlocks *addr)

+{

+  int i;

+  if (addr == NULL)

+    return 0;

+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {

+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);

+    if (f->ipAddressChoice->type == IPAddressChoice_inherit)

+      return 1;

+  }

+  return 0;

+}

+

+/*

+ * Figure out whether parent contains child.

+ */

+static int addr_contains(IPAddressOrRanges *parent,

+			 IPAddressOrRanges *child,

+			 int length)

+{

+  unsigned char p_min[ADDR_RAW_BUF_LEN], p_max[ADDR_RAW_BUF_LEN];

+  unsigned char c_min[ADDR_RAW_BUF_LEN], c_max[ADDR_RAW_BUF_LEN];

+  int p, c;

+

+  if (child == NULL || parent == child)

+    return 1;

+  if (parent == NULL)

+    return 0;

+

+  p = 0;

+  for (c = 0; c < sk_IPAddressOrRange_num(child); c++) {

+    extract_min_max(sk_IPAddressOrRange_value(child, c),

+		    c_min, c_max, length);

+    for (;; p++) {

+      if (p >= sk_IPAddressOrRange_num(parent))

+	return 0;

+      extract_min_max(sk_IPAddressOrRange_value(parent, p),

+		      p_min, p_max, length);

+      if (memcmp(p_max, c_max, length) < 0)

+	continue;

+      if (memcmp(p_min, c_min, length) > 0)

+	return 0;

+      break;

+    }

+  }

+

+  return 1;

+}

+

+/*

+ * Test whether a is a subset of b.

+ */

+int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)

+{

+  int i;

+  if (a == NULL || a == b)

+    return 1;

+  if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b))

+    return 0;

+  sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp);

+  for (i = 0; i < sk_IPAddressFamily_num(a); i++) {

+    IPAddressFamily *fa = sk_IPAddressFamily_value(a, i);

+    int j = sk_IPAddressFamily_find(b, fa);

+    IPAddressFamily *fb;

+    fb = sk_IPAddressFamily_value(b, j);

+    if (fb == NULL)

+       return 0;

+    if (!addr_contains(fb->ipAddressChoice->u.addressesOrRanges, 

+		       fa->ipAddressChoice->u.addressesOrRanges,

+		       length_from_afi(v3_addr_get_afi(fb))))

+      return 0;

+  }

+  return 1;

+}

+

+/*

+ * Validation error handling via callback.

+ */

+#define validation_err(_err_)		\

+  do {					\

+    if (ctx != NULL) {			\

+      ctx->error = _err_;		\

+      ctx->error_depth = i;		\

+      ctx->current_cert = x;		\

+      ret = ctx->verify_cb(0, ctx);	\

+    } else {				\

+      ret = 0;				\

+    }					\

+    if (!ret)				\

+      goto done;			\

+  } while (0)

+

+/*

+ * Core code for RFC 3779 2.3 path validation.

+ */

+static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,

+					  STACK_OF(X509) *chain,

+					  IPAddrBlocks *ext)

+{

+  IPAddrBlocks *child = NULL;

+  int i, j, ret = 1;

+  X509 *x;

+

+  OPENSSL_assert(chain != NULL && sk_X509_num(chain) > 0);

+  OPENSSL_assert(ctx != NULL || ext != NULL);

+  OPENSSL_assert(ctx == NULL || ctx->verify_cb != NULL);

+

+  /*

+   * Figure out where to start.  If we don't have an extension to

+   * check, we're done.  Otherwise, check canonical form and

+   * set up for walking up the chain.

+   */

+  if (ext != NULL) {

+    i = -1;

+    x = NULL;

+  } else {

+    i = 0;

+    x = sk_X509_value(chain, i);

+    OPENSSL_assert(x != NULL);

+    if ((ext = x->rfc3779_addr) == NULL)

+      goto done;

+  }

+  if (!v3_addr_is_canonical(ext))

+    validation_err(X509_V_ERR_INVALID_EXTENSION);

+  sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp);

+  if ((child = sk_IPAddressFamily_dup(ext)) == NULL) {

+    X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE);

+    ret = 0;

+    goto done;

+  }

+

+  /*

+   * Now walk up the chain.  No cert may list resources that its

+   * parent doesn't list.

+   */

+  for (i++; i < sk_X509_num(chain); i++) {

+    x = sk_X509_value(chain, i);

+    OPENSSL_assert(x != NULL);

+    if (!v3_addr_is_canonical(x->rfc3779_addr))

+      validation_err(X509_V_ERR_INVALID_EXTENSION);

+    if (x->rfc3779_addr == NULL) {

+      for (j = 0; j < sk_IPAddressFamily_num(child); j++) {

+	IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);

+	if (fc->ipAddressChoice->type != IPAddressChoice_inherit) {

+	  validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+	  break;

+	}

+      }

+      continue;

+    }

+    sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp);

+    for (j = 0; j < sk_IPAddressFamily_num(child); j++) {

+      IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);

+      int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);

+      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, k);

+      if (fp == NULL) {

+	if (fc->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {

+	  validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+	  break;

+	}

+	continue;

+      }

+      if (fp->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {

+	if (fc->ipAddressChoice->type == IPAddressChoice_inherit ||

+	    addr_contains(fp->ipAddressChoice->u.addressesOrRanges, 

+			  fc->ipAddressChoice->u.addressesOrRanges,

+			  length_from_afi(v3_addr_get_afi(fc))))

+	  sk_IPAddressFamily_set(child, j, fp);

+	else

+	  validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+      }

+    }

+  }

+

+  /*

+   * Trust anchor can't inherit.

+   */

+  OPENSSL_assert(x != NULL);

+  if (x->rfc3779_addr != NULL) {

+    for (j = 0; j < sk_IPAddressFamily_num(x->rfc3779_addr); j++) {

+      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, j);

+      if (fp->ipAddressChoice->type == IPAddressChoice_inherit &&

+	  sk_IPAddressFamily_find(child, fp) >= 0)

+	validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+    }

+  }

+

+ done:

+  sk_IPAddressFamily_free(child);

+  return ret;

+}

+

+#undef validation_err

+

+/*

+ * RFC 3779 2.3 path validation -- called from X509_verify_cert().

+ */

+int v3_addr_validate_path(X509_STORE_CTX *ctx)

+{

+  return v3_addr_validate_path_internal(ctx, ctx->chain, NULL);

+}

+

+/*

+ * RFC 3779 2.3 path validation of an extension.

+ * Test whether chain covers extension.

+ */

+int v3_addr_validate_resource_set(STACK_OF(X509) *chain,

+				  IPAddrBlocks *ext,

+				  int allow_inheritance)

+{

+  if (ext == NULL)

+    return 1;

+  if (chain == NULL || sk_X509_num(chain) == 0)

+    return 0;

+  if (!allow_inheritance && v3_addr_inherits(ext))

+    return 0;

+  return v3_addr_validate_path_internal(NULL, chain, ext);

+}

+

+#endif /* OPENSSL_NO_RFC3779 */

diff --git a/openssl/crypto/x509v3/v3_asid.c b/openssl/crypto/x509v3/v3_asid.c
index 56702f86b..fb7bc147c 100644
--- a/openssl/crypto/x509v3/v3_asid.c
+++ b/openssl/crypto/x509v3/v3_asid.c
@@ -1,844 +1,843 @@
-/*
- * Contributed to the OpenSSL Project by the American Registry for
- * Internet Numbers ("ARIN").
- */
-/* ====================================================================
- * 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).
- */
-
-/*
- * Implementation of RFC 3779 section 3.2.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/x509v3.h>
-#include <openssl/x509.h>
-#include <openssl/bn.h>
-
-#ifndef OPENSSL_NO_RFC3779
-
-/*
- * OpenSSL ASN.1 template translation of RFC 3779 3.2.3.
- */
-
-ASN1_SEQUENCE(ASRange) = {
-  ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
-  ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(ASRange)
-
-ASN1_CHOICE(ASIdOrRange) = {
-  ASN1_SIMPLE(ASIdOrRange, u.id,    ASN1_INTEGER),
-  ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
-} ASN1_CHOICE_END(ASIdOrRange)
-
-ASN1_CHOICE(ASIdentifierChoice) = {
-  ASN1_SIMPLE(ASIdentifierChoice,      u.inherit,       ASN1_NULL),
-  ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)
-} ASN1_CHOICE_END(ASIdentifierChoice)
-
-ASN1_SEQUENCE(ASIdentifiers) = {
-  ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),
-  ASN1_EXP_OPT(ASIdentifiers, rdi,   ASIdentifierChoice, 1)
-} ASN1_SEQUENCE_END(ASIdentifiers)
-
-IMPLEMENT_ASN1_FUNCTIONS(ASRange)
-IMPLEMENT_ASN1_FUNCTIONS(ASIdOrRange)
-IMPLEMENT_ASN1_FUNCTIONS(ASIdentifierChoice)
-IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers)
-
-/*
- * i2r method for an ASIdentifierChoice.
- */
-static int i2r_ASIdentifierChoice(BIO *out,
-				  ASIdentifierChoice *choice,
-				  int indent,
-				  const char *msg)
-{
-  int i;
-  char *s;
-  if (choice == NULL)
-    return 1;
-  BIO_printf(out, "%*s%s:\n", indent, "", msg);
-  switch (choice->type) {
-  case ASIdentifierChoice_inherit:
-    BIO_printf(out, "%*sinherit\n", indent + 2, "");
-    break;
-  case ASIdentifierChoice_asIdsOrRanges:
-    for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges); i++) {
-      ASIdOrRange *aor = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
-      switch (aor->type) {
-      case ASIdOrRange_id:
-	if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)
-	  return 0;
-	BIO_printf(out, "%*s%s\n", indent + 2, "", s);
-	OPENSSL_free(s);
-	break;
-      case ASIdOrRange_range:
-	if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL)
-	  return 0;
-	BIO_printf(out, "%*s%s-", indent + 2, "", s);
-	OPENSSL_free(s);
-	if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL)
-	  return 0;
-	BIO_printf(out, "%s\n", s);
-	OPENSSL_free(s);
-	break;
-      default:
-	return 0;
-      }
-    }
-    break;
-  default:
-    return 0;
-  }
-  return 1;
-}
-
-/*
- * i2r method for an ASIdentifier extension.
- */
-static int i2r_ASIdentifiers(const X509V3_EXT_METHOD *method,
-			     void *ext,
-			     BIO *out,
-			     int indent)
-{
-  ASIdentifiers *asid = ext;
-  return (i2r_ASIdentifierChoice(out, asid->asnum, indent,
-				 "Autonomous System Numbers") &&
-	  i2r_ASIdentifierChoice(out, asid->rdi, indent,
-				 "Routing Domain Identifiers"));
-}
-
-/*
- * Sort comparision function for a sequence of ASIdOrRange elements.
- */
-static int ASIdOrRange_cmp(const ASIdOrRange * const *a_,
-			   const ASIdOrRange * const *b_)
-{
-  const ASIdOrRange *a = *a_, *b = *b_;
-
-  assert((a->type == ASIdOrRange_id && a->u.id != NULL) ||
-	 (a->type == ASIdOrRange_range && a->u.range != NULL &&
-	  a->u.range->min != NULL && a->u.range->max != NULL));
-
-  assert((b->type == ASIdOrRange_id && b->u.id != NULL) ||
-	 (b->type == ASIdOrRange_range && b->u.range != NULL &&
-	  b->u.range->min != NULL && b->u.range->max != NULL));
-
-  if (a->type == ASIdOrRange_id && b->type == ASIdOrRange_id)
-    return ASN1_INTEGER_cmp(a->u.id, b->u.id);
-
-  if (a->type == ASIdOrRange_range && b->type == ASIdOrRange_range) {
-    int r = ASN1_INTEGER_cmp(a->u.range->min, b->u.range->min);
-    return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max, b->u.range->max);
-  }
-
-  if (a->type == ASIdOrRange_id)
-    return ASN1_INTEGER_cmp(a->u.id, b->u.range->min);
-  else
-    return ASN1_INTEGER_cmp(a->u.range->min, b->u.id);
-}
-
-/*
- * Add an inherit element.
- */
-int v3_asid_add_inherit(ASIdentifiers *asid, int which)
-{
-  ASIdentifierChoice **choice;
-  if (asid == NULL)
-    return 0;
-  switch (which) {
-  case V3_ASID_ASNUM:
-    choice = &asid->asnum;
-    break;
-  case V3_ASID_RDI:
-    choice = &asid->rdi;
-    break;
-  default:
-    return 0;
-  }
-  if (*choice == NULL) {
-    if ((*choice = ASIdentifierChoice_new()) == NULL)
-      return 0;
-    assert((*choice)->u.inherit == NULL);
-    if (((*choice)->u.inherit = ASN1_NULL_new()) == NULL)
-      return 0;
-    (*choice)->type = ASIdentifierChoice_inherit;
-  }
-  return (*choice)->type == ASIdentifierChoice_inherit;
-}
-
-/*
- * Add an ID or range to an ASIdentifierChoice.
- */
-int v3_asid_add_id_or_range(ASIdentifiers *asid,
-			    int which,
-			    ASN1_INTEGER *min,
-			    ASN1_INTEGER *max)
-{
-  ASIdentifierChoice **choice;
-  ASIdOrRange *aor;
-  if (asid == NULL)
-    return 0;
-  switch (which) {
-  case V3_ASID_ASNUM:
-    choice = &asid->asnum;
-    break;
-  case V3_ASID_RDI:
-    choice = &asid->rdi;
-    break;
-  default:
-    return 0;
-  }
-  if (*choice != NULL && (*choice)->type == ASIdentifierChoice_inherit)
-    return 0;
-  if (*choice == NULL) {
-    if ((*choice = ASIdentifierChoice_new()) == NULL)
-      return 0;
-    assert((*choice)->u.asIdsOrRanges == NULL);
-    (*choice)->u.asIdsOrRanges = sk_ASIdOrRange_new(ASIdOrRange_cmp);
-    if ((*choice)->u.asIdsOrRanges == NULL)
-      return 0;
-    (*choice)->type = ASIdentifierChoice_asIdsOrRanges;
-  }
-  if ((aor = ASIdOrRange_new()) == NULL)
-    return 0;
-  if (max == NULL) {
-    aor->type = ASIdOrRange_id;
-    aor->u.id = min;
-  } else {
-    aor->type = ASIdOrRange_range;
-    if ((aor->u.range = ASRange_new()) == NULL)
-      goto err;
-    ASN1_INTEGER_free(aor->u.range->min);
-    aor->u.range->min = min;
-    ASN1_INTEGER_free(aor->u.range->max);
-    aor->u.range->max = max;
-  }
-  if (!(sk_ASIdOrRange_push((*choice)->u.asIdsOrRanges, aor)))
-    goto err;
-  return 1;
-
- err:
-  ASIdOrRange_free(aor);
-  return 0;
-}
-
-/*
- * Extract min and max values from an ASIdOrRange.
- */
-static void extract_min_max(ASIdOrRange *aor,
-			    ASN1_INTEGER **min,
-			    ASN1_INTEGER **max)
-{
-  assert(aor != NULL && min != NULL && max != NULL);
-  switch (aor->type) {
-  case ASIdOrRange_id:
-    *min = aor->u.id;
-    *max = aor->u.id;
-    return;
-  case ASIdOrRange_range:
-    *min = aor->u.range->min;
-    *max = aor->u.range->max;
-    return;
-  }
-}
-
-/*
- * Check whether an ASIdentifierChoice is in canonical form.
- */
-static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
-{
-  ASN1_INTEGER *a_max_plus_one = NULL;
-  BIGNUM *bn = NULL;
-  int i, ret = 0;
-
-  /*
-   * Empty element or inheritance is canonical.
-   */
-  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)
-    return 1;
-
-  /*
-   * If not a list, or if empty list, it's broken.
-   */
-  if (choice->type != ASIdentifierChoice_asIdsOrRanges ||
-      sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)
-    return 0;
-
-  /*
-   * It's a list, check it.
-   */
-  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
-    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
-    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
-    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;
-
-    extract_min_max(a, &a_min, &a_max);
-    extract_min_max(b, &b_min, &b_max);
-
-    /*
-     * Punt misordered list, overlapping start, or inverted range.
-     */
-    if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 ||
-	ASN1_INTEGER_cmp(a_min, a_max) > 0 ||
-	ASN1_INTEGER_cmp(b_min, b_max) > 0)
-      goto done;
-
-    /*
-     * Calculate a_max + 1 to check for adjacency.
-     */
-    if ((bn == NULL && (bn = BN_new()) == NULL) ||
-	ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
-	!BN_add_word(bn, 1) ||
-	(a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
-      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,
-		ERR_R_MALLOC_FAILURE);
-      goto done;
-    }
-    
-    /*
-     * Punt if adjacent or overlapping.
-     */
-    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) >= 0)
-      goto done;
-  }
-
-  ret = 1;
-
- done:
-  ASN1_INTEGER_free(a_max_plus_one);
-  BN_free(bn);
-  return ret;
-}
-
-/*
- * Check whether an ASIdentifier extension is in canonical form.
- */
-int v3_asid_is_canonical(ASIdentifiers *asid)
-{
-  return (asid == NULL ||
-	  (ASIdentifierChoice_is_canonical(asid->asnum) ||
-	   ASIdentifierChoice_is_canonical(asid->rdi)));
-}
-
-/*
- * Whack an ASIdentifierChoice into canonical form.
- */
-static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
-{
-  ASN1_INTEGER *a_max_plus_one = NULL;
-  BIGNUM *bn = NULL;
-  int i, ret = 0;
-
-  /*
-   * Nothing to do for empty element or inheritance.
-   */
-  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)
-    return 1;
-
-  /*
-   * We have a list.  Sort it.
-   */
-  assert(choice->type == ASIdentifierChoice_asIdsOrRanges);
-  sk_ASIdOrRange_sort(choice->u.asIdsOrRanges);
-
-  /*
-   * Now check for errors and suboptimal encoding, rejecting the
-   * former and fixing the latter.
-   */
-  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
-    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
-    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
-    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;
-
-    extract_min_max(a, &a_min, &a_max);
-    extract_min_max(b, &b_min, &b_max);
-
-    /*
-     * Make sure we're properly sorted (paranoia).
-     */
-    assert(ASN1_INTEGER_cmp(a_min, b_min) <= 0);
-
-    /*
-     * Check for overlaps.
-     */
-    if (ASN1_INTEGER_cmp(a_max, b_min) >= 0) {
-      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
-		X509V3_R_EXTENSION_VALUE_ERROR);
-      goto done;
-    }
-
-    /*
-     * Calculate a_max + 1 to check for adjacency.
-     */
-    if ((bn == NULL && (bn = BN_new()) == NULL) ||
-	ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
-	!BN_add_word(bn, 1) ||
-	(a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
-      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, ERR_R_MALLOC_FAILURE);
-      goto done;
-    }
-    
-    /*
-     * If a and b are adjacent, merge them.
-     */
-    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) == 0) {
-      ASRange *r;
-      switch (a->type) {
-      case ASIdOrRange_id:
-	if ((r = OPENSSL_malloc(sizeof(ASRange))) == NULL) {
-	  X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
-		    ERR_R_MALLOC_FAILURE);
-	  goto done;
-	}
-	r->min = a_min;
-	r->max = b_max;
-	a->type = ASIdOrRange_range;
-	a->u.range = r;
-	break;
-      case ASIdOrRange_range:
-	ASN1_INTEGER_free(a->u.range->max);
-	a->u.range->max = b_max;
-	break;
-      }
-      switch (b->type) {
-      case ASIdOrRange_id:
-	b->u.id = NULL;
-	break;
-      case ASIdOrRange_range:
-	b->u.range->max = NULL;
-	break;
-      }
-      ASIdOrRange_free(b);
-      sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);
-      i--;
-      continue;
-    }
-  }
-
-  assert(ASIdentifierChoice_is_canonical(choice)); /* Paranoia */
-
-  ret = 1;
-
- done:
-  ASN1_INTEGER_free(a_max_plus_one);
-  BN_free(bn);
-  return ret;
-}
-
-/*
- * Whack an ASIdentifier extension into canonical form.
- */
-int v3_asid_canonize(ASIdentifiers *asid)
-{
-  return (asid == NULL ||
-	  (ASIdentifierChoice_canonize(asid->asnum) &&
-	   ASIdentifierChoice_canonize(asid->rdi)));
-}
-
-/*
- * v2i method for an ASIdentifier extension.
- */
-static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
-			       struct v3_ext_ctx *ctx,
-			       STACK_OF(CONF_VALUE) *values)
-{
-  ASIdentifiers *asid = NULL;
-  int i;
-
-  if ((asid = ASIdentifiers_new()) == NULL) {
-    X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
-    return NULL;
-  }
-
-  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
-    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);
-    ASN1_INTEGER *min = NULL, *max = NULL;
-    int i1, i2, i3, is_range, which;
-
-    /*
-     * Figure out whether this is an AS or an RDI.
-     */
-    if (       !name_cmp(val->name, "AS")) {
-      which = V3_ASID_ASNUM;
-    } else if (!name_cmp(val->name, "RDI")) {
-      which = V3_ASID_RDI;
-    } else {
-      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_EXTENSION_NAME_ERROR);
-      X509V3_conf_err(val);
-      goto err;
-    }
-
-    /*
-     * Handle inheritance.
-     */
-    if (!strcmp(val->value, "inherit")) {
-      if (v3_asid_add_inherit(asid, which))
-	continue;
-      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_INHERITANCE);
-      X509V3_conf_err(val);
-      goto err;
-    }
-
-    /*
-     * Number, range, or mistake, pick it apart and figure out which.
-     */
-    i1 = strspn(val->value, "0123456789");
-    if (val->value[i1] == '\0') {
-      is_range = 0;
-    } else {
-      is_range = 1;
-      i2 = i1 + strspn(val->value + i1, " \t");
-      if (val->value[i2] != '-') {
-	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASNUMBER);
-	X509V3_conf_err(val);
-	goto err;
-      }
-      i2++;
-      i2 = i2 + strspn(val->value + i2, " \t");
-      i3 = i2 + strspn(val->value + i2, "0123456789");
-      if (val->value[i3] != '\0') {
-	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASRANGE);
-	X509V3_conf_err(val);
-	goto err;
-      }
-    }
-
-    /*
-     * Syntax is ok, read and add it.
-     */
-    if (!is_range) {
-      if (!X509V3_get_value_int(val, &min)) {
-	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
-	goto err;
-      }
-    } else {
-      char *s = BUF_strdup(val->value);
-      if (s == NULL) {
-	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
-	goto err;
-      }
-      s[i1] = '\0';
-      min = s2i_ASN1_INTEGER(NULL, s);
-      max = s2i_ASN1_INTEGER(NULL, s + i2);
-      OPENSSL_free(s);
-      if (min == NULL || max == NULL) {
-	ASN1_INTEGER_free(min);
-	ASN1_INTEGER_free(max);
-	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
-	goto err;
-      }
-    }
-    if (!v3_asid_add_id_or_range(asid, which, min, max)) {
-      ASN1_INTEGER_free(min);
-      ASN1_INTEGER_free(max);
-      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
-      goto err;
-    }
-  }
-
-  /*
-   * Canonize the result, then we're done.
-   */
-  if (!v3_asid_canonize(asid))
-    goto err;
-  return asid;
-
- err:
-  ASIdentifiers_free(asid);
-  return NULL;
-}
-
-/*
- * OpenSSL dispatch.
- */
-const X509V3_EXT_METHOD v3_asid = {
-  NID_sbgp_autonomousSysNum,	/* nid */
-  0,				/* flags */
-  ASN1_ITEM_ref(ASIdentifiers),	/* template */
-  0, 0, 0, 0,			/* old functions, ignored */
-  0,				/* i2s */
-  0,				/* s2i */
-  0,				/* i2v */
-  v2i_ASIdentifiers,		/* v2i */
-  i2r_ASIdentifiers,		/* i2r */
-  0,				/* r2i */
-  NULL				/* extension-specific data */
-};
-
-/*
- * Figure out whether extension uses inheritance.
- */
-int v3_asid_inherits(ASIdentifiers *asid)
-{
-  return (asid != NULL &&
-	  ((asid->asnum != NULL &&
-	    asid->asnum->type == ASIdentifierChoice_inherit) ||
-	   (asid->rdi != NULL &&
-	    asid->rdi->type == ASIdentifierChoice_inherit)));
-}
-
-/*
- * Figure out whether parent contains child.
- */
-static int asid_contains(ASIdOrRanges *parent, ASIdOrRanges *child)
-{
-  ASN1_INTEGER *p_min, *p_max, *c_min, *c_max;
-  int p, c;
-
-  if (child == NULL || parent == child)
-    return 1;
-  if (parent == NULL)
-    return 0;
-
-  p = 0;
-  for (c = 0; c < sk_ASIdOrRange_num(child); c++) {
-    extract_min_max(sk_ASIdOrRange_value(child, c), &c_min, &c_max);
-    for (;; p++) {
-      if (p >= sk_ASIdOrRange_num(parent))
-	return 0;
-      extract_min_max(sk_ASIdOrRange_value(parent, p), &p_min, &p_max);
-      if (ASN1_INTEGER_cmp(p_max, c_max) < 0)
-	continue;
-      if (ASN1_INTEGER_cmp(p_min, c_min) > 0)
-	return 0;
-      break;
-    }
-  }
-
-  return 1;
-}
-
-/*
- * Test whether a is a subet of b.
- */
-int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b)
-{
-  return (a == NULL ||
-	  a == b ||
-	  (b != NULL &&
-	   !v3_asid_inherits(a) &&
-	   !v3_asid_inherits(b) &&
-	   asid_contains(b->asnum->u.asIdsOrRanges,
-			 a->asnum->u.asIdsOrRanges) &&
-	   asid_contains(b->rdi->u.asIdsOrRanges,
-			 a->rdi->u.asIdsOrRanges)));
-}
-
-/*
- * Validation error handling via callback.
- */
-#define validation_err(_err_)		\
-  do {					\
-    if (ctx != NULL) {			\
-      ctx->error = _err_;		\
-      ctx->error_depth = i;		\
-      ctx->current_cert = x;		\
-      ret = ctx->verify_cb(0, ctx);	\
-    } else {				\
-      ret = 0;				\
-    }					\
-    if (!ret)				\
-      goto done;			\
-  } while (0)
-
-/*
- * Core code for RFC 3779 3.3 path validation.
- */
-static int v3_asid_validate_path_internal(X509_STORE_CTX *ctx,
-					  STACK_OF(X509) *chain,
-					  ASIdentifiers *ext)
-{
-  ASIdOrRanges *child_as = NULL, *child_rdi = NULL;
-  int i, ret = 1, inherit_as = 0, inherit_rdi = 0;
-  X509 *x;
-
-  assert(chain != NULL && sk_X509_num(chain) > 0);
-  assert(ctx != NULL || ext != NULL);
-  assert(ctx == NULL || ctx->verify_cb != NULL);
-
-  /*
-   * Figure out where to start.  If we don't have an extension to
-   * check, we're done.  Otherwise, check canonical form and
-   * set up for walking up the chain.
-   */
-  if (ext != NULL) {
-    i = -1;
-    x = NULL;
-  } else {
-    i = 0;
-    x = sk_X509_value(chain, i);
-    assert(x != NULL);
-    if ((ext = x->rfc3779_asid) == NULL)
-      goto done;
-  }
-  if (!v3_asid_is_canonical(ext))
-    validation_err(X509_V_ERR_INVALID_EXTENSION);
-  if (ext->asnum != NULL)  {
-    switch (ext->asnum->type) {
-    case ASIdentifierChoice_inherit:
-      inherit_as = 1;
-      break;
-    case ASIdentifierChoice_asIdsOrRanges:
-      child_as = ext->asnum->u.asIdsOrRanges;
-      break;
-    }
-  }
-  if (ext->rdi != NULL) {
-    switch (ext->rdi->type) {
-    case ASIdentifierChoice_inherit:
-      inherit_rdi = 1;
-      break;
-    case ASIdentifierChoice_asIdsOrRanges:
-      child_rdi = ext->rdi->u.asIdsOrRanges;
-      break;
-    }
-  }
-
-  /*
-   * Now walk up the chain.  Extensions must be in canonical form, no
-   * cert may list resources that its parent doesn't list.
-   */
-  for (i++; i < sk_X509_num(chain); i++) {
-    x = sk_X509_value(chain, i);
-    assert(x != NULL);
-    if (x->rfc3779_asid == NULL) {
-      if (child_as != NULL || child_rdi != NULL)
-	validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-      continue;
-    }
-    if (!v3_asid_is_canonical(x->rfc3779_asid))
-      validation_err(X509_V_ERR_INVALID_EXTENSION);
-    if (x->rfc3779_asid->asnum == NULL && child_as != NULL) {
-      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-      child_as = NULL;
-      inherit_as = 0;
-    }
-    if (x->rfc3779_asid->asnum != NULL &&
-	x->rfc3779_asid->asnum->type == ASIdentifierChoice_asIdsOrRanges) {
-      if (inherit_as ||
-	  asid_contains(x->rfc3779_asid->asnum->u.asIdsOrRanges, child_as)) {
-	child_as = x->rfc3779_asid->asnum->u.asIdsOrRanges;
-	inherit_as = 0;
-      } else {
-	validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-      }
-    }
-    if (x->rfc3779_asid->rdi == NULL && child_rdi != NULL) {
-      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-      child_rdi = NULL;
-      inherit_rdi = 0;
-    }
-    if (x->rfc3779_asid->rdi != NULL &&
-	x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {
-      if (inherit_rdi ||
-	  asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges, child_rdi)) {
-	child_rdi = x->rfc3779_asid->rdi->u.asIdsOrRanges;
-	inherit_rdi = 0;
-      } else {
-	validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-      }
-    }
-  }
-
-  /*
-   * Trust anchor can't inherit.
-   */
-  assert(x != NULL);
-  if (x->rfc3779_asid != NULL) {
-    if (x->rfc3779_asid->asnum != NULL &&
-	x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)
-      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-    if (x->rfc3779_asid->rdi != NULL &&
-	x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)
-      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-  }
-
- done:
-  return ret;
-}
-
-#undef validation_err
-
-/*
- * RFC 3779 3.3 path validation -- called from X509_verify_cert().
- */
-int v3_asid_validate_path(X509_STORE_CTX *ctx)
-{
-  return v3_asid_validate_path_internal(ctx, ctx->chain, NULL);
-}
-
-/*
- * RFC 3779 3.3 path validation of an extension.
- * Test whether chain covers extension.
- */
-int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
-				  ASIdentifiers *ext,
-				  int allow_inheritance)
-{
-  if (ext == NULL)
-    return 1;
-  if (chain == NULL || sk_X509_num(chain) == 0)
-    return 0;
-  if (!allow_inheritance && v3_asid_inherits(ext))
-    return 0;
-  return v3_asid_validate_path_internal(NULL, chain, ext);
-}
-
-#endif /* OPENSSL_NO_RFC3779 */
+/*

+ * Contributed to the OpenSSL Project by the American Registry for

+ * Internet Numbers ("ARIN").

+ */

+/* ====================================================================

+ * 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).

+ */

+

+/*

+ * Implementation of RFC 3779 section 3.2.

+ */

+

+#include <stdio.h>

+#include <string.h>

+#include "cryptlib.h"

+#include <openssl/conf.h>

+#include <openssl/asn1.h>

+#include <openssl/asn1t.h>

+#include <openssl/x509v3.h>

+#include <openssl/x509.h>

+#include <openssl/bn.h>

+

+#ifndef OPENSSL_NO_RFC3779

+

+/*

+ * OpenSSL ASN.1 template translation of RFC 3779 3.2.3.

+ */

+

+ASN1_SEQUENCE(ASRange) = {

+  ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),

+  ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)

+} ASN1_SEQUENCE_END(ASRange)

+

+ASN1_CHOICE(ASIdOrRange) = {

+  ASN1_SIMPLE(ASIdOrRange, u.id,    ASN1_INTEGER),

+  ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)

+} ASN1_CHOICE_END(ASIdOrRange)

+

+ASN1_CHOICE(ASIdentifierChoice) = {

+  ASN1_SIMPLE(ASIdentifierChoice,      u.inherit,       ASN1_NULL),

+  ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)

+} ASN1_CHOICE_END(ASIdentifierChoice)

+

+ASN1_SEQUENCE(ASIdentifiers) = {

+  ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),

+  ASN1_EXP_OPT(ASIdentifiers, rdi,   ASIdentifierChoice, 1)

+} ASN1_SEQUENCE_END(ASIdentifiers)

+

+IMPLEMENT_ASN1_FUNCTIONS(ASRange)

+IMPLEMENT_ASN1_FUNCTIONS(ASIdOrRange)

+IMPLEMENT_ASN1_FUNCTIONS(ASIdentifierChoice)

+IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers)

+

+/*

+ * i2r method for an ASIdentifierChoice.

+ */

+static int i2r_ASIdentifierChoice(BIO *out,

+				  ASIdentifierChoice *choice,

+				  int indent,

+				  const char *msg)

+{

+  int i;

+  char *s;

+  if (choice == NULL)

+    return 1;

+  BIO_printf(out, "%*s%s:\n", indent, "", msg);

+  switch (choice->type) {

+  case ASIdentifierChoice_inherit:

+    BIO_printf(out, "%*sinherit\n", indent + 2, "");

+    break;

+  case ASIdentifierChoice_asIdsOrRanges:

+    for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges); i++) {

+      ASIdOrRange *aor = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);

+      switch (aor->type) {

+      case ASIdOrRange_id:

+	if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)

+	  return 0;

+	BIO_printf(out, "%*s%s\n", indent + 2, "", s);

+	OPENSSL_free(s);

+	break;

+      case ASIdOrRange_range:

+	if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL)

+	  return 0;

+	BIO_printf(out, "%*s%s-", indent + 2, "", s);

+	OPENSSL_free(s);

+	if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL)

+	  return 0;

+	BIO_printf(out, "%s\n", s);

+	OPENSSL_free(s);

+	break;

+      default:

+	return 0;

+      }

+    }

+    break;

+  default:

+    return 0;

+  }

+  return 1;

+}

+

+/*

+ * i2r method for an ASIdentifier extension.

+ */

+static int i2r_ASIdentifiers(const X509V3_EXT_METHOD *method,

+			     void *ext,

+			     BIO *out,

+			     int indent)

+{

+  ASIdentifiers *asid = ext;

+  return (i2r_ASIdentifierChoice(out, asid->asnum, indent,

+				 "Autonomous System Numbers") &&

+	  i2r_ASIdentifierChoice(out, asid->rdi, indent,

+				 "Routing Domain Identifiers"));

+}

+

+/*

+ * Sort comparision function for a sequence of ASIdOrRange elements.

+ */

+static int ASIdOrRange_cmp(const ASIdOrRange * const *a_,

+			   const ASIdOrRange * const *b_)

+{

+  const ASIdOrRange *a = *a_, *b = *b_;

+

+  OPENSSL_assert((a->type == ASIdOrRange_id && a->u.id != NULL) ||

+	 (a->type == ASIdOrRange_range && a->u.range != NULL &&

+	  a->u.range->min != NULL && a->u.range->max != NULL));

+

+  OPENSSL_assert((b->type == ASIdOrRange_id && b->u.id != NULL) ||

+	 (b->type == ASIdOrRange_range && b->u.range != NULL &&

+	  b->u.range->min != NULL && b->u.range->max != NULL));

+

+  if (a->type == ASIdOrRange_id && b->type == ASIdOrRange_id)

+    return ASN1_INTEGER_cmp(a->u.id, b->u.id);

+

+  if (a->type == ASIdOrRange_range && b->type == ASIdOrRange_range) {

+    int r = ASN1_INTEGER_cmp(a->u.range->min, b->u.range->min);

+    return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max, b->u.range->max);

+  }

+

+  if (a->type == ASIdOrRange_id)

+    return ASN1_INTEGER_cmp(a->u.id, b->u.range->min);

+  else

+    return ASN1_INTEGER_cmp(a->u.range->min, b->u.id);

+}

+

+/*

+ * Add an inherit element.

+ */

+int v3_asid_add_inherit(ASIdentifiers *asid, int which)

+{

+  ASIdentifierChoice **choice;

+  if (asid == NULL)

+    return 0;

+  switch (which) {

+  case V3_ASID_ASNUM:

+    choice = &asid->asnum;

+    break;

+  case V3_ASID_RDI:

+    choice = &asid->rdi;

+    break;

+  default:

+    return 0;

+  }

+  if (*choice == NULL) {

+    if ((*choice = ASIdentifierChoice_new()) == NULL)

+      return 0;

+    OPENSSL_assert((*choice)->u.inherit == NULL);

+    if (((*choice)->u.inherit = ASN1_NULL_new()) == NULL)

+      return 0;

+    (*choice)->type = ASIdentifierChoice_inherit;

+  }

+  return (*choice)->type == ASIdentifierChoice_inherit;

+}

+

+/*

+ * Add an ID or range to an ASIdentifierChoice.

+ */

+int v3_asid_add_id_or_range(ASIdentifiers *asid,

+			    int which,

+			    ASN1_INTEGER *min,

+			    ASN1_INTEGER *max)

+{

+  ASIdentifierChoice **choice;

+  ASIdOrRange *aor;

+  if (asid == NULL)

+    return 0;

+  switch (which) {

+  case V3_ASID_ASNUM:

+    choice = &asid->asnum;

+    break;

+  case V3_ASID_RDI:

+    choice = &asid->rdi;

+    break;

+  default:

+    return 0;

+  }

+  if (*choice != NULL && (*choice)->type == ASIdentifierChoice_inherit)

+    return 0;

+  if (*choice == NULL) {

+    if ((*choice = ASIdentifierChoice_new()) == NULL)

+      return 0;

+    OPENSSL_assert((*choice)->u.asIdsOrRanges == NULL);

+    (*choice)->u.asIdsOrRanges = sk_ASIdOrRange_new(ASIdOrRange_cmp);

+    if ((*choice)->u.asIdsOrRanges == NULL)

+      return 0;

+    (*choice)->type = ASIdentifierChoice_asIdsOrRanges;

+  }

+  if ((aor = ASIdOrRange_new()) == NULL)

+    return 0;

+  if (max == NULL) {

+    aor->type = ASIdOrRange_id;

+    aor->u.id = min;

+  } else {

+    aor->type = ASIdOrRange_range;

+    if ((aor->u.range = ASRange_new()) == NULL)

+      goto err;

+    ASN1_INTEGER_free(aor->u.range->min);

+    aor->u.range->min = min;

+    ASN1_INTEGER_free(aor->u.range->max);

+    aor->u.range->max = max;

+  }

+  if (!(sk_ASIdOrRange_push((*choice)->u.asIdsOrRanges, aor)))

+    goto err;

+  return 1;

+

+ err:

+  ASIdOrRange_free(aor);

+  return 0;

+}

+

+/*

+ * Extract min and max values from an ASIdOrRange.

+ */

+static void extract_min_max(ASIdOrRange *aor,

+			    ASN1_INTEGER **min,

+			    ASN1_INTEGER **max)

+{

+  OPENSSL_assert(aor != NULL && min != NULL && max != NULL);

+  switch (aor->type) {

+  case ASIdOrRange_id:

+    *min = aor->u.id;

+    *max = aor->u.id;

+    return;

+  case ASIdOrRange_range:

+    *min = aor->u.range->min;

+    *max = aor->u.range->max;

+    return;

+  }

+}

+

+/*

+ * Check whether an ASIdentifierChoice is in canonical form.

+ */

+static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)

+{

+  ASN1_INTEGER *a_max_plus_one = NULL;

+  BIGNUM *bn = NULL;

+  int i, ret = 0;

+

+  /*

+   * Empty element or inheritance is canonical.

+   */

+  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)

+    return 1;

+

+  /*

+   * If not a list, or if empty list, it's broken.

+   */

+  if (choice->type != ASIdentifierChoice_asIdsOrRanges ||

+      sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)

+    return 0;

+

+  /*

+   * It's a list, check it.

+   */

+  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {

+    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);

+    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);

+    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;

+

+    extract_min_max(a, &a_min, &a_max);

+    extract_min_max(b, &b_min, &b_max);

+

+    /*

+     * Punt misordered list, overlapping start, or inverted range.

+     */

+    if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 ||

+	ASN1_INTEGER_cmp(a_min, a_max) > 0 ||

+	ASN1_INTEGER_cmp(b_min, b_max) > 0)

+      goto done;

+

+    /*

+     * Calculate a_max + 1 to check for adjacency.

+     */

+    if ((bn == NULL && (bn = BN_new()) == NULL) ||

+	ASN1_INTEGER_to_BN(a_max, bn) == NULL ||

+	!BN_add_word(bn, 1) ||

+	(a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {

+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,

+		ERR_R_MALLOC_FAILURE);

+      goto done;

+    }

+    

+    /*

+     * Punt if adjacent or overlapping.

+     */

+    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) >= 0)

+      goto done;

+  }

+

+  ret = 1;

+

+ done:

+  ASN1_INTEGER_free(a_max_plus_one);

+  BN_free(bn);

+  return ret;

+}

+

+/*

+ * Check whether an ASIdentifier extension is in canonical form.

+ */

+int v3_asid_is_canonical(ASIdentifiers *asid)

+{

+  return (asid == NULL ||

+	  (ASIdentifierChoice_is_canonical(asid->asnum) &&

+	   ASIdentifierChoice_is_canonical(asid->rdi)));

+}

+

+/*

+ * Whack an ASIdentifierChoice into canonical form.

+ */

+static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)

+{

+  ASN1_INTEGER *a_max_plus_one = NULL;

+  BIGNUM *bn = NULL;

+  int i, ret = 0;

+

+  /*

+   * Nothing to do for empty element or inheritance.

+   */

+  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)

+    return 1;

+

+  /*

+   * We have a list.  Sort it.

+   */

+  OPENSSL_assert(choice->type == ASIdentifierChoice_asIdsOrRanges);

+  sk_ASIdOrRange_sort(choice->u.asIdsOrRanges);

+

+  /*

+   * Now check for errors and suboptimal encoding, rejecting the

+   * former and fixing the latter.

+   */

+  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {

+    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);

+    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);

+    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;

+

+    extract_min_max(a, &a_min, &a_max);

+    extract_min_max(b, &b_min, &b_max);

+

+    /*

+     * Make sure we're properly sorted (paranoia).

+     */

+    OPENSSL_assert(ASN1_INTEGER_cmp(a_min, b_min) <= 0);

+

+    /*

+     * Check for overlaps.

+     */

+    if (ASN1_INTEGER_cmp(a_max, b_min) >= 0) {

+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,

+		X509V3_R_EXTENSION_VALUE_ERROR);

+      goto done;

+    }

+

+    /*

+     * Calculate a_max + 1 to check for adjacency.

+     */

+    if ((bn == NULL && (bn = BN_new()) == NULL) ||

+	ASN1_INTEGER_to_BN(a_max, bn) == NULL ||

+	!BN_add_word(bn, 1) ||

+	(a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {

+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, ERR_R_MALLOC_FAILURE);

+      goto done;

+    }

+    

+    /*

+     * If a and b are adjacent, merge them.

+     */

+    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) == 0) {

+      ASRange *r;

+      switch (a->type) {

+      case ASIdOrRange_id:

+	if ((r = OPENSSL_malloc(sizeof(ASRange))) == NULL) {

+	  X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,

+		    ERR_R_MALLOC_FAILURE);

+	  goto done;

+	}

+	r->min = a_min;

+	r->max = b_max;

+	a->type = ASIdOrRange_range;

+	a->u.range = r;

+	break;

+      case ASIdOrRange_range:

+	ASN1_INTEGER_free(a->u.range->max);

+	a->u.range->max = b_max;

+	break;

+      }

+      switch (b->type) {

+      case ASIdOrRange_id:

+	b->u.id = NULL;

+	break;

+      case ASIdOrRange_range:

+	b->u.range->max = NULL;

+	break;

+      }

+      ASIdOrRange_free(b);

+      sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);

+      i--;

+      continue;

+    }

+  }

+

+  OPENSSL_assert(ASIdentifierChoice_is_canonical(choice)); /* Paranoia */

+

+  ret = 1;

+

+ done:

+  ASN1_INTEGER_free(a_max_plus_one);

+  BN_free(bn);

+  return ret;

+}

+

+/*

+ * Whack an ASIdentifier extension into canonical form.

+ */

+int v3_asid_canonize(ASIdentifiers *asid)

+{

+  return (asid == NULL ||

+	  (ASIdentifierChoice_canonize(asid->asnum) &&

+	   ASIdentifierChoice_canonize(asid->rdi)));

+}

+

+/*

+ * v2i method for an ASIdentifier extension.

+ */

+static void *v2i_ASIdentifiers(const struct v3_ext_method *method,

+			       struct v3_ext_ctx *ctx,

+			       STACK_OF(CONF_VALUE) *values)

+{

+  ASIdentifiers *asid = NULL;

+  int i;

+

+  if ((asid = ASIdentifiers_new()) == NULL) {

+    X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);

+    return NULL;

+  }

+

+  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {

+    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);

+    ASN1_INTEGER *min = NULL, *max = NULL;

+    int i1, i2, i3, is_range, which;

+

+    /*

+     * Figure out whether this is an AS or an RDI.

+     */

+    if (       !name_cmp(val->name, "AS")) {

+      which = V3_ASID_ASNUM;

+    } else if (!name_cmp(val->name, "RDI")) {

+      which = V3_ASID_RDI;

+    } else {

+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_EXTENSION_NAME_ERROR);

+      X509V3_conf_err(val);

+      goto err;

+    }

+

+    /*

+     * Handle inheritance.

+     */

+    if (!strcmp(val->value, "inherit")) {

+      if (v3_asid_add_inherit(asid, which))

+	continue;

+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_INHERITANCE);

+      X509V3_conf_err(val);

+      goto err;

+    }

+

+    /*

+     * Number, range, or mistake, pick it apart and figure out which.

+     */

+    i1 = strspn(val->value, "0123456789");

+    if (val->value[i1] == '\0') {

+      is_range = 0;

+    } else {

+      is_range = 1;

+      i2 = i1 + strspn(val->value + i1, " \t");

+      if (val->value[i2] != '-') {

+	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASNUMBER);

+	X509V3_conf_err(val);

+	goto err;

+      }

+      i2++;

+      i2 = i2 + strspn(val->value + i2, " \t");

+      i3 = i2 + strspn(val->value + i2, "0123456789");

+      if (val->value[i3] != '\0') {

+	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASRANGE);

+	X509V3_conf_err(val);

+	goto err;

+      }

+    }

+

+    /*

+     * Syntax is ok, read and add it.

+     */

+    if (!is_range) {

+      if (!X509V3_get_value_int(val, &min)) {

+	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);

+	goto err;

+      }

+    } else {

+      char *s = BUF_strdup(val->value);

+      if (s == NULL) {

+	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);

+	goto err;

+      }

+      s[i1] = '\0';

+      min = s2i_ASN1_INTEGER(NULL, s);

+      max = s2i_ASN1_INTEGER(NULL, s + i2);

+      OPENSSL_free(s);

+      if (min == NULL || max == NULL) {

+	ASN1_INTEGER_free(min);

+	ASN1_INTEGER_free(max);

+	X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);

+	goto err;

+      }

+    }

+    if (!v3_asid_add_id_or_range(asid, which, min, max)) {

+      ASN1_INTEGER_free(min);

+      ASN1_INTEGER_free(max);

+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);

+      goto err;

+    }

+  }

+

+  /*

+   * Canonize the result, then we're done.

+   */

+  if (!v3_asid_canonize(asid))

+    goto err;

+  return asid;

+

+ err:

+  ASIdentifiers_free(asid);

+  return NULL;

+}

+

+/*

+ * OpenSSL dispatch.

+ */

+const X509V3_EXT_METHOD v3_asid = {

+  NID_sbgp_autonomousSysNum,	/* nid */

+  0,				/* flags */

+  ASN1_ITEM_ref(ASIdentifiers),	/* template */

+  0, 0, 0, 0,			/* old functions, ignored */

+  0,				/* i2s */

+  0,				/* s2i */

+  0,				/* i2v */

+  v2i_ASIdentifiers,		/* v2i */

+  i2r_ASIdentifiers,		/* i2r */

+  0,				/* r2i */

+  NULL				/* extension-specific data */

+};

+

+/*

+ * Figure out whether extension uses inheritance.

+ */

+int v3_asid_inherits(ASIdentifiers *asid)

+{

+  return (asid != NULL &&

+	  ((asid->asnum != NULL &&

+	    asid->asnum->type == ASIdentifierChoice_inherit) ||

+	   (asid->rdi != NULL &&

+	    asid->rdi->type == ASIdentifierChoice_inherit)));

+}

+

+/*

+ * Figure out whether parent contains child.

+ */

+static int asid_contains(ASIdOrRanges *parent, ASIdOrRanges *child)

+{

+  ASN1_INTEGER *p_min, *p_max, *c_min, *c_max;

+  int p, c;

+

+  if (child == NULL || parent == child)

+    return 1;

+  if (parent == NULL)

+    return 0;

+

+  p = 0;

+  for (c = 0; c < sk_ASIdOrRange_num(child); c++) {

+    extract_min_max(sk_ASIdOrRange_value(child, c), &c_min, &c_max);

+    for (;; p++) {

+      if (p >= sk_ASIdOrRange_num(parent))

+	return 0;

+      extract_min_max(sk_ASIdOrRange_value(parent, p), &p_min, &p_max);

+      if (ASN1_INTEGER_cmp(p_max, c_max) < 0)

+	continue;

+      if (ASN1_INTEGER_cmp(p_min, c_min) > 0)

+	return 0;

+      break;

+    }

+  }

+

+  return 1;

+}

+

+/*

+ * Test whether a is a subet of b.

+ */

+int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b)

+{

+  return (a == NULL ||

+	  a == b ||

+	  (b != NULL &&

+	   !v3_asid_inherits(a) &&

+	   !v3_asid_inherits(b) &&

+	   asid_contains(b->asnum->u.asIdsOrRanges,

+			 a->asnum->u.asIdsOrRanges) &&

+	   asid_contains(b->rdi->u.asIdsOrRanges,

+			 a->rdi->u.asIdsOrRanges)));

+}

+

+/*

+ * Validation error handling via callback.

+ */

+#define validation_err(_err_)		\

+  do {					\

+    if (ctx != NULL) {			\

+      ctx->error = _err_;		\

+      ctx->error_depth = i;		\

+      ctx->current_cert = x;		\

+      ret = ctx->verify_cb(0, ctx);	\

+    } else {				\

+      ret = 0;				\

+    }					\

+    if (!ret)				\

+      goto done;			\

+  } while (0)

+

+/*

+ * Core code for RFC 3779 3.3 path validation.

+ */

+static int v3_asid_validate_path_internal(X509_STORE_CTX *ctx,

+					  STACK_OF(X509) *chain,

+					  ASIdentifiers *ext)

+{

+  ASIdOrRanges *child_as = NULL, *child_rdi = NULL;

+  int i, ret = 1, inherit_as = 0, inherit_rdi = 0;

+  X509 *x;

+

+  OPENSSL_assert(chain != NULL && sk_X509_num(chain) > 0);

+  OPENSSL_assert(ctx != NULL || ext != NULL);

+  OPENSSL_assert(ctx == NULL || ctx->verify_cb != NULL);

+

+  /*

+   * Figure out where to start.  If we don't have an extension to

+   * check, we're done.  Otherwise, check canonical form and

+   * set up for walking up the chain.

+   */

+  if (ext != NULL) {

+    i = -1;

+    x = NULL;

+  } else {

+    i = 0;

+    x = sk_X509_value(chain, i);

+    OPENSSL_assert(x != NULL);

+    if ((ext = x->rfc3779_asid) == NULL)

+      goto done;

+  }

+  if (!v3_asid_is_canonical(ext))

+    validation_err(X509_V_ERR_INVALID_EXTENSION);

+  if (ext->asnum != NULL)  {

+    switch (ext->asnum->type) {

+    case ASIdentifierChoice_inherit:

+      inherit_as = 1;

+      break;

+    case ASIdentifierChoice_asIdsOrRanges:

+      child_as = ext->asnum->u.asIdsOrRanges;

+      break;

+    }

+  }

+  if (ext->rdi != NULL) {

+    switch (ext->rdi->type) {

+    case ASIdentifierChoice_inherit:

+      inherit_rdi = 1;

+      break;

+    case ASIdentifierChoice_asIdsOrRanges:

+      child_rdi = ext->rdi->u.asIdsOrRanges;

+      break;

+    }

+  }

+

+  /*

+   * Now walk up the chain.  Extensions must be in canonical form, no

+   * cert may list resources that its parent doesn't list.

+   */

+  for (i++; i < sk_X509_num(chain); i++) {

+    x = sk_X509_value(chain, i);

+    OPENSSL_assert(x != NULL);

+    if (x->rfc3779_asid == NULL) {

+      if (child_as != NULL || child_rdi != NULL)

+	validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+      continue;

+    }

+    if (!v3_asid_is_canonical(x->rfc3779_asid))

+      validation_err(X509_V_ERR_INVALID_EXTENSION);

+    if (x->rfc3779_asid->asnum == NULL && child_as != NULL) {

+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+      child_as = NULL;

+      inherit_as = 0;

+    }

+    if (x->rfc3779_asid->asnum != NULL &&

+	x->rfc3779_asid->asnum->type == ASIdentifierChoice_asIdsOrRanges) {

+      if (inherit_as ||

+	  asid_contains(x->rfc3779_asid->asnum->u.asIdsOrRanges, child_as)) {

+	child_as = x->rfc3779_asid->asnum->u.asIdsOrRanges;

+	inherit_as = 0;

+      } else {

+	validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+      }

+    }

+    if (x->rfc3779_asid->rdi == NULL && child_rdi != NULL) {

+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+      child_rdi = NULL;

+      inherit_rdi = 0;

+    }

+    if (x->rfc3779_asid->rdi != NULL &&

+	x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {

+      if (inherit_rdi ||

+	  asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges, child_rdi)) {

+	child_rdi = x->rfc3779_asid->rdi->u.asIdsOrRanges;

+	inherit_rdi = 0;

+      } else {

+	validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+      }

+    }

+  }

+

+  /*

+   * Trust anchor can't inherit.

+   */

+  OPENSSL_assert(x != NULL);

+  if (x->rfc3779_asid != NULL) {

+    if (x->rfc3779_asid->asnum != NULL &&

+	x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)

+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+    if (x->rfc3779_asid->rdi != NULL &&

+	x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)

+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);

+  }

+

+ done:

+  return ret;

+}

+

+#undef validation_err

+

+/*

+ * RFC 3779 3.3 path validation -- called from X509_verify_cert().

+ */

+int v3_asid_validate_path(X509_STORE_CTX *ctx)

+{

+  return v3_asid_validate_path_internal(ctx, ctx->chain, NULL);

+}

+

+/*

+ * RFC 3779 3.3 path validation of an extension.

+ * Test whether chain covers extension.

+ */

+int v3_asid_validate_resource_set(STACK_OF(X509) *chain,

+				  ASIdentifiers *ext,

+				  int allow_inheritance)

+{

+  if (ext == NULL)

+    return 1;

+  if (chain == NULL || sk_X509_num(chain) == 0)

+    return 0;

+  if (!allow_inheritance && v3_asid_inherits(ext))

+    return 0;

+  return v3_asid_validate_path_internal(NULL, chain, ext);

+}

+

+#endif /* OPENSSL_NO_RFC3779 */