Move to flat package hierarchy

Note to self: never try to move submodules again To migrate your existing submodules (more or less): set -x set -e mkdir .git/modules/pkg for old in */*/src ; do new="pkg/${old#*/}" if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then continue fi git -C ".git/modules/$old" config core.worktree "../../../../../$new" rmdir "$new" mv "$old" "$new" sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp" mv "$new/.git.tmp" "$new/.git" mkdir ".git/modules/${new%/src}" mv ".git/modules/$old" ".git/modules/$new" rm "${old%/src}"/*.ninja mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/" rmdir "${old%/src}" || true done sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp mv .git/config.tmp .git/config
author: Michael Forney <mforney@mforney.org> 2016-12-11 16:04:20 -0800
committer: Michael Forney <mforney@mforney.org> 2016-12-13 23:10:30 -0800
commit: 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch)
tree: 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /core
parent: 9a506a6834df01a26795cea222b410f206efa9fa (diff)
177 files changed, 0 insertions, 24492 deletions
diff --git a/core/awk/.gitignore b/core/awk/.gitignore
deleted file mode 100644
index 012dc66e..00000000
--- a/core/awk/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/tools.ninja
diff --git a/core/awk/gen.rc b/core/awk/gen.rc
deleted file mode 100644
index 9d9b3a2e..00000000
--- a/core/awk/gen.rc
+++ /dev/null
@@ -1,25 +0,0 @@
-cflags\
-	'-std=c90' \
-	-D '_POSIX_C_SOURCE=200809L' \
-	-I '$outdir' \
-	-I '$srcdir'
-
-yacc gram '$srcdir'/awkgram.y
-build '$outdir'/ytab.h copy '$outdir'/gram.tab.h
-
-{
-	include 'toolchain/$host_toolchain.ninja'
-	cflags -I '$outdir'
-	exe maketab -d '$outdir'/ytab.h maketab.c
-} >tools.ninja ; subninja tools.ninja
-
-rule maketab '(cd $outdir && ./maketab) >$out.tmp && mv $out.tmp $out'
-build '$outdir'/proctab.c maketab '|' '$outdir'/^(maketab ytab.h)
-
-exe awk -d '$outdir'/ytab.h\
-	b.c main.c parse.c tran.c lib.c run.c lex.c\
-	'$outdir'/^(gram.tab.c proctab.c)
-file bin/awk '$outdir'/awk 755
-file share/man/man1/awk.1 '$srcdir'/awk.1 644
-
-fetch git
diff --git a/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch b/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
deleted file mode 100644
index cf62346a..00000000
--- a/core/awk/patch/0001-maketab-Only-consider-define-lines-that-match-the-ex.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dd4904dd150f9dfa2c3ca0392d6870c85fc14c26 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 10 Dec 2016 19:57:39 -0800
-Subject: [PATCH] maketab: Only consider #define lines that match the expected
- form
-
----
- maketab.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/maketab.c b/maketab.c
-index 31acd75..63208c8 100644
---- a/maketab.c
-+++ b/maketab.c
-@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
- 	i = 0;
- 	while (fgets(buf, sizeof buf, fp) != NULL) {
- 		n = sscanf(buf, "%1c %s %s %d", &c, def, name, &tok);
--		if (c != '#' || (n != 4 && strcmp(def,"define") != 0))	/* not a valid #define */
-+		if (c != '#' || n != 4 || strcmp(def,"define") != 0)	/* not a valid #define */
- 			continue;
- 		if (tok < FIRSTTOKEN || tok > LASTTOKEN) {
- 			/* fprintf(stderr, "maketab funny token %d %s ignored\n", tok, buf); */
--- 
-2.11.0
-
diff --git a/core/awk/rev b/core/awk/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/awk/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/awk/src b/core/awk/src
deleted file mode 160000
-Subproject e37f882d7273c61cb0b33c47d5fed3801ad38a6
diff --git a/core/bc/.gitignore b/core/bc/.gitignore
deleted file mode 100644
index dce428a7..00000000
--- a/core/bc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bc-1.06.95.tar.bz2
-/src
diff --git a/core/bc/config.h b/core/bc/config.h
deleted file mode 100644
index 35627d41..00000000
--- a/core/bc/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <config-posix.h>
-
-#define BC_COPYRIGHT "Copyright 1991-1994, 1997, 1998, 2000, 2004, 2006 Free Software Foundation, Inc."
-#define DC_COPYRIGHT "Copyright 1994, 1997, 1998, 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc."
-#define DC_VERSION "1.3.95"
-/* #undef HAVE_DOPRNT */
-/* #undef HAVE_LIB_H */
-#define HAVE_MEMORY_H 1
-/* #undef LIBEDIT */
-#define PACKAGE "bc"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME "bc"
-#define PACKAGE_STRING "bc 1.06.95"
-#define PACKAGE_TARNAME "bc"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.06.95"
-/* #undef READLINE */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#define VERSION "1.06.95"
-/* #undef YYTEXT_POINTER */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-/* #undef const */
-/* #undef ptrdiff_t */
-/* #undef size_t */
diff --git a/core/bc/gen.rc b/core/bc/gen.rc
deleted file mode 100644
index c75aff92..00000000
--- a/core/bc/gen.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-isystem include\
-	-I '$dir' \
-	-I '$srcdir'/h
-
-lib libbc.a lib/number.c
-exe bin/bc bc/^(main.c bc.c scan.c execute.c load.c storage.c util.c global.c warranty.c) libbc.a
-file bin/bc '$outdir'/bin/bc 755
-file share/man/man1/bc.1 '$srcdir'/doc/bc.1 644
-
-fetch curl
diff --git a/core/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch b/core/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch
deleted file mode 100644
index 2b91dc9b..00000000
--- a/core/bc/patch/0001-Fix-use-of-uninitialized-f_void.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 359f44a3a0605c94d57f35e4de39e6028dce018f Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 12 Jun 2016 20:12:28 -0700
-Subject: [PATCH] Fix use of uninitialized f_void
-
-See http://www.pixelbeat.org/programming/oss_bug_flow.html.
----
- bc/storage.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bc/storage.c b/bc/storage.c
-index 699729a..37b4c6c 100644
---- a/bc/storage.c
-+++ b/bc/storage.c
-@@ -99,6 +99,7 @@ more_functions (VOID)
-     {
-       f = &functions[indx];
-       f->f_defined = FALSE;
-+      f->f_void = FALSE;
-       f->f_body = (char *) bc_malloc (BC_START_SIZE);
-       f->f_body_size = BC_START_SIZE;
-       f->f_code_size = 0;
--- 
-2.8.1
-
diff --git a/core/bc/rev b/core/bc/rev
deleted file mode 100644
index d00491fd..00000000
--- a/core/bc/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/core/bc/sha256 b/core/bc/sha256
deleted file mode 100644
index 5aebdc1f..00000000
--- a/core/bc/sha256
+++ /dev/null
@@ -1 +0,0 @@
-7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc  bc-1.06.95.tar.bz2
diff --git a/core/bc/url b/core/bc/url
deleted file mode 100644
index 29e9268a..00000000
--- a/core/bc/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://alpha.gnu.org/gnu/bc/bc-1.06.95.tar.bz2"
diff --git a/core/bzip2/.gitignore b/core/bzip2/.gitignore
deleted file mode 100644
index fc553f38..00000000
--- a/core/bzip2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bzip2-1.0.6.tar.gz
-/src
diff --git a/core/bzip2/gen.rc b/core/bzip2/gen.rc
deleted file mode 100644
index 5cd9c64c..00000000
--- a/core/bzip2/gen.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-cflags\
-	-Wall -Winline\
-	-D '_FILE_OFFSET_BITS=64'
-
-lib libbz2.a blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c
-exe bzip2 bzip2.c libbz2.a
-
-file bin/bzip2 '$outdir'/bzip2 755
-file share/man/man1/bzip2.1  '$srcdir'/bzip2.1 644
-sym bin/bzcat bzip2
-
-fetch curl
diff --git a/core/bzip2/patch/0001-Remove-unused-nread-variable.patch b/core/bzip2/patch/0001-Remove-unused-nread-variable.patch
deleted file mode 100644
index 7b322a21..00000000
--- a/core/bzip2/patch/0001-Remove-unused-nread-variable.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 00cc7127e58adeeba4485fab901215b6df6184f6 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 10 Dec 2016 23:37:57 -0800
-Subject: [PATCH] Remove unused nread variable
-
----
- bzip2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bzip2.c b/bzip2.c
-index 6de9d1d..1dd5424 100644
---- a/bzip2.c
-+++ b/bzip2.c
-@@ -554,7 +554,7 @@ static
- Bool testStream ( FILE *zStream )
- {
-    BZFILE* bzf = NULL;
--   Int32   bzerr, bzerr_dummy, ret, nread, streamNo, i;
-+   Int32   bzerr, bzerr_dummy, ret, streamNo, i;
-    UChar   obuf[5000];
-    UChar   unused[BZ_MAX_UNUSED];
-    Int32   nUnused;
-@@ -577,7 +577,7 @@ Bool testStream ( FILE *zStream )
-       streamNo++;
- 
-       while (bzerr == BZ_OK) {
--         nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
-+         BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
-          if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
-       }
-       if (bzerr != BZ_STREAM_END) goto errhandler;
--- 
-2.11.0
-
diff --git a/core/bzip2/rev b/core/bzip2/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/bzip2/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/bzip2/sha256 b/core/bzip2/sha256
deleted file mode 100644
index 45eb8e18..00000000
--- a/core/bzip2/sha256
+++ /dev/null
@@ -1 +0,0 @@
-a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd  bzip2-1.0.6.tar.gz
diff --git a/core/bzip2/url b/core/bzip2/url
deleted file mode 100644
index 9648ced9..00000000
--- a/core/bzip2/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
diff --git a/core/curl/curl_config.h b/core/curl/curl_config.h
deleted file mode 100644
index 65855097..00000000
--- a/core/curl/curl_config.h
+++ /dev/null
@@ -1,243 +0,0 @@
-#include <config-posix.h>
-
-/* features */
-#define CURL_CA_BUNDLE "/etc/ssl/cert.pem"
-#define CURL_DISABLE_LDAP 1
-#define CURL_DISABLE_LDAPS 1
-#define CURL_DISABLE_POP3 1
-#define CURL_DISABLE_RTMP 1
-#define CURL_DISABLE_SMB 1
-#define CURL_DISABLE_SMTP 1
-#define ENABLE_IPV6 1
-#define HAVE_LIBSSL 1
-#define HAVE_LIBZ 1
-#define HAVE_ZLIB_H 1
-#define USE_OPENSSL 1
-#define USE_UNIX_SOCKETS 1
-/* #undef CURL_CA_PATH */
-/* #undef CURL_DISABLE_COOKIES */
-/* #undef CURL_DISABLE_CRYPTO_AUTH */
-/* #undef CURL_DISABLE_DICT */
-/* #undef CURL_DISABLE_FILE */
-/* #undef CURL_DISABLE_FTP */
-/* #undef CURL_DISABLE_GOPHER */
-/* #undef CURL_DISABLE_HTTP */
-/* #undef CURL_DISABLE_IMAP */
-/* #undef CURL_DISABLE_PROXY */
-/* #undef CURL_DISABLE_RTSP */
-/* #undef CURL_DISABLE_TELNET */
-/* #undef CURL_DISABLE_TFTP */
-/* #undef CURL_DISABLE_VERBOSE_STRINGS */
-/* #undef DISABLED_THREADSAFE */
-/* #undef EGD_SOCKET */
-/* #undef HAVE_KRB4 */
-/* #undef HAVE_LDAP_SSL */
-/* #undef HAVE_LIBIDN */
-/* #undef HAVE_LIBRESOLV */
-/* #undef HAVE_LIBRESOLVE */
-/* #undef HAVE_LIBSOCKET */
-/* #undef HAVE_OLD_GSSMIT */
-/* #undef USE_ARES */
-/* #undef USE_BLOCKING_SOCKETS */
-/* #undef USE_GNUTLS */
-/* #undef USE_LIBSSH2 */
-/* #undef USE_MANUAL */
-/* #undef USE_MBEDTLS */
-/* #undef USE_NGHTTP2 */
-/* #undef USE_NSS */
-/* #undef USE_OPENLDAP */
-/* #undef USE_POLARSSL */
-/* #undef USE_SCHANNEL */
-/* #undef USE_THREADS_POSIX */
-/* #undef USE_THREADS_WIN32 */
-/* #undef USE_WIN32_LARGE_FILES */
-/* #undef USE_WIN32_LDAP */
-/* #undef USE_WINDOWS_SSPI */
-/* #undef USE_YASSLEMUL */
-/* #undef WIN32_LEAN_AND_MEAN */
-
-/* headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_ARPA_TFTP_H 1
-#define HAVE_ERR_H 1
-#define HAVE_IFADDRS_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_OPENSSL_CRYPTO_H 1
-#define HAVE_OPENSSL_ENGINE_H 1
-#define HAVE_OPENSSL_ERR_H 1
-#define HAVE_OPENSSL_PEM_H 1
-#define HAVE_OPENSSL_PKCS12_H 1
-#define HAVE_OPENSSL_RSA_H 1
-#define HAVE_OPENSSL_SSL_H 1
-#define HAVE_OPENSSL_X509_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_PARAM_H 1
-#define TIME_WITH_SYS_TIME 1
-/* #undef HAVE_CRYPTO_H */
-/* #undef HAVE_DES_H */
-/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
-/* #undef HAVE_GSSAPI_GSSAPI_H */
-/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */
-/* #undef HAVE_IDN_FREE_H */
-/* #undef HAVE_IO_H */
-/* #undef HAVE_KRB_H */
-/* #undef HAVE_LBER_H */
-/* #undef HAVE_LDAP_H */
-/* #undef HAVE_LDAP_SSL_H */
-/* #undef HAVE_LDAPSSL_H */
-/* #undef HAVE_PEM_H */
-/* #undef HAVE_PROCESS_H */
-/* #undef HAVE_RSA_H */
-/* #undef HAVE_SGTTY_H */
-/* #undef HAVE_SSL_H */
-/* #undef HAVE_SYS_FILIO_H */
-/* #undef HAVE_SYS_SOCKIO_H */
-/* #undef HAVE_TLD_H */
-/* #undef HAVE_WINBER_H */
-/* #undef HAVE_WINDOWS_H */
-/* #undef HAVE_WINLDAP_H */
-/* #undef HAVE_WINSOCK2_H */
-/* #undef HAVE_WINSOCK_H */
-/* #undef HAVE_WS2TCPIP_H */
-/* #undef HAVE_X509_H */
-/* #undef NEED_LBER_H */
-
-/* types */
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 8
-#define SIZEOF_OFF_T 8
-#define SIZEOF_SHORT 2
-#define SIZEOF_SIZE_T 8
-#define SIZEOF_TIME_T 8
-#define SIZEOF_VOIDP 8
-
-/* functions */
-#define GETSERVBYPORT_R_ARGS 6
-#define GETSERVBYPORT_R_BUFSIZE 4096
-#define HAVE_CLOCK_GETTIME_MONOTONIC 1
-#define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1
-#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
-#define HAVE_FREEIFADDRS 1
-#define HAVE_GETHOSTBYADDR 1
-#define HAVE_GETHOSTBYADDR_R 1
-#define HAVE_GETHOSTBYADDR_R_8 1
-#define HAVE_GETHOSTBYNAME 1
-#define HAVE_GETHOSTBYNAME_R 1
-#define HAVE_GETHOSTBYNAME_R_6 1
-#define HAVE_GETIFADDRS 1
-#define HAVE_GETSERVBYPORT_R 1
-#define HAVE_POLL_FINE 1
-#define HAVE_RAND_STATUS 1
-#define HAVE_SSL_GET_SHUTDOWN 1
-#define HAVE_STRCASESTR 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRLCPY 1
-/* #undef HAVE_CLOSESOCKET */
-/* #undef HAVE_GETHOSTBYADDR_R_5 */
-/* #undef HAVE_GETHOSTBYADDR_R_7 */
-/* #undef HAVE_GETHOSTBYNAME_R_3 */
-/* #undef HAVE_GETHOSTBYNAME_R_5 */
-/* #undef HAVE_GETPASS_R */
-/* #undef HAVE_GLIBC_STRERROR_R */
-/* #undef HAVE_GSSAPI */
-/* #undef HAVE_GSSGNU */
-/* #undef HAVE_GSSHEIMDAL */
-/* #undef HAVE_GSSMIT */
-/* #undef HAVE_IDNA_STRERROR */
-/* #undef HAVE_IDN_FREE */
-/* #undef HAVE_INET_ADDR */
-/* #undef HAVE_INET_NTOA_R */
-/* #undef HAVE_INET_NTOA_R_2 */
-/* #undef HAVE_INET_NTOA_R_3 */
-/* #undef HAVE_IOCTL_FIONBIO */
-/* #undef HAVE_IOCTL_SIOCGIFADDR */
-/* #undef HAVE_IOCTLSOCKET */
-/* #undef HAVE_IOCTLSOCKET_CAMEL */
-/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
-/* #undef HAVE_IOCTLSOCKET_FIONBIO */
-/* #undef HAVE_KRB_GET_OUR_IP_FOR_REALM */
-/* #undef HAVE_LDAP_URL_PARSE */
-/* #undef HAVE_RAND_EGD */
-/* #undef HAVE_RAND_SCREEN */
-/* #undef HAVE_SETMODE */
-/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
-/* #undef HAVE_STRCMPI */
-/* #undef HAVE_STRICMP */
-/* #undef HAVE_STRNCMPI */
-/* #undef HAVE_STRNICMP */
-/* #undef HAVE_TLD_STRERROR */
-
-/* libssh2 */
-/* undef HAVE_LIBSSH2 */
-/* undef HAVE_LIBSSH2_EXIT */
-/* undef HAVE_LIBSSH2_H */
-/* undef HAVE_LIBSSH2_INIT */
-/* undef HAVE_LIBSSH2_SCP_SEND64 */
-/* undef HAVE_LIBSSH2_SESSION_HANDSHAKE */
-/* undef HAVE_LIBSSH2_VERSION */
-
-/* misc */
-#define BUILDING_LIBCURL 1
-#define CURL_STATICLIB 1
-#define HAVE_MSG_NOSIGNAL 1
-#define HAVE_VARIADIC_MACROS_GCC 1
-#define OS "Linux"
-#define RANDOM_FILE "/dev/urandom"
-/* #undef CURL_EXTERN_SYMBOL */
-/* #undef _FILE_OFFSET_BITS */
-/* #undef HAVE_NI_WITHSCOPEID */
-/* #undef _LARGE_FILES */
-/* #undef LT_OBJDIR */
-/* #undef NEED_REENTRANT */
-/* #undef PACKAGE */
-/* #undef PACKAGE_BUGREPORT */
-/* #undef PACKAGE_NAME */
-/* #undef PACKAGE_STRING */
-/* #undef PACKAGE_TARNAME */
-/* #undef PACKAGE_VERSION */
-/* #undef _THREAD_SAFE */
-/* #undef VERSION */
-
-/* posix */
-#define GETNAMEINFO_QUAL_ARG1 const
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *restrict
-#define GETNAMEINFO_TYPE_ARG46 socklen_t
-#define GETNAMEINFO_TYPE_ARG7 int
-#define HAVE_BOOL_T 1 /* non-standard macro name? */
-#define HAVE_FCNTL_O_NONBLOCK 1
-#define HAVE_LL 1
-#define HAVE_POSIX_STRERROR_R 1
-#define HAVE_SIG_ATOMIC_T_VOLATILE 1
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-#define HAVE_VARIADIC_MACROS_C99 1
-#define HAVE_WRITABLE_ARGV 1
-#define RECVFROM_TYPE_ARG1 int
-#define RECVFROM_TYPE_ARG2 void *restrict
-#define RECVFROM_TYPE_ARG3 size_t
-#define RECVFROM_TYPE_ARG4 int
-#define RECVFROM_TYPE_ARG5 struct sockaddr *restrict
-#define RECVFROM_TYPE_ARG6 socklen_t *restrict
-#define RECV_TYPE_ARG1 int
-#define RECV_TYPE_ARG2 void *
-#define RECV_TYPE_ARG3 size_t
-#define RECV_TYPE_ARG4 int
-#define RECV_TYPE_RETV ssize_t
-#define RETSIGTYPE void
-#define SELECT_QUAL_ARG5
-#define SELECT_TYPE_ARG1 int
-#define SELECT_TYPE_ARG234 fd_set *
-#define SELECT_TYPE_ARG5 struct timeval *restrict
-#define SELECT_TYPE_RETV int
-#define SEND_QUAL_ARG2 const
-#define SEND_TYPE_ARG1 int
-#define SEND_TYPE_ARG2 void *
-#define SEND_TYPE_ARG3 size_t
-#define SEND_TYPE_ARG4 int
-#define SEND_TYPE_RETV ssize_t
-#define STRERROR_R_TYPE_ARG3 size_t
-/* #undef NEED_BASENAME_PROTO */
-/* #undef NEED_MALLOC_H */
-/* #undef RECVFROM_TYPE_ARG2_IS_VOID */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID  */
diff --git a/core/curl/gen.rc b/core/curl/gen.rc
deleted file mode 100644
index 60974d86..00000000
--- a/core/curl/gen.rc
+++ /dev/null
@@ -1,107 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/core/zlib/include\
-	-I include\
-	-I '$dir' \
-	-I '$outdir'/include/curl\
-	-I '$outdir'/include\
-	-I '$srcdir'/lib\
-	-I '$srcdir'/src
-
-hdrs=include/curl/^(curl.h curlrules.h curlver.h easy.h mprintf.h multi.h stdcheaders.h typecheck-gcc.h)
-for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
-build '$outdir'/include/curl/curlbuild.h copy '$srcdir'/include/curl/curlbuild.h.dist
-phony headers '$outdir'/^($hdrs include/curl/curlbuild.h)
-
-phony deps core/^(libressl zlib)^/headers
-
-# src/lib/Makefile.inc:/^CSOURCES
-lib libcurl.a -d '$dir'/deps lib/^(\
-	file.c timeval.c base64.c hostip.c progress.c formdata.c\
-	cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c\
-	ldap.c version.c getenv.c escape.c mprintf.c telnet.c netrc.c\
-	getinfo.c transfer.c strcase.c easy.c security.c curl_fnmatch.c\
-	fileinfo.c ftplistparser.c wildcard.c krb5.c memdebug.c http_chunks.c\
-	strtok.c connect.c llist.c hash.c multi.c content_encoding.c share.c\
-	http_digest.c md4.c md5.c http_negotiate.c inet_pton.c strtoofft.c\
-	strerror.c amigaos.c hostasyn.c hostip4.c hostip6.c hostsyn.c\
-	inet_ntop.c parsedate.c select.c tftp.c splay.c strdup.c socks.c\
-	ssh.c curl_addrinfo.c socks_gssapi.c socks_sspi.c\
-	curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c\
-	pingpong.c rtsp.c curl_threads.c warnless.c hmac.c curl_rtmp.c\
-	openldap.c curl_gethostname.c gopher.c idn_win32.c\
-	http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c\
-	http_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_sasl.c\
-	curl_multibyte.c hostcheck.c conncache.c pipeline.c dotdot.c\
-	x509asn1.c http2.c smb.c curl_endian.c curl_des.c system_win32.c\
-	vauth/^(\
-		vauth.c cleartext.c cram.c\
-		digest.c digest_sspi.c krb5_gssapi.c\
-		krb5_sspi.c ntlm.c ntlm_sspi.c oauth2.c\
-		spnego_gssapi.c spnego_sspi.c\
-	)\
-	vtls/^(\
-		openssl.c gtls.c vtls.c nss.c\
-		polarssl.c polarssl_threadlock.c axtls.c\
-		cyassl.c schannel.c darwinssl.c gskit.c\
-		mbedtls.c\
-	)\
-) '$builddir'/^(\
-	core/libressl/libssl.a.d\
-	core/libressl/libcrypto.a.d\
-	core/zlib/libz.a\
-)
-
-build '$outdir'/tool_hugehelp.c.o cc '$dir'/tool_hugehelp.c '||' '$srcdir'/src/tool_hugehelp.h
-
-# src/src/Makefile.inc:/^CURL_CFILES
-exe curl -d '$outdir'/include/curl/curlbuild.h\
-	src/^(\
-		slist_wc.c\
-		tool_binmode.c\
-		tool_bname.c\
-		tool_cb_dbg.c\
-		tool_cb_hdr.c\
-		tool_cb_prg.c\
-		tool_cb_rea.c\
-		tool_cb_see.c\
-		tool_cb_wrt.c\
-		tool_cfgable.c\
-		tool_convert.c\
-		tool_dirhie.c\
-		tool_doswin.c\
-		tool_easysrc.c\
-		tool_formparse.c\
-		tool_getparam.c\
-		tool_getpass.c\
-		tool_help.c\
-		tool_helpers.c\
-		tool_homedir.c\
-		tool_libinfo.c\
-		tool_main.c\
-		tool_metalink.c\
-		tool_mfiles.c\
-		tool_msgs.c\
-		tool_operate.c\
-		tool_operhlp.c\
-		tool_panykey.c\
-		tool_paramhlp.c\
-		tool_parsecfg.c\
-		tool_strdup.c\
-		tool_setopt.c\
-		tool_sleep.c\
-		tool_urlglob.c\
-		tool_util.c\
-		tool_vms.c\
-		tool_writeenv.c\
-		tool_writeout.c\
-		tool_xattr.c\
-	)\
-	tool_hugehelp.c.o\
-	libcurl.a.d
-
-file bin/curl '$outdir'/curl 755
-file share/man/man1/curl.1 '$srcdir'/docs/curl.1 644
-
-fetch git
diff --git a/core/curl/rev b/core/curl/rev
deleted file mode 100644
index b8626c4c..00000000
--- a/core/curl/rev
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/core/curl/src b/core/curl/src
deleted file mode 160000
-Subproject 3c561c657c2f0e553b19115a506592a8bbd744b
diff --git a/core/curl/tool_hugehelp.c b/core/curl/tool_hugehelp.c
deleted file mode 100644
index bc33e2f1..00000000
--- a/core/curl/tool_hugehelp.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* built-in manual is disabled, blank function */
-#include "tool_hugehelp.h"
-void hugehelp(void) {}
diff --git a/core/e2fsprogs/.gitignore b/core/e2fsprogs/.gitignore
deleted file mode 100644
index 012dc66e..00000000
--- a/core/e2fsprogs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/tools.ninja
diff --git a/core/e2fsprogs/blkid_types.h b/core/e2fsprogs/blkid_types.h
deleted file mode 100644
index ee9b980a..00000000
--- a/core/e2fsprogs/blkid_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/types.h>
diff --git a/core/e2fsprogs/config.h b/core/e2fsprogs/config.h
deleted file mode 100644
index 6f018398..00000000
--- a/core/e2fsprogs/config.h
+++ /dev/null
@@ -1,188 +0,0 @@
-#include <config-posix.h>
-
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-/* #undef CONFIG_BLKID_DEBUG */
-#define CONFIG_BUILD_FINDFS 1
-/* #undef CONFIG_JBD_DEBUG */
-#define CONFIG_MMP 1
-/* #undef CONFIG_TDB */
-/* #undef CONFIG_TESTIO_DEBUG */
-/* #undef CRAY_STACKSEG_END */
-/* #undef C_ALLOCA */
-/* #undef DISABLE_BACKTRACE */
-#define ENABLE_BMAP_STATS 1
-/* #undef ENABLE_BMAP_STATS_OPS */
-/* #undef ENABLE_NLS */
-/* #undef HAVE_ADD_KEY */
-#define HAVE_ALLOCA 1
-#define HAVE_ALLOCA_H 1
-/* #undef HAVE_ARGZ_COUNT */
-/* #undef HAVE_ARGZ_H */
-/* #undef HAVE_ARGZ_NEXT */
-/* #undef HAVE_ARGZ_STRINGIFY */
-#define HAVE_ASPRINTF 1
-/* #undef HAVE_ATTR_XATTR_H */
-/* #undef HAVE_BACKTRACE */
-/* #undef HAVE_BLKID_PROBE_ENABLE_PARTITIONS */
-/* #undef HAVE_BLKID_PROBE_GET_TOPOLOGY */
-#define HAVE_BUILTIN_EXPECT 1
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-/* #undef HAVE_CHFLAGS */
-/* #undef HAVE_DCGETTEXT */
-#define HAVE_DECL_FEOF_UNLOCKED 1
-#define HAVE_DECL_FGETS_UNLOCKED 1
-#define HAVE_DECL_GETC_UNLOCKED 1
-#define HAVE_DECL__SNPRINTF 0
-#define HAVE_DECL__SNWPRINTF 0
-/* #undef HAVE_DOPRNT */
-/* #undef HAVE_EXECINFO_H */
-#define HAVE_EXT2_IOCTLS 1
-/* #undef HAVE_FADVISE64 */
-#define HAVE_FALLOCATE 1
-#define HAVE_FALLOCATE64 1
-#define HAVE_FEATURES_H 1
-#define HAVE_FSTAT64 1
-#define HAVE_FTRUNCATE64 1
-/* #undef HAVE_FUSE_H */
-#define HAVE_FUTIMES 1
-#define HAVE_GETDTABLESIZE 1
-/* #undef HAVE_GETMNTINFO */
-#define HAVE_GETOPT_H 1
-#define HAVE_GETPAGESIZE 1
-/* #undef HAVE_GETTEXT */
-#define HAVE_INTPTR_T 1
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-/* #undef HAVE_KEYCTL */
-#define HAVE_LANGINFO_CODESET 1
-#define HAVE_LC_MESSAGES 1
-/* #undef HAVE_LINUX_FALLOC_H */
-/* #undef HAVE_LINUX_FD_H */
-/* #undef HAVE_LINUX_LOOP_H */
-/* #undef HAVE_LINUX_MAJOR_H */
-#define HAVE_LLISTXATTR 1
-/* #undef HAVE_LLSEEK */
-/* #undef HAVE_LLSEEK_PROTOTYPE */
-#define HAVE_LONG_LONG_INT 1
-#define HAVE_LSEEK64 1
-#define HAVE_LSEEK64_PROTOTYPE 1
-/* #undef HAVE_MAGIC_H */
-/* #undef HAVE_MALLINFO */
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MEMPCPY 1
-#define HAVE_MNTENT_H 1
-/* #undef HAVE_NET_IF_DL_H */
-#define HAVE_OPEN64 1
-/* #undef HAVE_OPTRESET */
-#define HAVE_PATHS_H 1
-#define HAVE_POSIX_FADVISE64 1
-#define HAVE_POSIX_PRINTF 1
-#define HAVE_PRCTL 1
-#define HAVE_PREAD64 1
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-#define HAVE_PTHREAD_RWLOCK 1
-#define HAVE_PWRITE64 1
-#define HAVE_RECLEN_DIRENT 1
-/* #undef HAVE_SA_LEN */
-/* #undef HAVE_SECURE_GETENV */
-#define HAVE_SETMNTENT 1
-#define HAVE_SETRESGID 1
-#define HAVE_SETRESUID 1
-/* #undef HAVE_STAT_FLAGS */
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-#define HAVE_STRUCT_STAT_ST_ATIM 1
-#define HAVE_SYNC_FILE_RANGE 1
-/* #undef HAVE_SYS_ACL_H */
-/* #undef HAVE_SYS_DISKLABEL_H */
-/* #undef HAVE_SYS_DISK_H */
-#define HAVE_SYS_FILE_H 1
-#define HAVE_SYS_IOCTL_H 1
-/* #undef HAVE_SYS_KEY_H */
-/* #undef HAVE_SYS_MKDEV_H */
-#define HAVE_SYS_MOUNT_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_PRCTL_H 1
-/* #undef HAVE_SYS_SOCKIO_H */
-#define HAVE_SYS_SYSCALL_H 1
-/* #undef HAVE_SYS_SYSCTL_H */
-#define HAVE_SYS_SYSMACROS_H 1
-/* #undef HAVE_TERMIO_H */
-#define HAVE_TYPE_SSIZE_T 1
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-#define HAVE_USLEEP 1
-#define HAVE_VALLOC 1
-#define HAVE_VISIBILITY 1
-#define HAVE_WCHAR_T 1
-#define HAVE_WINT_T 1
-#define HAVE_WORKING_O_NOATIME 1
-#define HAVE_WORKING_O_NOFOLLOW 1
-#define HAVE___FSETLOCKING 1
-/* #undef HAVE___SECURE_GETENV */
-#define ICONV_CONST 
-#define INTDIV0_RAISES_SIGFPE 1
-#define PACKAGE "e2fsprogs"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME ""
-#define PACKAGE_STRING ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION ""
-/* #undef PRI_MACROS_BROKEN */
-/* #undef PTHREAD_IN_USE_DETECTION_HARD */
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 8
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF_OFF_T 8
-#define SIZEOF_SHORT 2
-#define SIZEOF_TIME_T 8
-#ifndef SIZE_MAX
-/* # undef SIZE_MAX */
-#endif
-/* #undef STACK_DIRECTION */
-#define TLS _Thread_local
-#define USE_POSIX_THREADS 1
-#define USE_POSIX_THREADS_WEAK 1
-/* #undef USE_PTH_THREADS */
-/* #undef USE_PTH_THREADS_WEAK */
-/* #undef USE_SOLARIS_THREADS */
-/* #undef USE_SOLARIS_THREADS_WEAK */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-/* #undef USE_UUIDD */
-/* #undef USE_WINDOWS_THREADS */
-#define VERSION "0.14.1"
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-/* #undef _INTL_REDIRECT_MACROS */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-/* #undef ptrdiff_t */
-/* #undef size_t */
-/* #undef uintmax_t */
-#include <dirpaths.h>
diff --git a/core/e2fsprogs/dirpaths.h b/core/e2fsprogs/dirpaths.h
deleted file mode 100644
index 6b0ac378..00000000
--- a/core/e2fsprogs/dirpaths.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define LOCALEDIR "/share/locale"
-#define ROOT_SYSCONFDIR "/etc"
diff --git a/core/e2fsprogs/ext2_types.h b/core/e2fsprogs/ext2_types.h
deleted file mode 100644
index c0c25c09..00000000
--- a/core/e2fsprogs/ext2_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <sys/types.h>
-#include <linux/types.h>
-#define __force
diff --git a/core/e2fsprogs/gen.rc b/core/e2fsprogs/gen.rc
deleted file mode 100644
index 21b56b42..00000000
--- a/core/e2fsprogs/gen.rc
+++ /dev/null
@@ -1,196 +0,0 @@
-version=1.43.1
-cflags\
-	-D HAVE_CONFIG_H\
-	-I include\
-	-I '$dir' \
-	-I '$outdir'/include\
-	-I '$outdir'/internal\
-	-I '$outdir'/internal/support\
-	-I '$srcdir'/lib
-
-set subst\
-	-e s,@E2FSPROGS_VERSION@,$version,\
-	-e s,@E2FSPROGS_MONTH@,June,\
-	-e s,@E2FSPROGS_YEAR@,2016,\
-	-e s,@JDEV@,,
-
-fn et {
-	et=$1 src='$outdir'/$2 hdr='$outdir'/$3
-	build $src awk $et '|' '$srcdir'/lib/et/et_c.awk ; with\
-		expr '-f $srcdir/lib/et/et_c.awk -v outfile=/dev/stdout outfn='`{basename $src}
-	build $hdr awk $et '|' '$srcdir'/lib/et/et_h.awk ; with\
-		expr '-f $srcdir/lib/et/et_h.awk -v outfile=/dev/stdout outfn='`{basename $hdr}
-}
-
-fn subst {
-	build '$outdir'/$1 sed '$srcdir'/$2 ; with expr '$subst'
-}
-
-fn man {
-	src=$1
-	base=`{basename $src}
-	sec=`{printf $base | tail -c 1}
-	subst $base $1
-	file share/man/man$sec/$base '$outdir'/$base 644
-}
-
-subst ext2_err.et lib/ext2fs/ext2_err.et.in
-et '$outdir'/ext2_err.et ext2_err.c include/ext2fs/ext2_err.h
-et '$srcdir'/lib/support/prof_err.et prof_err.c internal/support/prof_err.h
-
-build '$outdir'/include/blkid/blkid.h copy '$srcdir'/lib/blkid/blkid.h.in
-build '$outdir'/include/ext2fs/ext2_types.h copy '$dir'/ext2_types.h
-build '$outdir'/include/uuid/uuid.h copy '$srcdir'/lib/uuid/uuid.h.in
-build '$outdir'/internal/blkid/blkid_types.h copy '$dir'/blkid_types.h
-
-{
-	include 'toolchain/$host_toolchain.ninja'
-	exe gen_crc32ctable lib/ext2fs/gen_crc32ctable.c
-} >tools.ninja ; subninja tools.ninja
-rule gen_crc32ctable '$outdir/gen_crc32ctable >$out.tmp && mv $out.tmp $out'
-build '$outdir'/internal/crc32c_table.h gen_crc32ctable '|' '$outdir'/gen_crc32ctable
-
-phony headers '$outdir'/include/^(\
-	blkid/blkid.h\
-	ext2fs/^(ext2_err.h ext2_types.h)\
-	uuid/uuid.h\
-)
-phony deps '$dir'/headers '$outdir'/internal/^(\
-	blkid/blkid_types.h support/prof_err.h crc32c_table.h\
-)
-
-lib libcomm_err.a -d '$dir'/deps\
-	lib/et/^(error_message.c et_name.c init_et.c com_err.c com_right.c)
-lib libblkid.a -d '$dir'/deps lib/blkid/^(\
-	cache.c dev.c devname.c devno.c getsize.c llseek.c probe.c\
-	read.c resolve.c save.c tag.c version.c\
-)
-lib libe2p.a -d '$dir'/deps lib/e2p/^(\
-	feature.c fgetflags.c fsetflags.c fgetversion.c fsetversion.c\
-	getflags.c getversion.c hashstr.c iod.c ls.c mntopts.c\
-	parse_num.c pe.c pf.c ps.c setflags.c setversion.c uuid.c\
-	ostype.c percent.c crypto_mode.c fgetproject.c fsetproject.c\
-)
-lib libext2fs.a -d '$dir'/deps '$outdir'/ext2_err.c lib/ext2fs/^(\
-	alloc.c\
-	alloc_sb.c\
-	alloc_stats.c\
-	alloc_tables.c\
-	atexit.c\
-	badblocks.c\
-	bb_inode.c\
-	bitmaps.c\
-	bitops.c\
-	blkmap64_ba.c\
-	blkmap64_rb.c\
-	blknum.c\
-	block.c\
-	bmap.c\
-	check_desc.c\
-	closefs.c\
-	crc16.c\
-	crc32c.c\
-	csum.c\
-	dblist.c\
-	dblist_dir.c\
-	dirblock.c\
-	dirhash.c\
-	dir_iterate.c\
-	expanddir.c\
-	ext_attr.c\
-	extent.c\
-	fallocate.c\
-	fileio.c\
-	finddev.c\
-	flushb.c\
-	freefs.c\
-	gen_bitmap.c\
-	gen_bitmap64.c\
-	get_num_dirs.c\
-	get_pathname.c\
-	getsize.c\
-	getsectsize.c\
-	i_block.c\
-	icount.c\
-	ind_block.c\
-	initialize.c\
-	inline.c\
-	inline_data.c\
-	inode.c\
-	io_manager.c\
-	ismounted.c\
-	link.c\
-	llseek.c\
-	lookup.c\
-	mkdir.c\
-	mkjournal.c\
-	mmp.c\
-	namei.c\
-	native.c\
-	newdir.c\
-	openfs.c\
-	progress.c\
-	punch.c\
-	qcow2.c\
-	read_bb.c\
-	read_bb_file.c\
-	res_gdt.c\
-	rw_bitmaps.c\
-	sha512.c\
-	swapfs.c\
-	symlink.c\
-	undo_io.c\
-	unix_io.c\
-	unlink.c\
-	valid_blk.c\
-	version.c\
-	rbtree.c\
-	\
-	dupfs.c\
-)
-lib libsupport.a -d '$dir'/deps '$outdir'/prof_err.c lib/support/^(\
-	mkquota.c\
-	plausible.c\
-	profile.c\
-	parse_qtype.c\
-	profile_helpers.c\
-	quotaio.c\
-	quotaio_v2.c\
-	quotaio_tree.c\
-	dict.c\
-)
-lib libuuid.a -d '$dir'/deps lib/uuid/^(\
-	clear.c\
-	compare.c\
-	copy.c\
-	gen_uuid.c\
-	isnull.c\
-	pack.c\
-	parse.c\
-	unpack.c\
-	unparse.c\
-	uuid_time.c\
-)
-
-libs=(libext2fs.a libe2p.a libblkid.a libuuid.a libcomm_err.a libsupport.a)
-
-exe bin/e2fsck -d '$dir'/headers e2fsck/^(\
-	unix.c e2fsck.c super.c pass1.c pass1b.c pass2.c\
-	pass3.c pass4.c pass5.c journal.c badblocks.c util.c dirinfo.c\
-	dx_dirinfo.c ehandler.c problem.c message.c quota.c recovery.c\
-	region.c revoke.c ea_refcount.c rehash.c\
-	logfile.c sigcatcher.c readahead.c\
-	extents.c\
-) $libs
-file bin/e2fsck '$outdir'/bin/e2fsck 755
-man e2fsck/e2fsck.8.in
-man e2fsck/e2fsck.conf.5.in
-
-exe bin/resize2fs -d '$dir'/headers resize/^(\
-	extent.c resize2fs.c main.c online.c resource_track.c\
-	sim_progress.c\
-) $libs
-file bin/resize2fs '$outdir'/bin/resize2fs 755
-man resize/resize2fs.8.in
-
-fetch git
diff --git a/core/e2fsprogs/rev b/core/e2fsprogs/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/e2fsprogs/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/e2fsprogs/src b/core/e2fsprogs/src
deleted file mode 160000
-Subproject 4e52870eeb08ed7532bf4fd3d5cb1538f714bdc
diff --git a/core/file/config.h b/core/file/config.h
deleted file mode 100644
index 9bdf61af..00000000
--- a/core/file/config.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <config-posix.h>
-
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-#define BUILTIN_ELF 1
-#define ELFCORE 1
-#define HAVE_ASPRINTF 1
-#define HAVE_DECL_DAYLIGHT 1
-#define HAVE_DECL_TZNAME 1
-#define HAVE_ERR_H 1
-/* #undef HAVE_FMTCHECK */
-#define HAVE_GETOPT_H 1
-#define HAVE_GETOPT_LONG 1
-#define HAVE_GETPAGESIZE 1
-#define HAVE_INTPTR_T 1
-/* #undef HAVE_LIBGNURX */
-#define HAVE_LIBZ 1
-#define HAVE_MBSTATE_T 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MKOSTEMP 1
-#define HAVE_SIG_T 1
-#define HAVE_STRCASESTR 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRUCT_OPTION 1
-/* #undef HAVE_STRUCT_TM_TM_GMTOFF */
-#define HAVE_STRUCT_TM_TM_ZONE 1
-#define HAVE_SYS_PARAM_H 1
-/* #undef HAVE_SYS_UTIME_H */
-#define HAVE_TM_ISDST 1
-#define HAVE_TM_ZONE 1
-#define HAVE_VASPRINTF 1
-/* #undef HAVE_VFORK_H */
-/* #undef HAVE_XLOCALE_H */
-#define HAVE_ZLIB_H 1
-#define LT_OBJDIR ".libs/"
-/* #undef MAJOR_IN_MKDEV */
-/* #undef MAJOR_IN_SYSMACROS */
-#define PACKAGE "file"
-#define PACKAGE_BUGREPORT "christos@astron.com"
-#define PACKAGE_NAME "file"
-#define PACKAGE_STRING "file 5.29"
-#define PACKAGE_TARNAME "file"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "5.29"
-/* #undef TM_IN_SYS_TIME */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#define VERSION "5.29"
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-#define ZLIBSUPPORT 1
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGEFILE_SOURCE */
-/* #undef _LARGE_FILES */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-/* #undef _UINT32_T */
-/* #undef _UINT64_T */
-/* #undef _UINT8_T */
-/* #undef const */
-/* #undef int32_t */
-/* #undef int64_t */
-/* #undef intptr_t */
-/* #undef mbstate_t */
-/* #undef off_t */
-/* #undef pid_t */
-/* #undef size_t */
-/* #undef uint16_t */
-/* #undef uint32_t */
-/* #undef uint64_t */
-/* #undef uint8_t */
-/* #undef uintptr_t */
-/* #undef vfork */
diff --git a/core/file/gen.rc b/core/file/gen.rc
deleted file mode 100644
index 5547d101..00000000
--- a/core/file/gen.rc
+++ /dev/null
@@ -1,59 +0,0 @@
-version=5.29
-cflags\
-	-Wall\
-	-D HAVE_CONFIG_H\
-	-D 'MAGIC=''"/share/file/magic"''' \
-	-D _GNU_SOURCE\
-	-isystem '$builddir'/core/zlib/include\
-	-I include\
-	-I '$dir' \
-	-I '$outdir'/include
-
-build '$outdir'/include/magic.h sed '$srcdir'/src/magic.h.in ; with\
-	expr s,X.YY,`{echo $version | tr -d .}^,
-phony headers '$outdir'/include/magic.h
-
-build '$outdir'/file.1 sed '$srcdir'/doc/file.man ; exprs=(\
-	-e s,__CSECTION__,1,g\
-	-e s,__FSECTION__,5,g\
-	-e s,__VERSION__,$version,g\
-	-e s,__MAGIC__,/share/file/magic,g\
-) with expr $"exprs
-
-phony deps ('$dir' core/zlib)^/headers
-
-lib libmagic.a -d '$dir'/deps src/^(\
-	magic.c\
-	apprentice.c\
-	softmagic.c\
-	ascmagic.c\
-	encoding.c\
-	compress.c\
-	is_tar.c\
-	readelf.c\
-	print.c\
-	fsmagic.c\
-	funcs.c\
-	apptype.c\
-	der.c\
-	cdf.c\
-	cdf_time.c\
-	readcdf.c\
-	\
-	fmtcheck.c\
-)
-
-exe file -d '$dir'/headers src/file.c libmagic.a '$builddir/core/zlib/libz.a'
-file bin/file '$outdir'/file 755
-file share/man/man1/file.1 '$outdir'/file.1 644
-
-srcs=`{grep -v '^#' magic.txt}
-for(src in $srcs) build '$outdir'/magic/$src copy '$srcdir'/magic/Magdir/$src
-for(src in Header Localstuff) build '$outdir'/magic/$src copy '$srcdir'/magic/$src
-magic_outs=magic/^(Header Localstuff $srcs)
-
-rule magic 'cd $outdir && file -C -m magic'
-build '$outdir'/magic.mgc magic '|' '$outdir'/$magic_outs
-file share/file/magic.mgc '$outdir'/magic.mgc 644
-
-fetch git
diff --git a/core/file/magic.txt b/core/file/magic.txt
deleted file mode 100644
index 89286288..00000000
--- a/core/file/magic.txt
+++ /dev/null
@@ -1,282 +0,0 @@
-# <cd src/magic/Magdir && printf '%s\n' *
-acorn
-adi
-adventure
-algol68
-allegro
-alliant
-alpha
-amanda
-amigaos
-android
-animation
-aout
-apl
-apple
-application
-applix
-apt
-archive
-assembler
-asterix
-att3b
-audio
-basis
-ber
-bflt
-bioinformatics
-blackberry
-blcr
-blender
-blit
-bout
-bsdi
-bsi
-btsnoop
-c-lang
-c64
-cad
-cafebabe
-cbor
-cddb
-chord
-cisco
-citrus
-clarion
-claris
-clipper
-coff
-commands
-communications
-compress
-console
-convex
-coverage
-cracklib
-ctags
-ctf
-cubemap
-cups
-dact
-database
-der
-diamond
-diff
-digital
-dolby
-dump
-dyadic
-ebml
-editors
-efi
-elf
-encore
-epoc
-erlang
-esri
-etf
-fcs
-filesystems
-finger
-flash
-flif
-fonts
-fortran
-frame
-freebsd
-fsav
-fusecompress
-games
-gcc
-geo
-geos
-gimp
-gnome
-gnu
-gnumeric
-gpt
-grace
-graphviz
-gringotts
-guile
-hitachi-sh
-hp
-human68k
-ibm370
-ibm6000
-icc
-iff
-images
-inform
-intel
-interleaf
-island
-ispell
-isz
-java
-javascript
-jpeg
-karma
-kde
-keepass
-kerberos
-kml
-lecter
-lex
-lif
-linux
-lisp
-llvm
-lua
-luks
-m4
-mach
-macintosh
-macos
-magic
-mail.news
-make
-map
-maple
-marc21
-mathcad
-mathematica
-matroska
-mcrypt
-mercurial
-metastore
-meteorological
-microfocus
-mime
-mips
-mirage
-misctools
-mkid
-mlssa
-mmdf
-modem
-motorola
-mozilla
-msdos
-msooxml
-msvc
-msx
-mup
-music
-nasa
-natinst
-ncr
-neko
-netbsd
-netscape
-netware
-news
-nitpicker
-oasis
-ocaml
-octave
-ole2compounddocs
-olf
-os2
-os400
-os9
-osf1
-palm
-parix
-parrot
-pascal
-pbf
-pbm
-pc88
-pc98
-pdf
-pdp
-perl
-pgf
-pgp
-pkgadd
-plan9
-plus5
-polyml
-printer
-project
-psdbms
-psl
-pulsar
-pwsafe
-pyramid
-python
-qt
-revision
-riff
-rinex
-rpm
-rtf
-ruby
-sc
-sccs
-scientific
-securitycerts
-selinux
-sendmail
-sequent
-sereal
-sgi
-sgml
-sharc
-sinclair
-sisu
-sketch
-smalltalk
-smile
-sniffer
-softquad
-spec
-spectrum
-sql
-ssh
-ssl
-sun
-symbos
-sysex
-tcl
-teapot
-terminfo
-tex
-tgif
-ti-8x
-timezone
-troff
-tuxedo
-typeset
-unicode
-unknown
-uterus
-uuencode
-vacuum-cleaner
-varied.out
-varied.script
-vax
-vicar
-virtual
-virtutech
-visx
-vms
-vmware
-vorbis
-vxl
-warc
-weak
-windows
-wireless
-wordprocessors
-wsdl
-x68000
-xdelta
-xenix
-xilinx
-xo65
-xwindows
-zfs
-zilog
-zyxel
diff --git a/core/file/rev b/core/file/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/file/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/file/src b/core/file/src
deleted file mode 160000
-Subproject 015b0cdce1a0abb68ab99510e7fc8d2f77e8ec7
diff --git a/core/gen.rc b/core/gen.rc
deleted file mode 100644
index 0dcf6af7..00000000
--- a/core/gen.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-subgen awk
-subgen bc
-subgen bzip2
-subgen curl
-subgen e2fsprogs
-subgen file
-subgen git
-subgen iproute2
-subgen kbd
-subgen libressl
-subgen loksh
-subgen mdocml
-subgen ninja
-subgen openbsd
-subgen openssh
-subgen perp
-subgen pigz
-subgen plan9port
-subgen sbase
-subgen sdhcp
-subgen sinit
-subgen skeleton
-subgen tz
-subgen ubase
-subgen util-linux
-subgen xz
-subgen zlib
diff --git a/core/git/commands.txt b/core/git/commands.txt
deleted file mode 100644
index a5d3f05a..00000000
--- a/core/git/commands.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-# <cd src/Documentation && printf '%s\n' git-*.txt
-git-add.txt
-git-am.txt
-git-annotate.txt
-git-apply.txt
-git-archimport.txt
-git-archive.txt
-git-bisect-lk2009.txt
-git-bisect.txt
-git-blame.txt
-git-branch.txt
-git-bundle.txt
-git-cat-file.txt
-git-check-attr.txt
-git-check-ignore.txt
-git-check-mailmap.txt
-git-check-ref-format.txt
-git-checkout-index.txt
-git-checkout.txt
-git-cherry-pick.txt
-git-cherry.txt
-git-citool.txt
-git-clean.txt
-git-clone.txt
-git-column.txt
-git-commit-tree.txt
-git-commit.txt
-git-config.txt
-git-count-objects.txt
-git-credential-cache--daemon.txt
-git-credential-cache.txt
-git-credential-store.txt
-git-credential.txt
-git-cvsexportcommit.txt
-git-cvsimport.txt
-git-cvsserver.txt
-git-daemon.txt
-git-describe.txt
-git-diff-files.txt
-git-diff-index.txt
-git-diff-tree.txt
-git-diff.txt
-git-difftool.txt
-git-fast-export.txt
-git-fast-import.txt
-git-fetch-pack.txt
-git-fetch.txt
-git-filter-branch.txt
-git-fmt-merge-msg.txt
-git-for-each-ref.txt
-git-format-patch.txt
-git-fsck-objects.txt
-git-fsck.txt
-git-gc.txt
-git-get-tar-commit-id.txt
-git-grep.txt
-git-gui.txt
-git-hash-object.txt
-git-help.txt
-git-http-backend.txt
-git-http-fetch.txt
-git-http-push.txt
-git-imap-send.txt
-git-index-pack.txt
-git-init-db.txt
-git-init.txt
-git-instaweb.txt
-git-interpret-trailers.txt
-git-log.txt
-git-ls-files.txt
-git-ls-remote.txt
-git-ls-tree.txt
-git-mailinfo.txt
-git-mailsplit.txt
-git-merge-base.txt
-git-merge-file.txt
-git-merge-index.txt
-git-merge-one-file.txt
-git-merge-tree.txt
-git-merge.txt
-git-mergetool--lib.txt
-git-mergetool.txt
-git-mktag.txt
-git-mktree.txt
-git-mv.txt
-git-name-rev.txt
-git-notes.txt
-git-p4.txt
-git-pack-objects.txt
-git-pack-redundant.txt
-git-pack-refs.txt
-git-parse-remote.txt
-git-patch-id.txt
-git-prune-packed.txt
-git-prune.txt
-git-pull.txt
-git-push.txt
-git-quiltimport.txt
-git-read-tree.txt
-git-rebase.txt
-git-receive-pack.txt
-git-reflog.txt
-git-relink.txt
-git-remote-ext.txt
-git-remote-fd.txt
-git-remote-testgit.txt
-git-remote.txt
-git-repack.txt
-git-replace.txt
-git-request-pull.txt
-git-rerere.txt
-git-reset.txt
-git-rev-list.txt
-git-rev-parse.txt
-git-revert.txt
-git-rm.txt
-git-send-email.txt
-git-send-pack.txt
-git-sh-i18n--envsubst.txt
-git-sh-i18n.txt
-git-sh-setup.txt
-git-shell.txt
-git-shortlog.txt
-git-show-branch.txt
-git-show-index.txt
-git-show-ref.txt
-git-show.txt
-git-stage.txt
-git-stash.txt
-git-status.txt
-git-stripspace.txt
-git-submodule.txt
-git-svn.txt
-git-symbolic-ref.txt
-git-tag.txt
-git-tools.txt
-git-unpack-file.txt
-git-unpack-objects.txt
-git-update-index.txt
-git-update-ref.txt
-git-update-server-info.txt
-git-upload-archive.txt
-git-upload-pack.txt
-git-var.txt
-git-verify-commit.txt
-git-verify-pack.txt
-git-verify-tag.txt
-git-web--browse.txt
-git-whatchanged.txt
-git-worktree.txt
-git-write-tree.txt
diff --git a/core/git/config.h b/core/git/config.h
deleted file mode 100644
index 47cb9d5b..00000000
--- a/core/git/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define DEFAULT_GIT_TEMPLATE_DIR "share/git-core/templates"
-#define ETC_GITATTRIBUTES "/etc/gitattributes"
-#define ETC_GITCONFIG "/etc/gitconfig"
-#define GIT_EXEC_PATH "libexec/git-core"
-#define GIT_HTML_PATH "share/doc/git-doc"
-#define GIT_INFO_PATH "share/info"
-#define GIT_LOCALE_PATH "/share/locale"
-#define GIT_MAN_PATH "share/man"
-#define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.11.0"
-#define NO_SYS_POLL_H
-#define PAGER_ENV "LESS=FRX LV=-c"
-#define SHA1_HEADER <openssl/sha.h>
diff --git a/core/git/gen.rc b/core/git/gen.rc
deleted file mode 100644
index 3fdcabef..00000000
--- a/core/git/gen.rc
+++ /dev/null
@@ -1,381 +0,0 @@
-cflags\
-	-include '$dir'/config.h\
-	-isystem '$builddir'/core/zlib/include\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/core/curl/include\
-	-I '$srcdir' \
-	-I '$srcdir'/compat/regex\
-	-I '$outdir'
-
-rule cmdlist 'wd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$wd/$in >$$wd/$out.tmp && mv $$wd/$out.tmp $$wd/$out'
-build '$outdir'/common-cmds.h cmdlist '$srcdir'/command-list.txt '|' '$srcdir'/Documentation/`{grep -v '^#' commands.txt}
-
-phony deps '$outdir'/common-cmds.h core/^(curl libressl zlib)^/headers
-
-cc exec_cmd.c '||' '$dir'/deps ; with cflags '$cflags ''-DPREFIX=""'''
-cc common-main.c '||' '$dir'/deps
-cc compat/regex/regex.c '||' '$dir'/deps ; with cflags '$cflags -DGAWK -DNO_MBSUPPORT'
-
-# src/Makefile:/^LIB_OBJS.\+=
-lib libgit.a -d '$dir'/deps\
-	abspath.c\
-	advice.c\
-	alias.c\
-	alloc.c\
-	apply.c\
-	archive-tar.c\
-	archive-zip.c\
-	archive.c\
-	argv-array.c\
-	attr.c\
-	base85.c\
-	bisect.c\
-	blob.c\
-	branch.c\
-	bulk-checkin.c\
-	bundle.c\
-	cache-tree.c\
-	color.c\
-	column.c\
-	combine-diff.c\
-	commit.c\
-	compat/obstack.c\
-	compat/regex/regex.c.o\
-	compat/terminal.c\
-	config.c\
-	connect.c\
-	connected.c\
-	convert.c\
-	copy.c\
-	credential.c\
-	csum-file.c\
-	ctype.c\
-	date.c\
-	decorate.c\
-	diff-delta.c\
-	diff-lib.c\
-	diff-no-index.c\
-	diff.c\
-	diffcore-break.c\
-	diffcore-delta.c\
-	diffcore-order.c\
-	diffcore-pickaxe.c\
-	diffcore-rename.c\
-	dir.c\
-	dir-iterator.c\
-	editor.c\
-	entry.c\
-	environment.c\
-	ewah/bitmap.c\
-	ewah/ewah_bitmap.c\
-	ewah/ewah_io.c\
-	ewah/ewah_rlw.c\
-	exec_cmd.c.o\
-	fetch-pack.c\
-	fsck.c\
-	gettext.c\
-	gpg-interface.c\
-	graph.c\
-	grep.c\
-	hashmap.c\
-	help.c\
-	hex.c\
-	ident.c\
-	kwset.c\
-	levenshtein.c\
-	line-log.c\
-	line-range.c\
-	list-objects.c\
-	ll-merge.c\
-	lockfile.c\
-	log-tree.c\
-	mailinfo.c\
-	mailmap.c\
-	match-trees.c\
-	merge-blobs.c\
-	merge-recursive.c\
-	merge.c\
-	mergesort.c\
-	mru.c\
-	name-hash.c\
-	notes-cache.c\
-	notes-merge.c\
-	notes-utils.c\
-	notes.c\
-	object.c\
-	pack-bitmap-write.c\
-	pack-bitmap.c\
-	pack-check.c\
-	pack-objects.c\
-	pack-revindex.c\
-	pack-write.c\
-	pager.c\
-	parse-options-cb.c\
-	parse-options.c\
-	patch-delta.c\
-	patch-ids.c\
-	path.c\
-	pathspec.c\
-	pkt-line.c\
-	preload-index.c\
-	pretty.c\
-	prio-queue.c\
-	progress.c\
-	prompt.c\
-	quote.c\
-	reachable.c\
-	read-cache.c\
-	ref-filter.c\
-	reflog-walk.c\
-	refs.c\
-	refs/files-backend.c\
-	refs/iterator.c\
-	remote.c\
-	replace_object.c\
-	rerere.c\
-	resolve-undo.c\
-	revision.c\
-	run-command.c\
-	send-pack.c\
-	sequencer.c\
-	server-info.c\
-	setup.c\
-	sha1-array.c\
-	sha1-lookup.c\
-	sha1_file.c\
-	sha1_name.c\
-	shallow.c\
-	sideband.c\
-	sigchain.c\
-	split-index.c\
-	strbuf.c\
-	streaming.c\
-	string-list.c\
-	submodule-config.c\
-	submodule.c\
-	symlinks.c\
-	tag.c\
-	tempfile.c\
-	tmp-objdir.c\
-	trace.c\
-	trailer.c\
-	transport-helper.c\
-	transport.c\
-	tree-diff.c\
-	tree-walk.c\
-	tree.c\
-	unpack-trees.c\
-	url.c\
-	urlmatch.c\
-	usage.c\
-	userdiff.c\
-	utf8.c\
-	varint.c\
-	version.c\
-	versioncmp.c\
-	walker.c\
-	wildmatch.c\
-	worktree.c\
-	wrapper.c\
-	write_or_die.c\
-	ws.c\
-	wt-status.c\
-	xdiff-interface.c\
-	zlib.c\
-	\
-	thread-utils.c\
-	libxdiff.a\
-	'$builddir'/^(core/libressl/libcrypto.a.d core/zlib/libz.a)
-
-# src/Makefile:/^XDIFF_OBJS.\+=
-lib libxdiff.a xdiff/^(\
-	xdiffi.c\
-	xprepare.c\
-	xutils.c\
-	xemit.c\
-	xmerge.c\
-	xpatience.c\
-	xhistogram.c\
-)
-
-# src/Makefile:/^BUILTIN_OBJS.\+=
-exe git -d '$dir'/deps git.c common-main.c.o builtin/^(\
-	add.c\
-	am.c\
-	annotate.c\
-	apply.c\
-	archive.c\
-	bisect--helper.c\
-	blame.c\
-	branch.c\
-	bundle.c\
-	cat-file.c\
-	check-attr.c\
-	check-ignore.c\
-	check-mailmap.c\
-	check-ref-format.c\
-	checkout-index.c\
-	checkout.c\
-	clean.c\
-	clone.c\
-	column.c\
-	commit-tree.c\
-	commit.c\
-	config.c\
-	count-objects.c\
-	credential.c\
-	describe.c\
-	diff-files.c\
-	diff-index.c\
-	diff-tree.c\
-	diff.c\
-	fast-export.c\
-	fetch-pack.c\
-	fetch.c\
-	fmt-merge-msg.c\
-	for-each-ref.c\
-	fsck.c\
-	gc.c\
-	get-tar-commit-id.c\
-	grep.c\
-	hash-object.c\
-	help.c\
-	index-pack.c\
-	init-db.c\
-	interpret-trailers.c\
-	log.c\
-	ls-files.c\
-	ls-remote.c\
-	ls-tree.c\
-	mailinfo.c\
-	mailsplit.c\
-	merge.c\
-	merge-base.c\
-	merge-file.c\
-	merge-index.c\
-	merge-ours.c\
-	merge-recursive.c\
-	merge-tree.c\
-	mktag.c\
-	mktree.c\
-	mv.c\
-	name-rev.c\
-	notes.c\
-	pack-objects.c\
-	pack-redundant.c\
-	pack-refs.c\
-	patch-id.c\
-	prune-packed.c\
-	prune.c\
-	pull.c\
-	push.c\
-	read-tree.c\
-	receive-pack.c\
-	reflog.c\
-	remote.c\
-	remote-ext.c\
-	remote-fd.c\
-	repack.c\
-	replace.c\
-	rerere.c\
-	reset.c\
-	rev-list.c\
-	rev-parse.c\
-	revert.c\
-	rm.c\
-	send-pack.c\
-	shortlog.c\
-	show-branch.c\
-	show-ref.c\
-	stripspace.c\
-	submodule--helper.c\
-	symbolic-ref.c\
-	tag.c\
-	unpack-file.c\
-	unpack-objects.c\
-	update-index.c\
-	update-ref.c\
-	update-server-info.c\
-	upload-archive.c\
-	var.c\
-	verify-commit.c\
-	verify-pack.c\
-	verify-tag.c\
-	worktree.c\
-	write-tree.c\
-) libgit.a.d
-file bin/git '$outdir'/git 755
-
-fn x {
-	name=$1
-	shift
-	if(~ $#* 0) srcs=$name.c
-	if not srcs=$*
-	exe git-$name -d '$dir'/deps $srcs common-main.c.o libgit.a.d
-	file libexec/git-core/git-$name '$outdir'/git-$name 755
-}
-
-# src/Makefile:/^PROGRAM_OBJS./+=
-x credential-store
-x daemon
-x fast-import
-x http-backend
-x imap-send imap-send.c '$builddir'/core/libressl/libssl.a.d
-x sh-i18n--envsubst
-x shell
-x show-index
-x upload-pack
-# git-remote-testsvn is intentionally omitted.
-
-x remote-http remote-curl.c http.c http-walker.c '$builddir'/core/curl/libcurl.a.d
-for(remote in https ftp ftps) sym libexec/git-core/git-remote-$remote git-remote-http
-
-rule sh_gen 'sed -f $dir/sh_gen.sed $in >$out.tmp && mv $out.tmp $out'
-fn x {
-	name=$1
-	mode=$2
-	shift
-	build '$outdir'/git-$name sh_gen '$srcdir'/git-$name.sh '|' '$dir'/sh_gen.sed
-	file libexec/git-core/git-$name '$outdir'/git-$name $mode
-}
-
-# src/Makefile:/^SCRIPT_SH.\+=
-x bisect 755
-x difftool--helper 755
-x filter-branch 755
-x merge-octopus 755
-x merge-one-file 755
-x merge-resolve 755
-x mergetool 755
-x quiltimport 755
-x rebase 755
-x remote-testgit 755
-x request-pull 755
-x stash 755
-x submodule 755
-x web--browse 755
-
-# src/Makefile:/^SCRIPT_LIB.\+=
-x mergetool--lib 644
-x parse-remote 644
-x rebase--am 644
-x rebase--interactive 644
-x rebase--merge 644
-x sh-setup 644
-x sh-i18n 644
-
-for(exe in git-^(shell upload-pack))
-	sym bin/$exe ../libexec/git-core/$exe
-for(exe in git-^(receive-pack upload-archive))
-	sym bin/$exe git
-
-# templates
-dir share/git-core/templates/branches 755
-file share/git-core/templates/description '$srcdir'/templates/this--description 644
-file share/git-core/templates/info/exclude '$srcdir'/templates/info--exclude 644
-# Skip the sample hooks and install an empty directory instead.
-dir share/git-core/templates/hooks 755
-
-# TODO: Build and install man pages.
-
-fetch git
diff --git a/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch b/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
deleted file mode 100644
index 717f8b13..00000000
--- a/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b8d3b9e40f00194a25797f606aeebf946b38eba2 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 3 Dec 2016 00:41:41 -0800
-Subject: [PATCH] Drop dashes from builtin invocations in scripts
-
----
- git-merge-octopus.sh  | 2 +-
- git-merge-one-file.sh | 8 ++++----
- git-merge-resolve.sh  | 2 +-
- git-parse-remote.sh   | 2 +-
- git-submodule.sh      | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
-index bcf0d92..6c390d6 100755
---- a/git-merge-octopus.sh
-+++ b/git-merge-octopus.sh
-@@ -100,7 +100,7 @@ do
- 	if test $? -ne 0
- 	then
- 		gettextln "Simple merge did not work, trying automatic merge."
--		git-merge-index -o git-merge-one-file -a ||
-+		git merge-index -o git-merge-one-file -a ||
- 		OCTOPUS_FAILURE=1
- 		next=$(git write-tree 2>/dev/null)
- 	fi
-diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
-index 424b034..9879c59 100755
---- a/git-merge-one-file.sh
-+++ b/git-merge-one-file.sh
-@@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in
- 		;;
- 	esac
- 
--	src1=$(git-unpack-file $2)
--	src2=$(git-unpack-file $3)
-+	src1=$(git unpack-file $2)
-+	src2=$(git unpack-file $3)
- 	case "$1" in
- 	'')
- 		echo "Added $4 in both, but differently."
--		orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
-+		orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
- 		;;
- 	*)
- 		echo "Auto-merging $4"
--		orig=$(git-unpack-file $1)
-+		orig=$(git unpack-file $1)
- 		;;
- 	esac
- 
-diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
-index c9da747..343fe7b 100755
---- a/git-merge-resolve.sh
-+++ b/git-merge-resolve.sh
-@@ -45,7 +45,7 @@ then
- 	exit 0
- else
- 	echo "Simple merge failed, trying Automatic merge."
--	if git-merge-index -o git-merge-one-file -a
-+	if git merge-index -o git-merge-one-file -a
- 	then
- 		exit 0
- 	else
-diff --git a/git-parse-remote.sh b/git-parse-remote.sh
-index d3c3998..dcfa271 100644
---- a/git-parse-remote.sh
-+++ b/git-parse-remote.sh
-@@ -2,7 +2,7 @@
- # upstream branch that should be pulled by "git pull" from the current
- # branch.
- 
--# git-ls-remote could be called from outside a git managed repository;
-+# git ls-remote could be called from outside a git managed repository;
- # this would fail in that case and would issue an error message.
- GIT_DIR=$(git rev-parse -q --git-dir) || :;
- 
-diff --git a/git-submodule.sh b/git-submodule.sh
-index a024a13..4aac71f 100755
---- a/git-submodule.sh
-+++ b/git-submodule.sh
-@@ -843,7 +843,7 @@ cmd_summary() {
- 				test $status != A && test $ignore_config = all && continue
- 			fi
- 			# Also show added or modified modules which are checked out
--			GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
-+			GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 &&
- 			printf '%s\n' "$sm_path"
- 		done
- 	)
-@@ -877,11 +877,11 @@ cmd_summary() {
- 		missing_dst=
- 
- 		test $mod_src = 160000 &&
--		! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
-+		! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null &&
- 		missing_src=t
- 
- 		test $mod_dst = 160000 &&
--		! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
-+		! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null &&
- 		missing_dst=t
- 
- 		display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
--- 
-2.10.2
-
diff --git a/core/git/rev b/core/git/rev
deleted file mode 100644
index 45a4fb75..00000000
--- a/core/git/rev
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/core/git/sh_gen.sed b/core/git/sh_gen.sed
deleted file mode 100644
index ea0f0f21..00000000
--- a/core/git/sh_gen.sed
+++ /dev/null
@@ -1,10 +0,0 @@
-s|@SHELL_PATH@|/bin/sh|
-s|@@DIFF@@|diff|
-s|@@LOCALEDIR@@|/share/locale|g
-s|@@NO_CURL@@||g
-s|@@USE_GETTEXT_SCHEME@@||g
-/^\# @@BROKEN_PATH_FIX@@$/d
-s|@@GITWEBDIR@@|/share/gitweb|g
-s|@@PERL@@|/bin/perl|g
-s|@@SANE_TEXT_GREP@@||g
-s|@@PAGER_ENV@@|LESS=FRX LV=-c|g
diff --git a/core/git/src b/core/git/src
deleted file mode 160000
-Subproject 454cb6bd52a4de614a3633e4f547af03d5c3b64
diff --git a/core/iproute2/gen.rc b/core/iproute2/gen.rc
deleted file mode 100644
index 2b27d2f5..00000000
--- a/core/iproute2/gen.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-cflags\
-	-Wall '-Wformat=2' -Wmissing-declarations -Wmissing-prototypes\
-	-Wold-style-definition -Wstrict-prototypes\
-	-D _GNU_SOURCE\
-	-D HAVE_SETNS\
-	-I '$srcdir'/include\
-	-I '$srcdir'/misc
-
-lib libnetlink.a lib/^(\
-	libgenl.c ll_map.c libnetlink.c\
-	\
-	utils.c rt_names.c ll_types.c ll_proto.c ll_addr.c\
-	inet_proto.c namespace.c json_writer.c\
-	names.c color.c\
-	(dnet ipx mpls)^_ntop.c (dnet ipx mpls)^_pton.c\
-)
-
-exe bin/ip ip/^(\
-	ip.c ipaddress.c ipaddrlabel.c iproute.c iprule.c ipnetns.c\
-	rtm_map.c iptunnel.c ip6tunnel.c tunnel.c ipneigh.c ipntable.c iplink.c\
-	ipmaddr.c ipmonitor.c ipmroute.c ipprefix.c iptuntap.c iptoken.c\
-	ipxfrm.c xfrm_state.c xfrm_policy.c xfrm_monitor.c\
-	iplink_vlan.c link_veth.c link_gre.c iplink_can.c\
-	iplink_macvlan.c ipl2tp.c link_vti.c link_vti6.c\
-	iplink_vxlan.c tcp_metrics.c iplink_ipoib.c ipnetconf.c link_ip6tnl.c\
-	link_iptnl.c link_gre6.c iplink_bond.c iplink_bond_slave.c iplink_hsr.c\
-	iplink_bridge.c iplink_bridge_slave.c ipfou.c iplink_ipvlan.c\
-	iplink_geneve.c iplink_vrf.c iproute_lwtunnel.c ipmacsec.c ipila.c\
-) libnetlink.a
-
-exe bin/bridge\
-	bridge/^(bridge.c fdb.c monitor.c link.c mdb.c vlan.c)\
-	libnetlink.a
-
-yacc ssfilter '$srcdir'/misc/ssfilter.y
-exe bin/ss misc/ss.c '$outdir'/ssfilter.tab.c libnetlink.a
-
-for(exe in bin/^(ip bridge ss)) file $exe '$outdir'/$exe 755
-man=(\
-	bridge ip ss\
-	ip-^(\
-                addrlabel fou gue l2tp macsec maddress monitor mroute neighbour\
-                netconf netns ntable rule tcp_metrics token tunnel xfrm\
-	)\
-) for(man in man/man8/$man.8) file share/$man '$srcdir'/$man 644
-for(man in ip-address ip-link ip-route) {
-	build '$outdir'/$man.8 sed '$srcdir'/man/man8/$man.8.in ; with\
-		expr s,@SYSCONFDIR@,/etc,g
-	file share/man/man8/$man.8 '$outdir'/$man.8 644
-}
-
-fetch git
diff --git a/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch b/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
deleted file mode 100644
index 5c970a38..00000000
--- a/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 26ae3ca3f65a72f980c4e7821944c796be0494a7 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 25 Apr 2015 17:37:46 +0000
-Subject: [PATCH] Remove redundant linux/in{,6}.h includes
-
----
- include/linux/if_bridge.h | 1 -
- include/linux/if_tunnel.h | 2 --
- include/linux/netfilter.h | 2 --
- include/linux/xfrm.h      | 1 -
- 4 files changed, 6 deletions(-)
-
-diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
-index d9c76fe..016b4cc 100644
---- a/include/linux/if_bridge.h
-+++ b/include/linux/if_bridge.h
-@@ -15,7 +15,6 @@
- 
- #include <linux/types.h>
- #include <linux/if_ether.h>
--#include <linux/in6.h>
- 
- #define SYSFS_BRIDGE_ATTR	"bridge"
- #define SYSFS_BRIDGE_FDB	"brforward"
-diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
-index 24aa175..19d557d 100644
---- a/include/linux/if_tunnel.h
-+++ b/include/linux/if_tunnel.h
-@@ -2,9 +2,7 @@
- #define _IF_TUNNEL_H_
- 
- #include <linux/types.h>
--#include <linux/if.h>
- #include <linux/ip.h>
--#include <linux/in6.h>
- #include <asm/byteorder.h>
- 
- 
-diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index b71b4c9..3e4e6ae 100644
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -4,8 +4,6 @@
- #include <linux/types.h>
- 
- #include <linux/sysctl.h>
--#include <linux/in.h>
--#include <linux/in6.h>
- 
- /* Responses from hook functions. */
- #define NF_DROP 0
-diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
-index d09be24..237e9ad 100644
---- a/include/linux/xfrm.h
-+++ b/include/linux/xfrm.h
-@@ -1,7 +1,6 @@
- #ifndef _LINUX_XFRM_H
- #define _LINUX_XFRM_H
- 
--#include <linux/in6.h>
- #include <linux/types.h>
- 
- /* All of the structures in this file may not change size as they are
--- 
-2.10.0
-
diff --git a/core/iproute2/rev b/core/iproute2/rev
deleted file mode 100644
index 00750edc..00000000
--- a/core/iproute2/rev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/core/iproute2/src b/core/iproute2/src
deleted file mode 160000
-Subproject 63ec17a3da8138e6e363e7d89cab4a797d90fa3
diff --git a/core/kbd/config.h b/core/kbd/config.h
deleted file mode 100644
index 0931f0c3..00000000
--- a/core/kbd/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <config-posix.h>
-
-#define PACKAGE "kbd"
-#define PACKAGE_BUGREPORT "gladkov.alexey@gmail.com"
-#define PACKAGE_NAME "kbd"
-#define PACKAGE_STRING "kbd 2.0.3"
-#define PACKAGE_TARNAME "kbd"
-#define PACKAGE_URL "http://kbd-project.org/"
-#define PACKAGE_VERSION "2.0.3"
-#define VERSION "2.0.3"
-
-/* features */
-/* #undef ENABLE_NLS */
-
-/* headers */
-#define HAVE_LIBINTL_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_SYS_DIR_H 1
-#define HAVE_SYS_FILE_H 1
-#define HAVE_SYS_IOCTL_H 1
-/* #undef HAVE_NDIR_H */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* functions */
-#define HAVE_ICONV 1
-#define HAVE_DCGETTEXT 1
-#define HAVE_GETTEXT 1
-
-/* misc */
-#define YYTEXT_POINTER 1
-/* #undef LT_OBJDIR */
diff --git a/core/kbd/gen.rc b/core/kbd/gen.rc
deleted file mode 100644
index fd2c3578..00000000
--- a/core/kbd/gen.rc
+++ /dev/null
@@ -1,74 +0,0 @@
-cflags\
-	-D 'DATADIR=''"/share/kbd"''' \
-	-I include\
-	-I '$dir' \
-	-I '$srcdir' \
-	-I '$srcdir'/src\
-	-I '$srcdir'/src/libkeymap\
-	-I '$srcdir'/src/libkeymap/keymap
-
-lib libcommon.a src/^(getfd.c xmalloc.c kbd_error.c)
-lib libfont.a src/^(kdfontop.c kdmapop.c loadunimap.c psffontop.c utf8.c)
-lib libkeymap.a src/libkeymap/^(\
-	analyze.c\
-	array.c\
-	common.c\
-	diacr.c\
-	dump.c\
-	findfile.c\
-	func.c\
-	kernel.c\
-	kmap.c\
-	ksyms.c\
-	loadkeys.c\
-	modifiers.c\
-	parser.c\
-	summary.c\
-)
-
-# old: loadunimap mapscrn
-# optional: clrunmap getunimap setlogcons setvesablank setpalette screendump
-# i386/x86_64 only: resizecons
-# ubase: chvt
-
-fn x {
-	sect=$1
-	exe=$2
-	shift 2
-	exe $exe src/$exe.c $* libcommon.a libfont.a libkeymap.a
-	file bin/$exe '$outdir'/$exe 755
-	if(~ $sect ?~) {
-		sect=`{printf %s $sect | cut -c -1}
-		build '$outdir'/$exe.$sect sed '$srcdir'/docs/man/man$sect/$exe.$sect.in ; with\
-			expr s,@DATADIR@,/share/kbd,g
-		man='$outdir'/$exe.$sect
-	}
-	if not man='$srcdir'/docs/man/man$sect/$exe.$sect
-	if(~ $sect [18]) file share/man/man$sect/$exe.$sect $man 644
-	status=()
-}
-
-x 1 deallocvt
-x 1~ dumpkeys
-x 1 fgconsole
-x 8 getkeycodes
-x 1 kbd_mode
-x - kbdinfo
-x 1~ loadkeys
-x 1 openvt
-x 1 psfxtable
-x 8~ setfont src/mapscrn.c
-x 8 setkeycodes
-x 8 setvtrgb
-x 8 showconsolefont
-x 1 showkey
-
-# keymap data
-keymaps=`{grep -v '^#' keymaps.txt}
-for(keymap in keymaps/$keymaps) {
-	build '$outdir'/$keymap.gz gzip '$srcdir'/data/$keymap
-	file share/kbd/$keymap.gz '$outdir'/$keymap.gz 644
-}
-sym share/kbd/keymaps/ppc mac
-
-fetch git
diff --git a/core/kbd/keymaps.txt b/core/kbd/keymaps.txt
deleted file mode 100644
index b419eb0c..00000000
--- a/core/kbd/keymaps.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-# <cd src/data/keymaps && find * -type f '!' '(' -name README -o -name mk_modmap ')'
-amiga/amiga-us.map
-amiga/amiga-de.map
-atari/atari-se.map
-atari/atari-uk-falcon.map
-atari/atari-de.map
-atari/atari-us.map
-i386/dvorak/dvorak.map
-i386/dvorak/dvorak-l.map
-i386/dvorak/dvorak-fr.map
-i386/dvorak/ANSI-dvorak.map
-i386/dvorak/no.map
-i386/dvorak/dvorak-uk.map
-i386/dvorak/dvorak-la.map
-i386/dvorak/dvorak-ru.map
-i386/dvorak/dvorak-sv-a1.map
-i386/dvorak/dvorak-ca-fr.map
-i386/dvorak/dvorak-es.map
-i386/dvorak/dvorak-sv-a5.map
-i386/dvorak/dvorak-programmer.map
-i386/dvorak/dvorak-r.map
-i386/azerty/wangbe2.map
-i386/azerty/fr-latin9.map
-i386/azerty/azerty.map
-i386/azerty/fr-latin1.map
-i386/azerty/fr.map
-i386/azerty/wangbe.map
-i386/azerty/fr-pc.map
-i386/azerty/be-latin1.map
-i386/bepo/fr-bepo-latin9.map
-i386/bepo/fr-bepo.map
-i386/qwerty/bg-cp1251.map
-i386/qwerty/ttwin_alt-UTF-8.map
-i386/qwerty/ruwin_cplk-CP1251.map
-i386/qwerty/pl1.map
-i386/qwerty/no-latin1.map
-i386/qwerty/lv-tilde.map
-i386/qwerty/nl2.map
-i386/qwerty/ru-yawerty.map
-i386/qwerty/nl.map
-i386/qwerty/cz-lat2.map
-i386/qwerty/ttwin_cplk-UTF-8.map
-i386/qwerty/ruwin_alt_sh-UTF-8.map
-i386/qwerty/ruwin_ctrl-CP1251.map
-i386/qwerty/tralt.map
-i386/qwerty/ru-ms.map
-i386/qwerty/kyrgyz.map
-i386/qwerty/ua.map
-i386/qwerty/pl2.map
-i386/qwerty/trf.map
-i386/qwerty/it2.map
-i386/qwerty/bywin-cp1251.map
-i386/qwerty/ky_alt_sh-UTF-8.map
-i386/qwerty/ruwin_cplk-KOI8-R.map
-i386/qwerty/et-nodeadkeys.map
-i386/qwerty/us.map
-i386/qwerty/ru_win.map
-i386/qwerty/ruwin_ctrl-UTF-8.map
-i386/qwerty/pt-latin1.map
-i386/qwerty/il.map
-i386/qwerty/no-latin1.doc
-i386/qwerty/it-ibm.map
-i386/qwerty/cf.map
-i386/qwerty/mk0.map
-i386/qwerty/lt.baltic.map
-i386/qwerty/pl.map
-i386/qwerty/trq.map
-i386/qwerty/no.map
-i386/qwerty/dk-latin1.map
-i386/qwerty/ru.map
-i386/qwerty/ua-utf-ws.map
-i386/qwerty/br-abnt2.map
-i386/qwerty/et.map
-i386/qwerty/ru3.map
-i386/qwerty/es-cp850.map
-i386/qwerty/sr-cy.map
-i386/qwerty/cz-lat2-prog.map
-i386/qwerty/il-heb.map
-i386/qwerty/cz-cp1250.map
-i386/qwerty/sk-qwerty.map
-i386/qwerty/ttwin_ct_sh-UTF-8.map
-i386/qwerty/se-fi-ir209.map
-i386/qwerty/pc110.map
-i386/qwerty/fi.map
-i386/qwerty/lt.l4.map
-i386/qwerty/pt-latin9.map
-i386/qwerty/is-latin1-us.map
-i386/qwerty/br-abnt.map
-i386/qwerty/it.map
-i386/qwerty/mk-utf.map
-i386/qwerty/se-ir209.map
-i386/qwerty/defkeymap_V1.0.map
-i386/qwerty/mk-cp1251.map
-i386/qwerty/emacs.map
-i386/qwerty/ruwin_ct_sh-KOI8-R.map
-i386/qwerty/se-fi-lat6.map
-i386/qwerty/ru2.map
-i386/qwerty/mk.map
-i386/qwerty/ruwin_alt-UTF-8.map
-i386/qwerty/ro_std.map
-i386/qwerty/bg_bds-utf8.map
-i386/qwerty/ttwin_ctrl-UTF-8.map
-i386/qwerty/emacs2.map
-i386/qwerty/br-latin1-us.map
-i386/qwerty/ru-cp1251.map
-i386/qwerty/ua-cp1251.map
-i386/qwerty/ro.map
-i386/qwerty/jp106.map
-i386/qwerty/tj_alt-UTF8.map
-i386/qwerty/bg_bds-cp1251.map
-i386/qwerty/pl3.map
-i386/qwerty/pl4.map
-i386/qwerty/ruwin_alt-KOI8-R.map
-i386/qwerty/sk-prog-qwerty.map
-i386/qwerty/tr_q-latin5.map
-i386/qwerty/se-lat6.map
-i386/qwerty/hypermap.m4
-i386/qwerty/hu101.map
-i386/qwerty/dk.map
-i386/qwerty/kazakh.map
-i386/qwerty/ua-ws.map
-i386/qwerty/bg_pho-cp1251.map
-i386/qwerty/ruwin_ctrl-KOI8-R.map
-i386/qwerty/ruwin_ct_sh-UTF-8.map
-i386/qwerty/ru4.map
-i386/qwerty/is-latin1.map
-i386/qwerty/by-cp1251.map
-i386/qwerty/lv.map
-i386/qwerty/ruwin_alt-CP1251.map
-i386/qwerty/ruwin_ct_sh-CP1251.map
-i386/qwerty/lt.map
-i386/qwerty/ro_win.map
-i386/qwerty/us-acentos.map
-i386/qwerty/bg_pho-utf8.map
-i386/qwerty/gr.map
-i386/qwerty/ruwin_cplk-UTF-8.map
-i386/qwerty/defkeymap.map
-i386/qwerty/uk.map
-i386/qwerty/sv-latin1.map
-i386/qwerty/es.map
-i386/qwerty/gr-pc.map
-i386/qwerty/il-phonetic.map
-i386/qwerty/by.map
-i386/qwerty/ru1.map
-i386/qwerty/br-latin1-abnt2.map
-i386/qwerty/cz.map
-i386/qwerty/bashkir.map
-i386/qwerty/bg-cp855.map
-i386/qwerty/la-latin1.map
-i386/qwerty/ua-utf.map
-i386/fgGIod/trf.map
-i386/fgGIod/tr_f-latin5.map
-i386/olpc/pt.map
-i386/olpc/es.map
-i386/colemak/en-latin9.map
-i386/qwertz/de-latin1.map
-i386/qwertz/sg-latin1-lk450.map
-i386/qwertz/de-latin1-nodeadkeys.map
-i386/qwertz/cz-us-qwertz.map
-i386/qwertz/fr_CH.map
-i386/qwertz/de_alt_UTF-8.map
-i386/qwertz/croat.map
-i386/qwertz/sg.map
-i386/qwertz/de_CH-latin1.map
-i386/qwertz/slovene.map
-i386/qwertz/fr_CH-latin1.map
-i386/qwertz/sg-latin1.map
-i386/qwertz/hu.map
-i386/qwertz/de-mobii.map
-i386/qwertz/de.map
-i386/qwertz/sk-qwertz.map
-i386/qwertz/sk-prog-qwertz.map
-i386/qwertz/cz.map
-i386/include/compose.inc
-i386/include/keypad.map
-i386/include/euro2.map
-i386/include/linux-with-alt-and-altgr.inc
-i386/include/euro1.inc
-i386/include/linux-keys-extd.inc
-i386/include/ctrl.map
-i386/include/linux-with-modeshift-altgr.inc
-i386/include/applkey.map
-i386/include/euro.map
-i386/include/qwerty-layout.inc
-i386/include/linux-with-two-alt-keys.inc
-i386/include/euro1.map
-i386/include/unicode.map
-i386/include/backspace.map
-i386/include/windowkeys.map
-i386/include/azerty-layout.inc
-i386/include/linux-keys-bare.inc
-i386/include/qwertz-layout.inc
-include/compose.latin3
-include/compose.8859_7
-include/compose.8859_8
-include/compose.latin4
-include/compose.latin
-include/compose.latin2
-include/vim-compose.latin1
-include/compose.latin1
-mac/all/mac-dk-latin1.map
-mac/all/mac-fi-latin1.map
-mac/all/mac-de-latin1.map
-mac/all/mac-es.map
-mac/all/mac-it.map
-mac/all/mac-be.map
-mac/all/mac-dvorak.map
-mac/all/mac-se.map
-mac/all/mac-us.map
-mac/all/mac-de-latin1-nodeadkeys.map
-mac/all/mac-fr_CH-latin1.map
-mac/all/mac-fr.map
-mac/all/mac-pl.map
-mac/all/mac-pt-latin1.map
-mac/all/mac-template.map
-mac/all/mac-uk.map
-mac/all/mac-de_CH.map
-mac/include/mac-linux-keys-bare.inc
-mac/include/mac-euro2.map
-mac/include/mac-qwertz-layout.inc
-mac/include/mac-azerty-layout.inc
-mac/include/mac-qwerty-layout.inc
-mac/include/mac-euro.map
-sun/sunt5-uk.map
-sun/sunt4-no-latin1.map
-sun/sunt5-fr-latin1.map
-sun/sunt5-cz-us.map
-sun/sun-pl-altgraph.map
-sun/sunt5-de-latin1.map
-sun/sunt5-ru.map
-sun/sunkeymap.map
-sun/sunt4-fi-latin1.map
-sun/sundvorak.map
-sun/sun-pl.map
-sun/sunt6-uk.map
-sun/sunt5-es.map
-sun/sunt4-es.map
-sun/sunt5-fi-latin1.map
-sun/sunt5-us-cz.map
diff --git a/core/kbd/patch/0001-Import-pre-generated-analyze-parser-.-c-h-from-kbd-2.patch b/core/kbd/patch/0001-Import-pre-generated-analyze-parser-.-c-h-from-kbd-2.patch
deleted file mode 100644
index a17c040b..00000000
--- a/core/kbd/patch/0001-Import-pre-generated-analyze-parser-.-c-h-from-kbd-2.patch
+++ /dev/null
@@ -1,5719 +0,0 @@
-From 35fbc125884bc2d8ebe05e25eb205d29c14b1309 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 16 May 2016 22:58:17 -0700
-Subject: [PATCH] Import pre-generated {analyze,parser}.{c,h} from kbd-2.0.3
- distribution archive
-
-This avoids a dependency on bison and flex.
----
- src/libkeymap/analyze.c | 2896 +++++++++++++++++++++++++++++++++++++++++++++++
- src/libkeymap/analyze.h |  368 ++++++
- src/libkeymap/parser.c  | 2238 ++++++++++++++++++++++++++++++++++++
- src/libkeymap/parser.h  |  172 +++
- 4 files changed, 5674 insertions(+)
- create mode 100644 src/libkeymap/analyze.c
- create mode 100644 src/libkeymap/analyze.h
- create mode 100644 src/libkeymap/parser.c
- create mode 100644 src/libkeymap/parser.h
-
-diff --git a/src/libkeymap/analyze.c b/src/libkeymap/analyze.c
-new file mode 100644
-index 0000000..527d507
---- /dev/null
-+++ b/src/libkeymap/analyze.c
-@@ -0,0 +1,2896 @@
-+#line 15 "analyze.l"
-+#include "keymap.h"
-+int stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner);
-+int stack_pop(struct lk_ctx *ctx, void *scanner);
-+
-+
-+
-+#line 9 "analyze.c"
-+
-+#define  YY_INT_ALIGNED short int
-+
-+/* A lexical scanner generated by flex */
-+
-+#define FLEX_SCANNER
-+#define YY_FLEX_MAJOR_VERSION 2
-+#define YY_FLEX_MINOR_VERSION 5
-+#define YY_FLEX_SUBMINOR_VERSION 37
-+#if YY_FLEX_SUBMINOR_VERSION > 0
-+#define FLEX_BETA
-+#endif
-+
-+/* First, we deal with  platform-specific or compiler-specific issues. */
-+
-+/* begin standard C headers. */
-+#include <stdio.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+
-+/* end standard C headers. */
-+
-+/* flex integer type definitions */
-+
-+#ifndef FLEXINT_H
-+#define FLEXINT_H
-+
-+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-+
-+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-+
-+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
-+ * if you want the limit (max/min) macros for int types. 
-+ */
-+#ifndef __STDC_LIMIT_MACROS
-+#define __STDC_LIMIT_MACROS 1
-+#endif
-+
-+#include <inttypes.h>
-+typedef int8_t flex_int8_t;
-+typedef uint8_t flex_uint8_t;
-+typedef int16_t flex_int16_t;
-+typedef uint16_t flex_uint16_t;
-+typedef int32_t flex_int32_t;
-+typedef uint32_t flex_uint32_t;
-+#else
-+typedef signed char flex_int8_t;
-+typedef short int flex_int16_t;
-+typedef int flex_int32_t;
-+typedef unsigned char flex_uint8_t; 
-+typedef unsigned short int flex_uint16_t;
-+typedef unsigned int flex_uint32_t;
-+
-+/* Limits of integral types. */
-+#ifndef INT8_MIN
-+#define INT8_MIN               (-128)
-+#endif
-+#ifndef INT16_MIN
-+#define INT16_MIN              (-32767-1)
-+#endif
-+#ifndef INT32_MIN
-+#define INT32_MIN              (-2147483647-1)
-+#endif
-+#ifndef INT8_MAX
-+#define INT8_MAX               (127)
-+#endif
-+#ifndef INT16_MAX
-+#define INT16_MAX              (32767)
-+#endif
-+#ifndef INT32_MAX
-+#define INT32_MAX              (2147483647)
-+#endif
-+#ifndef UINT8_MAX
-+#define UINT8_MAX              (255U)
-+#endif
-+#ifndef UINT16_MAX
-+#define UINT16_MAX             (65535U)
-+#endif
-+#ifndef UINT32_MAX
-+#define UINT32_MAX             (4294967295U)
-+#endif
-+
-+#endif /* ! C99 */
-+
-+#endif /* ! FLEXINT_H */
-+
-+#ifdef __cplusplus
-+
-+/* The "const" storage-class-modifier is valid. */
-+#define YY_USE_CONST
-+
-+#else	/* ! __cplusplus */
-+
-+/* C99 requires __STDC__ to be defined as 1. */
-+#if defined (__STDC__)
-+
-+#define YY_USE_CONST
-+
-+#endif	/* defined (__STDC__) */
-+#endif	/* ! __cplusplus */
-+
-+#ifdef YY_USE_CONST
-+#define yyconst const
-+#else
-+#define yyconst
-+#endif
-+
-+/* Returned upon end-of-file. */
-+#define YY_NULL 0
-+
-+/* Promotes a possibly negative, possibly signed char to an unsigned
-+ * integer for use as an array index.  If the signed char is negative,
-+ * we want to instead treat it as an 8-bit unsigned char, hence the
-+ * double cast.
-+ */
-+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-+
-+#ifndef YY_GNUC_PREREQ
-+# if defined __GNUC__ && defined __GNUC_MINOR__
-+#  define YY_GNUC_PREREQ(maj, min) \
-+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+# else
-+#  define YY_GNUC_PREREQ(maj, min) 0
-+# endif
-+# if YY_GNUC_PREREQ(2, 5)
-+#  define YY_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-+# else
-+#  define YY_ATTRIBUTE_NORETURN /* __attribute__ ((__noreturn__)) */
-+#  define YY_ATTRIBUTE_UNUSED /* __attribute__ ((__unused__)) */
-+# endif
-+#endif
-+
-+/* An opaque pointer. */
-+#ifndef YY_TYPEDEF_YY_SCANNER_T
-+#define YY_TYPEDEF_YY_SCANNER_T
-+typedef void* yyscan_t;
-+#endif
-+
-+/* For convenience, these vars (plus the bison vars far below)
-+   are macros in the reentrant scanner. */
-+#define yyin yyg->yyin_r
-+#define yyout yyg->yyout_r
-+#define yyextra yyg->yyextra_r
-+#define yyleng yyg->yyleng_r
-+#define yytext yyg->yytext_r
-+#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-+#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-+#define yy_flex_debug yyg->yy_flex_debug_r
-+
-+/* Enter a start condition.  This macro really ought to take a parameter,
-+ * but we do it the disgusting crufty way forced on us by the ()-less
-+ * definition of BEGIN.
-+ */
-+#define BEGIN yyg->yy_start = 1 + 2 *
-+
-+/* Translate the current start state into a value that can be later handed
-+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
-+ * compatibility.
-+ */
-+#define YY_START ((yyg->yy_start - 1) / 2)
-+#define YYSTATE YY_START
-+
-+/* Action number for EOF rule of a given start state. */
-+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-+
-+/* Special action meaning "start processing a new file". */
-+#define YY_NEW_FILE yyrestart(yyin ,yyscanner )
-+
-+#define YY_END_OF_BUFFER_CHAR 0
-+
-+/* Size of default input buffer. */
-+#ifndef YY_BUF_SIZE
-+#define YY_BUF_SIZE 16384
-+#endif
-+
-+/* The state buf must be large enough to hold one state per character in the main buffer.
-+ */
-+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-+
-+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-+#define YY_TYPEDEF_YY_BUFFER_STATE
-+typedef struct yy_buffer_state *YY_BUFFER_STATE;
-+#endif
-+
-+#ifndef YY_TYPEDEF_YY_SIZE_T
-+#define YY_TYPEDEF_YY_SIZE_T
-+typedef size_t yy_size_t;
-+#endif
-+
-+#define EOB_ACT_CONTINUE_SCAN 0
-+#define EOB_ACT_END_OF_FILE 1
-+#define EOB_ACT_LAST_MATCH 2
-+
-+    #define YY_LESS_LINENO(n)
-+    
-+/* Return all but the first "n" matched characters back to the input stream. */
-+#define yyless(n) \
-+	do \
-+		{ \
-+		/* Undo effects of setting up yytext. */ \
-+        int yyless_macro_arg = (n); \
-+        YY_LESS_LINENO(yyless_macro_arg);\
-+		*yy_cp = yyg->yy_hold_char; \
-+		YY_RESTORE_YY_MORE_OFFSET \
-+		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-+		} \
-+	while ( 0 )
-+
-+#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
-+
-+#ifndef YY_STRUCT_YY_BUFFER_STATE
-+#define YY_STRUCT_YY_BUFFER_STATE
-+struct yy_buffer_state
-+	{
-+	FILE *yy_input_file;
-+
-+	char *yy_ch_buf;		/* input buffer */
-+	char *yy_buf_pos;		/* current position in input buffer */
-+
-+	/* Size of input buffer in bytes, not including room for EOB
-+	 * characters.
-+	 */
-+	yy_size_t yy_buf_size;
-+
-+	/* Number of characters read into yy_ch_buf, not including EOB
-+	 * characters.
-+	 */
-+	yy_size_t yy_n_chars;
-+
-+	/* Whether we "own" the buffer - i.e., we know we created it,
-+	 * and can realloc() it to grow it, and should free() it to
-+	 * delete it.
-+	 */
-+	int yy_is_our_buffer;
-+
-+	/* Whether this is an "interactive" input source; if so, and
-+	 * if we're using stdio for input, then we want to use getc()
-+	 * instead of fread(), to make sure we stop fetching input after
-+	 * each newline.
-+	 */
-+	int yy_is_interactive;
-+
-+	/* Whether we're considered to be at the beginning of a line.
-+	 * If so, '^' rules will be active on the next match, otherwise
-+	 * not.
-+	 */
-+	int yy_at_bol;
-+
-+    int yy_bs_lineno; /**< The line count. */
-+    int yy_bs_column; /**< The column count. */
-+    
-+	/* Whether to try to fill the input buffer when we reach the
-+	 * end of it.
-+	 */
-+	int yy_fill_buffer;
-+
-+	int yy_buffer_status;
-+
-+#define YY_BUFFER_NEW 0
-+#define YY_BUFFER_NORMAL 1
-+	/* When an EOF's been seen but there's still some text to process
-+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-+	 * shouldn't try reading from the input source any more.  We might
-+	 * still have a bunch of tokens to match, though, because of
-+	 * possible backing-up.
-+	 *
-+	 * When we actually see the EOF, we change the status to "new"
-+	 * (via yyrestart()), so that the user can continue scanning by
-+	 * just pointing yyin at a new input file.
-+	 */
-+#define YY_BUFFER_EOF_PENDING 2
-+
-+	};
-+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-+
-+/* We provide macros for accessing buffer states in case in the
-+ * future we want to put the buffer states in a more general
-+ * "scanner state".
-+ *
-+ * Returns the top of the stack, or NULL.
-+ */
-+#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
-+                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
-+                          : NULL)
-+
-+/* Same as previous macro, but useful when we know that the buffer stack is not
-+ * NULL or when we need an lvalue. For internal use only.
-+ */
-+#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
-+
-+void yyrestart (FILE *input_file ,yyscan_t yyscanner );
-+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-+void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-+void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-+void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-+void yypop_buffer_state (yyscan_t yyscanner );
-+
-+static void yyensure_buffer_stack (yyscan_t yyscanner );
-+static void yy_load_buffer_state (yyscan_t yyscanner );
-+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
-+
-+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
-+
-+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
-+
-+void *yyalloc (yy_size_t ,yyscan_t yyscanner );
-+void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
-+void yyfree (void * ,yyscan_t yyscanner );
-+
-+#define yy_new_buffer yy_create_buffer
-+
-+#define yy_set_interactive(is_interactive) \
-+	{ \
-+	if ( ! YY_CURRENT_BUFFER ){ \
-+        yyensure_buffer_stack (yyscanner); \
-+		YY_CURRENT_BUFFER_LVALUE =    \
-+            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-+	} \
-+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-+	}
-+
-+#define yy_set_bol(at_bol) \
-+	{ \
-+	if ( ! YY_CURRENT_BUFFER ){\
-+        yyensure_buffer_stack (yyscanner); \
-+		YY_CURRENT_BUFFER_LVALUE =    \
-+            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-+	} \
-+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-+	}
-+
-+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-+
-+/* Begin user sect3 */
-+
-+#define yywrap(yyscanner) 1
-+#define YY_SKIP_YYWRAP
-+
-+typedef unsigned char YY_CHAR;
-+
-+typedef int yy_state_type;
-+
-+#define yytext_ptr yytext_r
-+
-+static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
-+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
-+static int yy_get_next_buffer (yyscan_t yyscanner );
-+static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ) YY_ATTRIBUTE_NORETURN;
-+
-+/* Done after the current pattern has been matched and before the
-+ * corresponding action - sets up yytext.
-+ */
-+#define YY_DO_BEFORE_ACTION \
-+	yyg->yytext_ptr = yy_bp; \
-+	yyleng = (size_t) (yy_cp - yy_bp); \
-+	yyg->yy_hold_char = *yy_cp; \
-+	*yy_cp = '\0'; \
-+	yyg->yy_c_buf_p = yy_cp;
-+
-+#define YY_NUM_RULES 48
-+#define YY_END_OF_BUFFER 49
-+/* This struct is not used in this scanner,
-+   but its presence is necessary. */
-+struct yy_trans_info
-+	{
-+	flex_int32_t yy_verify;
-+	flex_int32_t yy_nxt;
-+	};
-+static yyconst flex_int16_t yy_accept[504] =
-+    {   0,
-+        0,    0,    0,    0,   45,   45,    0,    0,   49,   47,
-+        6,    5,   47,   40,   47,   16,   15,   14,   12,   12,
-+        8,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-+       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-+       47,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   45,   46,   48,    3,   48,    6,    0,    7,    0,
-+        0,   12,    0,   12,    0,   33,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,   35,
-+        0,    0,    0,    0,    0,    0,   10,    0,    0,    0,
-+
-+        4,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   10,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   45,   42,   41,   43,   44,    0,    3,
-+       39,    0,   39,    0,   12,   23,    0,   23,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,   36,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+       23,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+
-+        0,    0,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   41,    2,
-+       38,   37,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   41,   37,    0,    0,
-+       24,    0,    0,    0,    0,   27,   28,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,   20,
-+       21,    0,   21,    0,    0,   34,    0,    0,    0,    0,
-+        0,    0,    0,   21,    0,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,   25,   26,    9,
-+        9,   11,    0,    0,    0,    0,    0,    0,    0,    9,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,   13,   13,   13,   13,   13,   13,   13,    9,
-+        9,   13,   13,   13,   13,   13,   13,   13,    9,    0,
-+        0,   17,   32,   22,    0,    0,   19,   18,   31,    0,
-+        1,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-+       13,   13,    1,    0,    0,    0,    0,    0,    1,   13,
-+       13,   13,   13,   13,    0,   29,   13,   13,    0,   13,
-+
-+       30,   13,    0
-+    } ;
-+
-+static yyconst flex_int32_t yy_ec[256] =
-+    {   0,
-+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    2,    4,    5,    6,    1,    1,    1,    7,    1,
-+        1,    1,    8,    9,   10,    1,    1,   11,   12,   12,
-+       12,   12,   12,   12,   12,   13,   13,    1,    1,    1,
-+       14,    1,    1,    1,   15,   16,   17,   18,   19,   20,
-+       21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
-+       24,   31,   32,   33,   34,   24,   24,   35,   36,   24,
-+        1,   37,    1,    1,   38,    1,   39,   16,   40,   41,
-+
-+       42,   43,   44,   45,   46,   24,   47,   48,   49,   50,
-+       51,   52,   24,   53,   54,   55,   56,   24,   24,   35,
-+       57,   24,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1
-+    } ;
-+
-+static yyconst flex_int32_t yy_meta[58] =
-+    {   0,
-+        1,    1,    2,    1,    3,    1,    1,    1,    1,    1,
-+        4,    4,    4,    1,    4,    4,    4,    4,    4,    4,
-+        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-+        5,    5,    5,    5,    5,    5,    3,    5,    4,    4,
-+        4,    4,    4,    5,    5,    5,    5,    5,    5,    5,
-+        5,    5,    5,    5,    5,    5,    5
-+    } ;
-+
-+static yyconst flex_int16_t yy_base[517] =
-+    {   0,
-+        0,    0,   57,    0,  110,  111,  721,  720,  724,  727,
-+      721,  727,  719,  727,  684,  727,  727,  727,  106,  108,
-+      727,   96,  110,   94,  110,   96,  105,  118,  105,  122,
-+      717,  110,  123,  668,  668,  675,  666,  667,   82,  663,
-+      659,  134,    0,  157,  106,  150,  131,  141,  158,  142,
-+      162,  151,  156,  661,  661,  668,  659,  660,  130,  656,
-+      652,    0,  727,  209,  727,  195,  703,  701,  727,  696,
-+      211,  172,    0,  213,  154,  727,  164,  672,  686,  200,
-+      669,  647,  659,  180,  644,  665,  642,  658,  636,  727,
-+      677,  652,  667,  658,  642,  634,  727,    0,  652,  629,
-+
-+      727,  177,  182,  632,  644,  184,  629,  628,  640,  622,
-+      639,  631,  623,  619,    0,  184,    0,  198,  644,  658,
-+      208,  641,  619,  631,  191,  616,  637,  614,  630,  608,
-+        0,  649,  624,  639,  630,  614,  606,    0,  624,  601,
-+      205,  209,  604,  616,  194,  601,  600,  612,  594,  611,
-+      603,  595,  591,    0,  727,  236,  727,  727,  201,  727,
-+      727,  639,  638,  238,    0,  241,  242,  244,  612,  612,
-+      612,  608,  614,  585,  585,  585,  581,  587,  727,  239,
-+      241,  611,  587,  612,  608,  587,  583,    0,  613,  588,
-+      245,  572,  572,  572,  568,  574,  573,   93,  574,  576,
-+
-+      572,  578,  253,  247,  257,  584,  584,  584,  580,  586,
-+      557,  557,  557,  553,  559,    0,  244,  259,  583,  559,
-+      584,  580,  559,  555,  585,  560,  259,  544,  544,  544,
-+      540,  546,  545,  235,  546,  548,  544,  550,  261,  727,
-+      727,  727,  293,  247,  557,  534,  533,  553,  552,  554,
-+      551,  261,  262,  264,  530,  527,  276,  550,  563,  526,
-+      537,  524,  535,  545,  522,  538,  542,  514,  518,    0,
-+      541,  518,  512,  510,  509,  511,  508,  258,  504,  508,
-+      519,  507,  501,  505,  506,  522,  275,  499,  498,  518,
-+      517,  519,  516,  283,  278,  280,  495,  492,  289,  515,
-+
-+      528,  491,  502,  489,  500,  510,  487,  503,  507,  479,
-+      483,  506,  483,  477,  475,  474,  476,  473,  269,  469,
-+      473,  484,  472,  466,  470,  471,  727,  727,  511,  281,
-+      727,  495,  497,  483,  485,  727,  727,  468,  467,  469,
-+      468,  455,  457,  489,  476,  464,  452,  462,  450,  727,
-+      293,  480,  297,  456,    0,  727,  454,  456,  443,  445,
-+      454,  453,  441,  277,  448,    0,  294,  469,  471,  457,
-+      459,    0,    0,  442,  441,  443,  442,  429,  431,  463,
-+      450,  438,  426,  436,  424,    0,  305,  454,  307,  430,
-+        0,  428,  430,  417,  419,  428,  427,  415,  289,  422,
-+
-+      317,  442,  431,  444,  436,  415,  414,  404,  403,  415,
-+      408,  436,  422,  411,  398,  409,  396,  727,  727,  417,
-+      394,  727,  401,  391,  403,  396,  401,  400,  387,  386,
-+      319,  416,  405,  418,  410,  389,  388,  378,  377,  389,
-+      382,  410,  396,  385,  372,  383,  370,    0,    0,  391,
-+      368,  375,  365,  377,  370,  375,  374,  361,  360,  312,
-+      393,  727,  727,  727,  369,  368,  727,  727,  727,  364,
-+      396,  313,  370,    0,    0,    0,  329,  327,    0,    0,
-+        0,  326,  363,  322,  330,  305,  304,  303,  354,  324,
-+      321,  298,  297,  296,  312,  727,  313,    0,  332,  334,
-+
-+      727,    0,  727,  373,  378,  383,  388,  390,  395,  400,
-+      405,  346,  340,  273,  134,  122
-+    } ;
-+
-+static yyconst flex_int16_t yy_def[517] =
-+    {   0,
-+      503,    1,  503,    3,  504,  504,  505,  505,  503,  503,
-+      503,  503,  506,  503,  507,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  509,  503,  503,  503,  510,  503,  506,  503,  503,
-+      511,  503,  512,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  513,  503,  503,
-+
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  509,  503,  503,  503,  503,  510,  503,
-+      503,  503,  503,  503,  512,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  514,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+
-+      503,  503,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  515,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  516,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  508,  508,  508,  508,  508,  508,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  508,  508,  508,  508,  508,  508,  508,  508,  508,
-+      508,  508,  508,  503,  503,  503,  503,  503,  503,  508,
-+      508,  508,  508,  508,  503,  503,  508,  508,  503,  508,
-+
-+      503,  508,    0,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503
-+    } ;
-+
-+static yyconst flex_int16_t yy_nxt[785] =
-+    {   0,
-+       10,   11,   12,   13,   14,   13,   15,   16,   17,   18,
-+       19,   20,   20,   21,   22,   10,   23,   10,   10,   24,
-+       10,   10,   10,   10,   25,   10,   10,   10,   26,   27,
-+       10,   28,   29,   30,   10,   10,   31,   10,   32,   33,
-+       10,   10,   34,   10,   10,   35,   36,   10,   10,   10,
-+       37,   38,   10,   39,   40,   41,   10,   10,   11,   12,
-+       13,   14,   13,   15,   16,   17,   18,   19,   20,   20,
-+       21,   42,   43,   44,   43,   43,   45,   43,   43,   43,
-+       43,   46,   43,   43,   43,   47,   48,   43,   49,   50,
-+       51,   43,   43,   31,   10,   52,   53,   43,   43,   54,
-+
-+       43,   43,   55,   56,   43,   43,   43,   57,   58,   43,
-+       59,   60,   61,   43,   63,   63,   72,   72,   74,   74,
-+       74,   75,   86,   90,   78,  422,  112,   76,   88,   98,
-+       91,   79,  280,   97,  127,  102,  113,  355,   80,   93,
-+       73,  281,   81,   77,   87,   90,   64,   64,   82,   76,
-+       94,   89,   92,   99,   83,   97,  128,  103,  131,  116,
-+       84,  104,   95,   76,   85,  117,  132,  105,  129,   98,
-+      138,  119,   96,  106,  151,  100,  141,  107,  120,  134,
-+      131,  118,   72,   72,  152,  121,  166,  117,  133,  122,
-+      135,  130,  138,  139,  143,  123,  167,  160,  142,  160,
-+
-+      144,  124,  136,  160,  117,  240,  145,  125,  167,  167,
-+      146,  126,  137,  155,  167,  140,  203,  163,  168,  156,
-+      156,  164,  164,   74,   74,   74,  171,  172,  176,  177,
-+      204,  167,  194,  195,  208,  209,  191,  204,  204,  213,
-+      214,  204,  230,  231,  242,  157,  239,  239,  243,  243,
-+      244,  244,  205,  244,  244,  258,  244,  260,  158,  204,
-+      300,  245,  244,  227,  246,  259,  244,  261,  244,  330,
-+      301,  327,  327,  286,  321,  302,  270,  288,  244,  244,
-+      262,  244,  244,  322,  287,  303,  336,  247,  273,  263,
-+      287,  337,  330,  338,  287,  340,  287,  367,  304,  328,
-+
-+      289,  336,  314,  329,  329,  336,  337,  305,  372,  374,
-+      337,  376,  401,  373,  372,  339,  372,  341,  418,  373,
-+      367,  373,  418,  419,  418,  431,  460,  419,  460,  419,
-+      448,  375,  448,  377,  401,  449,  448,  449,  484,  490,
-+      495,  449,  497,  188,  499,  500,  501,  431,  502,  165,
-+      498,  498,  498,  498,  460,  489,  472,  496,  496,  496,
-+      484,  490,  496,  495,  489,  497,  499,  500,  494,  493,
-+      501,  492,  502,   62,   62,   62,   62,   62,   65,   65,
-+       65,   65,   65,   68,   68,   68,   68,   68,   70,  491,
-+       70,   70,   70,  115,  115,  154,  154,  489,  154,  154,
-+
-+      159,  159,  159,  159,  159,  162,  488,  162,  162,  162,
-+      487,  486,  485,  481,  480,  479,  483,  476,  475,  474,
-+      482,  481,  481,  480,  479,  480,  479,  480,  479,  476,
-+      475,  474,  474,  478,  477,  476,  475,  474,  473,  469,
-+      468,  467,  471,  464,  463,  462,  470,  469,  469,  468,
-+      467,  468,  467,  468,  467,  464,  463,  462,  462,  466,
-+      465,  464,  463,  462,  461,  459,  458,  457,  456,  455,
-+      454,  453,  452,  451,  450,  447,  446,  445,  444,  443,
-+      442,  441,  440,  439,  438,  437,  436,  435,  434,  433,
-+      432,  430,  429,  428,  427,  426,  425,  424,  423,  421,
-+
-+      420,  417,  416,  415,  414,  413,  412,  411,  410,  409,
-+      408,  407,  406,  405,  404,  403,  402,  328,  391,  400,
-+      399,  386,  398,  397,  396,  395,  394,  393,  392,  366,
-+      391,  391,  390,  389,  388,  387,  386,  386,  385,  384,
-+      383,  382,  381,  380,  379,  378,  371,  370,  369,  368,
-+      366,  366,  366,  356,  365,  364,  350,  363,  362,  361,
-+      360,  359,  358,  357,  331,  356,  356,  354,  353,  352,
-+      351,  350,  350,  349,  348,  347,  346,  345,  344,  343,
-+      342,  335,  334,  333,  332,  331,  331,  331,  326,  325,
-+      324,  323,  320,  319,  318,  317,  316,  315,  313,  312,
-+
-+      311,  310,  309,  308,  307,  306,  299,  298,  297,  296,
-+      295,  294,  293,  292,  291,  290,  285,  284,  283,  282,
-+      279,  278,  277,  276,  275,  274,  272,  271,  269,  268,
-+      267,  266,  265,  264,  257,  256,  255,  254,  253,  252,
-+      251,  250,  249,  248,  241,  241,  238,  237,  236,  235,
-+      234,  233,  216,  232,  229,  228,  226,  225,  224,  223,
-+      222,  221,  220,  219,  218,  217,  216,  216,  215,  212,
-+      211,  210,  207,  206,  202,  201,  200,  199,  198,  197,
-+      179,  196,  193,  192,  190,  189,  187,  186,  185,  184,
-+      183,  182,  181,  180,  179,  179,  178,  175,  174,  173,
-+
-+      170,  169,  161,   69,   67,  153,  138,  150,  131,  149,
-+      148,  147,  114,   97,  111,   90,  110,  109,  108,  101,
-+       71,   69,   67,  503,   66,   66,    9,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503
-+    } ;
-+
-+static yyconst flex_int16_t yy_chk[785] =
-+    {   0,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-+        1,    1,    1,    1,    1,    1,    1,    3,    3,    3,
-+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-+
-+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-+        3,    3,    3,    3,    5,    6,   19,   19,   20,   20,
-+       20,   22,   24,   26,   23,  516,   39,   22,   25,   30,
-+       27,   23,  198,   29,   45,   32,   39,  515,   23,   28,
-+       19,  198,   23,   22,   24,   26,    5,    6,   23,   22,
-+       28,   25,   27,   30,   23,   29,   45,   32,   47,   42,
-+       23,   33,   28,   32,   23,   42,   48,   33,   46,   51,
-+       50,   44,   28,   33,   59,   30,   52,   33,   44,   49,
-+       47,   42,   72,   72,   59,   44,   75,   42,   48,   44,
-+       49,   46,   50,   51,   53,   44,   77,   66,   52,   66,
-+
-+       53,   44,   49,  159,   52,  159,   53,   44,   75,  102,
-+       53,   44,   49,   64,  103,   51,  116,   71,   77,   64,
-+       64,   71,   71,   74,   74,   74,   80,   80,   84,   84,
-+      118,  102,  106,  106,  121,  121,  103,  141,  116,  125,
-+      125,  142,  145,  145,  164,   64,  156,  156,  164,  164,
-+      166,  167,  118,  168,  191,  180,  204,  181,   64,  141,
-+      217,  166,  203,  142,  168,  180,  205,  181,  227,  244,
-+      217,  239,  239,  203,  234,  218,  514,  205,  166,  167,
-+      181,  168,  191,  234,  204,  218,  252,  168,  191,  181,
-+      203,  252,  244,  253,  205,  254,  227,  287,  218,  243,
-+
-+      205,  257,  227,  243,  243,  278,  257,  218,  294,  295,
-+      278,  296,  330,  294,  299,  253,  319,  254,  351,  299,
-+      287,  319,  353,  351,  364,  367,  401,  353,  431,  364,
-+      387,  295,  389,  296,  330,  387,  399,  389,  460,  472,
-+      484,  399,  490,  513,  495,  497,  499,  367,  500,  512,
-+      494,  493,  492,  491,  401,  489,  431,  488,  487,  486,
-+      460,  472,  485,  484,  483,  490,  495,  497,  482,  478,
-+      499,  477,  500,  504,  504,  504,  504,  504,  505,  505,
-+      505,  505,  505,  506,  506,  506,  506,  506,  507,  473,
-+      507,  507,  507,  508,  508,  509,  509,  471,  509,  509,
-+
-+      510,  510,  510,  510,  510,  511,  470,  511,  511,  511,
-+      466,  465,  461,  459,  458,  457,  456,  455,  454,  453,
-+      452,  451,  450,  447,  446,  445,  444,  443,  442,  441,
-+      440,  439,  438,  437,  436,  435,  434,  433,  432,  430,
-+      429,  428,  427,  426,  425,  424,  423,  421,  420,  417,
-+      416,  415,  414,  413,  412,  411,  410,  409,  408,  407,
-+      406,  405,  404,  403,  402,  400,  398,  397,  396,  395,
-+      394,  393,  392,  390,  388,  385,  384,  383,  382,  381,
-+      380,  379,  378,  377,  376,  375,  374,  371,  370,  369,
-+      368,  365,  363,  362,  361,  360,  359,  358,  357,  354,
-+
-+      352,  349,  348,  347,  346,  345,  344,  343,  342,  341,
-+      340,  339,  338,  335,  334,  333,  332,  329,  326,  325,
-+      324,  323,  322,  321,  320,  318,  317,  316,  315,  314,
-+      313,  312,  311,  310,  309,  308,  307,  306,  305,  304,
-+      303,  302,  301,  300,  298,  297,  293,  292,  291,  290,
-+      289,  288,  286,  285,  284,  283,  282,  281,  280,  279,
-+      277,  276,  275,  274,  273,  272,  271,  269,  268,  267,
-+      266,  265,  264,  263,  262,  261,  260,  259,  258,  256,
-+      255,  251,  250,  249,  248,  247,  246,  245,  238,  237,
-+      236,  235,  233,  232,  231,  230,  229,  228,  226,  225,
-+
-+      224,  223,  222,  221,  220,  219,  215,  214,  213,  212,
-+      211,  210,  209,  208,  207,  206,  202,  201,  200,  199,
-+      197,  196,  195,  194,  193,  192,  190,  189,  187,  186,
-+      185,  184,  183,  182,  178,  177,  176,  175,  174,  173,
-+      172,  171,  170,  169,  163,  162,  153,  152,  151,  150,
-+      149,  148,  147,  146,  144,  143,  140,  139,  137,  136,
-+      135,  134,  133,  132,  130,  129,  128,  127,  126,  124,
-+      123,  122,  120,  119,  114,  113,  112,  111,  110,  109,
-+      108,  107,  105,  104,  100,   99,   96,   95,   94,   93,
-+       92,   91,   89,   88,   87,   86,   85,   83,   82,   81,
-+
-+       79,   78,   70,   68,   67,   61,   60,   58,   57,   56,
-+       55,   54,   41,   40,   38,   37,   36,   35,   34,   31,
-+       15,   13,   11,    9,    8,    7,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-+      503,  503,  503,  503
-+    } ;
-+
-+/* The intent behind this definition is that it'll catch
-+ * any uses of REJECT which flex missed.
-+ */
-+#define REJECT reject_used_but_not_detected
-+#define yymore() yymore_used_but_not_detected
-+#define YY_MORE_ADJ 0
-+#define YY_RESTORE_YY_MORE_OFFSET
-+#line 1 "analyze.l"
-+#line 2 "analyze.l"
-+#include <stdlib.h>
-+#include <unistd.h> /* readlink */
-+
-+#include "nls.h"
-+#include "kbd.h"
-+#include "contextP.h"
-+#include "ksyms.h"
-+#include "paths.h"
-+
-+#include "parser.h"
-+
-+#define YY_NO_INPUT 1
-+#line 32 "analyze.l"
-+int
-+stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner)
-+{
-+	int i = 0;
-+
-+	while (ctx->stack[i]) i++;
-+
-+	if (i == MAX_INCLUDE_DEPTH) {
-+		ERR(ctx, _("includes are nested too deeply"));
-+		return -1;
-+	}
-+
-+	ctx->stack[i] = fp;
-+
-+	yypush_buffer_state(yy_create_buffer(fp->fd,YY_BUF_SIZE,scanner),scanner);
-+	return 0;
-+}
-+
-+int
-+stack_pop(struct lk_ctx *ctx, void *scanner)
-+{
-+	int i = 0;
-+
-+	while (ctx->stack[i]) i++;
-+	if (!i)
-+		return 0;
-+	i--;
-+
-+	/*
-+	 * The top of stack is input file for library. No need to close it.
-+	 */
-+	if (i) {
-+		lk_fpclose(ctx->stack[i]);
-+		free(ctx->stack[i]);
-+	}
-+	ctx->stack[i] = NULL;
-+
-+	yypop_buffer_state(scanner);
-+	return 0;
-+}
-+
-+/*
-+ * Where shall we look for an include file?
-+ * Current strategy (undocumented, may change):
-+ *
-+ * 1. Look for a user-specified LOADKEYS_INCLUDE_PATH
-+ * 2. Try . and ../include and ../../include
-+ * 3. Try D and D/../include and D/../../include
-+ *    where D is the directory from where we are loading the current file.
-+ * 4. Try KD/include and KD/#/include where KD = DATADIR/KEYMAPDIR.
-+ *
-+ * Expected layout:
-+ * KD has subdirectories amiga, atari, i386, mac, sun, include
-+ * KD/include contains architecture-independent stuff
-+ * like strings and iso-8859-x compose tables.
-+ * KD/i386 has subdirectories qwerty, ... and include;
-+ * this latter include dir contains stuff with keycode=...
-+ *
-+ * (Of course, if the present setup turns out to be reasonable,
-+ * then later also the other architectures will grow and get
-+ * subdirectories, and the hard-coded i386 below will go again.)
-+ *
-+ * People that dislike a dozen lookups for loadkeys
-+ * can easily do "loadkeys file_with_includes; dumpkeys > my_keymap"
-+ * and afterwards use only "loadkeys /fullpath/mykeymap", where no
-+ * lookups are required.
-+ */
-+static const char *const include_dirpath0[] = { "", 0 };
-+static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 };
-+static const char *const include_dirpath3[] = {
-+	DATADIR "/" KEYMAPDIR "/include/",
-+	DATADIR "/" KEYMAPDIR "/i386/include/",
-+	DATADIR "/" KEYMAPDIR "/mac/include/", 0
-+};
-+
-+static const char *const include_suffixes[] = { "", ".inc", 0 };
-+
-+static int
-+find_incl_file_near_fn(struct lk_ctx *ctx, char *s, char *fn, lkfile_t *fp)
-+{
-+	const char *include_dirpath2[] = { 0, 0, 0, 0 };
-+	char *t, *te, *t1 = NULL, *t2 = NULL;
-+	int len, rc = 1;
-+
-+	if (!fn)
-+		return 1;
-+
-+	t = strdup(fn);
-+	if (t == NULL)
-+		goto nomem;
-+
-+	te = strrchr(t, '/');
-+	if (te) {
-+		te[1] = 0;
-+		len = strlen(t);
-+		include_dirpath2[0] = t;
-+		include_dirpath2[1] = t1 = malloc(len + 12);
-+		include_dirpath2[2] = t2 = malloc(len + 15);
-+
-+		if (t1 == NULL || t2 == NULL)
-+			goto nomem;
-+
-+		strcpy(t1, t);
-+		strcat(t1, "../include/");
-+		strcpy(t2, t);
-+		strcat(t2, "../../include/");
-+		rc = lk_findfile(s, include_dirpath2, include_suffixes, fp);
-+		free(t1);
-+		free(t2);
-+	}
-+	free(t);
-+	return rc;
-+
-+nomem:	ERR(ctx, _("out of memory"));
-+	if (t1) free(t1);
-+	if (t2) free(t2);
-+	if (t)  free(t);
-+	return -1;
-+}
-+
-+static int
-+find_standard_incl_file(struct lk_ctx *ctx, char *s, lkfile_t *fp)
-+{
-+	char *pathname;
-+	int rc = 1;
-+	int i = 0;
-+
-+	while (ctx->stack[i]) i++;
-+	if (i == 0)
-+		return -1;
-+	i--;
-+	pathname = ctx->stack[i]->pathname;
-+
-+	if (lk_findfile(s, include_dirpath1, include_suffixes, fp)) {
-+		if ((rc = find_incl_file_near_fn(ctx, s, pathname, fp)) == -1)
-+			return rc;
-+	}
-+
-+	/* If filename is a symlink, also look near its target. */
-+	if (rc) {
-+		char buf[MAXPATHLEN], path[MAXPATHLEN], *ptr;
-+		unsigned int n;
-+
-+		n = readlink(pathname, buf, sizeof(buf));
-+		if (n > 0 && n < sizeof(buf)) {
-+			buf[n] = 0;
-+			if (buf[0] == '/') {
-+				rc = find_incl_file_near_fn(ctx, s, buf, fp);
-+
-+			} else if (strlen(pathname) + n < sizeof(path)) {
-+				strcpy(path, pathname);
-+				path[sizeof(path) - 1] = 0;
-+				ptr = strrchr(path, '/');
-+				if (ptr)
-+					ptr[1] = 0;
-+				strcat(path, buf);
-+				rc = find_incl_file_near_fn(ctx, s, path, fp);
-+			}
-+		}
-+	}
-+
-+	if (rc)
-+		rc = lk_findfile(s, include_dirpath3, include_suffixes, fp);
-+	return rc;
-+}
-+
-+static int
-+find_incl_file(struct lk_ctx *ctx, char *s, lkfile_t *fp)
-+{
-+	char *ev;
-+
-+	if (!s || !*s)
-+		return 1;
-+
-+	if (*s == '/')		/* no path required */
-+		return (lk_findfile(s, include_dirpath0, include_suffixes, fp));
-+
-+	if ((ev = getenv("LOADKEYS_INCLUDE_PATH")) != NULL) {
-+		/* try user-specified path */
-+		const char *user_dir[2] = { 0, 0 };
-+		while (ev) {
-+			int rc;
-+			char *t = strchr(ev, ':');
-+			char sv = 0;
-+			if (t) {
-+				sv = *t;
-+				*t = 0;
-+			}
-+			user_dir[0] = ev;
-+			if (*ev)
-+				rc = lk_findfile(s, user_dir, include_suffixes, fp);
-+			else	/* empty string denotes system path */
-+				rc = find_standard_incl_file(ctx, s, fp);
-+
-+			if (rc <= 0)
-+				return rc;
-+			if (t)
-+				*t++ = sv;
-+			ev = t;
-+		}
-+		return 1;
-+	}
-+	return find_standard_incl_file(ctx, s, fp);
-+}
-+
-+static int
-+open_include(struct lk_ctx *ctx, char *s, yyscan_t scanner)
-+{
-+	int rc;
-+	lkfile_t *fp;
-+
-+	INFO(ctx, _("switching to %s"), s);
-+
-+	fp = malloc(sizeof(lkfile_t));
-+	if (!fp) {
-+		ERR(ctx, _("out of memory"));
-+		return -1;
-+	}
-+	memset(fp, 0, sizeof(lkfile_t));
-+
-+	rc = find_incl_file(ctx, s, fp);
-+	if (rc > 0) {
-+		ERR(ctx, _("cannot open include file %s"), s);
-+		free(s);
-+		return -1;
-+	} else if (rc == -1) {
-+		free(s);
-+		return -1;
-+	}
-+
-+	free(s);
-+
-+	return stack_push(ctx, fp, scanner);
-+}
-+
-+
-+
-+
-+#line 1048 "analyze.c"
-+
-+#define INITIAL 0
-+#define RVALUE 1
-+#define STR 2
-+#define INCLSTR 3
-+
-+#ifndef YY_NO_UNISTD_H
-+/* Special case for "unistd.h", since it is non-ANSI. We include it way
-+ * down here because we want the user's section 1 to have been scanned first.
-+ * The user has a chance to override it with an option.
-+ */
-+#include <unistd.h>
-+#endif
-+
-+#define YY_EXTRA_TYPE struct lk_ctx *
-+
-+/* Holds the entire state of the reentrant scanner. */
-+struct yyguts_t
-+    {
-+
-+    /* User-defined. Not touched by flex. */
-+    YY_EXTRA_TYPE yyextra_r;
-+
-+    /* The rest are the same as the globals declared in the non-reentrant scanner. */
-+    FILE *yyin_r, *yyout_r;
-+    size_t yy_buffer_stack_top; /**< index of top of stack. */
-+    size_t yy_buffer_stack_max; /**< capacity of stack. */
-+    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
-+    char yy_hold_char;
-+    yy_size_t yy_n_chars;
-+    yy_size_t yyleng_r;
-+    char *yy_c_buf_p;
-+    int yy_init;
-+    int yy_start;
-+    int yy_did_buffer_switch_on_eof;
-+    int yy_start_stack_ptr;
-+    int yy_start_stack_depth;
-+    int *yy_start_stack;
-+    yy_state_type yy_last_accepting_state;
-+    char* yy_last_accepting_cpos;
-+
-+    int yylineno_r;
-+    int yy_flex_debug_r;
-+
-+    char *yytext_r;
-+    int yy_more_flag;
-+    int yy_more_len;
-+
-+    YYSTYPE * yylval_r;
-+
-+    }; /* end struct yyguts_t */
-+
-+static int yy_init_globals (yyscan_t yyscanner );
-+
-+    /* This must go here because YYSTYPE and YYLTYPE are included
-+     * from bison output in section 1.*/
-+    #    define yylval yyg->yylval_r
-+    
-+int yylex_init (yyscan_t* scanner);
-+
-+int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-+
-+/* Accessor methods to globals.
-+   These are made visible to non-reentrant scanners for convenience. */
-+
-+int yylex_destroy (yyscan_t yyscanner );
-+
-+int yyget_debug (yyscan_t yyscanner );
-+
-+void yyset_debug (int debug_flag ,yyscan_t yyscanner );
-+
-+YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner );
-+
-+void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
-+
-+FILE *yyget_in (yyscan_t yyscanner );
-+
-+void yyset_in  (FILE * in_str ,yyscan_t yyscanner );
-+
-+FILE *yyget_out (yyscan_t yyscanner );
-+
-+void yyset_out  (FILE * out_str ,yyscan_t yyscanner );
-+
-+yy_size_t yyget_leng (yyscan_t yyscanner );
-+
-+char *yyget_text (yyscan_t yyscanner );
-+
-+int yyget_lineno (yyscan_t yyscanner );
-+
-+void yyset_lineno (int line_number ,yyscan_t yyscanner );
-+
-+int yyget_column  (yyscan_t yyscanner );
-+
-+void yyset_column (int column_no ,yyscan_t yyscanner );
-+
-+YYSTYPE * yyget_lval (yyscan_t yyscanner );
-+
-+void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
-+
-+/* Macros after this point can all be overridden by user definitions in
-+ * section 1.
-+ */
-+
-+#ifndef YY_SKIP_YYWRAP
-+#ifdef __cplusplus
-+extern "C" int yywrap (yyscan_t yyscanner );
-+#else
-+extern int yywrap (yyscan_t yyscanner );
-+#endif
-+#endif
-+
-+#ifndef yytext_ptr
-+static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-+#endif
-+
-+#ifdef YY_NEED_STRLEN
-+static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-+#endif
-+
-+#ifndef YY_NO_INPUT
-+
-+#ifdef __cplusplus
-+static int yyinput (yyscan_t yyscanner );
-+#else
-+static int input (yyscan_t yyscanner );
-+#endif
-+
-+#endif
-+
-+    static void yy_push_state (int new_state ,yyscan_t yyscanner);
-+    
-+    static void yy_pop_state (yyscan_t yyscanner );
-+    
-+/* Amount of stuff to slurp up with each read. */
-+#ifndef YY_READ_BUF_SIZE
-+#define YY_READ_BUF_SIZE 8192
-+#endif
-+
-+/* Copy whatever the last rule matched to the standard output. */
-+#ifndef ECHO
-+/* This used to be an fputs(), but since the string might contain NUL's,
-+ * we now use fwrite().
-+ */
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-+#endif
-+
-+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
-+ * is returned in "result".
-+ */
-+#ifndef YY_INPUT
-+#define YY_INPUT(buf,result,max_size) \
-+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-+		{ \
-+		int c = '*'; \
-+		size_t n; \
-+		for ( n = 0; n < max_size && \
-+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-+			buf[n] = (char) c; \
-+		if ( c == '\n' ) \
-+			buf[n++] = (char) c; \
-+		if ( c == EOF && ferror( yyin ) ) \
-+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-+		result = n; \
-+		} \
-+	else \
-+		{ \
-+		errno=0; \
-+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-+			{ \
-+			if( errno != EINTR) \
-+				{ \
-+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-+				break; \
-+				} \
-+			errno=0; \
-+			clearerr(yyin); \
-+			} \
-+		}\
-+\
-+
-+#endif
-+
-+/* No semi-colon after return; correct usage is to write "yyterminate();" -
-+ * we don't want an extra ';' after the "return" because that will cause
-+ * some compilers to complain about unreachable statements.
-+ */
-+#ifndef yyterminate
-+#define yyterminate() return YY_NULL
-+#endif
-+
-+/* Number of entries by which start-condition stack grows. */
-+#ifndef YY_START_STACK_INCR
-+#define YY_START_STACK_INCR 25
-+#endif
-+
-+/* Report a fatal error. */
-+#ifndef YY_FATAL_ERROR
-+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
-+#endif
-+
-+/* end tables serialization structures and prototypes */
-+
-+/* Default declaration of generated scanner - a define so the user can
-+ * easily add parameters.
-+ */
-+#ifndef YY_DECL
-+#define YY_DECL_IS_OURS 1
-+
-+extern int yylex \
-+               (YYSTYPE * yylval_param ,yyscan_t yyscanner);
-+
-+#define YY_DECL int yylex \
-+               (YYSTYPE * yylval_param , yyscan_t yyscanner)
-+#endif /* !YY_DECL */
-+
-+/* Code executed at the beginning of each rule, after yytext and yyleng
-+ * have been set up.
-+ */
-+#ifndef YY_USER_ACTION
-+#define YY_USER_ACTION
-+#endif
-+
-+/* Code executed at the end of each rule. */
-+#ifndef YY_BREAK
-+#define YY_BREAK break;
-+#endif
-+
-+#define YY_RULE_SETUP \
-+	YY_USER_ACTION
-+
-+/** The main scanner function which does all the work.
-+ */
-+YY_DECL
-+{
-+	register yy_state_type yy_current_state;
-+	register char *yy_cp, *yy_bp;
-+	register int yy_act;
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+#line 306 "analyze.l"
-+
-+
-+#line 1291 "analyze.c"
-+
-+    yylval = yylval_param;
-+
-+	if ( !yyg->yy_init )
-+		{
-+		yyg->yy_init = 1;
-+
-+#ifdef YY_USER_INIT
-+		YY_USER_INIT;
-+#endif
-+
-+		if ( ! yyg->yy_start )
-+			yyg->yy_start = 1;	/* first start state */
-+
-+		if ( ! yyin )
-+			yyin = stdin;
-+
-+		if ( ! yyout )
-+			yyout = stdout;
-+
-+		if ( ! YY_CURRENT_BUFFER ) {
-+			yyensure_buffer_stack (yyscanner);
-+			YY_CURRENT_BUFFER_LVALUE =
-+				yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-+		}
-+
-+		yy_load_buffer_state(yyscanner );
-+		}
-+
-+	while ( 1 )		/* loops until end-of-file is reached */
-+		{
-+		yy_cp = yyg->yy_c_buf_p;
-+
-+		/* Support of yytext. */
-+		*yy_cp = yyg->yy_hold_char;
-+
-+		/* yy_bp points to the position in yy_ch_buf of the start of
-+		 * the current run.
-+		 */
-+		yy_bp = yy_cp;
-+
-+		yy_current_state = yyg->yy_start;
-+yy_match:
-+		do
-+			{
-+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
-+			if ( yy_accept[yy_current_state] )
-+				{
-+				yyg->yy_last_accepting_state = yy_current_state;
-+				yyg->yy_last_accepting_cpos = yy_cp;
-+				}
-+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-+				{
-+				yy_current_state = (int) yy_def[yy_current_state];
-+				if ( yy_current_state >= 504 )
-+					yy_c = yy_meta[(unsigned int) yy_c];
-+				}
-+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-+			++yy_cp;
-+			}
-+		while ( yy_current_state != 503 );
-+		yy_cp = yyg->yy_last_accepting_cpos;
-+		yy_current_state = yyg->yy_last_accepting_state;
-+
-+yy_find_action:
-+		yy_act = yy_accept[yy_current_state];
-+
-+		YY_DO_BEFORE_ACTION;
-+
-+do_action:	/* This label is used only to access EOF actions. */
-+
-+		switch ( yy_act )
-+	{ /* beginning of action switch */
-+			case 0: /* must back up */
-+			/* undo the effects of YY_DO_BEFORE_ACTION */
-+			*yy_cp = yyg->yy_hold_char;
-+			yy_cp = yyg->yy_last_accepting_cpos;
-+			yy_current_state = yyg->yy_last_accepting_state;
-+			goto yy_find_action;
-+
-+case 1:
-+YY_RULE_SETUP
-+#line 308 "analyze.l"
-+{
-+				yy_push_state(INCLSTR, yyscanner);
-+			}
-+	YY_BREAK
-+case 2:
-+YY_RULE_SETUP
-+#line 311 "analyze.l"
-+{
-+				char *s = strndup(yytext+1, strlen(yytext)-2);
-+				if (s == NULL) {
-+					ERR(yyextra, _("out of memory"));
-+					return(ERROR);
-+				}
-+
-+				if (open_include(yyextra, s, yyscanner) == -1)
-+					return(ERROR);
-+
-+				while (((struct yyguts_t*)yyscanner)->yy_start_stack_ptr) {
-+					yy_pop_state(yyscanner);
-+				}
-+			}
-+	YY_BREAK
-+case 3:
-+/* rule 3 can match eol */
-+YY_RULE_SETUP
-+#line 325 "analyze.l"
-+{
-+				ERR(yyextra, _("expected filename between quotes"));
-+				return(ERROR);
-+			}
-+	YY_BREAK
-+case YY_STATE_EOF(INITIAL):
-+case YY_STATE_EOF(RVALUE):
-+case YY_STATE_EOF(STR):
-+case YY_STATE_EOF(INCLSTR):
-+#line 329 "analyze.l"
-+{
-+				stack_pop(yyextra, yyscanner);
-+				if (!YY_CURRENT_BUFFER)
-+					yyterminate();
-+			}
-+	YY_BREAK
-+case 4:
-+/* rule 4 can match eol */
-+YY_RULE_SETUP
-+#line 334 "analyze.l"
-+{
-+				yyset_lineno(yyget_lineno(yyscanner) + 1,yyscanner);
-+			}
-+	YY_BREAK
-+case 5:
-+/* rule 5 can match eol */
-+YY_RULE_SETUP
-+#line 337 "analyze.l"
-+{
-+				yyset_lineno(yyget_lineno(yyscanner) + 1,yyscanner);
-+
-+				while (((struct yyguts_t*)yyscanner)->yy_start_stack_ptr) {
-+					yy_pop_state(yyscanner);
-+				}
-+				return(EOL);
-+			}
-+	YY_BREAK
-+case 6:
-+YY_RULE_SETUP
-+#line 345 "analyze.l"
-+; /* do nothing */
-+	YY_BREAK
-+case 7:
-+/* rule 7 can match eol */
-+*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-+yyg->yy_c_buf_p = yy_cp -= 1;
-+YY_DO_BEFORE_ACTION; /* set up yytext again */
-+YY_RULE_SETUP
-+#line 346 "analyze.l"
-+; /* do nothing */
-+	YY_BREAK
-+case 8:
-+YY_RULE_SETUP
-+#line 347 "analyze.l"
-+{
-+				yy_push_state(RVALUE, yyscanner);
-+				lk_array_empty(yyextra->key_line);
-+				return(EQUALS);
-+			}
-+	YY_BREAK
-+case 9:
-+YY_RULE_SETUP
-+#line 352 "analyze.l"
-+{
-+				yy_push_state(RVALUE, yyscanner);
-+				return(STRING);
-+			}
-+	YY_BREAK
-+case 10:
-+YY_RULE_SETUP
-+#line 356 "analyze.l"
-+{
-+				yy_push_state(RVALUE, yyscanner);
-+				return(TO);
-+			}
-+	YY_BREAK
-+case 11:
-+YY_RULE_SETUP
-+#line 360 "analyze.l"
-+{
-+				yylval->num = strtol(yytext + 1, NULL, 16);
-+				if (yylval->num >= 0xf000) {
-+					ERR(yyextra, _("unicode keysym out of range: %s"),
-+						yytext);
-+					return(ERROR);
-+				}
-+				return(UNUMBER);
-+			}
-+	YY_BREAK
-+case 12:
-+YY_RULE_SETUP
-+#line 369 "analyze.l"
-+{
-+				yylval->num = strtol(yytext, NULL, 0);
-+				return(NUMBER);
-+			}
-+	YY_BREAK
-+case 13:
-+YY_RULE_SETUP
-+#line 373 "analyze.l"
-+{	return((yylval->num = ksymtocode(yyextra, yytext, TO_AUTO)) == -1 ? ERROR : LITERAL);	}
-+	YY_BREAK
-+case 14:
-+YY_RULE_SETUP
-+#line 374 "analyze.l"
-+{	return(DASH);		}
-+	YY_BREAK
-+case 15:
-+YY_RULE_SETUP
-+#line 375 "analyze.l"
-+{	return(COMMA);		}
-+	YY_BREAK
-+case 16:
-+YY_RULE_SETUP
-+#line 376 "analyze.l"
-+{	return(PLUS);		}
-+	YY_BREAK
-+case 17:
-+YY_RULE_SETUP
-+#line 377 "analyze.l"
-+{	return(CHARSET);	}
-+	YY_BREAK
-+case 18:
-+YY_RULE_SETUP
-+#line 378 "analyze.l"
-+{	return(KEYMAPS);	}
-+	YY_BREAK
-+case 19:
-+YY_RULE_SETUP
-+#line 379 "analyze.l"
-+{	return(KEYCODE);	}
-+	YY_BREAK
-+case 20:
-+YY_RULE_SETUP
-+#line 380 "analyze.l"
-+{	return(PLAIN);		}
-+	YY_BREAK
-+case 21:
-+YY_RULE_SETUP
-+#line 381 "analyze.l"
-+{	return(SHIFT);		}
-+	YY_BREAK
-+case 22:
-+YY_RULE_SETUP
-+#line 382 "analyze.l"
-+{	return(CONTROL);	}
-+	YY_BREAK
-+case 23:
-+YY_RULE_SETUP
-+#line 383 "analyze.l"
-+{	return(ALT);		}
-+	YY_BREAK
-+case 24:
-+YY_RULE_SETUP
-+#line 384 "analyze.l"
-+{	return(ALTGR);		}
-+	YY_BREAK
-+case 25:
-+YY_RULE_SETUP
-+#line 385 "analyze.l"
-+{	return(SHIFTL);		}
-+	YY_BREAK
-+case 26:
-+YY_RULE_SETUP
-+#line 386 "analyze.l"
-+{	return(SHIFTR);		}
-+	YY_BREAK
-+case 27:
-+YY_RULE_SETUP
-+#line 387 "analyze.l"
-+{	return(CTRLL);		}
-+	YY_BREAK
-+case 28:
-+YY_RULE_SETUP
-+#line 388 "analyze.l"
-+{	return(CTRLR);		}
-+	YY_BREAK
-+case 29:
-+YY_RULE_SETUP
-+#line 389 "analyze.l"
-+{	return(CAPSSHIFT);	}
-+	YY_BREAK
-+case 30:
-+YY_RULE_SETUP
-+#line 390 "analyze.l"
-+{	return(ALT_IS_META);	}
-+	YY_BREAK
-+case 31:
-+YY_RULE_SETUP
-+#line 391 "analyze.l"
-+{	return(STRINGS);	}
-+	YY_BREAK
-+case 32:
-+YY_RULE_SETUP
-+#line 392 "analyze.l"
-+{	return(COMPOSE);	}
-+	YY_BREAK
-+case 33:
-+YY_RULE_SETUP
-+#line 393 "analyze.l"
-+{	return(AS);		}
-+	YY_BREAK
-+case 34:
-+YY_RULE_SETUP
-+#line 394 "analyze.l"
-+{	return(USUAL);		}
-+	YY_BREAK
-+case 35:
-+YY_RULE_SETUP
-+#line 395 "analyze.l"
-+{	return(ON);		}
-+	YY_BREAK
-+case 36:
-+YY_RULE_SETUP
-+#line 396 "analyze.l"
-+{	return(FOR);		}
-+	YY_BREAK
-+case 37:
-+YY_RULE_SETUP
-+#line 397 "analyze.l"
-+{
-+				yylval->num = strtol(yytext + 2, NULL, 8);
-+				return(CCHAR);
-+			}
-+	YY_BREAK
-+case 38:
-+YY_RULE_SETUP
-+#line 401 "analyze.l"
-+{
-+				yylval->num = (unsigned char) yytext[2];
-+				return(CCHAR);
-+			}
-+	YY_BREAK
-+case 39:
-+YY_RULE_SETUP
-+#line 405 "analyze.l"
-+{
-+				yylval->num = (unsigned char) yytext[1];
-+				return(CCHAR);
-+			}
-+	YY_BREAK
-+case 40:
-+YY_RULE_SETUP
-+#line 409 "analyze.l"
-+{
-+				yylval->str.data[0] = '\0';
-+				yylval->str.len = 0;
-+
-+				yy_push_state(STR, yyscanner);
-+			}
-+	YY_BREAK
-+case 41:
-+YY_RULE_SETUP
-+#line 415 "analyze.l"
-+{
-+				if (yylval->str.len == MAX_PARSER_STRING) {
-+					ERR(yyextra, _("string too long"));
-+					return(ERROR);
-+				}
-+				yylval->str.data[yylval->str.len++] = strtol(yytext + 1, NULL, 8);
-+			}
-+	YY_BREAK
-+case 42:
-+YY_RULE_SETUP
-+#line 422 "analyze.l"
-+{
-+				if (yylval->str.len == MAX_PARSER_STRING) {
-+					ERR(yyextra, _("string too long"));
-+					return(ERROR);
-+				}
-+				yylval->str.data[yylval->str.len++] = '"';
-+			}
-+	YY_BREAK
-+case 43:
-+YY_RULE_SETUP
-+#line 429 "analyze.l"
-+{
-+				if (yylval->str.len == MAX_PARSER_STRING) {
-+					ERR(yyextra, _("string too long"));
-+					return(ERROR);
-+				}
-+				yylval->str.data[yylval->str.len++] = '\\';
-+			}
-+	YY_BREAK
-+case 44:
-+YY_RULE_SETUP
-+#line 436 "analyze.l"
-+{
-+				if (yylval->str.len == MAX_PARSER_STRING) {
-+					ERR(yyextra, _("string too long"));
-+					return(ERROR);
-+				}
-+				yylval->str.data[yylval->str.len++] = '\n';
-+			}
-+	YY_BREAK
-+case 45:
-+/* rule 45 can match eol */
-+YY_RULE_SETUP
-+#line 443 "analyze.l"
-+{
-+				int len = strlen(yytext);
-+
-+				if (yylval->str.len + len >= MAX_PARSER_STRING) {
-+					ERR(yyextra, _("string too long"));
-+					return(ERROR);
-+				}
-+
-+				strcpy((char *) yylval->str.data + yylval->str.len, yytext);
-+				yylval->str.len += len;
-+			}
-+	YY_BREAK
-+case 46:
-+YY_RULE_SETUP
-+#line 454 "analyze.l"
-+{
-+				yylval->str.data[yylval->str.len] = '\0';
-+				while (((struct yyguts_t*)yyscanner)->yy_start_stack_ptr) {
-+					yy_pop_state(yyscanner);
-+				}
-+				return(STRLITERAL);
-+			}
-+	YY_BREAK
-+case 47:
-+YY_RULE_SETUP
-+#line 461 "analyze.l"
-+{
-+				return(ERROR);
-+			}
-+	YY_BREAK
-+case 48:
-+YY_RULE_SETUP
-+#line 464 "analyze.l"
-+ECHO;
-+	YY_BREAK
-+#line 1735 "analyze.c"
-+
-+	case YY_END_OF_BUFFER:
-+		{
-+		/* Amount of text matched not including the EOB char. */
-+		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
-+
-+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-+		*yy_cp = yyg->yy_hold_char;
-+		YY_RESTORE_YY_MORE_OFFSET
-+
-+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-+			{
-+			/* We're scanning a new file or input source.  It's
-+			 * possible that this happened because the user
-+			 * just pointed yyin at a new source and called
-+			 * yylex().  If so, then we have to assure
-+			 * consistency between YY_CURRENT_BUFFER and our
-+			 * globals.  Here is the right place to do so, because
-+			 * this is the first action (other than possibly a
-+			 * back-up) that will match for the new input source.
-+			 */
-+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-+			}
-+
-+		/* Note that here we test for yy_c_buf_p "<=" to the position
-+		 * of the first EOB in the buffer, since yy_c_buf_p will
-+		 * already have been incremented past the NUL character
-+		 * (since all states make transitions on EOB to the
-+		 * end-of-buffer state).  Contrast this with the test
-+		 * in input().
-+		 */
-+		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-+			{ /* This was really a NUL. */
-+			yy_state_type yy_next_state;
-+
-+			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
-+
-+			yy_current_state = yy_get_previous_state( yyscanner );
-+
-+			/* Okay, we're now positioned to make the NUL
-+			 * transition.  We couldn't have
-+			 * yy_get_previous_state() go ahead and do it
-+			 * for us because it doesn't know how to deal
-+			 * with the possibility of jamming (and we don't
-+			 * want to build jamming into it because then it
-+			 * will run more slowly).
-+			 */
-+
-+			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
-+
-+			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-+
-+			if ( yy_next_state )
-+				{
-+				/* Consume the NUL. */
-+				yy_cp = ++yyg->yy_c_buf_p;
-+				yy_current_state = yy_next_state;
-+				goto yy_match;
-+				}
-+
-+			else
-+				{
-+				yy_cp = yyg->yy_last_accepting_cpos;
-+				yy_current_state = yyg->yy_last_accepting_state;
-+				goto yy_find_action;
-+				}
-+			}
-+
-+		else switch ( yy_get_next_buffer( yyscanner ) )
-+			{
-+			case EOB_ACT_END_OF_FILE:
-+				{
-+				yyg->yy_did_buffer_switch_on_eof = 0;
-+
-+				if ( yywrap(yyscanner ) )
-+					{
-+					/* Note: because we've taken care in
-+					 * yy_get_next_buffer() to have set up
-+					 * yytext, we can now set up
-+					 * yy_c_buf_p so that if some total
-+					 * hoser (like flex itself) wants to
-+					 * call the scanner after we return the
-+					 * YY_NULL, it'll still work - another
-+					 * YY_NULL will get returned.
-+					 */
-+					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
-+
-+					yy_act = YY_STATE_EOF(YY_START);
-+					goto do_action;
-+					}
-+
-+				else
-+					{
-+					if ( ! yyg->yy_did_buffer_switch_on_eof )
-+						YY_NEW_FILE;
-+					}
-+				break;
-+				}
-+
-+			case EOB_ACT_CONTINUE_SCAN:
-+				yyg->yy_c_buf_p =
-+					yyg->yytext_ptr + yy_amount_of_matched_text;
-+
-+				yy_current_state = yy_get_previous_state( yyscanner );
-+
-+				yy_cp = yyg->yy_c_buf_p;
-+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-+				goto yy_match;
-+
-+			case EOB_ACT_LAST_MATCH:
-+				yyg->yy_c_buf_p =
-+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
-+
-+				yy_current_state = yy_get_previous_state( yyscanner );
-+
-+				yy_cp = yyg->yy_c_buf_p;
-+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-+				goto yy_find_action;
-+			}
-+		break;
-+		}
-+
-+	default:
-+		YY_FATAL_ERROR(
-+			"fatal flex scanner internal error--no action found" );
-+	} /* end of action switch */
-+		} /* end of scanning one token */
-+} /* end of yylex */
-+
-+/* yy_get_next_buffer - try to read in a new buffer
-+ *
-+ * Returns a code representing an action:
-+ *	EOB_ACT_LAST_MATCH -
-+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
-+ *	EOB_ACT_END_OF_FILE - end of file
-+ */
-+static int yy_get_next_buffer (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-+	register char *source = yyg->yytext_ptr;
-+	register int number_to_move, i;
-+	int ret_val;
-+
-+	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
-+		YY_FATAL_ERROR(
-+		"fatal flex scanner internal error--end of buffer missed" );
-+
-+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-+		{ /* Don't try to fill the buffer, so this is an EOF. */
-+		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
-+			{
-+			/* We matched a single character, the EOB, so
-+			 * treat this as a final EOF.
-+			 */
-+			return EOB_ACT_END_OF_FILE;
-+			}
-+
-+		else
-+			{
-+			/* We matched some text prior to the EOB, first
-+			 * process it.
-+			 */
-+			return EOB_ACT_LAST_MATCH;
-+			}
-+		}
-+
-+	/* Try to read more data. */
-+
-+	/* First move last chars to start of buffer. */
-+	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
-+
-+	for ( i = 0; i < number_to_move; ++i )
-+		*(dest++) = *(source++);
-+
-+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-+		/* don't do the read, it's not guaranteed to return an EOF,
-+		 * just force an EOF
-+		 */
-+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
-+
-+	else
-+		{
-+			yy_size_t num_to_read =
-+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-+
-+		while ( num_to_read <= 0 )
-+			{ /* Not enough room in the buffer - grow it. */
-+
-+			/* just a shorter name for the current buffer */
-+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
-+
-+			int yy_c_buf_p_offset =
-+				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
-+
-+			if ( b->yy_is_our_buffer )
-+				{
-+				yy_size_t new_size = b->yy_buf_size * 2;
-+
-+				if ( new_size <= 0 )
-+					b->yy_buf_size += b->yy_buf_size / 8;
-+				else
-+					b->yy_buf_size *= 2;
-+
-+				b->yy_ch_buf = (char *)
-+					/* Include room in for 2 EOB chars. */
-+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
-+				}
-+			else
-+				/* Can't grow it, we don't own it. */
-+				b->yy_ch_buf = 0;
-+
-+			if ( ! b->yy_ch_buf )
-+				YY_FATAL_ERROR(
-+				"fatal error - scanner input buffer overflow" );
-+
-+			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-+
-+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-+						number_to_move - 1;
-+
-+			}
-+
-+		if ( num_to_read > YY_READ_BUF_SIZE )
-+			num_to_read = YY_READ_BUF_SIZE;
-+
-+		/* Read in more data. */
-+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-+			yyg->yy_n_chars, num_to_read );
-+
-+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-+		}
-+
-+	if ( yyg->yy_n_chars == 0 )
-+		{
-+		if ( number_to_move == YY_MORE_ADJ )
-+			{
-+			ret_val = EOB_ACT_END_OF_FILE;
-+			yyrestart(yyin  ,yyscanner);
-+			}
-+
-+		else
-+			{
-+			ret_val = EOB_ACT_LAST_MATCH;
-+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-+				YY_BUFFER_EOF_PENDING;
-+			}
-+		}
-+
-+	else
-+		ret_val = EOB_ACT_CONTINUE_SCAN;
-+
-+	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-+		/* Extend the array by 50%, plus the number we really need. */
-+		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
-+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
-+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-+	}
-+
-+	yyg->yy_n_chars += number_to_move;
-+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-+
-+	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-+
-+	return ret_val;
-+}
-+
-+/* yy_get_previous_state - get the state just before the EOB char was reached */
-+
-+    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
-+{
-+	register yy_state_type yy_current_state;
-+	register char *yy_cp;
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+	yy_current_state = yyg->yy_start;
-+
-+	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
-+		{
-+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-+		if ( yy_accept[yy_current_state] )
-+			{
-+			yyg->yy_last_accepting_state = yy_current_state;
-+			yyg->yy_last_accepting_cpos = yy_cp;
-+			}
-+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-+			{
-+			yy_current_state = (int) yy_def[yy_current_state];
-+			if ( yy_current_state >= 504 )
-+				yy_c = yy_meta[(unsigned int) yy_c];
-+			}
-+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-+		}
-+
-+	return yy_current_state;
-+}
-+
-+/* yy_try_NUL_trans - try to make a transition on the NUL character
-+ *
-+ * synopsis
-+ *	next_state = yy_try_NUL_trans( current_state );
-+ */
-+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
-+{
-+	register int yy_is_jam;
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-+	register char *yy_cp = yyg->yy_c_buf_p;
-+
-+	register YY_CHAR yy_c = 1;
-+	if ( yy_accept[yy_current_state] )
-+		{
-+		yyg->yy_last_accepting_state = yy_current_state;
-+		yyg->yy_last_accepting_cpos = yy_cp;
-+		}
-+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-+		{
-+		yy_current_state = (int) yy_def[yy_current_state];
-+		if ( yy_current_state >= 504 )
-+			yy_c = yy_meta[(unsigned int) yy_c];
-+		}
-+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-+	yy_is_jam = (yy_current_state == 503);
-+
-+	(void)yyg;
-+	return yy_is_jam ? 0 : yy_current_state;
-+}
-+
-+#ifndef YY_NO_INPUT
-+#ifdef __cplusplus
-+    static int yyinput (yyscan_t yyscanner)
-+#else
-+    static int input  (yyscan_t yyscanner)
-+#endif
-+
-+{
-+	int c;
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+	*yyg->yy_c_buf_p = yyg->yy_hold_char;
-+
-+	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-+		{
-+		/* yy_c_buf_p now points to the character we want to return.
-+		 * If this occurs *before* the EOB characters, then it's a
-+		 * valid NUL; if not, then we've hit the end of the buffer.
-+		 */
-+		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-+			/* This was really a NUL. */
-+			*yyg->yy_c_buf_p = '\0';
-+
-+		else
-+			{ /* need more input */
-+			yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
-+			++yyg->yy_c_buf_p;
-+
-+			switch ( yy_get_next_buffer( yyscanner ) )
-+				{
-+				case EOB_ACT_LAST_MATCH:
-+					/* This happens because yy_g_n_b()
-+					 * sees that we've accumulated a
-+					 * token and flags that we need to
-+					 * try matching the token before
-+					 * proceeding.  But for input(),
-+					 * there's no matching to consider.
-+					 * So convert the EOB_ACT_LAST_MATCH
-+					 * to EOB_ACT_END_OF_FILE.
-+					 */
-+
-+					/* Reset buffer status. */
-+					yyrestart(yyin ,yyscanner);
-+
-+					/*FALLTHROUGH*/
-+
-+				case EOB_ACT_END_OF_FILE:
-+					{
-+					if ( yywrap(yyscanner ) )
-+						return EOF;
-+
-+					if ( ! yyg->yy_did_buffer_switch_on_eof )
-+						YY_NEW_FILE;
-+#ifdef __cplusplus
-+					return yyinput(yyscanner);
-+#else
-+					return input(yyscanner);
-+#endif
-+					}
-+
-+				case EOB_ACT_CONTINUE_SCAN:
-+					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
-+					break;
-+				}
-+			}
-+		}
-+
-+	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
-+	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
-+	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
-+
-+	return c;
-+}
-+#endif	/* ifndef YY_NO_INPUT */
-+
-+/** Immediately switch to a different input stream.
-+ * @param input_file A readable stream.
-+ * @param yyscanner The scanner object.
-+ * @note This function does not reset the start condition to @c INITIAL .
-+ */
-+    void yyrestart  (FILE * input_file , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+	if ( ! YY_CURRENT_BUFFER ){
-+        yyensure_buffer_stack (yyscanner);
-+		YY_CURRENT_BUFFER_LVALUE =
-+            yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-+	}
-+
-+	yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
-+	yy_load_buffer_state(yyscanner );
-+}
-+
-+/** Switch to a different input buffer.
-+ * @param new_buffer The new input buffer.
-+ * @param yyscanner The scanner object.
-+ */
-+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+	/* TODO. We should be able to replace this entire function body
-+	 * with
-+	 *		yypop_buffer_state();
-+	 *		yypush_buffer_state(new_buffer);
-+     */
-+	yyensure_buffer_stack (yyscanner);
-+	if ( YY_CURRENT_BUFFER == new_buffer )
-+		return;
-+
-+	if ( YY_CURRENT_BUFFER )
-+		{
-+		/* Flush out information for old buffer. */
-+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-+		}
-+
-+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-+	yy_load_buffer_state(yyscanner );
-+
-+	/* We don't actually know whether we did this switch during
-+	 * EOF (yywrap()) processing, but the only time this flag
-+	 * is looked at is after yywrap() is called, so it's safe
-+	 * to go ahead and always set it.
-+	 */
-+	yyg->yy_did_buffer_switch_on_eof = 1;
-+}
-+
-+static void yy_load_buffer_state  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-+	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-+	yyg->yy_hold_char = *yyg->yy_c_buf_p;
-+}
-+
-+/** Allocate and initialize an input buffer state.
-+ * @param file A readable stream.
-+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
-+ * @param yyscanner The scanner object.
-+ * @return the allocated buffer state.
-+ */
-+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
-+{
-+	YY_BUFFER_STATE b;
-+    
-+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-+	if ( ! b )
-+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-+
-+	b->yy_buf_size = size;
-+
-+	/* yy_ch_buf has to be 2 characters longer than the size given because
-+	 * we need to put in 2 end-of-buffer characters.
-+	 */
-+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner );
-+	if ( ! b->yy_ch_buf )
-+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-+
-+	b->yy_is_our_buffer = 1;
-+
-+	yy_init_buffer(b,file ,yyscanner);
-+
-+	return b;
-+}
-+
-+/** Destroy the buffer.
-+ * @param b a buffer created with yy_create_buffer()
-+ * @param yyscanner The scanner object.
-+ */
-+    void yy_delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+	if ( ! b )
-+		return;
-+
-+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-+
-+	if ( b->yy_is_our_buffer )
-+		yyfree((void *) b->yy_ch_buf ,yyscanner );
-+
-+	yyfree((void *) b ,yyscanner );
-+}
-+
-+/* Initializes or reinitializes a buffer.
-+ * This function is sometimes called more than once on the same buffer,
-+ * such as during a yyrestart() or at EOF.
-+ */
-+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
-+
-+{
-+	int oerrno = errno;
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+	yy_flush_buffer(b ,yyscanner);
-+
-+	b->yy_input_file = file;
-+	b->yy_fill_buffer = 1;
-+
-+    /* If b is the current buffer, then yy_init_buffer was _probably_
-+     * called from yyrestart() or through yy_get_next_buffer.
-+     * In that case, we don't want to reset the lineno or column.
-+     */
-+    if (b != YY_CURRENT_BUFFER){
-+        b->yy_bs_lineno = 1;
-+        b->yy_bs_column = 0;
-+    }
-+
-+        b->yy_is_interactive = 0;
-+    
-+	errno = oerrno;
-+}
-+
-+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
-+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
-+ * @param yyscanner The scanner object.
-+ */
-+    void yy_flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+	if ( ! b )
-+		return;
-+
-+	b->yy_n_chars = 0;
-+
-+	/* We always need two end-of-buffer characters.  The first causes
-+	 * a transition to the end-of-buffer state.  The second causes
-+	 * a jam in that state.
-+	 */
-+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-+
-+	b->yy_buf_pos = &b->yy_ch_buf[0];
-+
-+	b->yy_at_bol = 1;
-+	b->yy_buffer_status = YY_BUFFER_NEW;
-+
-+	if ( b == YY_CURRENT_BUFFER )
-+		yy_load_buffer_state(yyscanner );
-+}
-+
-+/** Pushes the new state onto the stack. The new state becomes
-+ *  the current state. This function will allocate the stack
-+ *  if necessary.
-+ *  @param new_buffer The new state.
-+ *  @param yyscanner The scanner object.
-+ */
-+void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+	if (new_buffer == NULL)
-+		return;
-+
-+	yyensure_buffer_stack(yyscanner);
-+
-+	/* This block is copied from yy_switch_to_buffer. */
-+	if ( YY_CURRENT_BUFFER )
-+		{
-+		/* Flush out information for old buffer. */
-+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-+		}
-+
-+	/* Only push if top exists. Otherwise, replace top. */
-+	if (YY_CURRENT_BUFFER)
-+		yyg->yy_buffer_stack_top++;
-+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-+
-+	/* copied from yy_switch_to_buffer. */
-+	yy_load_buffer_state(yyscanner );
-+	yyg->yy_did_buffer_switch_on_eof = 1;
-+}
-+
-+/** Removes and deletes the top of the stack, if present.
-+ *  The next element becomes the new top.
-+ *  @param yyscanner The scanner object.
-+ */
-+void yypop_buffer_state (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+	if (!YY_CURRENT_BUFFER)
-+		return;
-+
-+	yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
-+	YY_CURRENT_BUFFER_LVALUE = NULL;
-+	if (yyg->yy_buffer_stack_top > 0)
-+		--yyg->yy_buffer_stack_top;
-+
-+	if (YY_CURRENT_BUFFER) {
-+		yy_load_buffer_state(yyscanner );
-+		yyg->yy_did_buffer_switch_on_eof = 1;
-+	}
-+}
-+
-+/* Allocates the stack if it does not exist.
-+ *  Guarantees space for at least one push.
-+ */
-+static void yyensure_buffer_stack (yyscan_t yyscanner)
-+{
-+	yy_size_t num_to_alloc;
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+	if (!yyg->yy_buffer_stack) {
-+
-+		/* First allocation is just for 2 elements, since we don't know if this
-+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-+		 * immediate realloc on the next call.
-+         */
-+		num_to_alloc = 1;
-+		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc
-+								(num_to_alloc * sizeof(struct yy_buffer_state*)
-+								, yyscanner);
-+		if ( ! yyg->yy_buffer_stack )
-+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-+								  
-+		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-+				
-+		yyg->yy_buffer_stack_max = num_to_alloc;
-+		yyg->yy_buffer_stack_top = 0;
-+		return;
-+	}
-+
-+	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
-+
-+		/* Increase the buffer to prepare for a possible push. */
-+		int grow_size = 8 /* arbitrary grow size */;
-+
-+		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
-+		yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc
-+								(yyg->yy_buffer_stack,
-+								num_to_alloc * sizeof(struct yy_buffer_state*)
-+								, yyscanner);
-+		if ( ! yyg->yy_buffer_stack )
-+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-+
-+		/* zero only the new slots.*/
-+		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
-+		yyg->yy_buffer_stack_max = num_to_alloc;
-+	}
-+}
-+
-+/** Setup the input buffer state to scan directly from a user-specified character buffer.
-+ * @param base the character buffer
-+ * @param size the size in bytes of the character buffer
-+ * @param yyscanner The scanner object.
-+ * @return the newly allocated buffer state object. 
-+ */
-+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
-+{
-+	YY_BUFFER_STATE b;
-+    
-+	if ( size < 2 ||
-+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-+		/* They forgot to leave room for the EOB's. */
-+		return 0;
-+
-+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-+	if ( ! b )
-+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-+
-+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-+	b->yy_buf_pos = b->yy_ch_buf = base;
-+	b->yy_is_our_buffer = 0;
-+	b->yy_input_file = 0;
-+	b->yy_n_chars = b->yy_buf_size;
-+	b->yy_is_interactive = 0;
-+	b->yy_at_bol = 1;
-+	b->yy_fill_buffer = 0;
-+	b->yy_buffer_status = YY_BUFFER_NEW;
-+
-+	yy_switch_to_buffer(b ,yyscanner );
-+
-+	return b;
-+}
-+
-+/** Setup the input buffer state to scan a string. The next call to yylex() will
-+ * scan from a @e copy of @a str.
-+ * @param yystr a NUL-terminated string to scan
-+ * @param yyscanner The scanner object.
-+ * @return the newly allocated buffer state object.
-+ * @note If you want to scan bytes that may contain NUL values, then use
-+ *       yy_scan_bytes() instead.
-+ */
-+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
-+{
-+    
-+	return yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
-+}
-+
-+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
-+ * scan from a @e copy of @a bytes.
-+ * @param yybytes the byte buffer to scan
-+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
-+ * @param yyscanner The scanner object.
-+ * @return the newly allocated buffer state object.
-+ */
-+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner)
-+{
-+	YY_BUFFER_STATE b;
-+	char *buf;
-+	yy_size_t n;
-+	yy_size_t i;
-+    
-+	/* Get memory for full buffer, including space for trailing EOB's. */
-+	n = _yybytes_len + 2;
-+	buf = (char *) yyalloc(n ,yyscanner );
-+	if ( ! buf )
-+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-+
-+	for ( i = 0; i < _yybytes_len; ++i )
-+		buf[i] = yybytes[i];
-+
-+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-+
-+	b = yy_scan_buffer(buf,n ,yyscanner);
-+	if ( ! b )
-+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-+
-+	/* It's okay to grow etc. this buffer, and we should throw it
-+	 * away when we're done.
-+	 */
-+	b->yy_is_our_buffer = 1;
-+
-+	return b;
-+}
-+
-+    static void yy_push_state (int  new_state , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+	if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth )
-+		{
-+		yy_size_t new_size;
-+
-+		yyg->yy_start_stack_depth += YY_START_STACK_INCR;
-+		new_size = yyg->yy_start_stack_depth * sizeof( int );
-+
-+		if ( ! yyg->yy_start_stack )
-+			yyg->yy_start_stack = (int *) yyalloc(new_size ,yyscanner );
-+
-+		else
-+			yyg->yy_start_stack = (int *) yyrealloc((void *) yyg->yy_start_stack,new_size ,yyscanner );
-+
-+		if ( ! yyg->yy_start_stack )
-+			YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
-+		}
-+
-+	yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START;
-+
-+	BEGIN(new_state);
-+}
-+
-+    static void yy_pop_state  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+	if ( --yyg->yy_start_stack_ptr < 0 )
-+		YY_FATAL_ERROR( "start-condition stack underflow" );
-+
-+	BEGIN(yyg->yy_start_stack[yyg->yy_start_stack_ptr]);
-+}
-+
-+#ifndef YY_EXIT_FAILURE
-+#define YY_EXIT_FAILURE 2
-+#endif
-+
-+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED)
-+{
-+	(void) fprintf( stderr, "%s\n", msg );
-+	exit( YY_EXIT_FAILURE );
-+}
-+
-+/* Redefine yyless() so it works in section 3 code. */
-+
-+#undef yyless
-+#define yyless(n) \
-+	do \
-+		{ \
-+		/* Undo effects of setting up yytext. */ \
-+        int yyless_macro_arg = (n); \
-+        YY_LESS_LINENO(yyless_macro_arg);\
-+		yytext[yyleng] = yyg->yy_hold_char; \
-+		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
-+		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
-+		*yyg->yy_c_buf_p = '\0'; \
-+		yyleng = yyless_macro_arg; \
-+		} \
-+	while ( 0 )
-+
-+/* Accessor  methods (get/set functions) to struct members. */
-+
-+/** Get the user-defined data for this scanner.
-+ * @param yyscanner The scanner object.
-+ */
-+YY_EXTRA_TYPE yyget_extra  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    return yyextra;
-+}
-+
-+/** Get the current line number.
-+ * @param yyscanner The scanner object.
-+ */
-+int yyget_lineno  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    
-+        if (! YY_CURRENT_BUFFER)
-+            return 0;
-+    
-+    return yylineno;
-+}
-+
-+/** Get the current column number.
-+ * @param yyscanner The scanner object.
-+ */
-+int yyget_column  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    
-+        if (! YY_CURRENT_BUFFER)
-+            return 0;
-+    
-+    return yycolumn;
-+}
-+
-+/** Get the input stream.
-+ * @param yyscanner The scanner object.
-+ */
-+FILE *yyget_in  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    return yyin;
-+}
-+
-+/** Get the output stream.
-+ * @param yyscanner The scanner object.
-+ */
-+FILE *yyget_out  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    return yyout;
-+}
-+
-+/** Get the length of the current token.
-+ * @param yyscanner The scanner object.
-+ */
-+yy_size_t yyget_leng  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    return yyleng;
-+}
-+
-+/** Get the current token.
-+ * @param yyscanner The scanner object.
-+ */
-+
-+char *yyget_text  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    return yytext;
-+}
-+
-+/** Set the user-defined data. This data is never touched by the scanner.
-+ * @param user_defined The data to be associated with this scanner.
-+ * @param yyscanner The scanner object.
-+ */
-+void yyset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    yyextra = user_defined ;
-+}
-+
-+/** Set the current line number.
-+ * @param line_number
-+ * @param yyscanner The scanner object.
-+ */
-+void yyset_lineno (int  line_number , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+        /* lineno is only valid if an input buffer exists. */
-+        if (! YY_CURRENT_BUFFER )
-+           YY_FATAL_ERROR( "yyset_lineno called with no buffer" );
-+    
-+    yylineno = line_number;
-+}
-+
-+/** Set the current column.
-+ * @param line_number
-+ * @param yyscanner The scanner object.
-+ */
-+void yyset_column (int  column_no , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+        /* column is only valid if an input buffer exists. */
-+        if (! YY_CURRENT_BUFFER )
-+           YY_FATAL_ERROR( "yyset_column called with no buffer" );
-+    
-+    yycolumn = column_no;
-+}
-+
-+/** Set the input stream. This does not discard the current
-+ * input buffer.
-+ * @param in_str A readable stream.
-+ * @param yyscanner The scanner object.
-+ * @see yy_switch_to_buffer
-+ */
-+void yyset_in (FILE *  in_str , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    yyin = in_str ;
-+}
-+
-+void yyset_out (FILE *  out_str , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    yyout = out_str ;
-+}
-+
-+int yyget_debug  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    return yy_flex_debug;
-+}
-+
-+void yyset_debug (int  bdebug , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    yy_flex_debug = bdebug ;
-+}
-+
-+/* Accessor methods for yylval and yylloc */
-+
-+YYSTYPE * yyget_lval  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    return yylval;
-+}
-+
-+void yyset_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    yylval = yylval_param;
-+}
-+
-+/* User-visible API */
-+
-+/* yylex_init is special because it creates the scanner itself, so it is
-+ * the ONLY reentrant function that doesn't take the scanner as the last argument.
-+ * That's why we explicitly handle the declaration, instead of using our macros.
-+ */
-+
-+int yylex_init(yyscan_t* ptr_yy_globals)
-+
-+{
-+    if (ptr_yy_globals == NULL){
-+        errno = EINVAL;
-+        return 1;
-+    }
-+
-+    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
-+
-+    if (*ptr_yy_globals == NULL){
-+        errno = ENOMEM;
-+        return 1;
-+    }
-+
-+    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
-+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-+
-+    return yy_init_globals ( *ptr_yy_globals );
-+}
-+
-+/* yylex_init_extra has the same functionality as yylex_init, but follows the
-+ * convention of taking the scanner as the last argument. Note however, that
-+ * this is a *pointer* to a scanner, as it will be allocated by this call (and
-+ * is the reason, too, why this function also must handle its own declaration).
-+ * The user defined value in the first argument will be available to yyalloc in
-+ * the yyextra field.
-+ */
-+
-+int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
-+
-+{
-+    struct yyguts_t dummy_yyguts;
-+
-+    yyset_extra (yy_user_defined, &dummy_yyguts);
-+
-+    if (ptr_yy_globals == NULL){
-+        errno = EINVAL;
-+        return 1;
-+    }
-+	
-+    *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-+	
-+    if (*ptr_yy_globals == NULL){
-+        errno = ENOMEM;
-+        return 1;
-+    }
-+    
-+    /* By setting to 0xAA, we expose bugs in
-+    yy_init_globals. Leave at 0x00 for releases. */
-+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-+    
-+    yyset_extra (yy_user_defined, *ptr_yy_globals);
-+    
-+    return yy_init_globals ( *ptr_yy_globals );
-+}
-+
-+static int yy_init_globals (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+    /* Initialization is the same as for the non-reentrant scanner.
-+     * This function is called from yylex_destroy(), so don't allocate here.
-+     */
-+
-+    yyg->yy_buffer_stack = 0;
-+    yyg->yy_buffer_stack_top = 0;
-+    yyg->yy_buffer_stack_max = 0;
-+    yyg->yy_c_buf_p = (char *) 0;
-+    yyg->yy_init = 0;
-+    yyg->yy_start = 0;
-+
-+    yyg->yy_start_stack_ptr = 0;
-+    yyg->yy_start_stack_depth = 0;
-+    yyg->yy_start_stack =  NULL;
-+
-+/* Defined in main.c */
-+#ifdef YY_STDINIT
-+    yyin = stdin;
-+    yyout = stdout;
-+#else
-+    yyin = (FILE *) 0;
-+    yyout = (FILE *) 0;
-+#endif
-+
-+    /* For future reference: Set errno on error, since we are called by
-+     * yylex_init()
-+     */
-+    return 0;
-+}
-+
-+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-+int yylex_destroy  (yyscan_t yyscanner)
-+{
-+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-+
-+    /* Pop the buffer stack, destroying each element. */
-+	while(YY_CURRENT_BUFFER){
-+		yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
-+		YY_CURRENT_BUFFER_LVALUE = NULL;
-+		yypop_buffer_state(yyscanner);
-+	}
-+
-+	/* Destroy the stack itself. */
-+	yyfree(yyg->yy_buffer_stack ,yyscanner);
-+	yyg->yy_buffer_stack = NULL;
-+
-+    /* Destroy the start condition stack. */
-+        yyfree(yyg->yy_start_stack ,yyscanner );
-+        yyg->yy_start_stack = NULL;
-+
-+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-+     * yylex() is called, initialization will occur. */
-+    yy_init_globals( yyscanner);
-+
-+    /* Destroy the main struct (reentrant only). */
-+    yyfree ( yyscanner , yyscanner );
-+    yyscanner = NULL;
-+    return 0;
-+}
-+
-+/*
-+ * Internal utility routines.
-+ */
-+
-+#ifndef yytext_ptr
-+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED)
-+{
-+	register int i;
-+	for ( i = 0; i < n; ++i )
-+		s1[i] = s2[i];
-+}
-+#endif
-+
-+#ifdef YY_NEED_STRLEN
-+static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED)
-+{
-+	register int n;
-+	for ( n = 0; s[n]; ++n )
-+		;
-+
-+	return n;
-+}
-+#endif
-+
-+void *yyalloc (yy_size_t  size , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED)
-+{
-+	return (void *) malloc( size );
-+}
-+
-+void *yyrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED)
-+{
-+	/* The cast to (char *) in the following accommodates both
-+	 * implementations that use char* generic pointers, and those
-+	 * that use void* generic pointers.  It works with the latter
-+	 * because both ANSI C and C++ allow castless assignment from
-+	 * any pointer type to void*, and deal with argument conversions
-+	 * as though doing an assignment.
-+	 */
-+	return (void *) realloc( (char *) ptr, size );
-+}
-+
-+void yyfree (void * ptr , yyscan_t yyscanner YY_ATTRIBUTE_UNUSED)
-+{
-+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-+}
-+
-+#define YYTABLES_NAME "yytables"
-+
-+#line 464 "analyze.l"
-+
-+
-+
-diff --git a/src/libkeymap/analyze.h b/src/libkeymap/analyze.h
-new file mode 100644
-index 0000000..eb8ea5d
---- /dev/null
-+++ b/src/libkeymap/analyze.h
-@@ -0,0 +1,368 @@
-+#ifndef yyHEADER_H
-+#define yyHEADER_H 1
-+#define yyIN_HEADER 1
-+
-+#line 15 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.l"
-+#include "keymap.h"
-+int stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner);
-+int stack_pop(struct lk_ctx *ctx, void *scanner);
-+
-+
-+
-+#line 13 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.h"
-+
-+#define  YY_INT_ALIGNED short int
-+
-+/* A lexical scanner generated by flex */
-+
-+#define FLEX_SCANNER
-+#define YY_FLEX_MAJOR_VERSION 2
-+#define YY_FLEX_MINOR_VERSION 5
-+#define YY_FLEX_SUBMINOR_VERSION 37
-+#if YY_FLEX_SUBMINOR_VERSION > 0
-+#define FLEX_BETA
-+#endif
-+
-+/* First, we deal with  platform-specific or compiler-specific issues. */
-+
-+/* begin standard C headers. */
-+#include <stdio.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+
-+/* end standard C headers. */
-+
-+/* flex integer type definitions */
-+
-+#ifndef FLEXINT_H
-+#define FLEXINT_H
-+
-+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-+
-+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-+
-+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
-+ * if you want the limit (max/min) macros for int types. 
-+ */
-+#ifndef __STDC_LIMIT_MACROS
-+#define __STDC_LIMIT_MACROS 1
-+#endif
-+
-+#include <inttypes.h>
-+typedef int8_t flex_int8_t;
-+typedef uint8_t flex_uint8_t;
-+typedef int16_t flex_int16_t;
-+typedef uint16_t flex_uint16_t;
-+typedef int32_t flex_int32_t;
-+typedef uint32_t flex_uint32_t;
-+#else
-+typedef signed char flex_int8_t;
-+typedef short int flex_int16_t;
-+typedef int flex_int32_t;
-+typedef unsigned char flex_uint8_t; 
-+typedef unsigned short int flex_uint16_t;
-+typedef unsigned int flex_uint32_t;
-+
-+/* Limits of integral types. */
-+#ifndef INT8_MIN
-+#define INT8_MIN               (-128)
-+#endif
-+#ifndef INT16_MIN
-+#define INT16_MIN              (-32767-1)
-+#endif
-+#ifndef INT32_MIN
-+#define INT32_MIN              (-2147483647-1)
-+#endif
-+#ifndef INT8_MAX
-+#define INT8_MAX               (127)
-+#endif
-+#ifndef INT16_MAX
-+#define INT16_MAX              (32767)
-+#endif
-+#ifndef INT32_MAX
-+#define INT32_MAX              (2147483647)
-+#endif
-+#ifndef UINT8_MAX
-+#define UINT8_MAX              (255U)
-+#endif
-+#ifndef UINT16_MAX
-+#define UINT16_MAX             (65535U)
-+#endif
-+#ifndef UINT32_MAX
-+#define UINT32_MAX             (4294967295U)
-+#endif
-+
-+#endif /* ! C99 */
-+
-+#endif /* ! FLEXINT_H */
-+
-+#ifdef __cplusplus
-+
-+/* The "const" storage-class-modifier is valid. */
-+#define YY_USE_CONST
-+
-+#else	/* ! __cplusplus */
-+
-+/* C99 requires __STDC__ to be defined as 1. */
-+#if defined (__STDC__)
-+
-+#define YY_USE_CONST
-+
-+#endif	/* defined (__STDC__) */
-+#endif	/* ! __cplusplus */
-+
-+#ifdef YY_USE_CONST
-+#define yyconst const
-+#else
-+#define yyconst
-+#endif
-+
-+#ifndef YY_GNUC_PREREQ
-+# if defined __GNUC__ && defined __GNUC_MINOR__
-+#  define YY_GNUC_PREREQ(maj, min) \
-+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+# else
-+#  define YY_GNUC_PREREQ(maj, min) 0
-+# endif
-+# if YY_GNUC_PREREQ(2, 5)
-+#  define YY_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-+# else
-+#  define YY_ATTRIBUTE_NORETURN /* __attribute__ ((__noreturn__)) */
-+#  define YY_ATTRIBUTE_UNUSED /* __attribute__ ((__unused__)) */
-+# endif
-+#endif
-+
-+/* An opaque pointer. */
-+#ifndef YY_TYPEDEF_YY_SCANNER_T
-+#define YY_TYPEDEF_YY_SCANNER_T
-+typedef void* yyscan_t;
-+#endif
-+
-+/* For convenience, these vars (plus the bison vars far below)
-+   are macros in the reentrant scanner. */
-+#define yyin yyg->yyin_r
-+#define yyout yyg->yyout_r
-+#define yyextra yyg->yyextra_r
-+#define yyleng yyg->yyleng_r
-+#define yytext yyg->yytext_r
-+#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-+#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-+#define yy_flex_debug yyg->yy_flex_debug_r
-+
-+/* Size of default input buffer. */
-+#ifndef YY_BUF_SIZE
-+#define YY_BUF_SIZE 16384
-+#endif
-+
-+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-+#define YY_TYPEDEF_YY_BUFFER_STATE
-+typedef struct yy_buffer_state *YY_BUFFER_STATE;
-+#endif
-+
-+#ifndef YY_TYPEDEF_YY_SIZE_T
-+#define YY_TYPEDEF_YY_SIZE_T
-+typedef size_t yy_size_t;
-+#endif
-+
-+#ifndef YY_STRUCT_YY_BUFFER_STATE
-+#define YY_STRUCT_YY_BUFFER_STATE
-+struct yy_buffer_state
-+	{
-+	FILE *yy_input_file;
-+
-+	char *yy_ch_buf;		/* input buffer */
-+	char *yy_buf_pos;		/* current position in input buffer */
-+
-+	/* Size of input buffer in bytes, not including room for EOB
-+	 * characters.
-+	 */
-+	yy_size_t yy_buf_size;
-+
-+	/* Number of characters read into yy_ch_buf, not including EOB
-+	 * characters.
-+	 */
-+	yy_size_t yy_n_chars;
-+
-+	/* Whether we "own" the buffer - i.e., we know we created it,
-+	 * and can realloc() it to grow it, and should free() it to
-+	 * delete it.
-+	 */
-+	int yy_is_our_buffer;
-+
-+	/* Whether this is an "interactive" input source; if so, and
-+	 * if we're using stdio for input, then we want to use getc()
-+	 * instead of fread(), to make sure we stop fetching input after
-+	 * each newline.
-+	 */
-+	int yy_is_interactive;
-+
-+	/* Whether we're considered to be at the beginning of a line.
-+	 * If so, '^' rules will be active on the next match, otherwise
-+	 * not.
-+	 */
-+	int yy_at_bol;
-+
-+    int yy_bs_lineno; /**< The line count. */
-+    int yy_bs_column; /**< The column count. */
-+    
-+	/* Whether to try to fill the input buffer when we reach the
-+	 * end of it.
-+	 */
-+	int yy_fill_buffer;
-+
-+	int yy_buffer_status;
-+
-+	};
-+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-+
-+void yyrestart (FILE *input_file ,yyscan_t yyscanner );
-+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-+void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-+void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-+void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-+void yypop_buffer_state (yyscan_t yyscanner );
-+
-+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
-+
-+void *yyalloc (yy_size_t ,yyscan_t yyscanner );
-+void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
-+void yyfree (void * ,yyscan_t yyscanner );
-+
-+/* Begin user sect3 */
-+
-+#define yywrap(yyscanner) 1
-+#define YY_SKIP_YYWRAP
-+
-+#define yytext_ptr yytext_r
-+
-+#ifdef YY_HEADER_EXPORT_START_CONDITIONS
-+#define INITIAL 0
-+#define RVALUE 1
-+#define STR 2
-+#define INCLSTR 3
-+
-+#endif
-+
-+#ifndef YY_NO_UNISTD_H
-+/* Special case for "unistd.h", since it is non-ANSI. We include it way
-+ * down here because we want the user's section 1 to have been scanned first.
-+ * The user has a chance to override it with an option.
-+ */
-+#include <unistd.h>
-+#endif
-+
-+#define YY_EXTRA_TYPE struct lk_ctx *
-+
-+int yylex_init (yyscan_t* scanner);
-+
-+int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-+
-+/* Accessor methods to globals.
-+   These are made visible to non-reentrant scanners for convenience. */
-+
-+int yylex_destroy (yyscan_t yyscanner );
-+
-+int yyget_debug (yyscan_t yyscanner );
-+
-+void yyset_debug (int debug_flag ,yyscan_t yyscanner );
-+
-+YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner );
-+
-+void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
-+
-+FILE *yyget_in (yyscan_t yyscanner );
-+
-+void yyset_in  (FILE * in_str ,yyscan_t yyscanner );
-+
-+FILE *yyget_out (yyscan_t yyscanner );
-+
-+void yyset_out  (FILE * out_str ,yyscan_t yyscanner );
-+
-+yy_size_t yyget_leng (yyscan_t yyscanner );
-+
-+char *yyget_text (yyscan_t yyscanner );
-+
-+int yyget_lineno (yyscan_t yyscanner );
-+
-+void yyset_lineno (int line_number ,yyscan_t yyscanner );
-+
-+int yyget_column  (yyscan_t yyscanner );
-+
-+void yyset_column (int column_no ,yyscan_t yyscanner );
-+
-+YYSTYPE * yyget_lval (yyscan_t yyscanner );
-+
-+void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
-+
-+/* Macros after this point can all be overridden by user definitions in
-+ * section 1.
-+ */
-+
-+#ifndef YY_SKIP_YYWRAP
-+#ifdef __cplusplus
-+extern "C" int yywrap (yyscan_t yyscanner );
-+#else
-+extern int yywrap (yyscan_t yyscanner );
-+#endif
-+#endif
-+
-+#ifndef yytext_ptr
-+static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-+#endif
-+
-+#ifdef YY_NEED_STRLEN
-+static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-+#endif
-+
-+#ifndef YY_NO_INPUT
-+
-+#endif
-+
-+/* Amount of stuff to slurp up with each read. */
-+#ifndef YY_READ_BUF_SIZE
-+#define YY_READ_BUF_SIZE 8192
-+#endif
-+
-+/* Number of entries by which start-condition stack grows. */
-+#ifndef YY_START_STACK_INCR
-+#define YY_START_STACK_INCR 25
-+#endif
-+
-+/* Default declaration of generated scanner - a define so the user can
-+ * easily add parameters.
-+ */
-+#ifndef YY_DECL
-+#define YY_DECL_IS_OURS 1
-+
-+extern int yylex \
-+               (YYSTYPE * yylval_param ,yyscan_t yyscanner);
-+
-+#define YY_DECL int yylex \
-+               (YYSTYPE * yylval_param , yyscan_t yyscanner)
-+#endif /* !YY_DECL */
-+
-+/* yy_get_previous_state - get the state just before the EOB char was reached */
-+
-+#undef YY_NEW_FILE
-+#undef YY_FLUSH_BUFFER
-+#undef yy_set_bol
-+#undef yy_new_buffer
-+#undef yy_set_interactive
-+#undef YY_DO_BEFORE_ACTION
-+
-+#ifdef YY_DECL_IS_OURS
-+#undef YY_DECL_IS_OURS
-+#undef YY_DECL
-+#endif
-+
-+#line 464 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.l"
-+
-+
-+#line 367 "/home/legion/scm/.kbd/kbd/src/libkeymap/analyze.h"
-+#undef yyIN_HEADER
-+#endif /* yyHEADER_H */
-diff --git a/src/libkeymap/parser.c b/src/libkeymap/parser.c
-new file mode 100644
-index 0000000..62a9436
---- /dev/null
-+++ b/src/libkeymap/parser.c
-@@ -0,0 +1,2238 @@
-+/* A Bison parser, made by GNU Bison 2.7.1.  */
-+
-+/* Bison implementation for Yacc-like parsers in C
-+   
-+      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-+   
-+   This program is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+   
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+   
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* As a special exception, you may create a larger work that contains
-+   part or all of the Bison parser skeleton and distribute that work
-+   under terms of your choice, so long as that work isn't itself a
-+   parser generator using the skeleton or a modified version thereof
-+   as a parser skeleton.  Alternatively, if you modify or redistribute
-+   the parser skeleton itself, you may (at your option) remove this
-+   special exception, which will cause the skeleton and the resulting
-+   Bison output files to be licensed under the GNU General Public
-+   License without this special exception.
-+   
-+   This special exception was added by the Free Software Foundation in
-+   version 2.2 of Bison.  */
-+
-+/* C LALR(1) parser skeleton written by Richard Stallman, by
-+   simplifying the original so-called "semantic" parser.  */
-+
-+/* All symbols defined below should begin with yy or YY, to avoid
-+   infringing on user name space.  This should be done even for local
-+   variables, as they might otherwise be expanded by user macros.
-+   There are some unavoidable exceptions within include files to
-+   define necessary library symbols; they are noted "INFRINGES ON
-+   USER NAME SPACE" below.  */
-+
-+/* Identify Bison output.  */
-+#define YYBISON 1
-+
-+/* Bison version.  */
-+#define YYBISON_VERSION "2.7.1"
-+
-+/* Skeleton name.  */
-+#define YYSKELETON_NAME "yacc.c"
-+
-+/* Pure parsers.  */
-+#define YYPURE 1
-+
-+/* Push parsers.  */
-+#define YYPUSH 0
-+
-+/* Pull parsers.  */
-+#define YYPULL 1
-+
-+
-+
-+
-+/* Copy the first part of user declarations.  */
-+/* Line 371 of yacc.c  */
-+#line 12 "parser.y"
-+
-+#define YY_HEADER_EXPORT_START_CONDITIONS 1
-+
-+#include "nls.h"
-+#include "kbd.h"
-+
-+#include "contextP.h"
-+#include "ksyms.h"
-+#include "modifiers.h"
-+
-+#include "parser.h"
-+#include "analyze.h"
-+
-+/* Line 371 of yacc.c  */
-+#line 82 "parser.c"
-+
-+# ifndef YY_NULL
-+#  if defined __cplusplus && 201103L <= __cplusplus
-+#   define YY_NULL nullptr
-+#  else
-+#   define YY_NULL 0
-+#  endif
-+# endif
-+
-+/* Enabling verbose error messages.  */
-+#ifdef YYERROR_VERBOSE
-+# undef YYERROR_VERBOSE
-+# define YYERROR_VERBOSE 1
-+#else
-+# define YYERROR_VERBOSE 1
-+#endif
-+
-+/* In a future release of Bison, this section will be replaced
-+   by #include "y.tab.h".  */
-+#ifndef YY_YY_Y_TAB_H_INCLUDED
-+# define YY_YY_Y_TAB_H_INCLUDED
-+/* Enabling traces.  */
-+#ifndef YYDEBUG
-+# define YYDEBUG 1
-+#endif
-+#if YYDEBUG
-+extern int yydebug;
-+#endif
-+/* "%code requires" blocks.  */
-+/* Line 387 of yacc.c  */
-+#line 26 "parser.y"
-+
-+#include "keymap.h"
-+
-+#ifndef STRDATA_STRUCT
-+#define STRDATA_STRUCT
-+#define MAX_PARSER_STRING 512
-+struct strdata {
-+	unsigned int len;
-+	unsigned char data[MAX_PARSER_STRING];
-+};
-+#endif
-+
-+
-+/* Line 387 of yacc.c  */
-+#line 128 "parser.c"
-+
-+/* Tokens.  */
-+#ifndef YYTOKENTYPE
-+# define YYTOKENTYPE
-+   /* Put the tokens into the symbol table, so that GDB and other debuggers
-+      know about them.  */
-+   enum yytokentype {
-+     EOL = 258,
-+     NUMBER = 259,
-+     LITERAL = 260,
-+     CHARSET = 261,
-+     KEYMAPS = 262,
-+     KEYCODE = 263,
-+     EQUALS = 264,
-+     PLAIN = 265,
-+     SHIFT = 266,
-+     CONTROL = 267,
-+     ALT = 268,
-+     ALTGR = 269,
-+     SHIFTL = 270,
-+     SHIFTR = 271,
-+     CTRLL = 272,
-+     CTRLR = 273,
-+     CAPSSHIFT = 274,
-+     COMMA = 275,
-+     DASH = 276,
-+     STRING = 277,
-+     STRLITERAL = 278,
-+     COMPOSE = 279,
-+     TO = 280,
-+     CCHAR = 281,
-+     ERROR = 282,
-+     PLUS = 283,
-+     UNUMBER = 284,
-+     ALT_IS_META = 285,
-+     STRINGS = 286,
-+     AS = 287,
-+     USUAL = 288,
-+     ON = 289,
-+     FOR = 290
-+   };
-+#endif
-+/* Tokens.  */
-+#define EOL 258
-+#define NUMBER 259
-+#define LITERAL 260
-+#define CHARSET 261
-+#define KEYMAPS 262
-+#define KEYCODE 263
-+#define EQUALS 264
-+#define PLAIN 265
-+#define SHIFT 266
-+#define CONTROL 267
-+#define ALT 268
-+#define ALTGR 269
-+#define SHIFTL 270
-+#define SHIFTR 271
-+#define CTRLL 272
-+#define CTRLR 273
-+#define CAPSSHIFT 274
-+#define COMMA 275
-+#define DASH 276
-+#define STRING 277
-+#define STRLITERAL 278
-+#define COMPOSE 279
-+#define TO 280
-+#define CCHAR 281
-+#define ERROR 282
-+#define PLUS 283
-+#define UNUMBER 284
-+#define ALT_IS_META 285
-+#define STRINGS 286
-+#define AS 287
-+#define USUAL 288
-+#define ON 289
-+#define FOR 290
-+
-+
-+
-+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-+typedef union YYSTYPE
-+{
-+/* Line 387 of yacc.c  */
-+#line 58 "parser.y"
-+
-+	long long int num;
-+	struct strdata str;
-+
-+
-+/* Line 387 of yacc.c  */
-+#line 219 "parser.c"
-+} YYSTYPE;
-+# define YYSTYPE_IS_TRIVIAL 1
-+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-+# define YYSTYPE_IS_DECLARED 1
-+#endif
-+
-+
-+#ifdef YYPARSE_PARAM
-+#if defined __STDC__ || defined __cplusplus
-+int yyparse (void *YYPARSE_PARAM);
-+#else
-+int yyparse ();
-+#endif
-+#else /* ! YYPARSE_PARAM */
-+#if defined __STDC__ || defined __cplusplus
-+int yyparse (void *scanner, struct lk_ctx *ctx);
-+#else
-+int yyparse ();
-+#endif
-+#endif /* ! YYPARSE_PARAM */
-+
-+#endif /* !YY_YY_Y_TAB_H_INCLUDED  */
-+
-+/* Copy the second part of user declarations.  */
-+/* Line 390 of yacc.c  */
-+#line 71 "parser.y"
-+
-+static int
-+yyerror(yyscan_t scanner __attribute__ ((unused)),
-+        struct lk_ctx *ctx, const char *s)
-+{
-+	ERR(ctx, "%s", s);
-+	return 0;
-+}
-+
-+static int
-+strings_as_usual(struct lk_ctx *ctx)
-+{
-+	/*
-+	 * 26 strings, mostly inspired by the VT100 family
-+	 */
-+	char *stringvalues[30] = {
-+		/* F1 .. F20 */
-+		"\033[[A",  "\033[[B",  "\033[[C",  "\033[[D",  "\033[[E",
-+		"\033[17~", "\033[18~", "\033[19~", "\033[20~", "\033[21~",
-+		"\033[23~", "\033[24~", "\033[25~", "\033[26~",
-+		"\033[28~", "\033[29~",
-+		"\033[31~", "\033[32~", "\033[33~", "\033[34~",
-+		/* Find,    Insert,     Remove,     Select,     Prior */
-+		"\033[1~",  "\033[2~",  "\033[3~",  "\033[4~",  "\033[5~",
-+		/* Next,    Macro,      Help,       Do,         Pause */
-+		"\033[6~",  0,          0,          0,          0
-+	};
-+	int i;
-+
-+	for (i = 0; i < 30; i++) {
-+		if (stringvalues[i]) {
-+			struct kbsentry ke;
-+			ke.kb_func = i;
-+			strncpy((char *)ke.kb_string, stringvalues[i],
-+				sizeof(ke.kb_string));
-+			ke.kb_string[sizeof(ke.kb_string) - 1] = 0;
-+
-+			if (lk_add_func(ctx, &ke) == -1)
-+				return -1;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static int
-+compose_as_usual(struct lk_ctx *ctx, char *charset)
-+{
-+	if (charset && strcmp(charset, "iso-8859-1")) {
-+		ERR(ctx, _("loadkeys: don't know how to compose for %s"), charset);
-+		return -1;
-+
-+	} else {
-+		struct ccc {
-+			unsigned char c1, c2, c3;
-+		} def_latin1_composes[68] = {
-+			{ '`', 'A', 0300 }, { '`', 'a', 0340 },
-+			{ '\'', 'A', 0301 }, { '\'', 'a', 0341 },
-+			{ '^', 'A', 0302 }, { '^', 'a', 0342 },
-+			{ '~', 'A', 0303 }, { '~', 'a', 0343 },
-+			{ '"', 'A', 0304 }, { '"', 'a', 0344 },
-+			{ 'O', 'A', 0305 }, { 'o', 'a', 0345 },
-+			{ '0', 'A', 0305 }, { '0', 'a', 0345 },
-+			{ 'A', 'A', 0305 }, { 'a', 'a', 0345 },
-+			{ 'A', 'E', 0306 }, { 'a', 'e', 0346 },
-+			{ ',', 'C', 0307 }, { ',', 'c', 0347 },
-+			{ '`', 'E', 0310 }, { '`', 'e', 0350 },
-+			{ '\'', 'E', 0311 }, { '\'', 'e', 0351 },
-+			{ '^', 'E', 0312 }, { '^', 'e', 0352 },
-+			{ '"', 'E', 0313 }, { '"', 'e', 0353 },
-+			{ '`', 'I', 0314 }, { '`', 'i', 0354 },
-+			{ '\'', 'I', 0315 }, { '\'', 'i', 0355 },
-+			{ '^', 'I', 0316 }, { '^', 'i', 0356 },
-+			{ '"', 'I', 0317 }, { '"', 'i', 0357 },
-+			{ '-', 'D', 0320 }, { '-', 'd', 0360 },
-+			{ '~', 'N', 0321 }, { '~', 'n', 0361 },
-+			{ '`', 'O', 0322 }, { '`', 'o', 0362 },
-+			{ '\'', 'O', 0323 }, { '\'', 'o', 0363 },
-+			{ '^', 'O', 0324 }, { '^', 'o', 0364 },
-+			{ '~', 'O', 0325 }, { '~', 'o', 0365 },
-+			{ '"', 'O', 0326 }, { '"', 'o', 0366 },
-+			{ '/', 'O', 0330 }, { '/', 'o', 0370 },
-+			{ '`', 'U', 0331 }, { '`', 'u', 0371 },
-+			{ '\'', 'U', 0332 }, { '\'', 'u', 0372 },
-+			{ '^', 'U', 0333 }, { '^', 'u', 0373 },
-+			{ '"', 'U', 0334 }, { '"', 'u', 0374 },
-+			{ '\'', 'Y', 0335 }, { '\'', 'y', 0375 },
-+			{ 'T', 'H', 0336 }, { 't', 'h', 0376 },
-+			{ 's', 's', 0337 }, { '"', 'y', 0377 },
-+			{ 's', 'z', 0337 }, { 'i', 'j', 0377 }
-+		};
-+		int i;
-+		for (i = 0; i < 68; i++) {
-+			struct lk_kbdiacr ptr;
-+			struct ccc c = def_latin1_composes[i];
-+
-+			ptr.diacr  = c.c1;
-+			ptr.base   = c.c2;
-+			ptr.result = c.c3;
-+
-+			if (lk_append_compose(ctx, &ptr) == -1)
-+				return -1;
-+		}
-+	}
-+	return 0;
-+}
-+
-+
-+/* Line 390 of yacc.c  */
-+#line 354 "parser.c"
-+
-+#ifdef short
-+# undef short
-+#endif
-+
-+#ifdef YYTYPE_UINT8
-+typedef YYTYPE_UINT8 yytype_uint8;
-+#else
-+typedef unsigned char yytype_uint8;
-+#endif
-+
-+#ifdef YYTYPE_INT8
-+typedef YYTYPE_INT8 yytype_int8;
-+#elif (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+typedef signed char yytype_int8;
-+#else
-+typedef short int yytype_int8;
-+#endif
-+
-+#ifdef YYTYPE_UINT16
-+typedef YYTYPE_UINT16 yytype_uint16;
-+#else
-+typedef unsigned short int yytype_uint16;
-+#endif
-+
-+#ifdef YYTYPE_INT16
-+typedef YYTYPE_INT16 yytype_int16;
-+#else
-+typedef short int yytype_int16;
-+#endif
-+
-+#ifndef YYSIZE_T
-+# ifdef __SIZE_TYPE__
-+#  define YYSIZE_T __SIZE_TYPE__
-+# elif defined size_t
-+#  define YYSIZE_T size_t
-+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-+#  define YYSIZE_T size_t
-+# else
-+#  define YYSIZE_T unsigned int
-+# endif
-+#endif
-+
-+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-+
-+#ifndef YY_
-+# if defined YYENABLE_NLS && YYENABLE_NLS
-+#  if ENABLE_NLS
-+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-+#  endif
-+# endif
-+# ifndef YY_
-+#  define YY_(Msgid) Msgid
-+# endif
-+#endif
-+
-+#ifndef __attribute__
-+/* This feature is available in gcc versions 2.5 and later.  */
-+# if (! defined __GNUC__ || __GNUC__ < 2 \
-+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-+#  define __attribute__(Spec) /* empty */
-+# endif
-+#endif
-+
-+/* Suppress unused-variable warnings by "using" E.  */
-+#if ! defined lint || defined __GNUC__
-+# define YYUSE(E) ((void) (E))
-+#else
-+# define YYUSE(E) /* empty */
-+#endif
-+
-+
-+/* Identity function, used to suppress warnings about constant conditions.  */
-+#ifndef lint
-+# define YYID(N) (N)
-+#else
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static int
-+YYID (int yyi)
-+#else
-+static int
-+YYID (yyi)
-+    int yyi;
-+#endif
-+{
-+  return yyi;
-+}
-+#endif
-+
-+#if ! defined yyoverflow || YYERROR_VERBOSE
-+
-+/* The parser invokes alloca or malloc; define the necessary symbols.  */
-+
-+# ifdef YYSTACK_USE_ALLOCA
-+#  if YYSTACK_USE_ALLOCA
-+#   ifdef __GNUC__
-+#    define YYSTACK_ALLOC __builtin_alloca
-+#   elif defined __BUILTIN_VA_ARG_INCR
-+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-+#   elif defined _AIX
-+#    define YYSTACK_ALLOC __alloca
-+#   elif defined _MSC_VER
-+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-+#    define alloca _alloca
-+#   else
-+#    define YYSTACK_ALLOC alloca
-+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-+#     ifndef EXIT_SUCCESS
-+#      define EXIT_SUCCESS 0
-+#     endif
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+
-+# ifdef YYSTACK_ALLOC
-+   /* Pacify GCC's `empty if-body' warning.  */
-+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-+#  ifndef YYSTACK_ALLOC_MAXIMUM
-+    /* The OS might guarantee only one guard page at the bottom of the stack,
-+       and a page size can be as small as 4096 bytes.  So we cannot safely
-+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-+       to allow for a few compiler-allocated temporary stack slots.  */
-+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-+#  endif
-+# else
-+#  define YYSTACK_ALLOC YYMALLOC
-+#  define YYSTACK_FREE YYFREE
-+#  ifndef YYSTACK_ALLOC_MAXIMUM
-+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-+#  endif
-+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-+       && ! ((defined YYMALLOC || defined malloc) \
-+	     && (defined YYFREE || defined free)))
-+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-+#   ifndef EXIT_SUCCESS
-+#    define EXIT_SUCCESS 0
-+#   endif
-+#  endif
-+#  ifndef YYMALLOC
-+#   define YYMALLOC malloc
-+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-+#   endif
-+#  endif
-+#  ifndef YYFREE
-+#   define YYFREE free
-+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+void free (void *); /* INFRINGES ON USER NAME SPACE */
-+#   endif
-+#  endif
-+# endif
-+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-+
-+
-+#if (! defined yyoverflow \
-+     && (! defined __cplusplus \
-+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-+
-+/* A type that is properly aligned for any stack member.  */
-+union yyalloc
-+{
-+  yytype_int16 yyss_alloc;
-+  YYSTYPE yyvs_alloc;
-+};
-+
-+/* The size of the maximum gap between one aligned stack and the next.  */
-+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-+
-+/* The size of an array large to enough to hold all stacks, each with
-+   N elements.  */
-+# define YYSTACK_BYTES(N) \
-+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-+      + YYSTACK_GAP_MAXIMUM)
-+
-+# define YYCOPY_NEEDED 1
-+
-+/* Relocate STACK from its old location to the new one.  The
-+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-+   elements in the stack, and YYPTR gives the new location of the
-+   stack.  Advance YYPTR to a properly aligned location for the next
-+   stack.  */
-+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-+    do									\
-+      {									\
-+	YYSIZE_T yynewbytes;						\
-+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-+	Stack = &yyptr->Stack_alloc;					\
-+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-+	yyptr += yynewbytes / sizeof (*yyptr);				\
-+      }									\
-+    while (YYID (0))
-+
-+#endif
-+
-+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-+/* Copy COUNT objects from SRC to DST.  The source and destination do
-+   not overlap.  */
-+# ifndef YYCOPY
-+#  if defined __GNUC__ && 1 < __GNUC__
-+#   define YYCOPY(Dst, Src, Count) \
-+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-+#  else
-+#   define YYCOPY(Dst, Src, Count)              \
-+      do                                        \
-+        {                                       \
-+          YYSIZE_T yyi;                         \
-+          for (yyi = 0; yyi < (Count); yyi++)   \
-+            (Dst)[yyi] = (Src)[yyi];            \
-+        }                                       \
-+      while (YYID (0))
-+#  endif
-+# endif
-+#endif /* !YYCOPY_NEEDED */
-+
-+/* YYFINAL -- State number of the termination state.  */
-+#define YYFINAL  2
-+/* YYLAST -- Last index in YYTABLE.  */
-+#define YYLAST   86
-+
-+/* YYNTOKENS -- Number of terminals.  */
-+#define YYNTOKENS  36
-+/* YYNNTS -- Number of nonterminals.  */
-+#define YYNNTS  19
-+/* YYNRULES -- Number of rules.  */
-+#define YYNRULES  50
-+/* YYNRULES -- Number of states.  */
-+#define YYNSTATES  91
-+
-+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-+#define YYUNDEFTOK  2
-+#define YYMAXUTOK   290
-+
-+#define YYTRANSLATE(YYX)						\
-+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-+
-+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-+static const yytype_uint8 yytranslate[] =
-+{
-+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-+      35
-+};
-+
-+#if YYDEBUG
-+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-+   YYRHS.  */
-+static const yytype_uint8 yyprhs[] =
-+{
-+       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
-+      19,    21,    23,    25,    29,    32,    37,    44,    49,    53,
-+      57,    59,    63,    65,    71,    78,    85,    87,    89,    95,
-+     102,   109,   112,   114,   116,   118,   120,   122,   124,   126,
-+     128,   130,   132,   133,   136,   138,   140,   143,   145,   148,
-+     150
-+};
-+
-+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-+static const yytype_int8 yyrhs[] =
-+{
-+      37,     0,    -1,    -1,    37,    38,    -1,     3,    -1,    39,
-+      -1,    40,    -1,    41,    -1,    42,    -1,    43,    -1,    49,
-+      -1,    46,    -1,    47,    -1,     6,    23,     3,    -1,    30,
-+       3,    -1,    31,    32,    33,     3,    -1,    24,    32,    33,
-+      35,    23,     3,    -1,    24,    32,    33,     3,    -1,     7,
-+      44,     3,    -1,    44,    20,    45,    -1,    45,    -1,     4,
-+      21,     4,    -1,     4,    -1,    22,     5,     9,    23,     3,
-+      -1,    24,    48,    48,    25,    48,     3,    -1,    24,    48,
-+      48,    25,    54,     3,    -1,    26,    -1,    29,    -1,     8,
-+       4,     9,    52,     3,    -1,    50,     8,     4,     9,    54,
-+       3,    -1,    10,     8,     4,     9,    54,     3,    -1,    50,
-+      51,    -1,    51,    -1,    11,    -1,    12,    -1,    13,    -1,
-+      14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,    -1,
-+      19,    -1,    -1,    53,    52,    -1,    54,    -1,     4,    -1,
-+      28,     4,    -1,    29,    -1,    28,    29,    -1,     5,    -1,
-+      28,     5,    -1
-+};
-+
-+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-+static const yytype_uint16 yyrline[] =
-+{
-+       0,   180,   180,   181,   183,   184,   185,   186,   187,   188,
-+     189,   190,   191,   193,   210,   215,   222,   227,   233,   238,
-+     239,   241,   249,   255,   275,   285,   296,   297,   299,   359,
-+     365,   372,   373,   375,   376,   377,   378,   379,   380,   381,
-+     382,   383,   387,   388,   390,   396,   397,   398,   399,   400,
-+     401
-+};
-+#endif
-+
-+#if YYDEBUG || YYERROR_VERBOSE || 1
-+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-+static const char *const yytname[] =
-+{
-+  "$end", "error", "$undefined", "EOL", "NUMBER", "LITERAL", "CHARSET",
-+  "KEYMAPS", "KEYCODE", "EQUALS", "PLAIN", "SHIFT", "CONTROL", "ALT",
-+  "ALTGR", "SHIFTL", "SHIFTR", "CTRLL", "CTRLR", "CAPSSHIFT", "COMMA",
-+  "DASH", "STRING", "STRLITERAL", "COMPOSE", "TO", "CCHAR", "ERROR",
-+  "PLUS", "UNUMBER", "ALT_IS_META", "STRINGS", "AS", "USUAL", "ON", "FOR",
-+  "$accept", "keytable", "line", "charsetline", "altismetaline",
-+  "usualstringsline", "usualcomposeline", "keymapline", "range", "range0",
-+  "strline", "compline", "compsym", "singleline", "modifiers", "modifier",
-+  "rvalue0", "rvalue1", "rvalue", YY_NULL
-+};
-+#endif
-+
-+# ifdef YYPRINT
-+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-+   token YYLEX-NUM.  */
-+static const yytype_uint16 yytoknum[] =
-+{
-+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-+     285,   286,   287,   288,   289,   290
-+};
-+# endif
-+
-+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-+static const yytype_uint8 yyr1[] =
-+{
-+       0,    36,    37,    37,    38,    38,    38,    38,    38,    38,
-+      38,    38,    38,    39,    40,    41,    42,    42,    43,    44,
-+      44,    45,    45,    46,    47,    47,    48,    48,    49,    49,
-+      49,    50,    50,    51,    51,    51,    51,    51,    51,    51,
-+      51,    51,    52,    52,    53,    54,    54,    54,    54,    54,
-+      54
-+};
-+
-+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-+static const yytype_uint8 yyr2[] =
-+{
-+       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
-+       1,     1,     1,     3,     2,     4,     6,     4,     3,     3,
-+       1,     3,     1,     5,     6,     6,     1,     1,     5,     6,
-+       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-+       1,     1,     0,     2,     1,     1,     2,     1,     2,     1,
-+       2
-+};
-+
-+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-+   Performed when YYTABLE doesn't specify something else to do.  Zero
-+   means the default is an error.  */
-+static const yytype_uint8 yydefact[] =
-+{
-+       2,     0,     1,     4,     0,     0,     0,     0,    33,    34,
-+      35,    36,    37,    38,    39,    40,    41,     0,     0,     0,
-+       0,     3,     5,     6,     7,     8,     9,    11,    12,    10,
-+       0,    32,     0,    22,     0,    20,     0,     0,     0,    26,
-+      27,     0,     0,    14,     0,     0,    31,    13,     0,    18,
-+       0,    42,     0,     0,     0,     0,     0,     0,    21,    19,
-+      45,    49,     0,    47,     0,    42,    44,     0,     0,    17,
-+       0,     0,    15,     0,    46,    50,    48,    28,    43,     0,
-+      23,     0,    27,     0,     0,     0,    30,    16,    24,    25,
-+      29
-+};
-+
-+/* YYDEFGOTO[NTERM-NUM].  */
-+static const yytype_int8 yydefgoto[] =
-+{
-+      -1,     1,    21,    22,    23,    24,    25,    26,    34,    35,
-+      27,    28,    42,    29,    30,    31,    64,    65,    66
-+};
-+
-+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-+   STATE-NUM.  */
-+#define YYPACT_NINF -42
-+static const yytype_int8 yypact[] =
-+{
-+     -42,     3,   -42,   -42,   -21,     4,     8,    -1,   -42,   -42,
-+     -42,   -42,   -42,   -42,   -42,   -42,   -42,    26,    12,    37,
-+      10,   -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,
-+      50,   -42,    47,    30,    34,   -42,    43,    49,    46,   -42,
-+     -42,    23,    20,   -42,    24,    55,   -42,   -42,    66,   -42,
-+       4,    19,    62,    51,    -3,    48,    69,    67,   -42,   -42,
-+     -42,   -42,    31,   -42,    72,    19,   -42,    19,    74,   -42,
-+      56,     0,   -42,    19,   -42,   -42,   -42,   -42,   -42,    75,
-+     -42,    77,   -42,    78,    79,    80,   -42,   -42,   -42,   -42,
-+     -42
-+};
-+
-+/* YYPGOTO[NTERM-NUM].  */
-+static const yytype_int8 yypgoto[] =
-+{
-+     -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,   -42,    35,
-+     -42,   -42,   -41,   -42,   -42,    54,    21,   -42,   -28
-+};
-+
-+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-+   positive, shift that token.  If negative, reduce the rule which
-+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-+#define YYTABLE_NINF -1
-+static const yytype_uint8 yytable[] =
-+{
-+      69,    55,    32,     2,    60,    61,     3,    37,    33,     4,
-+       5,     6,    36,     7,     8,     9,    10,    11,    12,    13,
-+      14,    15,    16,    60,    61,    17,    39,    18,    62,    82,
-+      83,    38,    70,    19,    20,    74,    75,    49,    39,    79,
-+      43,    40,    44,    84,    41,    85,    39,    62,    63,    40,
-+      47,    48,    51,    52,    50,    53,    54,    56,    45,    57,
-+      76,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-+      58,    67,    72,    71,    68,    77,    73,    80,    86,    81,
-+      87,    88,    89,    90,    46,    59,    78
-+};
-+
-+#define yypact_value_is_default(Yystate) \
-+  (!!((Yystate) == (-42)))
-+
-+#define yytable_value_is_error(Yytable_value) \
-+  YYID (0)
-+
-+static const yytype_uint8 yycheck[] =
-+{
-+       3,    42,    23,     0,     4,     5,     3,     8,     4,     6,
-+       7,     8,     4,    10,    11,    12,    13,    14,    15,    16,
-+      17,    18,    19,     4,     5,    22,    26,    24,    28,    29,
-+      71,     5,    35,    30,    31,     4,     5,     3,    26,    67,
-+       3,    29,    32,    71,    32,    73,    26,    28,    29,    29,
-+       3,    21,     9,     4,    20,     9,    33,    33,     8,     4,
-+      29,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-+       4,     9,     3,    25,    23,     3,     9,     3,     3,    23,
-+       3,     3,     3,     3,    30,    50,    65
-+};
-+
-+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-+   symbol of state STATE-NUM.  */
-+static const yytype_uint8 yystos[] =
-+{
-+       0,    37,     0,     3,     6,     7,     8,    10,    11,    12,
-+      13,    14,    15,    16,    17,    18,    19,    22,    24,    30,
-+      31,    38,    39,    40,    41,    42,    43,    46,    47,    49,
-+      50,    51,    23,     4,    44,    45,     4,     8,     5,    26,
-+      29,    32,    48,     3,    32,     8,    51,     3,    21,     3,
-+      20,     9,     4,     9,    33,    48,    33,     4,     4,    45,
-+       4,     5,    28,    29,    52,    53,    54,     9,    23,     3,
-+      35,    25,     3,     9,     4,     5,    29,     3,    52,    54,
-+       3,    23,    29,    48,    54,    54,     3,     3,     3,     3,
-+       3
-+};
-+
-+#define yyerrok		(yyerrstatus = 0)
-+#define yyclearin	(yychar = YYEMPTY)
-+#define YYEMPTY		(-2)
-+#define YYEOF		0
-+
-+#define YYACCEPT	goto yyacceptlab
-+#define YYABORT		goto yyabortlab
-+#define YYERROR		goto yyerrorlab
-+
-+
-+/* Like YYERROR except do call yyerror.  This remains here temporarily
-+   to ease the transition to the new meaning of YYERROR, for GCC.
-+   Once GCC version 2 has supplanted version 1, this can go.  However,
-+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-+   discussed.  */
-+
-+#define YYFAIL		goto yyerrlab
-+#if defined YYFAIL
-+  /* This is here to suppress warnings from the GCC cpp's
-+     -Wunused-macros.  Normally we don't worry about that warning, but
-+     some users do, and we want to make it easy for users to remove
-+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-+#endif
-+
-+#define YYRECOVERING()  (!!yyerrstatus)
-+
-+#define YYBACKUP(Token, Value)                                  \
-+do                                                              \
-+  if (yychar == YYEMPTY)                                        \
-+    {                                                           \
-+      yychar = (Token);                                         \
-+      yylval = (Value);                                         \
-+      YYPOPSTACK (yylen);                                       \
-+      yystate = *yyssp;                                         \
-+      goto yybackup;                                            \
-+    }                                                           \
-+  else                                                          \
-+    {                                                           \
-+      yyerror (scanner, ctx, YY_("syntax error: cannot back up")); \
-+      YYERROR;							\
-+    }								\
-+while (YYID (0))
-+
-+/* Error token number */
-+#define YYTERROR	1
-+#define YYERRCODE	256
-+
-+
-+/* This macro is provided for backward compatibility. */
-+#ifndef YY_LOCATION_PRINT
-+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-+#endif
-+
-+
-+/* YYLEX -- calling `yylex' with the right arguments.  */
-+#ifdef YYLEX_PARAM
-+# define YYLEX yylex (&yylval, YYLEX_PARAM)
-+#else
-+# define YYLEX yylex (&yylval, scanner)
-+#endif
-+
-+/* Enable debugging if requested.  */
-+#if YYDEBUG
-+
-+# ifndef YYFPRINTF
-+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-+#  define YYFPRINTF fprintf
-+# endif
-+
-+# define YYDPRINTF(Args)			\
-+do {						\
-+  if (yydebug)					\
-+    YYFPRINTF Args;				\
-+} while (YYID (0))
-+
-+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-+do {									  \
-+  if (yydebug)								  \
-+    {									  \
-+      YYFPRINTF (stderr, "%s ", Title);					  \
-+      yy_symbol_print (stderr,						  \
-+		  Type, Value, scanner, ctx); \
-+      YYFPRINTF (stderr, "\n");						  \
-+    }									  \
-+} while (YYID (0))
-+
-+
-+/*--------------------------------.
-+| Print this symbol on YYOUTPUT.  |
-+`--------------------------------*/
-+
-+/*ARGSUSED*/
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void *scanner, struct lk_ctx *ctx)
-+#else
-+static void
-+yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner, ctx)
-+    FILE *yyoutput;
-+    int yytype;
-+    YYSTYPE const * const yyvaluep;
-+    void *scanner;
-+    struct lk_ctx *ctx;
-+#endif
-+{
-+  FILE *yyo = yyoutput;
-+  YYUSE (yyo);
-+  if (!yyvaluep)
-+    return;
-+  YYUSE (scanner);
-+  YYUSE (ctx);
-+# ifdef YYPRINT
-+  if (yytype < YYNTOKENS)
-+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-+# else
-+  YYUSE (yyoutput);
-+# endif
-+  YYUSE (yytype);
-+}
-+
-+
-+/*--------------------------------.
-+| Print this symbol on YYOUTPUT.  |
-+`--------------------------------*/
-+
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void *scanner, struct lk_ctx *ctx)
-+#else
-+static void
-+yy_symbol_print (yyoutput, yytype, yyvaluep, scanner, ctx)
-+    FILE *yyoutput;
-+    int yytype;
-+    YYSTYPE const * const yyvaluep;
-+    void *scanner;
-+    struct lk_ctx *ctx;
-+#endif
-+{
-+  if (yytype < YYNTOKENS)
-+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-+  else
-+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-+
-+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner, ctx);
-+  YYFPRINTF (yyoutput, ")");
-+}
-+
-+/*------------------------------------------------------------------.
-+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-+| TOP (included).                                                   |
-+`------------------------------------------------------------------*/
-+
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-+#else
-+static void
-+yy_stack_print (yybottom, yytop)
-+    yytype_int16 *yybottom;
-+    yytype_int16 *yytop;
-+#endif
-+{
-+  YYFPRINTF (stderr, "Stack now");
-+  for (; yybottom <= yytop; yybottom++)
-+    {
-+      int yybot = *yybottom;
-+      YYFPRINTF (stderr, " %d", yybot);
-+    }
-+  YYFPRINTF (stderr, "\n");
-+}
-+
-+# define YY_STACK_PRINT(Bottom, Top)				\
-+do {								\
-+  if (yydebug)							\
-+    yy_stack_print ((Bottom), (Top));				\
-+} while (YYID (0))
-+
-+
-+/*------------------------------------------------.
-+| Report that the YYRULE is going to be reduced.  |
-+`------------------------------------------------*/
-+
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, void *scanner, struct lk_ctx *ctx)
-+#else
-+static void
-+yy_reduce_print (yyvsp, yyrule, scanner, ctx)
-+    YYSTYPE *yyvsp;
-+    int yyrule;
-+    void *scanner;
-+    struct lk_ctx *ctx;
-+#endif
-+{
-+  int yynrhs = yyr2[yyrule];
-+  int yyi;
-+  unsigned long int yylno = yyrline[yyrule];
-+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-+	     yyrule - 1, yylno);
-+  /* The symbols being reduced.  */
-+  for (yyi = 0; yyi < yynrhs; yyi++)
-+    {
-+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-+		       &(yyvsp[(yyi + 1) - (yynrhs)])
-+		       		       , scanner, ctx);
-+      YYFPRINTF (stderr, "\n");
-+    }
-+}
-+
-+# define YY_REDUCE_PRINT(Rule)		\
-+do {					\
-+  if (yydebug)				\
-+    yy_reduce_print (yyvsp, Rule, scanner, ctx); \
-+} while (YYID (0))
-+
-+/* Nonzero means print parse trace.  It is left uninitialized so that
-+   multiple parsers can coexist.  */
-+int yydebug;
-+#else /* !YYDEBUG */
-+# define YYDPRINTF(Args)
-+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-+# define YY_STACK_PRINT(Bottom, Top)
-+# define YY_REDUCE_PRINT(Rule)
-+#endif /* !YYDEBUG */
-+
-+
-+/* YYINITDEPTH -- initial size of the parser's stacks.  */
-+#ifndef	YYINITDEPTH
-+# define YYINITDEPTH 200
-+#endif
-+
-+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-+   if the built-in stack extension method is used).
-+
-+   Do not make this value too large; the results are undefined if
-+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-+   evaluated with infinite-precision integer arithmetic.  */
-+
-+#ifndef YYMAXDEPTH
-+# define YYMAXDEPTH 10000
-+#endif
-+
-+
-+#if YYERROR_VERBOSE
-+
-+# ifndef yystrlen
-+#  if defined __GLIBC__ && defined _STRING_H
-+#   define yystrlen strlen
-+#  else
-+/* Return the length of YYSTR.  */
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static YYSIZE_T
-+yystrlen (const char *yystr)
-+#else
-+static YYSIZE_T
-+yystrlen (yystr)
-+    const char *yystr;
-+#endif
-+{
-+  YYSIZE_T yylen;
-+  for (yylen = 0; yystr[yylen]; yylen++)
-+    continue;
-+  return yylen;
-+}
-+#  endif
-+# endif
-+
-+# ifndef yystpcpy
-+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+#   define yystpcpy stpcpy
-+#  else
-+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-+   YYDEST.  */
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static char *
-+yystpcpy (char *yydest, const char *yysrc)
-+#else
-+static char *
-+yystpcpy (yydest, yysrc)
-+    char *yydest;
-+    const char *yysrc;
-+#endif
-+{
-+  char *yyd = yydest;
-+  const char *yys = yysrc;
-+
-+  while ((*yyd++ = *yys++) != '\0')
-+    continue;
-+
-+  return yyd - 1;
-+}
-+#  endif
-+# endif
-+
-+# ifndef yytnamerr
-+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-+   quotes and backslashes, so that it's suitable for yyerror.  The
-+   heuristic is that double-quoting is unnecessary unless the string
-+   contains an apostrophe, a comma, or backslash (other than
-+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-+   null, do not copy; instead, return the length of what the result
-+   would have been.  */
-+static YYSIZE_T
-+yytnamerr (char *yyres, const char *yystr)
-+{
-+  if (*yystr == '"')
-+    {
-+      YYSIZE_T yyn = 0;
-+      char const *yyp = yystr;
-+
-+      for (;;)
-+	switch (*++yyp)
-+	  {
-+	  case '\'':
-+	  case ',':
-+	    goto do_not_strip_quotes;
-+
-+	  case '\\':
-+	    if (*++yyp != '\\')
-+	      goto do_not_strip_quotes;
-+	    /* Fall through.  */
-+	  default:
-+	    if (yyres)
-+	      yyres[yyn] = *yyp;
-+	    yyn++;
-+	    break;
-+
-+	  case '"':
-+	    if (yyres)
-+	      yyres[yyn] = '\0';
-+	    return yyn;
-+	  }
-+    do_not_strip_quotes: ;
-+    }
-+
-+  if (! yyres)
-+    return yystrlen (yystr);
-+
-+  return yystpcpy (yyres, yystr) - yyres;
-+}
-+# endif
-+
-+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-+   about the unexpected token YYTOKEN for the state stack whose top is
-+   YYSSP.
-+
-+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-+   not large enough to hold the message.  In that case, also set
-+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-+   required number of bytes is too large to store.  */
-+static int
-+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-+                yytype_int16 *yyssp, int yytoken)
-+{
-+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
-+  YYSIZE_T yysize = yysize0;
-+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-+  /* Internationalized format string. */
-+  const char *yyformat = YY_NULL;
-+  /* Arguments of yyformat. */
-+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-+  /* Number of reported tokens (one for the "unexpected", one per
-+     "expected"). */
-+  int yycount = 0;
-+
-+  /* There are many possibilities here to consider:
-+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-+       for details.  YYERROR is fine as it does not invoke this
-+       function.
-+     - If this state is a consistent state with a default action, then
-+       the only way this function was invoked is if the default action
-+       is an error action.  In that case, don't check for expected
-+       tokens because there are none.
-+     - The only way there can be no lookahead present (in yychar) is if
-+       this state is a consistent state with a default action.  Thus,
-+       detecting the absence of a lookahead is sufficient to determine
-+       that there is no unexpected or expected token to report.  In that
-+       case, just report a simple "syntax error".
-+     - Don't assume there isn't a lookahead just because this state is a
-+       consistent state with a default action.  There might have been a
-+       previous inconsistent state, consistent state with a non-default
-+       action, or user semantic action that manipulated yychar.
-+     - Of course, the expected token list depends on states to have
-+       correct lookahead information, and it depends on the parser not
-+       to perform extra reductions after fetching a lookahead from the
-+       scanner and before detecting a syntax error.  Thus, state merging
-+       (from LALR or IELR) and default reductions corrupt the expected
-+       token list.  However, the list is correct for canonical LR with
-+       one exception: it will still contain any token that will not be
-+       accepted due to an error action in a later state.
-+  */
-+  if (yytoken != YYEMPTY)
-+    {
-+      int yyn = yypact[*yyssp];
-+      yyarg[yycount++] = yytname[yytoken];
-+      if (!yypact_value_is_default (yyn))
-+        {
-+          /* Start YYX at -YYN if negative to avoid negative indexes in
-+             YYCHECK.  In other words, skip the first -YYN actions for
-+             this state because they are default actions.  */
-+          int yyxbegin = yyn < 0 ? -yyn : 0;
-+          /* Stay within bounds of both yycheck and yytname.  */
-+          int yychecklim = YYLAST - yyn + 1;
-+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-+          int yyx;
-+
-+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-+                && !yytable_value_is_error (yytable[yyx + yyn]))
-+              {
-+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-+                  {
-+                    yycount = 1;
-+                    yysize = yysize0;
-+                    break;
-+                  }
-+                yyarg[yycount++] = yytname[yyx];
-+                {
-+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-+                  if (! (yysize <= yysize1
-+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+                    return 2;
-+                  yysize = yysize1;
-+                }
-+              }
-+        }
-+    }
-+
-+  switch (yycount)
-+    {
-+# define YYCASE_(N, S)                      \
-+      case N:                               \
-+        yyformat = S;                       \
-+      break
-+      YYCASE_(0, YY_("syntax error"));
-+      YYCASE_(1, YY_("syntax error, unexpected %s"));
-+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-+# undef YYCASE_
-+    }
-+
-+  {
-+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+      return 2;
-+    yysize = yysize1;
-+  }
-+
-+  if (*yymsg_alloc < yysize)
-+    {
-+      *yymsg_alloc = 2 * yysize;
-+      if (! (yysize <= *yymsg_alloc
-+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-+      return 1;
-+    }
-+
-+  /* Avoid sprintf, as that infringes on the user's name space.
-+     Don't have undefined behavior even if the translation
-+     produced a string with the wrong number of "%s"s.  */
-+  {
-+    char *yyp = *yymsg;
-+    int yyi = 0;
-+    while ((*yyp = *yyformat) != '\0')
-+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-+        {
-+          yyp += yytnamerr (yyp, yyarg[yyi++]);
-+          yyformat += 2;
-+        }
-+      else
-+        {
-+          yyp++;
-+          yyformat++;
-+        }
-+  }
-+  return 0;
-+}
-+#endif /* YYERROR_VERBOSE */
-+
-+/*-----------------------------------------------.
-+| Release the memory associated to this symbol.  |
-+`-----------------------------------------------*/
-+
-+/*ARGSUSED*/
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+static void
-+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, void *scanner, struct lk_ctx *ctx)
-+#else
-+static void
-+yydestruct (yymsg, yytype, yyvaluep, scanner, ctx)
-+    const char *yymsg;
-+    int yytype;
-+    YYSTYPE *yyvaluep;
-+    void *scanner;
-+    struct lk_ctx *ctx;
-+#endif
-+{
-+  YYUSE (yyvaluep);
-+  YYUSE (scanner);
-+  YYUSE (ctx);
-+
-+  if (!yymsg)
-+    yymsg = "Deleting";
-+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-+
-+  YYUSE (yytype);
-+}
-+
-+
-+
-+
-+/*----------.
-+| yyparse.  |
-+`----------*/
-+
-+#ifdef YYPARSE_PARAM
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+int
-+yyparse (void *YYPARSE_PARAM)
-+#else
-+int
-+yyparse (YYPARSE_PARAM)
-+    void *YYPARSE_PARAM;
-+#endif
-+#else /* ! YYPARSE_PARAM */
-+#if (defined __STDC__ || defined __C99__FUNC__ \
-+     || defined __cplusplus || defined _MSC_VER)
-+int
-+yyparse (void *scanner, struct lk_ctx *ctx)
-+#else
-+int
-+yyparse (scanner, ctx)
-+    void *scanner;
-+    struct lk_ctx *ctx;
-+#endif
-+#endif
-+{
-+/* The lookahead symbol.  */
-+int yychar;
-+
-+
-+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-+    _Pragma ("GCC diagnostic push") \
-+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-+    _Pragma ("GCC diagnostic pop")
-+#else
-+/* Default value used for initialization, for pacifying older GCCs
-+   or non-GCC compilers.  */
-+static YYSTYPE yyval_default;
-+# define YY_INITIAL_VALUE(Value) = Value
-+#endif
-+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-+#endif
-+#ifndef YY_INITIAL_VALUE
-+# define YY_INITIAL_VALUE(Value) /* Nothing. */
-+#endif
-+
-+/* The semantic value of the lookahead symbol.  */
-+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-+
-+    /* Number of syntax errors so far.  */
-+    int yynerrs;
-+
-+    int yystate;
-+    /* Number of tokens to shift before error messages enabled.  */
-+    int yyerrstatus;
-+
-+    /* The stacks and their tools:
-+       `yyss': related to states.
-+       `yyvs': related to semantic values.
-+
-+       Refer to the stacks through separate pointers, to allow yyoverflow
-+       to reallocate them elsewhere.  */
-+
-+    /* The state stack.  */
-+    yytype_int16 yyssa[YYINITDEPTH];
-+    yytype_int16 *yyss;
-+    yytype_int16 *yyssp;
-+
-+    /* The semantic value stack.  */
-+    YYSTYPE yyvsa[YYINITDEPTH];
-+    YYSTYPE *yyvs;
-+    YYSTYPE *yyvsp;
-+
-+    YYSIZE_T yystacksize;
-+
-+  int yyn;
-+  int yyresult;
-+  /* Lookahead token as an internal (translated) token number.  */
-+  int yytoken = 0;
-+  /* The variables used to return semantic value and location from the
-+     action routines.  */
-+  YYSTYPE yyval;
-+
-+#if YYERROR_VERBOSE
-+  /* Buffer for error messages, and its allocated size.  */
-+  char yymsgbuf[128];
-+  char *yymsg = yymsgbuf;
-+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-+#endif
-+
-+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-+
-+  /* The number of symbols on the RHS of the reduced rule.
-+     Keep to zero when no symbol should be popped.  */
-+  int yylen = 0;
-+
-+  yyssp = yyss = yyssa;
-+  yyvsp = yyvs = yyvsa;
-+  yystacksize = YYINITDEPTH;
-+
-+  YYDPRINTF ((stderr, "Starting parse\n"));
-+
-+  yystate = 0;
-+  yyerrstatus = 0;
-+  yynerrs = 0;
-+  yychar = YYEMPTY; /* Cause a token to be read.  */
-+  goto yysetstate;
-+
-+/*------------------------------------------------------------.
-+| yynewstate -- Push a new state, which is found in yystate.  |
-+`------------------------------------------------------------*/
-+ yynewstate:
-+  /* In all cases, when you get here, the value and location stacks
-+     have just been pushed.  So pushing a state here evens the stacks.  */
-+  yyssp++;
-+
-+ yysetstate:
-+  *yyssp = yystate;
-+
-+  if (yyss + yystacksize - 1 <= yyssp)
-+    {
-+      /* Get the current used size of the three stacks, in elements.  */
-+      YYSIZE_T yysize = yyssp - yyss + 1;
-+
-+#ifdef yyoverflow
-+      {
-+	/* Give user a chance to reallocate the stack.  Use copies of
-+	   these so that the &'s don't force the real ones into
-+	   memory.  */
-+	YYSTYPE *yyvs1 = yyvs;
-+	yytype_int16 *yyss1 = yyss;
-+
-+	/* Each stack pointer address is followed by the size of the
-+	   data in use in that stack, in bytes.  This used to be a
-+	   conditional around just the two extra args, but that might
-+	   be undefined if yyoverflow is a macro.  */
-+	yyoverflow (YY_("memory exhausted"),
-+		    &yyss1, yysize * sizeof (*yyssp),
-+		    &yyvs1, yysize * sizeof (*yyvsp),
-+		    &yystacksize);
-+
-+	yyss = yyss1;
-+	yyvs = yyvs1;
-+      }
-+#else /* no yyoverflow */
-+# ifndef YYSTACK_RELOCATE
-+      goto yyexhaustedlab;
-+# else
-+      /* Extend the stack our own way.  */
-+      if (YYMAXDEPTH <= yystacksize)
-+	goto yyexhaustedlab;
-+      yystacksize *= 2;
-+      if (YYMAXDEPTH < yystacksize)
-+	yystacksize = YYMAXDEPTH;
-+
-+      {
-+	yytype_int16 *yyss1 = yyss;
-+	union yyalloc *yyptr =
-+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-+	if (! yyptr)
-+	  goto yyexhaustedlab;
-+	YYSTACK_RELOCATE (yyss_alloc, yyss);
-+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-+#  undef YYSTACK_RELOCATE
-+	if (yyss1 != yyssa)
-+	  YYSTACK_FREE (yyss1);
-+      }
-+# endif
-+#endif /* no yyoverflow */
-+
-+      yyssp = yyss + yysize - 1;
-+      yyvsp = yyvs + yysize - 1;
-+
-+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-+		  (unsigned long int) yystacksize));
-+
-+      if (yyss + yystacksize - 1 <= yyssp)
-+	YYABORT;
-+    }
-+
-+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-+
-+  if (yystate == YYFINAL)
-+    YYACCEPT;
-+
-+  goto yybackup;
-+
-+/*-----------.
-+| yybackup.  |
-+`-----------*/
-+yybackup:
-+
-+  /* Do appropriate processing given the current state.  Read a
-+     lookahead token if we need one and don't already have one.  */
-+
-+  /* First try to decide what to do without reference to lookahead token.  */
-+  yyn = yypact[yystate];
-+  if (yypact_value_is_default (yyn))
-+    goto yydefault;
-+
-+  /* Not known => get a lookahead token if don't already have one.  */
-+
-+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-+  if (yychar == YYEMPTY)
-+    {
-+      YYDPRINTF ((stderr, "Reading a token: "));
-+      yychar = YYLEX;
-+    }
-+
-+  if (yychar <= YYEOF)
-+    {
-+      yychar = yytoken = YYEOF;
-+      YYDPRINTF ((stderr, "Now at end of input.\n"));
-+    }
-+  else
-+    {
-+      yytoken = YYTRANSLATE (yychar);
-+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-+    }
-+
-+  /* If the proper action on seeing token YYTOKEN is to reduce or to
-+     detect an error, take that action.  */
-+  yyn += yytoken;
-+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-+    goto yydefault;
-+  yyn = yytable[yyn];
-+  if (yyn <= 0)
-+    {
-+      if (yytable_value_is_error (yyn))
-+        goto yyerrlab;
-+      yyn = -yyn;
-+      goto yyreduce;
-+    }
-+
-+  /* Count tokens shifted since error; after three, turn off error
-+     status.  */
-+  if (yyerrstatus)
-+    yyerrstatus--;
-+
-+  /* Shift the lookahead token.  */
-+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-+
-+  /* Discard the shifted token.  */
-+  yychar = YYEMPTY;
-+
-+  yystate = yyn;
-+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+  *++yyvsp = yylval;
-+  YY_IGNORE_MAYBE_UNINITIALIZED_END
-+
-+  goto yynewstate;
-+
-+
-+/*-----------------------------------------------------------.
-+| yydefault -- do the default action for the current state.  |
-+`-----------------------------------------------------------*/
-+yydefault:
-+  yyn = yydefact[yystate];
-+  if (yyn == 0)
-+    goto yyerrlab;
-+  goto yyreduce;
-+
-+
-+/*-----------------------------.
-+| yyreduce -- Do a reduction.  |
-+`-----------------------------*/
-+yyreduce:
-+  /* yyn is the number of a rule to reduce with.  */
-+  yylen = yyr2[yyn];
-+
-+  /* If YYLEN is nonzero, implement the default value of the action:
-+     `$$ = $1'.
-+
-+     Otherwise, the following line sets YYVAL to garbage.
-+     This behavior is undocumented and Bison
-+     users should not rely upon it.  Assigning to YYVAL
-+     unconditionally makes the parser a bit smaller, and it avoids a
-+     GCC warning that YYVAL may be used uninitialized.  */
-+  yyval = yyvsp[1-yylen];
-+
-+
-+  YY_REDUCE_PRINT (yyn);
-+  switch (yyn)
-+    {
-+        case 13:
-+/* Line 1787 of yacc.c  */
-+#line 194 "parser.y"
-+    {
-+				if (lk_set_charset(ctx, (char *) (yyvsp[(2) - (3)].str).data)) {
-+					ERR(ctx,
-+						_("unknown charset %s - ignoring charset request\n"),
-+						(char *) (yyvsp[(2) - (3)].str).data);
-+					YYERROR;
-+				}
-+				ctx->keywords |= LK_KEYWORD_CHARSET;
-+
-+				/* Unicode: The first 256 code points were made
-+				   identical to the content of ISO 8859-1 */
-+				if (ctx->flags & LK_FLAG_PREFER_UNICODE &&
-+				    !strcasecmp((char *) (yyvsp[(2) - (3)].str).data, "iso-8859-1"))
-+					ctx->flags ^= LK_FLAG_PREFER_UNICODE;
-+			}
-+    break;
-+
-+  case 14:
-+/* Line 1787 of yacc.c  */
-+#line 211 "parser.y"
-+    {
-+				ctx->keywords |= LK_KEYWORD_ALTISMETA;
-+			}
-+    break;
-+
-+  case 15:
-+/* Line 1787 of yacc.c  */
-+#line 216 "parser.y"
-+    {
-+				if (strings_as_usual(ctx) == -1)
-+					YYERROR;
-+				ctx->keywords |= LK_KEYWORD_STRASUSUAL;
-+			}
-+    break;
-+
-+  case 16:
-+/* Line 1787 of yacc.c  */
-+#line 223 "parser.y"
-+    {
-+				if (compose_as_usual(ctx, (char *) (yyvsp[(5) - (6)].str).data) == -1)
-+					YYERROR;
-+			}
-+    break;
-+
-+  case 17:
-+/* Line 1787 of yacc.c  */
-+#line 228 "parser.y"
-+    {
-+				if (compose_as_usual(ctx, 0) == -1)
-+					YYERROR;
-+			}
-+    break;
-+
-+  case 18:
-+/* Line 1787 of yacc.c  */
-+#line 234 "parser.y"
-+    {
-+				ctx->keywords |= LK_KEYWORD_KEYMAPS;
-+			}
-+    break;
-+
-+  case 21:
-+/* Line 1787 of yacc.c  */
-+#line 242 "parser.y"
-+    {
-+				int i;
-+				for (i = (yyvsp[(1) - (3)].num); i <= (yyvsp[(3) - (3)].num); i++) {
-+					if (lk_add_map(ctx, i) == -1)
-+						YYERROR;
-+				}
-+			}
-+    break;
-+
-+  case 22:
-+/* Line 1787 of yacc.c  */
-+#line 250 "parser.y"
-+    {
-+				if (lk_add_map(ctx, (yyvsp[(1) - (1)].num)) == -1)
-+					YYERROR;
-+			}
-+    break;
-+
-+  case 23:
-+/* Line 1787 of yacc.c  */
-+#line 256 "parser.y"
-+    {
-+				struct kbsentry ke;
-+
-+				if (KTYP((yyvsp[(2) - (5)].num)) != KT_FN) {
-+					ERR(ctx, _("'%s' is not a function key symbol"),
-+						get_sym(ctx, KTYP((yyvsp[(2) - (5)].num)), KVAL((yyvsp[(2) - (5)].num))));
-+					YYERROR;
-+				}
-+
-+				ke.kb_func = KVAL((yyvsp[(2) - (5)].num));
-+				strncpy((char *) ke.kb_string,
-+				        (char *) (yyvsp[(4) - (5)].str).data,
-+				        sizeof(ke.kb_string));
-+				ke.kb_string[sizeof(ke.kb_string) - 1] = 0;
-+
-+				if (lk_add_func(ctx, &ke) == -1)
-+					YYERROR;
-+			}
-+    break;
-+
-+  case 24:
-+/* Line 1787 of yacc.c  */
-+#line 276 "parser.y"
-+    {
-+				struct lk_kbdiacr ptr;
-+				ptr.diacr  = (yyvsp[(2) - (6)].num);
-+				ptr.base   = (yyvsp[(3) - (6)].num);
-+				ptr.result = (yyvsp[(5) - (6)].num);
-+
-+				if (lk_append_compose(ctx, &ptr) == -1)
-+					YYERROR;
-+			}
-+    break;
-+
-+  case 25:
-+/* Line 1787 of yacc.c  */
-+#line 286 "parser.y"
-+    {
-+				struct lk_kbdiacr ptr;
-+				ptr.diacr  = (yyvsp[(2) - (6)].num);
-+				ptr.base   = (yyvsp[(3) - (6)].num);
-+				ptr.result = (yyvsp[(5) - (6)].num);
-+
-+				if (lk_append_compose(ctx, &ptr) == -1)
-+					YYERROR;
-+			}
-+    break;
-+
-+  case 26:
-+/* Line 1787 of yacc.c  */
-+#line 296 "parser.y"
-+    {	(yyval.num) = (yyvsp[(1) - (1)].num);		}
-+    break;
-+
-+  case 27:
-+/* Line 1787 of yacc.c  */
-+#line 297 "parser.y"
-+    {	(yyval.num) = (yyvsp[(1) - (1)].num) ^ 0xf000;	}
-+    break;
-+
-+  case 28:
-+/* Line 1787 of yacc.c  */
-+#line 300 "parser.y"
-+    {
-+				unsigned int j, i, keycode;
-+				int *val;
-+
-+				if (ctx->key_line->count == 1) {
-+					char one = 1;
-+					/* Some files do not have a keymaps line, and
-+					 * we have to wait until all input has been read
-+					 * before we know which maps to fill. */
-+					lk_array_set(ctx->key_constant, (yyvsp[(2) - (5)].num), &one);
-+
-+					/* On the other hand, we now have include files,
-+					 * and it should be possible to override lines
-+					 * from an include file. So, kill old defs. */
-+					for (j = 0; j < ctx->keymap->total; j++) {
-+						if (!lk_map_exists(ctx, j))
-+							continue;
-+
-+						if (lk_del_key(ctx, j, (yyvsp[(2) - (5)].num)) < 0)
-+							YYERROR;
-+					}
-+				}
-+
-+				if (ctx->keywords & LK_KEYWORD_KEYMAPS) {
-+					i = 0;
-+
-+					for (j = 0; j < ctx->keymap->total; j++) {
-+						if (!lk_map_exists(ctx, j))
-+							continue;
-+
-+						if (ctx->key_line->count != 1 || i == 0) {
-+							keycode = K_HOLE;
-+
-+							if (i < ctx->key_line->count) {
-+								val = lk_array_get(ctx->key_line, i);
-+								keycode = *val;
-+							}
-+
-+							if (lk_add_key(ctx, j, (yyvsp[(2) - (5)].num), keycode) < 0)
-+								YYERROR;
-+						}
-+						i++;
-+					}
-+
-+					if (i < ctx->key_line->count) {
-+						ERR(ctx, _("too many (%d) entries on one line"),
-+							ctx->key_line->count);
-+						YYERROR;
-+					}
-+				} else {
-+					for (i = 0; i < ctx->key_line->count; i++) {
-+						val = lk_array_get(ctx->key_line, i);
-+
-+						if (lk_add_key(ctx, i, (yyvsp[(2) - (5)].num), *val) < 0)
-+							YYERROR;
-+					}
-+				}
-+			}
-+    break;
-+
-+  case 29:
-+/* Line 1787 of yacc.c  */
-+#line 360 "parser.y"
-+    {
-+				if (lk_add_key(ctx, ctx->mod, (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].num)) < 0)
-+					YYERROR;
-+				ctx->mod = 0;
-+			}
-+    break;
-+
-+  case 30:
-+/* Line 1787 of yacc.c  */
-+#line 366 "parser.y"
-+    {
-+				if (lk_add_key(ctx, 0, (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].num)) < 0)
-+					YYERROR;
-+				ctx->mod = 0;
-+			}
-+    break;
-+
-+  case 33:
-+/* Line 1787 of yacc.c  */
-+#line 375 "parser.y"
-+    { ctx->mod |= M_SHIFT;	}
-+    break;
-+
-+  case 34:
-+/* Line 1787 of yacc.c  */
-+#line 376 "parser.y"
-+    { ctx->mod |= M_CTRL;	}
-+    break;
-+
-+  case 35:
-+/* Line 1787 of yacc.c  */
-+#line 377 "parser.y"
-+    { ctx->mod |= M_ALT;		}
-+    break;
-+
-+  case 36:
-+/* Line 1787 of yacc.c  */
-+#line 378 "parser.y"
-+    { ctx->mod |= M_ALTGR;	}
-+    break;
-+
-+  case 37:
-+/* Line 1787 of yacc.c  */
-+#line 379 "parser.y"
-+    { ctx->mod |= M_SHIFTL;	}
-+    break;
-+
-+  case 38:
-+/* Line 1787 of yacc.c  */
-+#line 380 "parser.y"
-+    { ctx->mod |= M_SHIFTR;	}
-+    break;
-+
-+  case 39:
-+/* Line 1787 of yacc.c  */
-+#line 381 "parser.y"
-+    { ctx->mod |= M_CTRLL;	}
-+    break;
-+
-+  case 40:
-+/* Line 1787 of yacc.c  */
-+#line 382 "parser.y"
-+    { ctx->mod |= M_CTRLR;	}
-+    break;
-+
-+  case 41:
-+/* Line 1787 of yacc.c  */
-+#line 383 "parser.y"
-+    { ctx->mod |= M_CAPSSHIFT;	}
-+    break;
-+
-+  case 44:
-+/* Line 1787 of yacc.c  */
-+#line 391 "parser.y"
-+    {
-+				int val = (yyvsp[(1) - (1)].num);
-+				lk_array_append(ctx->key_line, &val);
-+			}
-+    break;
-+
-+  case 45:
-+/* Line 1787 of yacc.c  */
-+#line 396 "parser.y"
-+    { (yyval.num) = convert_code(ctx, (yyvsp[(1) - (1)].num), TO_AUTO);		}
-+    break;
-+
-+  case 46:
-+/* Line 1787 of yacc.c  */
-+#line 397 "parser.y"
-+    { (yyval.num) = add_capslock(ctx, (yyvsp[(2) - (2)].num));			}
-+    break;
-+
-+  case 47:
-+/* Line 1787 of yacc.c  */
-+#line 398 "parser.y"
-+    { (yyval.num) = convert_code(ctx, (yyvsp[(1) - (1)].num)^0xf000, TO_AUTO);	}
-+    break;
-+
-+  case 48:
-+/* Line 1787 of yacc.c  */
-+#line 399 "parser.y"
-+    { (yyval.num) = add_capslock(ctx, (yyvsp[(2) - (2)].num)^0xf000);		}
-+    break;
-+
-+  case 49:
-+/* Line 1787 of yacc.c  */
-+#line 400 "parser.y"
-+    { (yyval.num) = (yyvsp[(1) - (1)].num);					}
-+    break;
-+
-+  case 50:
-+/* Line 1787 of yacc.c  */
-+#line 401 "parser.y"
-+    { (yyval.num) = add_capslock(ctx, (yyvsp[(2) - (2)].num));			}
-+    break;
-+
-+
-+/* Line 1787 of yacc.c  */
-+#line 1979 "parser.c"
-+      default: break;
-+    }
-+  /* User semantic actions sometimes alter yychar, and that requires
-+     that yytoken be updated with the new translation.  We take the
-+     approach of translating immediately before every use of yytoken.
-+     One alternative is translating here after every semantic action,
-+     but that translation would be missed if the semantic action invokes
-+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-+     incorrect destructor might then be invoked immediately.  In the
-+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-+     to an incorrect destructor call or verbose syntax error message
-+     before the lookahead is translated.  */
-+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-+
-+  YYPOPSTACK (yylen);
-+  yylen = 0;
-+  YY_STACK_PRINT (yyss, yyssp);
-+
-+  *++yyvsp = yyval;
-+
-+  /* Now `shift' the result of the reduction.  Determine what state
-+     that goes to, based on the state we popped back to and the rule
-+     number reduced by.  */
-+
-+  yyn = yyr1[yyn];
-+
-+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-+    yystate = yytable[yystate];
-+  else
-+    yystate = yydefgoto[yyn - YYNTOKENS];
-+
-+  goto yynewstate;
-+
-+
-+/*------------------------------------.
-+| yyerrlab -- here on detecting error |
-+`------------------------------------*/
-+yyerrlab:
-+  /* Make sure we have latest lookahead translation.  See comments at
-+     user semantic actions for why this is necessary.  */
-+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-+
-+  /* If not already recovering from an error, report this error.  */
-+  if (!yyerrstatus)
-+    {
-+      ++yynerrs;
-+#if ! YYERROR_VERBOSE
-+      yyerror (scanner, ctx, YY_("syntax error"));
-+#else
-+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-+                                        yyssp, yytoken)
-+      {
-+        char const *yymsgp = YY_("syntax error");
-+        int yysyntax_error_status;
-+        yysyntax_error_status = YYSYNTAX_ERROR;
-+        if (yysyntax_error_status == 0)
-+          yymsgp = yymsg;
-+        else if (yysyntax_error_status == 1)
-+          {
-+            if (yymsg != yymsgbuf)
-+              YYSTACK_FREE (yymsg);
-+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-+            if (!yymsg)
-+              {
-+                yymsg = yymsgbuf;
-+                yymsg_alloc = sizeof yymsgbuf;
-+                yysyntax_error_status = 2;
-+              }
-+            else
-+              {
-+                yysyntax_error_status = YYSYNTAX_ERROR;
-+                yymsgp = yymsg;
-+              }
-+          }
-+        yyerror (scanner, ctx, yymsgp);
-+        if (yysyntax_error_status == 2)
-+          goto yyexhaustedlab;
-+      }
-+# undef YYSYNTAX_ERROR
-+#endif
-+    }
-+
-+
-+
-+  if (yyerrstatus == 3)
-+    {
-+      /* If just tried and failed to reuse lookahead token after an
-+	 error, discard it.  */
-+
-+      if (yychar <= YYEOF)
-+	{
-+	  /* Return failure if at end of input.  */
-+	  if (yychar == YYEOF)
-+	    YYABORT;
-+	}
-+      else
-+	{
-+	  yydestruct ("Error: discarding",
-+		      yytoken, &yylval, scanner, ctx);
-+	  yychar = YYEMPTY;
-+	}
-+    }
-+
-+  /* Else will try to reuse lookahead token after shifting the error
-+     token.  */
-+  goto yyerrlab1;
-+
-+
-+/*---------------------------------------------------.
-+| yyerrorlab -- error raised explicitly by YYERROR.  |
-+`---------------------------------------------------*/
-+yyerrorlab:
-+
-+  /* Pacify compilers like GCC when the user code never invokes
-+     YYERROR and the label yyerrorlab therefore never appears in user
-+     code.  */
-+  if (/*CONSTCOND*/ 0)
-+     goto yyerrorlab;
-+
-+  /* Do not reclaim the symbols of the rule which action triggered
-+     this YYERROR.  */
-+  YYPOPSTACK (yylen);
-+  yylen = 0;
-+  YY_STACK_PRINT (yyss, yyssp);
-+  yystate = *yyssp;
-+  goto yyerrlab1;
-+
-+
-+/*-------------------------------------------------------------.
-+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-+`-------------------------------------------------------------*/
-+yyerrlab1:
-+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
-+
-+  for (;;)
-+    {
-+      yyn = yypact[yystate];
-+      if (!yypact_value_is_default (yyn))
-+	{
-+	  yyn += YYTERROR;
-+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-+	    {
-+	      yyn = yytable[yyn];
-+	      if (0 < yyn)
-+		break;
-+	    }
-+	}
-+
-+      /* Pop the current state because it cannot handle the error token.  */
-+      if (yyssp == yyss)
-+	YYABORT;
-+
-+
-+      yydestruct ("Error: popping",
-+		  yystos[yystate], yyvsp, scanner, ctx);
-+      YYPOPSTACK (1);
-+      yystate = *yyssp;
-+      YY_STACK_PRINT (yyss, yyssp);
-+    }
-+
-+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-+  *++yyvsp = yylval;
-+  YY_IGNORE_MAYBE_UNINITIALIZED_END
-+
-+
-+  /* Shift the error token.  */
-+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-+
-+  yystate = yyn;
-+  goto yynewstate;
-+
-+
-+/*-------------------------------------.
-+| yyacceptlab -- YYACCEPT comes here.  |
-+`-------------------------------------*/
-+yyacceptlab:
-+  yyresult = 0;
-+  goto yyreturn;
-+
-+/*-----------------------------------.
-+| yyabortlab -- YYABORT comes here.  |
-+`-----------------------------------*/
-+yyabortlab:
-+  yyresult = 1;
-+  goto yyreturn;
-+
-+#if !defined yyoverflow || YYERROR_VERBOSE
-+/*-------------------------------------------------.
-+| yyexhaustedlab -- memory exhaustion comes here.  |
-+`-------------------------------------------------*/
-+yyexhaustedlab:
-+  yyerror (scanner, ctx, YY_("memory exhausted"));
-+  yyresult = 2;
-+  /* Fall through.  */
-+#endif
-+
-+yyreturn:
-+  if (yychar != YYEMPTY)
-+    {
-+      /* Make sure we have latest lookahead translation.  See comments at
-+         user semantic actions for why this is necessary.  */
-+      yytoken = YYTRANSLATE (yychar);
-+      yydestruct ("Cleanup: discarding lookahead",
-+                  yytoken, &yylval, scanner, ctx);
-+    }
-+  /* Do not reclaim the symbols of the rule which action triggered
-+     this YYABORT or YYACCEPT.  */
-+  YYPOPSTACK (yylen);
-+  YY_STACK_PRINT (yyss, yyssp);
-+  while (yyssp != yyss)
-+    {
-+      yydestruct ("Cleanup: popping",
-+		  yystos[*yyssp], yyvsp, scanner, ctx);
-+      YYPOPSTACK (1);
-+    }
-+#ifndef yyoverflow
-+  if (yyss != yyssa)
-+    YYSTACK_FREE (yyss);
-+#endif
-+#if YYERROR_VERBOSE
-+  if (yymsg != yymsgbuf)
-+    YYSTACK_FREE (yymsg);
-+#endif
-+  /* Make sure YYID is used.  */
-+  return YYID (yyresult);
-+}
-+
-+
-+/* Line 2050 of yacc.c  */
-+#line 403 "parser.y"
-+
-+
-+int
-+lk_parse_keymap(struct lk_ctx *ctx, lkfile_t *f)
-+{
-+	yyscan_t scanner;
-+	int rc = -1;
-+
-+	ctx->mod = 0;
-+
-+	yylex_init(&scanner);
-+	yylex_init_extra(ctx, &scanner);
-+
-+	INFO(ctx, _("Loading %s"), f->pathname);
-+
-+	if (stack_push(ctx, f, scanner) == -1)
-+		goto fail;
-+
-+	if (yyparse(scanner, ctx))
-+		goto fail;
-+
-+	rc = 0;
-+
-+	stack_pop(ctx, scanner);
-+
-+ fail:	yylex_destroy(scanner);
-+	return rc;
-+}
-diff --git a/src/libkeymap/parser.h b/src/libkeymap/parser.h
-new file mode 100644
-index 0000000..99251df
---- /dev/null
-+++ b/src/libkeymap/parser.h
-@@ -0,0 +1,172 @@
-+/* A Bison parser, made by GNU Bison 2.7.1.  */
-+
-+/* Bison interface for Yacc-like parsers in C
-+   
-+      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-+   
-+   This program is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+   
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+   
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* As a special exception, you may create a larger work that contains
-+   part or all of the Bison parser skeleton and distribute that work
-+   under terms of your choice, so long as that work isn't itself a
-+   parser generator using the skeleton or a modified version thereof
-+   as a parser skeleton.  Alternatively, if you modify or redistribute
-+   the parser skeleton itself, you may (at your option) remove this
-+   special exception, which will cause the skeleton and the resulting
-+   Bison output files to be licensed under the GNU General Public
-+   License without this special exception.
-+   
-+   This special exception was added by the Free Software Foundation in
-+   version 2.2 of Bison.  */
-+
-+#ifndef YY_YY_PARSER_H_INCLUDED
-+# define YY_YY_PARSER_H_INCLUDED
-+/* Enabling traces.  */
-+#ifndef YYDEBUG
-+# define YYDEBUG 1
-+#endif
-+#if YYDEBUG
-+extern int yydebug;
-+#endif
-+/* "%code requires" blocks.  */
-+/* Line 2053 of yacc.c  */
-+#line 26 "parser.y"
-+
-+#include "keymap.h"
-+
-+#ifndef STRDATA_STRUCT
-+#define STRDATA_STRUCT
-+#define MAX_PARSER_STRING 512
-+struct strdata {
-+	unsigned int len;
-+	unsigned char data[MAX_PARSER_STRING];
-+};
-+#endif
-+
-+
-+/* Line 2053 of yacc.c  */
-+#line 60 "parser.h"
-+
-+/* Tokens.  */
-+#ifndef YYTOKENTYPE
-+# define YYTOKENTYPE
-+   /* Put the tokens into the symbol table, so that GDB and other debuggers
-+      know about them.  */
-+   enum yytokentype {
-+     EOL = 258,
-+     NUMBER = 259,
-+     LITERAL = 260,
-+     CHARSET = 261,
-+     KEYMAPS = 262,
-+     KEYCODE = 263,
-+     EQUALS = 264,
-+     PLAIN = 265,
-+     SHIFT = 266,
-+     CONTROL = 267,
-+     ALT = 268,
-+     ALTGR = 269,
-+     SHIFTL = 270,
-+     SHIFTR = 271,
-+     CTRLL = 272,
-+     CTRLR = 273,
-+     CAPSSHIFT = 274,
-+     COMMA = 275,
-+     DASH = 276,
-+     STRING = 277,
-+     STRLITERAL = 278,
-+     COMPOSE = 279,
-+     TO = 280,
-+     CCHAR = 281,
-+     ERROR = 282,
-+     PLUS = 283,
-+     UNUMBER = 284,
-+     ALT_IS_META = 285,
-+     STRINGS = 286,
-+     AS = 287,
-+     USUAL = 288,
-+     ON = 289,
-+     FOR = 290
-+   };
-+#endif
-+/* Tokens.  */
-+#define EOL 258
-+#define NUMBER 259
-+#define LITERAL 260
-+#define CHARSET 261
-+#define KEYMAPS 262
-+#define KEYCODE 263
-+#define EQUALS 264
-+#define PLAIN 265
-+#define SHIFT 266
-+#define CONTROL 267
-+#define ALT 268
-+#define ALTGR 269
-+#define SHIFTL 270
-+#define SHIFTR 271
-+#define CTRLL 272
-+#define CTRLR 273
-+#define CAPSSHIFT 274
-+#define COMMA 275
-+#define DASH 276
-+#define STRING 277
-+#define STRLITERAL 278
-+#define COMPOSE 279
-+#define TO 280
-+#define CCHAR 281
-+#define ERROR 282
-+#define PLUS 283
-+#define UNUMBER 284
-+#define ALT_IS_META 285
-+#define STRINGS 286
-+#define AS 287
-+#define USUAL 288
-+#define ON 289
-+#define FOR 290
-+
-+
-+
-+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-+typedef union YYSTYPE
-+{
-+/* Line 2053 of yacc.c  */
-+#line 58 "parser.y"
-+
-+	long long int num;
-+	struct strdata str;
-+
-+
-+/* Line 2053 of yacc.c  */
-+#line 151 "parser.h"
-+} YYSTYPE;
-+# define YYSTYPE_IS_TRIVIAL 1
-+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-+# define YYSTYPE_IS_DECLARED 1
-+#endif
-+
-+
-+#ifdef YYPARSE_PARAM
-+#if defined __STDC__ || defined __cplusplus
-+int yyparse (void *YYPARSE_PARAM);
-+#else
-+int yyparse ();
-+#endif
-+#else /* ! YYPARSE_PARAM */
-+#if defined __STDC__ || defined __cplusplus
-+int yyparse (void *scanner, struct lk_ctx *ctx);
-+#else
-+int yyparse ();
-+#endif
-+#endif /* ! YYPARSE_PARAM */
-+
-+#endif /* !YY_YY_PARSER_H_INCLUDED  */
--- 
-2.6.2
-
diff --git a/core/kbd/rev b/core/kbd/rev
deleted file mode 100644
index d00491fd..00000000
--- a/core/kbd/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/core/kbd/src b/core/kbd/src
deleted file mode 160000
-Subproject f1cbca04b4b9ae782ed8b4391b682615cb77d99
diff --git a/core/libressl/gen.rc b/core/libressl/gen.rc
deleted file mode 100644
index c80e9ede..00000000
--- a/core/libressl/gen.rc
+++ /dev/null
@@ -1,307 +0,0 @@
-cflags\
-	-Wno-attributes\
-	-D LIBRESSL_INTERNAL\
-	-D OPENSSL_NO_HW_PADLOCK\
-	-D OPENSSL_NO_ASM\
-	-D '''__warn_references(sym,msg)=''' \
-	-isystem core/openbsd/include\
-	-I '$outdir'/include\
-	-I '$outdir'/internal\
-	-I '$srcdir'/src/lib/libcrypto\
-	-I '$srcdir'/src/lib/libcrypto/asn1\
-	-I '$srcdir'/src/lib/libcrypto/evp\
-	-I '$srcdir'/src/lib/libcrypto/modes
-
-srchdrs=(\
-	libcrypto/^(\
-		aes/aes.h\
-		asn1/asn1.h\
-		asn1/asn1_mac.h\
-		asn1/asn1t.h\
-		bf/blowfish.h\
-		bio/bio.h\
-		bn/bn.h\
-		buffer/buffer.h\
-		camellia/camellia.h\
-		cast/cast.h\
-		chacha/chacha.h\
-		cmac/cmac.h\
-		comp/comp.h\
-		conf/conf.h\
-		conf/conf_api.h\
-		crypto.h\
-		des/des.h\
-		dh/dh.h\
-		dsa/dsa.h\
-		dso/dso.h\
-		ec/ec.h\
-		ecdh/ecdh.h\
-		ecdsa/ecdsa.h\
-		engine/engine.h\
-		err/err.h\
-		evp/evp.h\
-		gost/gost.h\
-		hmac/hmac.h\
-		idea/idea.h\
-		krb5/krb5_asn.h\
-		lhash/lhash.h\
-		md4/md4.h\
-		md5/md5.h\
-		modes/modes.h\
-		objects/objects.h\
-		ocsp/ocsp.h\
-		opensslfeatures.h\
-		opensslv.h\
-		ossl_typ.h\
-		pem/pem.h\
-		pem/pem2.h\
-		pkcs12/pkcs12.h\
-		pkcs7/pkcs7.h\
-		poly1305/poly1305.h\
-		rand/rand.h\
-		rc2/rc2.h\
-		rc4/rc4.h\
-		ripemd/ripemd.h\
-		rsa/rsa.h\
-		sha/sha.h\
-		stack/safestack.h\
-		stack/stack.h\
-		ts/ts.h\
-		txt_db/txt_db.h\
-		ui/ui.h\
-		ui/ui_compat.h\
-		whrlpool/whrlpool.h\
-		x509/x509.h\
-		x509/x509_vfy.h\
-		x509v3/x509v3.h\
-		\
-		objects/obj_mac.h\
-	)\
-	libssl/^(srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h)\
-	libcrypto/arch/amd64/opensslconf.h\
-)
-hdrs=()
-for(srchdr in $srchdrs) {
-	base=`{basename $srchdr}
-	hdr='$outdir'/include/openssl/$base
-	hdrs=($hdrs $hdr)
-	build $hdr copy '$srcdir'/src/lib/$srchdr
-	file include/openssl/$base '$srcdir'/src/lib/$srchdr 644
-}
-phony headers $hdrs
-
-# src/lib/libcrypto/crypto/Makefile
-lib libcrypto.a -d '$dir'/headers src/lib/libcrypto/^(\
-	cryptlib.c malloc-wrapper.c mem_dbg.c cversion.c ex_data.c cpt_err.c\
-	o_time.c o_str.c o_init.c\
-	mem_clr.c\
-	aes/^(\
-		aes_misc.c aes_ecb.c aes_cfb.c aes_ofb.c\
-		aes_ctr.c aes_ige.c aes_wrap.c\
-	)\
-	asn1/^(\
-		a_object.c a_bitstr.c a_time.c a_int.c a_octet.c\
-		a_print.c a_type.c a_dup.c a_d2i_fp.c a_i2d_fp.c\
-		a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c\
-		x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c\
-		x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c\
-		x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\
-		t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c\
-		tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c\
-		tasn_prn.c ameth_lib.c\
-		f_int.c f_string.c n_pkey.c\
-		f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c\
-		asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c\
-		evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c\
-		a_set.c\
-		a_time_tm.c\
-	)\
-	bf/^(bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c)\
-	bio/^(\
-		bio_lib.c bio_cb.c bio_err.c\
-		bss_mem.c bss_null.c bss_fd.c\
-		bss_file.c bss_sock.c bss_conn.c\
-		bf_null.c bf_buff.c b_print.c b_dump.c\
-		b_posix.c b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c\
-		bss_dgram.c\
-	)\
-	bn/^(\
-		bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c\
-		bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c\
-		bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c\
-		bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c\
-		bn_depr.c bn_const.c bn_x931p.c\
-	)\
-	buffer/^(buffer.c buf_err.c buf_str.c)\
-	camellia/^(cmll_cfb.c cmll_ctr.c cmll_ecb.c cmll_ofb.c)\
-	cast/^(c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c)\
-	chacha/chacha.c\
-	cmac/^(cmac.c cm_ameth.c cm_pmeth.c)\
-	comp/^(comp_lib.c comp_err.c c_rle.c c_zlib.c)\
-	conf/^(\
-		conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c\
-		conf_mall.c conf_sap.c\
-	)\
-	des/^(\
-		cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c\
-		ecb3_enc.c ecb_enc.c  enc_read.c enc_writ.c\
-		fcrypt.c ofb64enc.c ofb_enc.c  pcbc_enc.c\
-		qud_cksm.c rand_key.c set_key.c xcbc_enc.c\
-		str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c\
-	)\
-	dh/^(\
-		dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c\
-		dh_ameth.c dh_pmeth.c dh_prn.c\
-	)\
-	dsa/^(\
-		dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c\
-		dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_pmeth.c dsa_prn.c\
-	)\
-	dso/^(\
-		dso_dlfcn.c dso_err.c dso_lib.c dso_null.c\
-		dso_openssl.c\
-	)\
-	ec/^(\
-		ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\
-		ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\
-		ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c\
-		ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c\
-		ecp_oct.c ec2_oct.c ec_oct.c\
-	)\
-	ecdh/^(ech_lib.c ech_key.c ech_err.c)\
-	ecdsa/^(ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c)\
-	engine/^(\
-		eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c\
-		eng_table.c eng_pkey.c eng_fat.c eng_all.c\
-		tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c\
-		tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c\
-		eng_openssl.c eng_cnf.c eng_dyn.c\
-	)\
-	err/^(err.c err_all.c err_prn.c)\
-	evp/^(\
-		encode.c digest.c evp_enc.c evp_key.c\
-		e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c\
-		e_rc4.c e_aes.c names.c\
-		e_xcbc_d.c e_rc2.c e_cast.c\
-		m_null.c m_md4.c m_md5.c m_sha1.c m_wp.c\
-		m_dss.c m_dss1.c m_ripemd.c m_ecdsa.c\
-		p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c\
-		bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c\
-		c_all.c evp_lib.c\
-		evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c\
-		e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c\
-		e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c\
-		e_chacha.c evp_aead.c e_chacha20poly1305.c\
-		e_gost2814789.c m_gost2814789.c m_gostr341194.c m_streebog.c\
-	)\
-	gost/^(\
-		gost2814789.c gost89_keywrap.c gost89_params.c gost89imit_ameth.c\
-		gost89imit_pmeth.c gost_asn1.c gost_err.c gostr341001.c\
-		gostr341001_ameth.c gostr341001_key.c gostr341001_params.c\
-		gostr341001_pmeth.c gostr341194.c streebog.c\
-	)\
-	hmac/^(hmac.c hm_ameth.c hm_pmeth.c)\
-	idea/^(i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c)\
-	krb5/krb5_asn.c\
-	lhash/^(lhash.c lh_stats.c)\
-	md4/^(md4_dgst.c md4_one.c)\
-	md5/^(md5_dgst.c md5_one.c)\
-	modes/^(cbc128.c ctr128.c cts128.c cfb128.c ofb128.c gcm128.c ccm128.c xts128.c)\
-	objects/^(o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c)\
-	ocsp/^(\
-		ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c\
-		ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c\
-	)\
-	pem/^(\
-		pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c\
-		pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c\
-	)\
-	pkcs12/^(\
-		p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c\
-		p12_init.c p12_key.c p12_kiss.c p12_mutl.c\
-		p12_utl.c p12_npas.c pk12err.c p12_p8d.c p12_p8e.c\
-	)\
-	pkcs7/^(\
-		pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c\
-		pk7_mime.c bio_pk7.c\
-	)\
-	poly1305/poly1305.c\
-	rand/^(randfile.c rand_lib.c rand_err.c)\
-	rc2/^(rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c)\
-	ripemd/^(rmd_dgst.c rmd_one.c)\
-	rsa/^(\
-		rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c\
-		rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c\
-		rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c\
-		rsa_pmeth.c rsa_crpt.c\
-	)\
-	sha/^(sha1dgst.c sha1_one.c sha256.c sha512.c)\
-	stack/stack.c\
-	ts/^(\
-		ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c\
-		ts_rsp_sign.c ts_rsp_verify.c ts_verify_ctx.c ts_lib.c ts_conf.c\
-		ts_asn1.c\
-	)\
-	txt_db/txt_db.c\
-	ui/^(ui_err.c ui_lib.c ui_openssl.c ui_util.c)\
-	whrlpool/wp_dgst.c\
-	x509/^(\
-		x509_def.c x509_d2.c x509_r2x.c x509_cmp.c\
-		x509_obj.c x509_req.c x509spki.c x509_vfy.c\
-		x509_set.c x509cset.c x509rset.c x509_err.c\
-		x509name.c x509_v3.c x509_ext.c x509_att.c\
-		x509type.c x509_lu.c x_all.c x509_txt.c\
-		x509_trs.c by_file.c by_dir.c by_mem.c x509_vpm.c\
-	)\
-	x509v3/^(\
-		v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c\
-		v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c\
-		v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c\
-		v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c\
-		pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c\
-	)\
-	\
-	aes/^(aes_core.c aes_cbc.c)\
-	bf/^(bf_enc.c)\
-	bn/^(bn_asm.c)\
-	camellia/^(camellia.c cmll_cbc.c cmll_misc.c)\
-	des/^(des_enc.c fcrypt_b.c)\
-	rc4/^(rc4_enc.c rc4_skey.c)\
-	whrlpool/^(wp_block.c)\
-) '$builddir'/core/openbsd/libbsd.a
-file lib/libcrypto.a '$outdir'/libcrypto.a 644
-
-# src/lib/libssl/ssl/Makefile
-lib libssl.a src/lib/libssl/^(\
-	s3_srvr.c s3_clnt.c s3_lib.c s3_pkt.c s3_both.c \
-	s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \
-	t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \
-	d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \
-	d1_both.c d1_enc.c d1_srtp.c \
-	ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
-	ssl_ciph.c ssl_stat.c ssl_rsa.c \
-	ssl_asn1.c ssl_txt.c ssl_algs.c \
-	bio_ssl.c ssl_err.c t1_reneg.c \
-	pqueue.c\
-	\
-	s3_cbc.c\
-	bs_ber.c bs_cbb.c bs_cbs.c\
-) libcrypto.a.d
-file lib/libssl.a '$outdir'/libssl.a 644
-
-# src/usr.bin/openssl/Makefile
-exe openssl src/usr.bin/openssl/^(\
-	apps.c apps_posix.c asn1pars.c ca.c certhash.c ciphers.c crl.c\
-	crl2p7.c dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c\
-	errstr.c gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c\
-	openssl.c passwd.c pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c\
-	pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c s_cb.c s_client.c\
-	s_server.c s_socket.c s_time.c sess_id.c smime.c speed.c spkac.c ts.c\
-	verify.c version.c x509.c\
-) libssl.a.d libcrypto.a.d
-file bin/openssl '$outdir'/openssl 755
-file share/man/man1/openssl.1 '$srcdir'/src/usr.bin/openssl/openssl.1 644
-
-file share/libressl/cert.pem '$srcdir'/src/lib/libcrypto/cert.pem 644
-
-fetch git
diff --git a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch b/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch
deleted file mode 100644
index e1ecf6ad..00000000
--- a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch
+++ /dev/null
@@ -1,9450 +0,0 @@
-From 9e633f64197625448e65ad2f86cb033bc12b2c4a Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 14 Jun 2016 21:17:48 -0700
-Subject: [PATCH] Add generated obj_{dat,mac}.h from libressl 2.5.0
- distribution
-
----
- src/lib/libcrypto/objects/obj_dat.h | 5266 +++++++++++++++++++++++++++++++++++
- src/lib/libcrypto/objects/obj_mac.h | 4156 +++++++++++++++++++++++++++
- 2 files changed, 9422 insertions(+)
- create mode 100644 src/lib/libcrypto/objects/obj_dat.h
- create mode 100644 src/lib/libcrypto/objects/obj_mac.h
-
-diff --git a/src/lib/libcrypto/objects/obj_dat.h b/src/lib/libcrypto/objects/obj_dat.h
-new file mode 100644
-index 0000000..fdb826a
---- /dev/null
-+++ b/src/lib/libcrypto/objects/obj_dat.h
-@@ -0,0 +1,5266 @@
-+/* crypto/objects/obj_dat.h */
-+
-+/* THIS FILE IS GENERATED FROM objects.h by obj_dat.pl via the
-+ * following command:
-+ * perl obj_dat.pl obj_mac.h obj_dat.h
-+ */
-+
-+/* Copyright (C) 1995-1997 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.]
-+ */
-+
-+#define NUM_NID 950
-+#define NUM_SN 943
-+#define NUM_LN 943
-+#define NUM_OBJ 884
-+
-+static const unsigned char lvalues[6199]={
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  0] OBJ_rsadsi */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  6] OBJ_pkcs */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02,     /* [ 13] OBJ_md2 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x05,     /* [ 21] OBJ_md5 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x04,     /* [ 29] OBJ_rc4 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,/* [ 37] OBJ_rsaEncryption */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,/* [ 46] OBJ_md2WithRSAEncryption */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x04,/* [ 55] OBJ_md5WithRSAEncryption */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x01,/* [ 64] OBJ_pbeWithMD2AndDES_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x03,/* [ 73] OBJ_pbeWithMD5AndDES_CBC */
-+0x55,                                        /* [ 82] OBJ_X500 */
-+0x55,0x04,                                   /* [ 83] OBJ_X509 */
-+0x55,0x04,0x03,                              /* [ 85] OBJ_commonName */
-+0x55,0x04,0x06,                              /* [ 88] OBJ_countryName */
-+0x55,0x04,0x07,                              /* [ 91] OBJ_localityName */
-+0x55,0x04,0x08,                              /* [ 94] OBJ_stateOrProvinceName */
-+0x55,0x04,0x0A,                              /* [ 97] OBJ_organizationName */
-+0x55,0x04,0x0B,                              /* [100] OBJ_organizationalUnitName */
-+0x55,0x08,0x01,0x01,                         /* [103] OBJ_rsa */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,     /* [107] OBJ_pkcs7 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x01,/* [115] OBJ_pkcs7_data */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02,/* [124] OBJ_pkcs7_signed */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x03,/* [133] OBJ_pkcs7_enveloped */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x04,/* [142] OBJ_pkcs7_signedAndEnveloped */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x05,/* [151] OBJ_pkcs7_digest */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x06,/* [160] OBJ_pkcs7_encrypted */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x03,     /* [169] OBJ_pkcs3 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x03,0x01,/* [177] OBJ_dhKeyAgreement */
-+0x2B,0x0E,0x03,0x02,0x06,                    /* [186] OBJ_des_ecb */
-+0x2B,0x0E,0x03,0x02,0x09,                    /* [191] OBJ_des_cfb64 */
-+0x2B,0x0E,0x03,0x02,0x07,                    /* [196] OBJ_des_cbc */
-+0x2B,0x0E,0x03,0x02,0x11,                    /* [201] OBJ_des_ede_ecb */
-+0x2B,0x06,0x01,0x04,0x01,0x81,0x3C,0x07,0x01,0x01,0x02,/* [206] OBJ_idea_cbc */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x02,     /* [217] OBJ_rc2_cbc */
-+0x2B,0x0E,0x03,0x02,0x12,                    /* [225] OBJ_sha */
-+0x2B,0x0E,0x03,0x02,0x0F,                    /* [230] OBJ_shaWithRSAEncryption */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x07,     /* [235] OBJ_des_ede3_cbc */
-+0x2B,0x0E,0x03,0x02,0x08,                    /* [243] OBJ_des_ofb64 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,     /* [248] OBJ_pkcs9 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x01,/* [256] OBJ_pkcs9_emailAddress */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x02,/* [265] OBJ_pkcs9_unstructuredName */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x03,/* [274] OBJ_pkcs9_contentType */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x04,/* [283] OBJ_pkcs9_messageDigest */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x05,/* [292] OBJ_pkcs9_signingTime */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x06,/* [301] OBJ_pkcs9_countersignature */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x07,/* [310] OBJ_pkcs9_challengePassword */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x08,/* [319] OBJ_pkcs9_unstructuredAddress */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x09,/* [328] OBJ_pkcs9_extCertAttributes */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,          /* [337] OBJ_netscape */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,     /* [344] OBJ_netscape_cert_extension */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x02,     /* [352] OBJ_netscape_data_type */
-+0x2B,0x0E,0x03,0x02,0x1A,                    /* [360] OBJ_sha1 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,/* [365] OBJ_sha1WithRSAEncryption */
-+0x2B,0x0E,0x03,0x02,0x0D,                    /* [374] OBJ_dsaWithSHA */
-+0x2B,0x0E,0x03,0x02,0x0C,                    /* [379] OBJ_dsa_2 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0B,/* [384] OBJ_pbeWithSHA1AndRC2_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0C,/* [393] OBJ_id_pbkdf2 */
-+0x2B,0x0E,0x03,0x02,0x1B,                    /* [402] OBJ_dsaWithSHA1_2 */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x01,/* [407] OBJ_netscape_cert_type */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x02,/* [416] OBJ_netscape_base_url */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x03,/* [425] OBJ_netscape_revocation_url */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x04,/* [434] OBJ_netscape_ca_revocation_url */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x07,/* [443] OBJ_netscape_renewal_url */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x08,/* [452] OBJ_netscape_ca_policy_url */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x0C,/* [461] OBJ_netscape_ssl_server_name */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x0D,/* [470] OBJ_netscape_comment */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x02,0x05,/* [479] OBJ_netscape_cert_sequence */
-+0x55,0x1D,                                   /* [488] OBJ_id_ce */
-+0x55,0x1D,0x0E,                              /* [490] OBJ_subject_key_identifier */
-+0x55,0x1D,0x0F,                              /* [493] OBJ_key_usage */
-+0x55,0x1D,0x10,                              /* [496] OBJ_private_key_usage_period */
-+0x55,0x1D,0x11,                              /* [499] OBJ_subject_alt_name */
-+0x55,0x1D,0x12,                              /* [502] OBJ_issuer_alt_name */
-+0x55,0x1D,0x13,                              /* [505] OBJ_basic_constraints */
-+0x55,0x1D,0x14,                              /* [508] OBJ_crl_number */
-+0x55,0x1D,0x20,                              /* [511] OBJ_certificate_policies */
-+0x55,0x1D,0x23,                              /* [514] OBJ_authority_key_identifier */
-+0x2B,0x06,0x01,0x04,0x01,0x97,0x55,0x01,0x02,/* [517] OBJ_bf_cbc */
-+0x55,0x08,0x03,0x65,                         /* [526] OBJ_mdc2 */
-+0x55,0x08,0x03,0x64,                         /* [530] OBJ_mdc2WithRSA */
-+0x55,0x04,0x2A,                              /* [534] OBJ_givenName */
-+0x55,0x04,0x04,                              /* [537] OBJ_surname */
-+0x55,0x04,0x2B,                              /* [540] OBJ_initials */
-+0x55,0x1D,0x1F,                              /* [543] OBJ_crl_distribution_points */
-+0x2B,0x0E,0x03,0x02,0x03,                    /* [546] OBJ_md5WithRSA */
-+0x55,0x04,0x05,                              /* [551] OBJ_serialNumber */
-+0x55,0x04,0x0C,                              /* [554] OBJ_title */
-+0x55,0x04,0x0D,                              /* [557] OBJ_description */
-+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0A,/* [560] OBJ_cast5_cbc */
-+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0C,/* [569] OBJ_pbeWithMD5AndCast5_CBC */
-+0x2A,0x86,0x48,0xCE,0x38,0x04,0x03,          /* [578] OBJ_dsaWithSHA1 */
-+0x2B,0x0E,0x03,0x02,0x1D,                    /* [585] OBJ_sha1WithRSA */
-+0x2A,0x86,0x48,0xCE,0x38,0x04,0x01,          /* [590] OBJ_dsa */
-+0x2B,0x24,0x03,0x02,0x01,                    /* [597] OBJ_ripemd160 */
-+0x2B,0x24,0x03,0x03,0x01,0x02,               /* [602] OBJ_ripemd160WithRSA */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x08,     /* [608] OBJ_rc5_cbc */
-+0x29,0x01,0x01,0x85,0x1A,0x01,               /* [616] OBJ_rle_compression */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x08,/* [622] OBJ_zlib_compression */
-+0x55,0x1D,0x25,                              /* [633] OBJ_ext_key_usage */
-+0x2B,0x06,0x01,0x05,0x05,0x07,               /* [636] OBJ_id_pkix */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,          /* [642] OBJ_id_kp */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x01,     /* [649] OBJ_server_auth */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x02,     /* [657] OBJ_client_auth */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x03,     /* [665] OBJ_code_sign */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x04,     /* [673] OBJ_email_protect */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x08,     /* [681] OBJ_time_stamp */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x15,/* [689] OBJ_ms_code_ind */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x16,/* [699] OBJ_ms_code_com */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x01,/* [709] OBJ_ms_ctl_sign */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x03,/* [719] OBJ_ms_sgc */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x04,/* [729] OBJ_ms_efs */
-+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x04,0x01,/* [739] OBJ_ns_sgc */
-+0x55,0x1D,0x1B,                              /* [748] OBJ_delta_crl */
-+0x55,0x1D,0x15,                              /* [751] OBJ_crl_reason */
-+0x55,0x1D,0x18,                              /* [754] OBJ_invalidity_date */
-+0x2B,0x65,0x01,0x04,0x01,                    /* [757] OBJ_sxnet */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x01,/* [762] OBJ_pbe_WithSHA1And128BitRC4 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x02,/* [772] OBJ_pbe_WithSHA1And40BitRC4 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x03,/* [782] OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x04,/* [792] OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x05,/* [802] OBJ_pbe_WithSHA1And128BitRC2_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x06,/* [812] OBJ_pbe_WithSHA1And40BitRC2_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x01,/* [822] OBJ_keyBag */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x02,/* [833] OBJ_pkcs8ShroudedKeyBag */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x03,/* [844] OBJ_certBag */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x04,/* [855] OBJ_crlBag */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x05,/* [866] OBJ_secretBag */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x06,/* [877] OBJ_safeContentsBag */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x14,/* [888] OBJ_friendlyName */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x15,/* [897] OBJ_localKeyID */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x01,/* [906] OBJ_x509Certificate */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x02,/* [916] OBJ_sdsiCertificate */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x17,0x01,/* [926] OBJ_x509Crl */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0D,/* [936] OBJ_pbes2 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0E,/* [945] OBJ_pbmac1 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x07,     /* [954] OBJ_hmacWithSHA1 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x01,     /* [962] OBJ_id_qt_cps */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x02,     /* [970] OBJ_id_qt_unotice */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0F,/* [978] OBJ_SMIMECapabilities */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x04,/* [987] OBJ_pbeWithMD2AndRC2_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x06,/* [996] OBJ_pbeWithMD5AndRC2_CBC */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0A,/* [1005] OBJ_pbeWithSHA1AndDES_CBC */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0E,/* [1014] OBJ_ms_ext_req */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0E,/* [1024] OBJ_ext_req */
-+0x55,0x04,0x29,                              /* [1033] OBJ_name */
-+0x55,0x04,0x2E,                              /* [1036] OBJ_dnQualifier */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,          /* [1039] OBJ_id_pe */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,          /* [1046] OBJ_id_ad */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x01,     /* [1053] OBJ_info_access */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,     /* [1061] OBJ_ad_OCSP */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x02,     /* [1069] OBJ_ad_ca_issuers */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x09,     /* [1077] OBJ_OCSP_sign */
-+0x2A,                                        /* [1085] OBJ_member_body */
-+0x2A,0x86,0x48,                              /* [1086] OBJ_ISO_US */
-+0x2A,0x86,0x48,0xCE,0x38,                    /* [1089] OBJ_X9_57 */
-+0x2A,0x86,0x48,0xCE,0x38,0x04,               /* [1094] OBJ_X9cm */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,     /* [1100] OBJ_pkcs1 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,     /* [1108] OBJ_pkcs5 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,/* [1116] OBJ_SMIME */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,/* [1125] OBJ_id_smime_mod */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,/* [1135] OBJ_id_smime_ct */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,/* [1145] OBJ_id_smime_aa */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,/* [1155] OBJ_id_smime_alg */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,/* [1165] OBJ_id_smime_cd */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,/* [1175] OBJ_id_smime_spq */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,/* [1185] OBJ_id_smime_cti */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x01,/* [1195] OBJ_id_smime_mod_cms */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x02,/* [1206] OBJ_id_smime_mod_ess */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x03,/* [1217] OBJ_id_smime_mod_oid */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x04,/* [1228] OBJ_id_smime_mod_msg_v3 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x05,/* [1239] OBJ_id_smime_mod_ets_eSignature_88 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x06,/* [1250] OBJ_id_smime_mod_ets_eSignature_97 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x07,/* [1261] OBJ_id_smime_mod_ets_eSigPolicy_88 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x08,/* [1272] OBJ_id_smime_mod_ets_eSigPolicy_97 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x01,/* [1283] OBJ_id_smime_ct_receipt */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x02,/* [1294] OBJ_id_smime_ct_authData */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x03,/* [1305] OBJ_id_smime_ct_publishCert */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x04,/* [1316] OBJ_id_smime_ct_TSTInfo */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x05,/* [1327] OBJ_id_smime_ct_TDTInfo */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x06,/* [1338] OBJ_id_smime_ct_contentInfo */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x07,/* [1349] OBJ_id_smime_ct_DVCSRequestData */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x08,/* [1360] OBJ_id_smime_ct_DVCSResponseData */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x01,/* [1371] OBJ_id_smime_aa_receiptRequest */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x02,/* [1382] OBJ_id_smime_aa_securityLabel */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x03,/* [1393] OBJ_id_smime_aa_mlExpandHistory */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x04,/* [1404] OBJ_id_smime_aa_contentHint */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x05,/* [1415] OBJ_id_smime_aa_msgSigDigest */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x06,/* [1426] OBJ_id_smime_aa_encapContentType */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x07,/* [1437] OBJ_id_smime_aa_contentIdentifier */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x08,/* [1448] OBJ_id_smime_aa_macValue */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x09,/* [1459] OBJ_id_smime_aa_equivalentLabels */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0A,/* [1470] OBJ_id_smime_aa_contentReference */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0B,/* [1481] OBJ_id_smime_aa_encrypKeyPref */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0C,/* [1492] OBJ_id_smime_aa_signingCertificate */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0D,/* [1503] OBJ_id_smime_aa_smimeEncryptCerts */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0E,/* [1514] OBJ_id_smime_aa_timeStampToken */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0F,/* [1525] OBJ_id_smime_aa_ets_sigPolicyId */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x10,/* [1536] OBJ_id_smime_aa_ets_commitmentType */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x11,/* [1547] OBJ_id_smime_aa_ets_signerLocation */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x12,/* [1558] OBJ_id_smime_aa_ets_signerAttr */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x13,/* [1569] OBJ_id_smime_aa_ets_otherSigCert */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x14,/* [1580] OBJ_id_smime_aa_ets_contentTimestamp */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x15,/* [1591] OBJ_id_smime_aa_ets_CertificateRefs */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x16,/* [1602] OBJ_id_smime_aa_ets_RevocationRefs */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x17,/* [1613] OBJ_id_smime_aa_ets_certValues */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x18,/* [1624] OBJ_id_smime_aa_ets_revocationValues */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x19,/* [1635] OBJ_id_smime_aa_ets_escTimeStamp */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1A,/* [1646] OBJ_id_smime_aa_ets_certCRLTimestamp */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1B,/* [1657] OBJ_id_smime_aa_ets_archiveTimeStamp */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1C,/* [1668] OBJ_id_smime_aa_signatureType */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1D,/* [1679] OBJ_id_smime_aa_dvcs_dvc */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x01,/* [1690] OBJ_id_smime_alg_ESDHwith3DES */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x02,/* [1701] OBJ_id_smime_alg_ESDHwithRC2 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x03,/* [1712] OBJ_id_smime_alg_3DESwrap */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x04,/* [1723] OBJ_id_smime_alg_RC2wrap */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x05,/* [1734] OBJ_id_smime_alg_ESDH */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x06,/* [1745] OBJ_id_smime_alg_CMS3DESwrap */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x07,/* [1756] OBJ_id_smime_alg_CMSRC2wrap */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,0x01,/* [1767] OBJ_id_smime_cd_ldap */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x01,/* [1778] OBJ_id_smime_spq_ets_sqt_uri */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x02,/* [1789] OBJ_id_smime_spq_ets_sqt_unotice */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x01,/* [1800] OBJ_id_smime_cti_ets_proofOfOrigin */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x02,/* [1811] OBJ_id_smime_cti_ets_proofOfReceipt */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x03,/* [1822] OBJ_id_smime_cti_ets_proofOfDelivery */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x04,/* [1833] OBJ_id_smime_cti_ets_proofOfSender */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x05,/* [1844] OBJ_id_smime_cti_ets_proofOfApproval */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x06,/* [1855] OBJ_id_smime_cti_ets_proofOfCreation */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x04,     /* [1866] OBJ_md4 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,          /* [1874] OBJ_id_pkix_mod */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,          /* [1881] OBJ_id_qt */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,          /* [1888] OBJ_id_it */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,          /* [1895] OBJ_id_pkip */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,          /* [1902] OBJ_id_alg */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,          /* [1909] OBJ_id_cmc */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x08,          /* [1916] OBJ_id_on */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,          /* [1923] OBJ_id_pda */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,          /* [1930] OBJ_id_aca */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0B,          /* [1937] OBJ_id_qcs */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,          /* [1944] OBJ_id_cct */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x01,     /* [1951] OBJ_id_pkix1_explicit_88 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x02,     /* [1959] OBJ_id_pkix1_implicit_88 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x03,     /* [1967] OBJ_id_pkix1_explicit_93 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x04,     /* [1975] OBJ_id_pkix1_implicit_93 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x05,     /* [1983] OBJ_id_mod_crmf */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x06,     /* [1991] OBJ_id_mod_cmc */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x07,     /* [1999] OBJ_id_mod_kea_profile_88 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x08,     /* [2007] OBJ_id_mod_kea_profile_93 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x09,     /* [2015] OBJ_id_mod_cmp */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0A,     /* [2023] OBJ_id_mod_qualified_cert_88 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0B,     /* [2031] OBJ_id_mod_qualified_cert_93 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0C,     /* [2039] OBJ_id_mod_attribute_cert */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0D,     /* [2047] OBJ_id_mod_timestamp_protocol */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0E,     /* [2055] OBJ_id_mod_ocsp */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0F,     /* [2063] OBJ_id_mod_dvcs */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x10,     /* [2071] OBJ_id_mod_cmp2000 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x02,     /* [2079] OBJ_biometricInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x03,     /* [2087] OBJ_qcStatements */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x04,     /* [2095] OBJ_ac_auditEntity */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x05,     /* [2103] OBJ_ac_targeting */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x06,     /* [2111] OBJ_aaControls */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x07,     /* [2119] OBJ_sbgp_ipAddrBlock */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x08,     /* [2127] OBJ_sbgp_autonomousSysNum */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x09,     /* [2135] OBJ_sbgp_routerIdentifier */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x03,     /* [2143] OBJ_textNotice */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x05,     /* [2151] OBJ_ipsecEndSystem */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x06,     /* [2159] OBJ_ipsecTunnel */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x07,     /* [2167] OBJ_ipsecUser */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x0A,     /* [2175] OBJ_dvcs */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x01,     /* [2183] OBJ_id_it_caProtEncCert */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x02,     /* [2191] OBJ_id_it_signKeyPairTypes */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x03,     /* [2199] OBJ_id_it_encKeyPairTypes */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x04,     /* [2207] OBJ_id_it_preferredSymmAlg */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x05,     /* [2215] OBJ_id_it_caKeyUpdateInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x06,     /* [2223] OBJ_id_it_currentCRL */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x07,     /* [2231] OBJ_id_it_unsupportedOIDs */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x08,     /* [2239] OBJ_id_it_subscriptionRequest */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x09,     /* [2247] OBJ_id_it_subscriptionResponse */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0A,     /* [2255] OBJ_id_it_keyPairParamReq */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0B,     /* [2263] OBJ_id_it_keyPairParamRep */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0C,     /* [2271] OBJ_id_it_revPassphrase */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0D,     /* [2279] OBJ_id_it_implicitConfirm */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0E,     /* [2287] OBJ_id_it_confirmWaitTime */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0F,     /* [2295] OBJ_id_it_origPKIMessage */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,     /* [2303] OBJ_id_regCtrl */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,     /* [2311] OBJ_id_regInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x01,/* [2319] OBJ_id_regCtrl_regToken */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x02,/* [2328] OBJ_id_regCtrl_authenticator */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x03,/* [2337] OBJ_id_regCtrl_pkiPublicationInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x04,/* [2346] OBJ_id_regCtrl_pkiArchiveOptions */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x05,/* [2355] OBJ_id_regCtrl_oldCertID */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x06,/* [2364] OBJ_id_regCtrl_protocolEncrKey */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x01,/* [2373] OBJ_id_regInfo_utf8Pairs */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x02,/* [2382] OBJ_id_regInfo_certReq */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x01,     /* [2391] OBJ_id_alg_des40 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x02,     /* [2399] OBJ_id_alg_noSignature */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x03,     /* [2407] OBJ_id_alg_dh_sig_hmac_sha1 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x04,     /* [2415] OBJ_id_alg_dh_pop */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x01,     /* [2423] OBJ_id_cmc_statusInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x02,     /* [2431] OBJ_id_cmc_identification */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x03,     /* [2439] OBJ_id_cmc_identityProof */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x04,     /* [2447] OBJ_id_cmc_dataReturn */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x05,     /* [2455] OBJ_id_cmc_transactionId */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x06,     /* [2463] OBJ_id_cmc_senderNonce */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x07,     /* [2471] OBJ_id_cmc_recipientNonce */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x08,     /* [2479] OBJ_id_cmc_addExtensions */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x09,     /* [2487] OBJ_id_cmc_encryptedPOP */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0A,     /* [2495] OBJ_id_cmc_decryptedPOP */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0B,     /* [2503] OBJ_id_cmc_lraPOPWitness */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0F,     /* [2511] OBJ_id_cmc_getCert */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x10,     /* [2519] OBJ_id_cmc_getCRL */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x11,     /* [2527] OBJ_id_cmc_revokeRequest */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x12,     /* [2535] OBJ_id_cmc_regInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x13,     /* [2543] OBJ_id_cmc_responseInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x15,     /* [2551] OBJ_id_cmc_queryPending */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x16,     /* [2559] OBJ_id_cmc_popLinkRandom */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x17,     /* [2567] OBJ_id_cmc_popLinkWitness */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x18,     /* [2575] OBJ_id_cmc_confirmCertAcceptance */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x01,     /* [2583] OBJ_id_on_personalData */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x01,     /* [2591] OBJ_id_pda_dateOfBirth */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x02,     /* [2599] OBJ_id_pda_placeOfBirth */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x03,     /* [2607] OBJ_id_pda_gender */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x04,     /* [2615] OBJ_id_pda_countryOfCitizenship */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x05,     /* [2623] OBJ_id_pda_countryOfResidence */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x01,     /* [2631] OBJ_id_aca_authenticationInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x02,     /* [2639] OBJ_id_aca_accessIdentity */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x03,     /* [2647] OBJ_id_aca_chargingIdentity */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x04,     /* [2655] OBJ_id_aca_group */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x05,     /* [2663] OBJ_id_aca_role */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0B,0x01,     /* [2671] OBJ_id_qcs_pkixQCSyntax_v1 */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x01,     /* [2679] OBJ_id_cct_crs */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x02,     /* [2687] OBJ_id_cct_PKIData */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x03,     /* [2695] OBJ_id_cct_PKIResponse */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x03,     /* [2703] OBJ_ad_timeStamping */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x04,     /* [2711] OBJ_ad_dvcs */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x01,/* [2719] OBJ_id_pkix_OCSP_basic */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x02,/* [2728] OBJ_id_pkix_OCSP_Nonce */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x03,/* [2737] OBJ_id_pkix_OCSP_CrlID */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x04,/* [2746] OBJ_id_pkix_OCSP_acceptableResponses */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x05,/* [2755] OBJ_id_pkix_OCSP_noCheck */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x06,/* [2764] OBJ_id_pkix_OCSP_archiveCutoff */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x07,/* [2773] OBJ_id_pkix_OCSP_serviceLocator */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x08,/* [2782] OBJ_id_pkix_OCSP_extendedStatus */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x09,/* [2791] OBJ_id_pkix_OCSP_valid */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0A,/* [2800] OBJ_id_pkix_OCSP_path */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0B,/* [2809] OBJ_id_pkix_OCSP_trustRoot */
-+0x2B,0x0E,0x03,0x02,                         /* [2818] OBJ_algorithm */
-+0x2B,0x0E,0x03,0x02,0x0B,                    /* [2822] OBJ_rsaSignature */
-+0x55,0x08,                                   /* [2827] OBJ_X500algorithms */
-+0x2B,                                        /* [2829] OBJ_org */
-+0x2B,0x06,                                   /* [2830] OBJ_dod */
-+0x2B,0x06,0x01,                              /* [2832] OBJ_iana */
-+0x2B,0x06,0x01,0x01,                         /* [2835] OBJ_Directory */
-+0x2B,0x06,0x01,0x02,                         /* [2839] OBJ_Management */
-+0x2B,0x06,0x01,0x03,                         /* [2843] OBJ_Experimental */
-+0x2B,0x06,0x01,0x04,                         /* [2847] OBJ_Private */
-+0x2B,0x06,0x01,0x05,                         /* [2851] OBJ_Security */
-+0x2B,0x06,0x01,0x06,                         /* [2855] OBJ_SNMPv2 */
-+0x2B,0x06,0x01,0x07,                         /* [2859] OBJ_Mail */
-+0x2B,0x06,0x01,0x04,0x01,                    /* [2863] OBJ_Enterprises */
-+0x2B,0x06,0x01,0x04,0x01,0x8B,0x3A,0x82,0x58,/* [2868] OBJ_dcObject */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x19,/* [2877] OBJ_domainComponent */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0D,/* [2887] OBJ_Domain */
-+0x55,0x01,0x05,                              /* [2897] OBJ_selected_attribute_types */
-+0x55,0x01,0x05,0x37,                         /* [2900] OBJ_clearance */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x03,/* [2904] OBJ_md4WithRSAEncryption */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0A,     /* [2913] OBJ_ac_proxying */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0B,     /* [2921] OBJ_sinfo_access */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x06,     /* [2929] OBJ_id_aca_encAttrs */
-+0x55,0x04,0x48,                              /* [2937] OBJ_role */
-+0x55,0x1D,0x24,                              /* [2940] OBJ_policy_constraints */
-+0x55,0x1D,0x37,                              /* [2943] OBJ_target_information */
-+0x55,0x1D,0x38,                              /* [2946] OBJ_no_rev_avail */
-+0x2A,0x86,0x48,0xCE,0x3D,                    /* [2949] OBJ_ansi_X9_62 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x01,          /* [2954] OBJ_X9_62_prime_field */
-+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,          /* [2961] OBJ_X9_62_characteristic_two_field */
-+0x2A,0x86,0x48,0xCE,0x3D,0x02,0x01,          /* [2968] OBJ_X9_62_id_ecPublicKey */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x01,     /* [2975] OBJ_X9_62_prime192v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x02,     /* [2983] OBJ_X9_62_prime192v2 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x03,     /* [2991] OBJ_X9_62_prime192v3 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x04,     /* [2999] OBJ_X9_62_prime239v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x05,     /* [3007] OBJ_X9_62_prime239v2 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x06,     /* [3015] OBJ_X9_62_prime239v3 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x07,     /* [3023] OBJ_X9_62_prime256v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x01,          /* [3031] OBJ_ecdsa_with_SHA1 */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x01,/* [3038] OBJ_ms_csp_name */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x01,/* [3047] OBJ_aes_128_ecb */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x02,/* [3056] OBJ_aes_128_cbc */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x03,/* [3065] OBJ_aes_128_ofb128 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x04,/* [3074] OBJ_aes_128_cfb128 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x15,/* [3083] OBJ_aes_192_ecb */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x16,/* [3092] OBJ_aes_192_cbc */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x17,/* [3101] OBJ_aes_192_ofb128 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x18,/* [3110] OBJ_aes_192_cfb128 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x29,/* [3119] OBJ_aes_256_ecb */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2A,/* [3128] OBJ_aes_256_cbc */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2B,/* [3137] OBJ_aes_256_ofb128 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2C,/* [3146] OBJ_aes_256_cfb128 */
-+0x55,0x1D,0x17,                              /* [3155] OBJ_hold_instruction_code */
-+0x2A,0x86,0x48,0xCE,0x38,0x02,0x01,          /* [3158] OBJ_hold_instruction_none */
-+0x2A,0x86,0x48,0xCE,0x38,0x02,0x02,          /* [3165] OBJ_hold_instruction_call_issuer */
-+0x2A,0x86,0x48,0xCE,0x38,0x02,0x03,          /* [3172] OBJ_hold_instruction_reject */
-+0x09,                                        /* [3179] OBJ_data */
-+0x09,0x92,0x26,                              /* [3180] OBJ_pss */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,          /* [3183] OBJ_ucl */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,     /* [3190] OBJ_pilot */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,/* [3198] OBJ_pilotAttributeType */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,/* [3207] OBJ_pilotAttributeSyntax */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,/* [3216] OBJ_pilotObjectClass */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x0A,/* [3225] OBJ_pilotGroups */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x04,/* [3234] OBJ_iA5StringSyntax */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x05,/* [3244] OBJ_caseIgnoreIA5StringSyntax */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x03,/* [3254] OBJ_pilotObject */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x04,/* [3264] OBJ_pilotPerson */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x05,/* [3274] OBJ_account */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x06,/* [3284] OBJ_document */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x07,/* [3294] OBJ_room */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x09,/* [3304] OBJ_documentSeries */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0E,/* [3314] OBJ_rFC822localPart */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0F,/* [3324] OBJ_dNSDomain */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x11,/* [3334] OBJ_domainRelatedObject */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x12,/* [3344] OBJ_friendlyCountry */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x13,/* [3354] OBJ_simpleSecurityObject */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x14,/* [3364] OBJ_pilotOrganization */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x15,/* [3374] OBJ_pilotDSA */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x16,/* [3384] OBJ_qualityLabelledData */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3394] OBJ_userId */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x02,/* [3404] OBJ_textEncodedORAddress */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x03,/* [3414] OBJ_rfc822Mailbox */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x04,/* [3424] OBJ_info */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x05,/* [3434] OBJ_favouriteDrink */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x06,/* [3444] OBJ_roomNumber */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x07,/* [3454] OBJ_photo */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x08,/* [3464] OBJ_userClass */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x09,/* [3474] OBJ_host */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0A,/* [3484] OBJ_manager */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0B,/* [3494] OBJ_documentIdentifier */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0C,/* [3504] OBJ_documentTitle */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0D,/* [3514] OBJ_documentVersion */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0E,/* [3524] OBJ_documentAuthor */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0F,/* [3534] OBJ_documentLocation */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x14,/* [3544] OBJ_homeTelephoneNumber */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x15,/* [3554] OBJ_secretary */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x16,/* [3564] OBJ_otherMailbox */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x17,/* [3574] OBJ_lastModifiedTime */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x18,/* [3584] OBJ_lastModifiedBy */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1A,/* [3594] OBJ_aRecord */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1B,/* [3604] OBJ_pilotAttributeType27 */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1C,/* [3614] OBJ_mXRecord */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1D,/* [3624] OBJ_nSRecord */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1E,/* [3634] OBJ_sOARecord */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1F,/* [3644] OBJ_cNAMERecord */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x25,/* [3654] OBJ_associatedDomain */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x26,/* [3664] OBJ_associatedName */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x27,/* [3674] OBJ_homePostalAddress */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x28,/* [3684] OBJ_personalTitle */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x29,/* [3694] OBJ_mobileTelephoneNumber */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2A,/* [3704] OBJ_pagerTelephoneNumber */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2B,/* [3714] OBJ_friendlyCountryName */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2D,/* [3724] OBJ_organizationalStatus */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2E,/* [3734] OBJ_janetMailbox */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2F,/* [3744] OBJ_mailPreferenceOption */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x30,/* [3754] OBJ_buildingName */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x31,/* [3764] OBJ_dSAQuality */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x32,/* [3774] OBJ_singleLevelQuality */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x33,/* [3784] OBJ_subtreeMinimumQuality */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x34,/* [3794] OBJ_subtreeMaximumQuality */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x35,/* [3804] OBJ_personalSignature */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x36,/* [3814] OBJ_dITRedirect */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x37,/* [3824] OBJ_audio */
-+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x38,/* [3834] OBJ_documentPublisher */
-+0x55,0x04,0x2D,                              /* [3844] OBJ_x500UniqueIdentifier */
-+0x2B,0x06,0x01,0x07,0x01,                    /* [3847] OBJ_mime_mhs */
-+0x2B,0x06,0x01,0x07,0x01,0x01,               /* [3852] OBJ_mime_mhs_headings */
-+0x2B,0x06,0x01,0x07,0x01,0x02,               /* [3858] OBJ_mime_mhs_bodies */
-+0x2B,0x06,0x01,0x07,0x01,0x01,0x01,          /* [3864] OBJ_id_hex_partial_message */
-+0x2B,0x06,0x01,0x07,0x01,0x01,0x02,          /* [3871] OBJ_id_hex_multipart_message */
-+0x55,0x04,0x2C,                              /* [3878] OBJ_generationQualifier */
-+0x55,0x04,0x41,                              /* [3881] OBJ_pseudonym */
-+0x67,0x2A,                                   /* [3884] OBJ_id_set */
-+0x67,0x2A,0x00,                              /* [3886] OBJ_set_ctype */
-+0x67,0x2A,0x01,                              /* [3889] OBJ_set_msgExt */
-+0x67,0x2A,0x03,                              /* [3892] OBJ_set_attr */
-+0x67,0x2A,0x05,                              /* [3895] OBJ_set_policy */
-+0x67,0x2A,0x07,                              /* [3898] OBJ_set_certExt */
-+0x67,0x2A,0x08,                              /* [3901] OBJ_set_brand */
-+0x67,0x2A,0x00,0x00,                         /* [3904] OBJ_setct_PANData */
-+0x67,0x2A,0x00,0x01,                         /* [3908] OBJ_setct_PANToken */
-+0x67,0x2A,0x00,0x02,                         /* [3912] OBJ_setct_PANOnly */
-+0x67,0x2A,0x00,0x03,                         /* [3916] OBJ_setct_OIData */
-+0x67,0x2A,0x00,0x04,                         /* [3920] OBJ_setct_PI */
-+0x67,0x2A,0x00,0x05,                         /* [3924] OBJ_setct_PIData */
-+0x67,0x2A,0x00,0x06,                         /* [3928] OBJ_setct_PIDataUnsigned */
-+0x67,0x2A,0x00,0x07,                         /* [3932] OBJ_setct_HODInput */
-+0x67,0x2A,0x00,0x08,                         /* [3936] OBJ_setct_AuthResBaggage */
-+0x67,0x2A,0x00,0x09,                         /* [3940] OBJ_setct_AuthRevReqBaggage */
-+0x67,0x2A,0x00,0x0A,                         /* [3944] OBJ_setct_AuthRevResBaggage */
-+0x67,0x2A,0x00,0x0B,                         /* [3948] OBJ_setct_CapTokenSeq */
-+0x67,0x2A,0x00,0x0C,                         /* [3952] OBJ_setct_PInitResData */
-+0x67,0x2A,0x00,0x0D,                         /* [3956] OBJ_setct_PI_TBS */
-+0x67,0x2A,0x00,0x0E,                         /* [3960] OBJ_setct_PResData */
-+0x67,0x2A,0x00,0x10,                         /* [3964] OBJ_setct_AuthReqTBS */
-+0x67,0x2A,0x00,0x11,                         /* [3968] OBJ_setct_AuthResTBS */
-+0x67,0x2A,0x00,0x12,                         /* [3972] OBJ_setct_AuthResTBSX */
-+0x67,0x2A,0x00,0x13,                         /* [3976] OBJ_setct_AuthTokenTBS */
-+0x67,0x2A,0x00,0x14,                         /* [3980] OBJ_setct_CapTokenData */
-+0x67,0x2A,0x00,0x15,                         /* [3984] OBJ_setct_CapTokenTBS */
-+0x67,0x2A,0x00,0x16,                         /* [3988] OBJ_setct_AcqCardCodeMsg */
-+0x67,0x2A,0x00,0x17,                         /* [3992] OBJ_setct_AuthRevReqTBS */
-+0x67,0x2A,0x00,0x18,                         /* [3996] OBJ_setct_AuthRevResData */
-+0x67,0x2A,0x00,0x19,                         /* [4000] OBJ_setct_AuthRevResTBS */
-+0x67,0x2A,0x00,0x1A,                         /* [4004] OBJ_setct_CapReqTBS */
-+0x67,0x2A,0x00,0x1B,                         /* [4008] OBJ_setct_CapReqTBSX */
-+0x67,0x2A,0x00,0x1C,                         /* [4012] OBJ_setct_CapResData */
-+0x67,0x2A,0x00,0x1D,                         /* [4016] OBJ_setct_CapRevReqTBS */
-+0x67,0x2A,0x00,0x1E,                         /* [4020] OBJ_setct_CapRevReqTBSX */
-+0x67,0x2A,0x00,0x1F,                         /* [4024] OBJ_setct_CapRevResData */
-+0x67,0x2A,0x00,0x20,                         /* [4028] OBJ_setct_CredReqTBS */
-+0x67,0x2A,0x00,0x21,                         /* [4032] OBJ_setct_CredReqTBSX */
-+0x67,0x2A,0x00,0x22,                         /* [4036] OBJ_setct_CredResData */
-+0x67,0x2A,0x00,0x23,                         /* [4040] OBJ_setct_CredRevReqTBS */
-+0x67,0x2A,0x00,0x24,                         /* [4044] OBJ_setct_CredRevReqTBSX */
-+0x67,0x2A,0x00,0x25,                         /* [4048] OBJ_setct_CredRevResData */
-+0x67,0x2A,0x00,0x26,                         /* [4052] OBJ_setct_PCertReqData */
-+0x67,0x2A,0x00,0x27,                         /* [4056] OBJ_setct_PCertResTBS */
-+0x67,0x2A,0x00,0x28,                         /* [4060] OBJ_setct_BatchAdminReqData */
-+0x67,0x2A,0x00,0x29,                         /* [4064] OBJ_setct_BatchAdminResData */
-+0x67,0x2A,0x00,0x2A,                         /* [4068] OBJ_setct_CardCInitResTBS */
-+0x67,0x2A,0x00,0x2B,                         /* [4072] OBJ_setct_MeAqCInitResTBS */
-+0x67,0x2A,0x00,0x2C,                         /* [4076] OBJ_setct_RegFormResTBS */
-+0x67,0x2A,0x00,0x2D,                         /* [4080] OBJ_setct_CertReqData */
-+0x67,0x2A,0x00,0x2E,                         /* [4084] OBJ_setct_CertReqTBS */
-+0x67,0x2A,0x00,0x2F,                         /* [4088] OBJ_setct_CertResData */
-+0x67,0x2A,0x00,0x30,                         /* [4092] OBJ_setct_CertInqReqTBS */
-+0x67,0x2A,0x00,0x31,                         /* [4096] OBJ_setct_ErrorTBS */
-+0x67,0x2A,0x00,0x32,                         /* [4100] OBJ_setct_PIDualSignedTBE */
-+0x67,0x2A,0x00,0x33,                         /* [4104] OBJ_setct_PIUnsignedTBE */
-+0x67,0x2A,0x00,0x34,                         /* [4108] OBJ_setct_AuthReqTBE */
-+0x67,0x2A,0x00,0x35,                         /* [4112] OBJ_setct_AuthResTBE */
-+0x67,0x2A,0x00,0x36,                         /* [4116] OBJ_setct_AuthResTBEX */
-+0x67,0x2A,0x00,0x37,                         /* [4120] OBJ_setct_AuthTokenTBE */
-+0x67,0x2A,0x00,0x38,                         /* [4124] OBJ_setct_CapTokenTBE */
-+0x67,0x2A,0x00,0x39,                         /* [4128] OBJ_setct_CapTokenTBEX */
-+0x67,0x2A,0x00,0x3A,                         /* [4132] OBJ_setct_AcqCardCodeMsgTBE */
-+0x67,0x2A,0x00,0x3B,                         /* [4136] OBJ_setct_AuthRevReqTBE */
-+0x67,0x2A,0x00,0x3C,                         /* [4140] OBJ_setct_AuthRevResTBE */
-+0x67,0x2A,0x00,0x3D,                         /* [4144] OBJ_setct_AuthRevResTBEB */
-+0x67,0x2A,0x00,0x3E,                         /* [4148] OBJ_setct_CapReqTBE */
-+0x67,0x2A,0x00,0x3F,                         /* [4152] OBJ_setct_CapReqTBEX */
-+0x67,0x2A,0x00,0x40,                         /* [4156] OBJ_setct_CapResTBE */
-+0x67,0x2A,0x00,0x41,                         /* [4160] OBJ_setct_CapRevReqTBE */
-+0x67,0x2A,0x00,0x42,                         /* [4164] OBJ_setct_CapRevReqTBEX */
-+0x67,0x2A,0x00,0x43,                         /* [4168] OBJ_setct_CapRevResTBE */
-+0x67,0x2A,0x00,0x44,                         /* [4172] OBJ_setct_CredReqTBE */
-+0x67,0x2A,0x00,0x45,                         /* [4176] OBJ_setct_CredReqTBEX */
-+0x67,0x2A,0x00,0x46,                         /* [4180] OBJ_setct_CredResTBE */
-+0x67,0x2A,0x00,0x47,                         /* [4184] OBJ_setct_CredRevReqTBE */
-+0x67,0x2A,0x00,0x48,                         /* [4188] OBJ_setct_CredRevReqTBEX */
-+0x67,0x2A,0x00,0x49,                         /* [4192] OBJ_setct_CredRevResTBE */
-+0x67,0x2A,0x00,0x4A,                         /* [4196] OBJ_setct_BatchAdminReqTBE */
-+0x67,0x2A,0x00,0x4B,                         /* [4200] OBJ_setct_BatchAdminResTBE */
-+0x67,0x2A,0x00,0x4C,                         /* [4204] OBJ_setct_RegFormReqTBE */
-+0x67,0x2A,0x00,0x4D,                         /* [4208] OBJ_setct_CertReqTBE */
-+0x67,0x2A,0x00,0x4E,                         /* [4212] OBJ_setct_CertReqTBEX */
-+0x67,0x2A,0x00,0x4F,                         /* [4216] OBJ_setct_CertResTBE */
-+0x67,0x2A,0x00,0x50,                         /* [4220] OBJ_setct_CRLNotificationTBS */
-+0x67,0x2A,0x00,0x51,                         /* [4224] OBJ_setct_CRLNotificationResTBS */
-+0x67,0x2A,0x00,0x52,                         /* [4228] OBJ_setct_BCIDistributionTBS */
-+0x67,0x2A,0x01,0x01,                         /* [4232] OBJ_setext_genCrypt */
-+0x67,0x2A,0x01,0x03,                         /* [4236] OBJ_setext_miAuth */
-+0x67,0x2A,0x01,0x04,                         /* [4240] OBJ_setext_pinSecure */
-+0x67,0x2A,0x01,0x05,                         /* [4244] OBJ_setext_pinAny */
-+0x67,0x2A,0x01,0x07,                         /* [4248] OBJ_setext_track2 */
-+0x67,0x2A,0x01,0x08,                         /* [4252] OBJ_setext_cv */
-+0x67,0x2A,0x05,0x00,                         /* [4256] OBJ_set_policy_root */
-+0x67,0x2A,0x07,0x00,                         /* [4260] OBJ_setCext_hashedRoot */
-+0x67,0x2A,0x07,0x01,                         /* [4264] OBJ_setCext_certType */
-+0x67,0x2A,0x07,0x02,                         /* [4268] OBJ_setCext_merchData */
-+0x67,0x2A,0x07,0x03,                         /* [4272] OBJ_setCext_cCertRequired */
-+0x67,0x2A,0x07,0x04,                         /* [4276] OBJ_setCext_tunneling */
-+0x67,0x2A,0x07,0x05,                         /* [4280] OBJ_setCext_setExt */
-+0x67,0x2A,0x07,0x06,                         /* [4284] OBJ_setCext_setQualf */
-+0x67,0x2A,0x07,0x07,                         /* [4288] OBJ_setCext_PGWYcapabilities */
-+0x67,0x2A,0x07,0x08,                         /* [4292] OBJ_setCext_TokenIdentifier */
-+0x67,0x2A,0x07,0x09,                         /* [4296] OBJ_setCext_Track2Data */
-+0x67,0x2A,0x07,0x0A,                         /* [4300] OBJ_setCext_TokenType */
-+0x67,0x2A,0x07,0x0B,                         /* [4304] OBJ_setCext_IssuerCapabilities */
-+0x67,0x2A,0x03,0x00,                         /* [4308] OBJ_setAttr_Cert */
-+0x67,0x2A,0x03,0x01,                         /* [4312] OBJ_setAttr_PGWYcap */
-+0x67,0x2A,0x03,0x02,                         /* [4316] OBJ_setAttr_TokenType */
-+0x67,0x2A,0x03,0x03,                         /* [4320] OBJ_setAttr_IssCap */
-+0x67,0x2A,0x03,0x00,0x00,                    /* [4324] OBJ_set_rootKeyThumb */
-+0x67,0x2A,0x03,0x00,0x01,                    /* [4329] OBJ_set_addPolicy */
-+0x67,0x2A,0x03,0x02,0x01,                    /* [4334] OBJ_setAttr_Token_EMV */
-+0x67,0x2A,0x03,0x02,0x02,                    /* [4339] OBJ_setAttr_Token_B0Prime */
-+0x67,0x2A,0x03,0x03,0x03,                    /* [4344] OBJ_setAttr_IssCap_CVM */
-+0x67,0x2A,0x03,0x03,0x04,                    /* [4349] OBJ_setAttr_IssCap_T2 */
-+0x67,0x2A,0x03,0x03,0x05,                    /* [4354] OBJ_setAttr_IssCap_Sig */
-+0x67,0x2A,0x03,0x03,0x03,0x01,               /* [4359] OBJ_setAttr_GenCryptgrm */
-+0x67,0x2A,0x03,0x03,0x04,0x01,               /* [4365] OBJ_setAttr_T2Enc */
-+0x67,0x2A,0x03,0x03,0x04,0x02,               /* [4371] OBJ_setAttr_T2cleartxt */
-+0x67,0x2A,0x03,0x03,0x05,0x01,               /* [4377] OBJ_setAttr_TokICCsig */
-+0x67,0x2A,0x03,0x03,0x05,0x02,               /* [4383] OBJ_setAttr_SecDevSig */
-+0x67,0x2A,0x08,0x01,                         /* [4389] OBJ_set_brand_IATA_ATA */
-+0x67,0x2A,0x08,0x1E,                         /* [4393] OBJ_set_brand_Diners */
-+0x67,0x2A,0x08,0x22,                         /* [4397] OBJ_set_brand_AmericanExpress */
-+0x67,0x2A,0x08,0x23,                         /* [4401] OBJ_set_brand_JCB */
-+0x67,0x2A,0x08,0x04,                         /* [4405] OBJ_set_brand_Visa */
-+0x67,0x2A,0x08,0x05,                         /* [4409] OBJ_set_brand_MasterCard */
-+0x67,0x2A,0x08,0xAE,0x7B,                    /* [4413] OBJ_set_brand_Novus */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A,     /* [4418] OBJ_des_cdmf */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4426] OBJ_rsaOAEPEncryptionSET */
-+0x67,                                        /* [4435] OBJ_international_organizations */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4436] OBJ_ms_smartcard_login */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4446] OBJ_ms_upn */
-+0x55,0x04,0x09,                              /* [4456] OBJ_streetAddress */
-+0x55,0x04,0x11,                              /* [4459] OBJ_postalCode */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,          /* [4462] OBJ_id_ppl */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0E,     /* [4469] OBJ_proxyCertInfo */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x00,     /* [4477] OBJ_id_ppl_anyLanguage */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x01,     /* [4485] OBJ_id_ppl_inheritAll */
-+0x55,0x1D,0x1E,                              /* [4493] OBJ_name_constraints */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x02,     /* [4496] OBJ_Independent */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,/* [4504] OBJ_sha256WithRSAEncryption */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0C,/* [4513] OBJ_sha384WithRSAEncryption */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,/* [4522] OBJ_sha512WithRSAEncryption */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0E,/* [4531] OBJ_sha224WithRSAEncryption */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,/* [4540] OBJ_sha256 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,/* [4549] OBJ_sha384 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,/* [4558] OBJ_sha512 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,/* [4567] OBJ_sha224 */
-+0x2B,                                        /* [4576] OBJ_identified_organization */
-+0x2B,0x81,0x04,                              /* [4577] OBJ_certicom_arc */
-+0x67,0x2B,                                   /* [4580] OBJ_wap */
-+0x67,0x2B,0x01,                              /* [4582] OBJ_wap_wsg */
-+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,     /* [4585] OBJ_X9_62_id_characteristic_two_basis */
-+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x01,/* [4593] OBJ_X9_62_onBasis */
-+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x02,/* [4602] OBJ_X9_62_tpBasis */
-+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x03,/* [4611] OBJ_X9_62_ppBasis */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x01,     /* [4620] OBJ_X9_62_c2pnb163v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x02,     /* [4628] OBJ_X9_62_c2pnb163v2 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x03,     /* [4636] OBJ_X9_62_c2pnb163v3 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x04,     /* [4644] OBJ_X9_62_c2pnb176v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x05,     /* [4652] OBJ_X9_62_c2tnb191v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x06,     /* [4660] OBJ_X9_62_c2tnb191v2 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x07,     /* [4668] OBJ_X9_62_c2tnb191v3 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x08,     /* [4676] OBJ_X9_62_c2onb191v4 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x09,     /* [4684] OBJ_X9_62_c2onb191v5 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0A,     /* [4692] OBJ_X9_62_c2pnb208w1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0B,     /* [4700] OBJ_X9_62_c2tnb239v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0C,     /* [4708] OBJ_X9_62_c2tnb239v2 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0D,     /* [4716] OBJ_X9_62_c2tnb239v3 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0E,     /* [4724] OBJ_X9_62_c2onb239v4 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0F,     /* [4732] OBJ_X9_62_c2onb239v5 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x10,     /* [4740] OBJ_X9_62_c2pnb272w1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x11,     /* [4748] OBJ_X9_62_c2pnb304w1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x12,     /* [4756] OBJ_X9_62_c2tnb359v1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x13,     /* [4764] OBJ_X9_62_c2pnb368w1 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x14,     /* [4772] OBJ_X9_62_c2tnb431r1 */
-+0x2B,0x81,0x04,0x00,0x06,                    /* [4780] OBJ_secp112r1 */
-+0x2B,0x81,0x04,0x00,0x07,                    /* [4785] OBJ_secp112r2 */
-+0x2B,0x81,0x04,0x00,0x1C,                    /* [4790] OBJ_secp128r1 */
-+0x2B,0x81,0x04,0x00,0x1D,                    /* [4795] OBJ_secp128r2 */
-+0x2B,0x81,0x04,0x00,0x09,                    /* [4800] OBJ_secp160k1 */
-+0x2B,0x81,0x04,0x00,0x08,                    /* [4805] OBJ_secp160r1 */
-+0x2B,0x81,0x04,0x00,0x1E,                    /* [4810] OBJ_secp160r2 */
-+0x2B,0x81,0x04,0x00,0x1F,                    /* [4815] OBJ_secp192k1 */
-+0x2B,0x81,0x04,0x00,0x20,                    /* [4820] OBJ_secp224k1 */
-+0x2B,0x81,0x04,0x00,0x21,                    /* [4825] OBJ_secp224r1 */
-+0x2B,0x81,0x04,0x00,0x0A,                    /* [4830] OBJ_secp256k1 */
-+0x2B,0x81,0x04,0x00,0x22,                    /* [4835] OBJ_secp384r1 */
-+0x2B,0x81,0x04,0x00,0x23,                    /* [4840] OBJ_secp521r1 */
-+0x2B,0x81,0x04,0x00,0x04,                    /* [4845] OBJ_sect113r1 */
-+0x2B,0x81,0x04,0x00,0x05,                    /* [4850] OBJ_sect113r2 */
-+0x2B,0x81,0x04,0x00,0x16,                    /* [4855] OBJ_sect131r1 */
-+0x2B,0x81,0x04,0x00,0x17,                    /* [4860] OBJ_sect131r2 */
-+0x2B,0x81,0x04,0x00,0x01,                    /* [4865] OBJ_sect163k1 */
-+0x2B,0x81,0x04,0x00,0x02,                    /* [4870] OBJ_sect163r1 */
-+0x2B,0x81,0x04,0x00,0x0F,                    /* [4875] OBJ_sect163r2 */
-+0x2B,0x81,0x04,0x00,0x18,                    /* [4880] OBJ_sect193r1 */
-+0x2B,0x81,0x04,0x00,0x19,                    /* [4885] OBJ_sect193r2 */
-+0x2B,0x81,0x04,0x00,0x1A,                    /* [4890] OBJ_sect233k1 */
-+0x2B,0x81,0x04,0x00,0x1B,                    /* [4895] OBJ_sect233r1 */
-+0x2B,0x81,0x04,0x00,0x03,                    /* [4900] OBJ_sect239k1 */
-+0x2B,0x81,0x04,0x00,0x10,                    /* [4905] OBJ_sect283k1 */
-+0x2B,0x81,0x04,0x00,0x11,                    /* [4910] OBJ_sect283r1 */
-+0x2B,0x81,0x04,0x00,0x24,                    /* [4915] OBJ_sect409k1 */
-+0x2B,0x81,0x04,0x00,0x25,                    /* [4920] OBJ_sect409r1 */
-+0x2B,0x81,0x04,0x00,0x26,                    /* [4925] OBJ_sect571k1 */
-+0x2B,0x81,0x04,0x00,0x27,                    /* [4930] OBJ_sect571r1 */
-+0x67,0x2B,0x01,0x04,0x01,                    /* [4935] OBJ_wap_wsg_idm_ecid_wtls1 */
-+0x67,0x2B,0x01,0x04,0x03,                    /* [4940] OBJ_wap_wsg_idm_ecid_wtls3 */
-+0x67,0x2B,0x01,0x04,0x04,                    /* [4945] OBJ_wap_wsg_idm_ecid_wtls4 */
-+0x67,0x2B,0x01,0x04,0x05,                    /* [4950] OBJ_wap_wsg_idm_ecid_wtls5 */
-+0x67,0x2B,0x01,0x04,0x06,                    /* [4955] OBJ_wap_wsg_idm_ecid_wtls6 */
-+0x67,0x2B,0x01,0x04,0x07,                    /* [4960] OBJ_wap_wsg_idm_ecid_wtls7 */
-+0x67,0x2B,0x01,0x04,0x08,                    /* [4965] OBJ_wap_wsg_idm_ecid_wtls8 */
-+0x67,0x2B,0x01,0x04,0x09,                    /* [4970] OBJ_wap_wsg_idm_ecid_wtls9 */
-+0x67,0x2B,0x01,0x04,0x0A,                    /* [4975] OBJ_wap_wsg_idm_ecid_wtls10 */
-+0x67,0x2B,0x01,0x04,0x0B,                    /* [4980] OBJ_wap_wsg_idm_ecid_wtls11 */
-+0x67,0x2B,0x01,0x04,0x0C,                    /* [4985] OBJ_wap_wsg_idm_ecid_wtls12 */
-+0x55,0x1D,0x20,0x00,                         /* [4990] OBJ_any_policy */
-+0x55,0x1D,0x21,                              /* [4994] OBJ_policy_mappings */
-+0x55,0x1D,0x36,                              /* [4997] OBJ_inhibit_any_policy */
-+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x02,/* [5000] OBJ_camellia_128_cbc */
-+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x03,/* [5011] OBJ_camellia_192_cbc */
-+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x04,/* [5022] OBJ_camellia_256_cbc */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x01,     /* [5033] OBJ_camellia_128_ecb */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x15,     /* [5041] OBJ_camellia_192_ecb */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x29,     /* [5049] OBJ_camellia_256_ecb */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x04,     /* [5057] OBJ_camellia_128_cfb128 */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x18,     /* [5065] OBJ_camellia_192_cfb128 */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2C,     /* [5073] OBJ_camellia_256_cfb128 */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x03,     /* [5081] OBJ_camellia_128_ofb128 */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x17,     /* [5089] OBJ_camellia_192_ofb128 */
-+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2B,     /* [5097] OBJ_camellia_256_ofb128 */
-+0x55,0x1D,0x09,                              /* [5105] OBJ_subject_directory_attributes */
-+0x55,0x1D,0x1C,                              /* [5108] OBJ_issuing_distribution_point */
-+0x55,0x1D,0x1D,                              /* [5111] OBJ_certificate_issuer */
-+0x2A,0x83,0x1A,0x8C,0x9A,0x44,               /* [5114] OBJ_kisa */
-+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x03,     /* [5120] OBJ_seed_ecb */
-+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x04,     /* [5128] OBJ_seed_cbc */
-+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x06,     /* [5136] OBJ_seed_ofb128 */
-+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x05,     /* [5144] OBJ_seed_cfb128 */
-+0x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x01,     /* [5152] OBJ_hmac_md5 */
-+0x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x02,     /* [5160] OBJ_hmac_sha1 */
-+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0D,/* [5168] OBJ_id_PasswordBasedMAC */
-+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x1E,/* [5177] OBJ_id_DHBasedMac */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x10,     /* [5186] OBJ_id_it_suppLangTags */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x05,     /* [5194] OBJ_caRepository */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x09,/* [5202] OBJ_id_smime_ct_compressedData */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x1B,/* [5213] OBJ_id_ct_asciiTextWithCRLF */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x05,/* [5224] OBJ_id_aes128_wrap */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x19,/* [5233] OBJ_id_aes192_wrap */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2D,/* [5242] OBJ_id_aes256_wrap */
-+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x02,          /* [5251] OBJ_ecdsa_with_Recommended */
-+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,          /* [5258] OBJ_ecdsa_with_Specified */
-+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x01,     /* [5265] OBJ_ecdsa_with_SHA224 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x02,     /* [5273] OBJ_ecdsa_with_SHA256 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x03,     /* [5281] OBJ_ecdsa_with_SHA384 */
-+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x04,     /* [5289] OBJ_ecdsa_with_SHA512 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x06,     /* [5297] OBJ_hmacWithMD5 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x08,     /* [5305] OBJ_hmacWithSHA224 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x09,     /* [5313] OBJ_hmacWithSHA256 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0A,     /* [5321] OBJ_hmacWithSHA384 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0B,     /* [5329] OBJ_hmacWithSHA512 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x01,/* [5337] OBJ_dsa_with_SHA224 */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x02,/* [5346] OBJ_dsa_with_SHA256 */
-+0x28,0xCF,0x06,0x03,0x00,0x37,               /* [5355] OBJ_whirlpool */
-+0x2A,0x85,0x03,0x02,0x02,                    /* [5361] OBJ_cryptopro */
-+0x2A,0x85,0x03,0x02,0x09,                    /* [5366] OBJ_cryptocom */
-+0x2A,0x85,0x03,0x02,0x02,0x03,               /* [5371] OBJ_id_GostR3411_94_with_GostR3410_2001 */
-+0x2A,0x85,0x03,0x02,0x02,0x04,               /* [5377] OBJ_id_GostR3411_94_with_GostR3410_94 */
-+0x2A,0x85,0x03,0x02,0x02,0x09,               /* [5383] OBJ_id_GostR3411_94 */
-+0x2A,0x85,0x03,0x02,0x02,0x0A,               /* [5389] OBJ_id_HMACGostR3411_94 */
-+0x2A,0x85,0x03,0x02,0x02,0x13,               /* [5395] OBJ_id_GostR3410_2001 */
-+0x2A,0x85,0x03,0x02,0x02,0x14,               /* [5401] OBJ_id_GostR3410_94 */
-+0x2A,0x85,0x03,0x02,0x02,0x15,               /* [5407] OBJ_id_Gost28147_89 */
-+0x2A,0x85,0x03,0x02,0x02,0x16,               /* [5413] OBJ_id_Gost28147_89_MAC */
-+0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5419] OBJ_id_GostR3411_94_prf */
-+0x2A,0x85,0x03,0x02,0x02,0x62,               /* [5425] OBJ_id_GostR3410_2001DH */
-+0x2A,0x85,0x03,0x02,0x02,0x63,               /* [5431] OBJ_id_GostR3410_94DH */
-+0x2A,0x85,0x03,0x02,0x02,0x0E,0x01,          /* [5437] OBJ_id_Gost28147_89_CryptoPro_KeyMeshing */
-+0x2A,0x85,0x03,0x02,0x02,0x0E,0x00,          /* [5444] OBJ_id_Gost28147_89_None_KeyMeshing */
-+0x2A,0x85,0x03,0x02,0x02,0x1E,0x00,          /* [5451] OBJ_id_GostR3411_94_TestParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1E,0x01,          /* [5458] OBJ_id_GostR3411_94_CryptoProParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x00,          /* [5465] OBJ_id_Gost28147_89_TestParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x01,          /* [5472] OBJ_id_Gost28147_89_CryptoPro_A_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x02,          /* [5479] OBJ_id_Gost28147_89_CryptoPro_B_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x03,          /* [5486] OBJ_id_Gost28147_89_CryptoPro_C_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x04,          /* [5493] OBJ_id_Gost28147_89_CryptoPro_D_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x05,          /* [5500] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x06,          /* [5507] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x1F,0x07,          /* [5514] OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x20,0x00,          /* [5521] OBJ_id_GostR3410_94_TestParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x20,0x02,          /* [5528] OBJ_id_GostR3410_94_CryptoPro_A_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x20,0x03,          /* [5535] OBJ_id_GostR3410_94_CryptoPro_B_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x20,0x04,          /* [5542] OBJ_id_GostR3410_94_CryptoPro_C_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x20,0x05,          /* [5549] OBJ_id_GostR3410_94_CryptoPro_D_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x21,0x01,          /* [5556] OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x21,0x02,          /* [5563] OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x21,0x03,          /* [5570] OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x23,0x00,          /* [5577] OBJ_id_GostR3410_2001_TestParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x23,0x01,          /* [5584] OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x23,0x02,          /* [5591] OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x23,0x03,          /* [5598] OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x24,0x00,          /* [5605] OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x24,0x01,          /* [5612] OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet */
-+0x2A,0x85,0x03,0x02,0x02,0x14,0x01,          /* [5619] OBJ_id_GostR3410_94_a */
-+0x2A,0x85,0x03,0x02,0x02,0x14,0x02,          /* [5626] OBJ_id_GostR3410_94_aBis */
-+0x2A,0x85,0x03,0x02,0x02,0x14,0x03,          /* [5633] OBJ_id_GostR3410_94_b */
-+0x2A,0x85,0x03,0x02,0x02,0x14,0x04,          /* [5640] OBJ_id_GostR3410_94_bBis */
-+0x2A,0x85,0x03,0x02,0x09,0x01,0x06,0x01,     /* [5647] OBJ_id_Gost28147_89_cc */
-+0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x03,     /* [5655] OBJ_id_GostR3410_94_cc */
-+0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5663] OBJ_id_GostR3410_2001_cc */
-+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5671] OBJ_id_GostR3411_94_with_GostR3410_94_cc */
-+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5679] OBJ_id_GostR3411_94_with_GostR3410_2001_cc */
-+0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5687] OBJ_id_GostR3410_2001_ParamSet_cc */
-+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x02,/* [5695] OBJ_LocalKeySet */
-+0x55,0x1D,0x2E,                              /* [5704] OBJ_freshest_crl */
-+0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x03,     /* [5707] OBJ_id_on_permanentIdentifier */
-+0x55,0x04,0x0E,                              /* [5715] OBJ_searchGuide */
-+0x55,0x04,0x0F,                              /* [5718] OBJ_businessCategory */
-+0x55,0x04,0x10,                              /* [5721] OBJ_postalAddress */
-+0x55,0x04,0x12,                              /* [5724] OBJ_postOfficeBox */
-+0x55,0x04,0x13,                              /* [5727] OBJ_physicalDeliveryOfficeName */
-+0x55,0x04,0x14,                              /* [5730] OBJ_telephoneNumber */
-+0x55,0x04,0x15,                              /* [5733] OBJ_telexNumber */
-+0x55,0x04,0x16,                              /* [5736] OBJ_teletexTerminalIdentifier */
-+0x55,0x04,0x17,                              /* [5739] OBJ_facsimileTelephoneNumber */
-+0x55,0x04,0x18,                              /* [5742] OBJ_x121Address */
-+0x55,0x04,0x19,                              /* [5745] OBJ_internationaliSDNNumber */
-+0x55,0x04,0x1A,                              /* [5748] OBJ_registeredAddress */
-+0x55,0x04,0x1B,                              /* [5751] OBJ_destinationIndicator */
-+0x55,0x04,0x1C,                              /* [5754] OBJ_preferredDeliveryMethod */
-+0x55,0x04,0x1D,                              /* [5757] OBJ_presentationAddress */
-+0x55,0x04,0x1E,                              /* [5760] OBJ_supportedApplicationContext */
-+0x55,0x04,0x1F,                              /* [5763] OBJ_member */
-+0x55,0x04,0x20,                              /* [5766] OBJ_owner */
-+0x55,0x04,0x21,                              /* [5769] OBJ_roleOccupant */
-+0x55,0x04,0x22,                              /* [5772] OBJ_seeAlso */
-+0x55,0x04,0x23,                              /* [5775] OBJ_userPassword */
-+0x55,0x04,0x24,                              /* [5778] OBJ_userCertificate */
-+0x55,0x04,0x25,                              /* [5781] OBJ_cACertificate */
-+0x55,0x04,0x26,                              /* [5784] OBJ_authorityRevocationList */
-+0x55,0x04,0x27,                              /* [5787] OBJ_certificateRevocationList */
-+0x55,0x04,0x28,                              /* [5790] OBJ_crossCertificatePair */
-+0x55,0x04,0x2F,                              /* [5793] OBJ_enhancedSearchGuide */
-+0x55,0x04,0x30,                              /* [5796] OBJ_protocolInformation */
-+0x55,0x04,0x31,                              /* [5799] OBJ_distinguishedName */
-+0x55,0x04,0x32,                              /* [5802] OBJ_uniqueMember */
-+0x55,0x04,0x33,                              /* [5805] OBJ_houseIdentifier */
-+0x55,0x04,0x34,                              /* [5808] OBJ_supportedAlgorithms */
-+0x55,0x04,0x35,                              /* [5811] OBJ_deltaRevocationList */
-+0x55,0x04,0x36,                              /* [5814] OBJ_dmdName */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x09,/* [5817] OBJ_id_alg_PWRI_KEK */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x06,/* [5828] OBJ_aes_128_gcm */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x07,/* [5837] OBJ_aes_128_ccm */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x08,/* [5846] OBJ_id_aes128_wrap_pad */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1A,/* [5855] OBJ_aes_192_gcm */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1B,/* [5864] OBJ_aes_192_ccm */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1C,/* [5873] OBJ_id_aes192_wrap_pad */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2E,/* [5882] OBJ_aes_256_gcm */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2F,/* [5891] OBJ_aes_256_ccm */
-+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x30,/* [5900] OBJ_id_aes256_wrap_pad */
-+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x02,/* [5909] OBJ_id_camellia128_wrap */
-+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x03,/* [5920] OBJ_id_camellia192_wrap */
-+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x04,/* [5931] OBJ_id_camellia256_wrap */
-+0x55,0x1D,0x25,0x00,                         /* [5942] OBJ_anyExtendedKeyUsage */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x08,/* [5946] OBJ_mgf1 */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0A,/* [5955] OBJ_rsassaPss */
-+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x07,/* [5964] OBJ_rsaesOaep */
-+0x2B,0x24,                                   /* [5973] OBJ_teletrust */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,          /* [5975] OBJ_brainpool */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x01,/* [5982] OBJ_brainpoolP160r1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x02,/* [5991] OBJ_brainpoolP160t1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x03,/* [6000] OBJ_brainpoolP192r1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x04,/* [6009] OBJ_brainpoolP192t1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x05,/* [6018] OBJ_brainpoolP224r1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x06,/* [6027] OBJ_brainpoolP224t1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x07,/* [6036] OBJ_brainpoolP256r1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x08,/* [6045] OBJ_brainpoolP256t1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x09,/* [6054] OBJ_brainpoolP320r1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0A,/* [6063] OBJ_brainpoolP320t1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0B,/* [6072] OBJ_brainpoolP384r1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0C,/* [6081] OBJ_brainpoolP384t1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0D,/* [6090] OBJ_brainpoolP512r1 */
-+0x2B,0x24,0x03,0x03,0x02,0x08,0x01,0x01,0x0E,/* [6099] OBJ_brainpoolP512t1 */
-+0x2A,0x81,0x7A,0x01,0x81,0x5F,0x65,0x82,0x00,0x01,/* [6108] OBJ_FRP256v1 */
-+0x2A,0x85,0x03,0x07,0x01,                    /* [6118] OBJ_tc26 */
-+0x2A,0x85,0x03,0x07,0x01,0x01,0x02,0x02,     /* [6123] OBJ_id_tc26_gost3411_2012_256 */
-+0x2A,0x85,0x03,0x07,0x01,0x01,0x02,0x03,     /* [6131] OBJ_id_tc26_gost3411_2012_512 */
-+0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x02,0x01,/* [6139] OBJ_id_tc26_gost_3410_2012_512_paramSetA */
-+0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x02,0x02,/* [6148] OBJ_id_tc26_gost_3410_2012_512_paramSetB */
-+0x2A,0x85,0x03,0x07,0x01,0x02,0x05,0x01,0x01,/* [6157] OBJ_id_tc26_gost_28147_param_Z */
-+0x2A,0x85,0x03,0x07,0x01,0x01,0x01,0x01,     /* [6166] OBJ_id_tc26_gost3410_2012_256 */
-+0x2A,0x85,0x03,0x07,0x01,0x01,0x01,0x02,     /* [6174] OBJ_id_tc26_gost3410_2012_512 */
-+0x2A,0x85,0x03,0x07,0x01,0x01,0x03,0x02,     /* [6182] OBJ_id_tc26_signwithdigest_gost3410_2012_256 */
-+0x2A,0x85,0x03,0x07,0x01,0x01,0x03,0x03,     /* [6190] OBJ_id_tc26_signwithdigest_gost3410_2012_512 */
-+};
-+
-+static const ASN1_OBJECT nid_objs[NUM_NID]={
-+{"UNDEF","undefined",NID_undef,0,NULL,0},
-+{"rsadsi","RSA Data Security, Inc.",NID_rsadsi,6,&(lvalues[0]),0},
-+{"pkcs","RSA Data Security, Inc. PKCS",NID_pkcs,7,&(lvalues[6]),0},
-+{"MD2","md2",NID_md2,8,&(lvalues[13]),0},
-+{"MD5","md5",NID_md5,8,&(lvalues[21]),0},
-+{"RC4","rc4",NID_rc4,8,&(lvalues[29]),0},
-+{"rsaEncryption","rsaEncryption",NID_rsaEncryption,9,&(lvalues[37]),0},
-+{"RSA-MD2","md2WithRSAEncryption",NID_md2WithRSAEncryption,9,
-+	&(lvalues[46]),0},
-+{"RSA-MD5","md5WithRSAEncryption",NID_md5WithRSAEncryption,9,
-+	&(lvalues[55]),0},
-+{"PBE-MD2-DES","pbeWithMD2AndDES-CBC",NID_pbeWithMD2AndDES_CBC,9,
-+	&(lvalues[64]),0},
-+{"PBE-MD5-DES","pbeWithMD5AndDES-CBC",NID_pbeWithMD5AndDES_CBC,9,
-+	&(lvalues[73]),0},
-+{"X500","directory services (X.500)",NID_X500,1,&(lvalues[82]),0},
-+{"X509","X509",NID_X509,2,&(lvalues[83]),0},
-+{"CN","commonName",NID_commonName,3,&(lvalues[85]),0},
-+{"C","countryName",NID_countryName,3,&(lvalues[88]),0},
-+{"L","localityName",NID_localityName,3,&(lvalues[91]),0},
-+{"ST","stateOrProvinceName",NID_stateOrProvinceName,3,&(lvalues[94]),0},
-+{"O","organizationName",NID_organizationName,3,&(lvalues[97]),0},
-+{"OU","organizationalUnitName",NID_organizationalUnitName,3,
-+	&(lvalues[100]),0},
-+{"RSA","rsa",NID_rsa,4,&(lvalues[103]),0},
-+{"pkcs7","pkcs7",NID_pkcs7,8,&(lvalues[107]),0},
-+{"pkcs7-data","pkcs7-data",NID_pkcs7_data,9,&(lvalues[115]),0},
-+{"pkcs7-signedData","pkcs7-signedData",NID_pkcs7_signed,9,
-+	&(lvalues[124]),0},
-+{"pkcs7-envelopedData","pkcs7-envelopedData",NID_pkcs7_enveloped,9,
-+	&(lvalues[133]),0},
-+{"pkcs7-signedAndEnvelopedData","pkcs7-signedAndEnvelopedData",
-+	NID_pkcs7_signedAndEnveloped,9,&(lvalues[142]),0},
-+{"pkcs7-digestData","pkcs7-digestData",NID_pkcs7_digest,9,
-+	&(lvalues[151]),0},
-+{"pkcs7-encryptedData","pkcs7-encryptedData",NID_pkcs7_encrypted,9,
-+	&(lvalues[160]),0},
-+{"pkcs3","pkcs3",NID_pkcs3,8,&(lvalues[169]),0},
-+{"dhKeyAgreement","dhKeyAgreement",NID_dhKeyAgreement,9,
-+	&(lvalues[177]),0},
-+{"DES-ECB","des-ecb",NID_des_ecb,5,&(lvalues[186]),0},
-+{"DES-CFB","des-cfb",NID_des_cfb64,5,&(lvalues[191]),0},
-+{"DES-CBC","des-cbc",NID_des_cbc,5,&(lvalues[196]),0},
-+{"DES-EDE","des-ede",NID_des_ede_ecb,5,&(lvalues[201]),0},
-+{"DES-EDE3","des-ede3",NID_des_ede3_ecb,0,NULL,0},
-+{"IDEA-CBC","idea-cbc",NID_idea_cbc,11,&(lvalues[206]),0},
-+{"IDEA-CFB","idea-cfb",NID_idea_cfb64,0,NULL,0},
-+{"IDEA-ECB","idea-ecb",NID_idea_ecb,0,NULL,0},
-+{"RC2-CBC","rc2-cbc",NID_rc2_cbc,8,&(lvalues[217]),0},
-+{"RC2-ECB","rc2-ecb",NID_rc2_ecb,0,NULL,0},
-+{"RC2-CFB","rc2-cfb",NID_rc2_cfb64,0,NULL,0},
-+{"RC2-OFB","rc2-ofb",NID_rc2_ofb64,0,NULL,0},
-+{"SHA","sha",NID_sha,5,&(lvalues[225]),0},
-+{"RSA-SHA","shaWithRSAEncryption",NID_shaWithRSAEncryption,5,
-+	&(lvalues[230]),0},
-+{"DES-EDE-CBC","des-ede-cbc",NID_des_ede_cbc,0,NULL,0},
-+{"DES-EDE3-CBC","des-ede3-cbc",NID_des_ede3_cbc,8,&(lvalues[235]),0},
-+{"DES-OFB","des-ofb",NID_des_ofb64,5,&(lvalues[243]),0},
-+{"IDEA-OFB","idea-ofb",NID_idea_ofb64,0,NULL,0},
-+{"pkcs9","pkcs9",NID_pkcs9,8,&(lvalues[248]),0},
-+{"emailAddress","emailAddress",NID_pkcs9_emailAddress,9,
-+	&(lvalues[256]),0},
-+{"unstructuredName","unstructuredName",NID_pkcs9_unstructuredName,9,
-+	&(lvalues[265]),0},
-+{"contentType","contentType",NID_pkcs9_contentType,9,&(lvalues[274]),0},
-+{"messageDigest","messageDigest",NID_pkcs9_messageDigest,9,
-+	&(lvalues[283]),0},
-+{"signingTime","signingTime",NID_pkcs9_signingTime,9,&(lvalues[292]),0},
-+{"countersignature","countersignature",NID_pkcs9_countersignature,9,
-+	&(lvalues[301]),0},
-+{"challengePassword","challengePassword",NID_pkcs9_challengePassword,
-+	9,&(lvalues[310]),0},
-+{"unstructuredAddress","unstructuredAddress",
-+	NID_pkcs9_unstructuredAddress,9,&(lvalues[319]),0},
-+{"extendedCertificateAttributes","extendedCertificateAttributes",
-+	NID_pkcs9_extCertAttributes,9,&(lvalues[328]),0},
-+{"Netscape","Netscape Communications Corp.",NID_netscape,7,
-+	&(lvalues[337]),0},
-+{"nsCertExt","Netscape Certificate Extension",
-+	NID_netscape_cert_extension,8,&(lvalues[344]),0},
-+{"nsDataType","Netscape Data Type",NID_netscape_data_type,8,
-+	&(lvalues[352]),0},
-+{"DES-EDE-CFB","des-ede-cfb",NID_des_ede_cfb64,0,NULL,0},
-+{"DES-EDE3-CFB","des-ede3-cfb",NID_des_ede3_cfb64,0,NULL,0},
-+{"DES-EDE-OFB","des-ede-ofb",NID_des_ede_ofb64,0,NULL,0},
-+{"DES-EDE3-OFB","des-ede3-ofb",NID_des_ede3_ofb64,0,NULL,0},
-+{"SHA1","sha1",NID_sha1,5,&(lvalues[360]),0},
-+{"RSA-SHA1","sha1WithRSAEncryption",NID_sha1WithRSAEncryption,9,
-+	&(lvalues[365]),0},
-+{"DSA-SHA","dsaWithSHA",NID_dsaWithSHA,5,&(lvalues[374]),0},
-+{"DSA-old","dsaEncryption-old",NID_dsa_2,5,&(lvalues[379]),0},
-+{"PBE-SHA1-RC2-64","pbeWithSHA1AndRC2-CBC",NID_pbeWithSHA1AndRC2_CBC,
-+	9,&(lvalues[384]),0},
-+{"PBKDF2","PBKDF2",NID_id_pbkdf2,9,&(lvalues[393]),0},
-+{"DSA-SHA1-old","dsaWithSHA1-old",NID_dsaWithSHA1_2,5,&(lvalues[402]),0},
-+{"nsCertType","Netscape Cert Type",NID_netscape_cert_type,9,
-+	&(lvalues[407]),0},
-+{"nsBaseUrl","Netscape Base Url",NID_netscape_base_url,9,
-+	&(lvalues[416]),0},
-+{"nsRevocationUrl","Netscape Revocation Url",
-+	NID_netscape_revocation_url,9,&(lvalues[425]),0},
-+{"nsCaRevocationUrl","Netscape CA Revocation Url",
-+	NID_netscape_ca_revocation_url,9,&(lvalues[434]),0},
-+{"nsRenewalUrl","Netscape Renewal Url",NID_netscape_renewal_url,9,
-+	&(lvalues[443]),0},
-+{"nsCaPolicyUrl","Netscape CA Policy Url",NID_netscape_ca_policy_url,
-+	9,&(lvalues[452]),0},
-+{"nsSslServerName","Netscape SSL Server Name",
-+	NID_netscape_ssl_server_name,9,&(lvalues[461]),0},
-+{"nsComment","Netscape Comment",NID_netscape_comment,9,&(lvalues[470]),0},
-+{"nsCertSequence","Netscape Certificate Sequence",
-+	NID_netscape_cert_sequence,9,&(lvalues[479]),0},
-+{"DESX-CBC","desx-cbc",NID_desx_cbc,0,NULL,0},
-+{"id-ce","id-ce",NID_id_ce,2,&(lvalues[488]),0},
-+{"subjectKeyIdentifier","X509v3 Subject Key Identifier",
-+	NID_subject_key_identifier,3,&(lvalues[490]),0},
-+{"keyUsage","X509v3 Key Usage",NID_key_usage,3,&(lvalues[493]),0},
-+{"privateKeyUsagePeriod","X509v3 Private Key Usage Period",
-+	NID_private_key_usage_period,3,&(lvalues[496]),0},
-+{"subjectAltName","X509v3 Subject Alternative Name",
-+	NID_subject_alt_name,3,&(lvalues[499]),0},
-+{"issuerAltName","X509v3 Issuer Alternative Name",NID_issuer_alt_name,
-+	3,&(lvalues[502]),0},
-+{"basicConstraints","X509v3 Basic Constraints",NID_basic_constraints,
-+	3,&(lvalues[505]),0},
-+{"crlNumber","X509v3 CRL Number",NID_crl_number,3,&(lvalues[508]),0},
-+{"certificatePolicies","X509v3 Certificate Policies",
-+	NID_certificate_policies,3,&(lvalues[511]),0},
-+{"authorityKeyIdentifier","X509v3 Authority Key Identifier",
-+	NID_authority_key_identifier,3,&(lvalues[514]),0},
-+{"BF-CBC","bf-cbc",NID_bf_cbc,9,&(lvalues[517]),0},
-+{"BF-ECB","bf-ecb",NID_bf_ecb,0,NULL,0},
-+{"BF-CFB","bf-cfb",NID_bf_cfb64,0,NULL,0},
-+{"BF-OFB","bf-ofb",NID_bf_ofb64,0,NULL,0},
-+{"MDC2","mdc2",NID_mdc2,4,&(lvalues[526]),0},
-+{"RSA-MDC2","mdc2WithRSA",NID_mdc2WithRSA,4,&(lvalues[530]),0},
-+{"RC4-40","rc4-40",NID_rc4_40,0,NULL,0},
-+{"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL,0},
-+{"GN","givenName",NID_givenName,3,&(lvalues[534]),0},
-+{"SN","surname",NID_surname,3,&(lvalues[537]),0},
-+{"initials","initials",NID_initials,3,&(lvalues[540]),0},
-+{NULL,NULL,NID_undef,0,NULL,0},
-+{"crlDistributionPoints","X509v3 CRL Distribution Points",
-+	NID_crl_distribution_points,3,&(lvalues[543]),0},
-+{"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[546]),0},
-+{"serialNumber","serialNumber",NID_serialNumber,3,&(lvalues[551]),0},
-+{"title","title",NID_title,3,&(lvalues[554]),0},
-+{"description","description",NID_description,3,&(lvalues[557]),0},
-+{"CAST5-CBC","cast5-cbc",NID_cast5_cbc,9,&(lvalues[560]),0},
-+{"CAST5-ECB","cast5-ecb",NID_cast5_ecb,0,NULL,0},
-+{"CAST5-CFB","cast5-cfb",NID_cast5_cfb64,0,NULL,0},
-+{"CAST5-OFB","cast5-ofb",NID_cast5_ofb64,0,NULL,0},
-+{"pbeWithMD5AndCast5CBC","pbeWithMD5AndCast5CBC",
-+	NID_pbeWithMD5AndCast5_CBC,9,&(lvalues[569]),0},
-+{"DSA-SHA1","dsaWithSHA1",NID_dsaWithSHA1,7,&(lvalues[578]),0},
-+{"MD5-SHA1","md5-sha1",NID_md5_sha1,0,NULL,0},
-+{"RSA-SHA1-2","sha1WithRSA",NID_sha1WithRSA,5,&(lvalues[585]),0},
-+{"DSA","dsaEncryption",NID_dsa,7,&(lvalues[590]),0},
-+{"RIPEMD160","ripemd160",NID_ripemd160,5,&(lvalues[597]),0},
-+{NULL,NULL,NID_undef,0,NULL,0},
-+{"RSA-RIPEMD160","ripemd160WithRSA",NID_ripemd160WithRSA,6,
-+	&(lvalues[602]),0},
-+{"RC5-CBC","rc5-cbc",NID_rc5_cbc,8,&(lvalues[608]),0},
-+{"RC5-ECB","rc5-ecb",NID_rc5_ecb,0,NULL,0},
-+{"RC5-CFB","rc5-cfb",NID_rc5_cfb64,0,NULL,0},
-+{"RC5-OFB","rc5-ofb",NID_rc5_ofb64,0,NULL,0},
-+{"RLE","run length compression",NID_rle_compression,6,&(lvalues[616]),0},
-+{"ZLIB","zlib compression",NID_zlib_compression,11,&(lvalues[622]),0},
-+{"extendedKeyUsage","X509v3 Extended Key Usage",NID_ext_key_usage,3,
-+	&(lvalues[633]),0},
-+{"PKIX","PKIX",NID_id_pkix,6,&(lvalues[636]),0},
-+{"id-kp","id-kp",NID_id_kp,7,&(lvalues[642]),0},
-+{"serverAuth","TLS Web Server Authentication",NID_server_auth,8,
-+	&(lvalues[649]),0},
-+{"clientAuth","TLS Web Client Authentication",NID_client_auth,8,
-+	&(lvalues[657]),0},
-+{"codeSigning","Code Signing",NID_code_sign,8,&(lvalues[665]),0},
-+{"emailProtection","E-mail Protection",NID_email_protect,8,
-+	&(lvalues[673]),0},
-+{"timeStamping","Time Stamping",NID_time_stamp,8,&(lvalues[681]),0},
-+{"msCodeInd","Microsoft Individual Code Signing",NID_ms_code_ind,10,
-+	&(lvalues[689]),0},
-+{"msCodeCom","Microsoft Commercial Code Signing",NID_ms_code_com,10,
-+	&(lvalues[699]),0},
-+{"msCTLSign","Microsoft Trust List Signing",NID_ms_ctl_sign,10,
-+	&(lvalues[709]),0},
-+{"msSGC","Microsoft Server Gated Crypto",NID_ms_sgc,10,&(lvalues[719]),0},
-+{"msEFS","Microsoft Encrypted File System",NID_ms_efs,10,
-+	&(lvalues[729]),0},
-+{"nsSGC","Netscape Server Gated Crypto",NID_ns_sgc,9,&(lvalues[739]),0},
-+{"deltaCRL","X509v3 Delta CRL Indicator",NID_delta_crl,3,
-+	&(lvalues[748]),0},
-+{"CRLReason","X509v3 CRL Reason Code",NID_crl_reason,3,&(lvalues[751]),0},
-+{"invalidityDate","Invalidity Date",NID_invalidity_date,3,
-+	&(lvalues[754]),0},
-+{"SXNetID","Strong Extranet ID",NID_sxnet,5,&(lvalues[757]),0},
-+{"PBE-SHA1-RC4-128","pbeWithSHA1And128BitRC4",
-+	NID_pbe_WithSHA1And128BitRC4,10,&(lvalues[762]),0},
-+{"PBE-SHA1-RC4-40","pbeWithSHA1And40BitRC4",
-+	NID_pbe_WithSHA1And40BitRC4,10,&(lvalues[772]),0},
-+{"PBE-SHA1-3DES","pbeWithSHA1And3-KeyTripleDES-CBC",
-+	NID_pbe_WithSHA1And3_Key_TripleDES_CBC,10,&(lvalues[782]),0},
-+{"PBE-SHA1-2DES","pbeWithSHA1And2-KeyTripleDES-CBC",
-+	NID_pbe_WithSHA1And2_Key_TripleDES_CBC,10,&(lvalues[792]),0},
-+{"PBE-SHA1-RC2-128","pbeWithSHA1And128BitRC2-CBC",
-+	NID_pbe_WithSHA1And128BitRC2_CBC,10,&(lvalues[802]),0},
-+{"PBE-SHA1-RC2-40","pbeWithSHA1And40BitRC2-CBC",
-+	NID_pbe_WithSHA1And40BitRC2_CBC,10,&(lvalues[812]),0},
-+{"keyBag","keyBag",NID_keyBag,11,&(lvalues[822]),0},
-+{"pkcs8ShroudedKeyBag","pkcs8ShroudedKeyBag",NID_pkcs8ShroudedKeyBag,
-+	11,&(lvalues[833]),0},
-+{"certBag","certBag",NID_certBag,11,&(lvalues[844]),0},
-+{"crlBag","crlBag",NID_crlBag,11,&(lvalues[855]),0},
-+{"secretBag","secretBag",NID_secretBag,11,&(lvalues[866]),0},
-+{"safeContentsBag","safeContentsBag",NID_safeContentsBag,11,
-+	&(lvalues[877]),0},
-+{"friendlyName","friendlyName",NID_friendlyName,9,&(lvalues[888]),0},
-+{"localKeyID","localKeyID",NID_localKeyID,9,&(lvalues[897]),0},
-+{"x509Certificate","x509Certificate",NID_x509Certificate,10,
-+	&(lvalues[906]),0},
-+{"sdsiCertificate","sdsiCertificate",NID_sdsiCertificate,10,
-+	&(lvalues[916]),0},
-+{"x509Crl","x509Crl",NID_x509Crl,10,&(lvalues[926]),0},
-+{"PBES2","PBES2",NID_pbes2,9,&(lvalues[936]),0},
-+{"PBMAC1","PBMAC1",NID_pbmac1,9,&(lvalues[945]),0},
-+{"hmacWithSHA1","hmacWithSHA1",NID_hmacWithSHA1,8,&(lvalues[954]),0},
-+{"id-qt-cps","Policy Qualifier CPS",NID_id_qt_cps,8,&(lvalues[962]),0},
-+{"id-qt-unotice","Policy Qualifier User Notice",NID_id_qt_unotice,8,
-+	&(lvalues[970]),0},
-+{"RC2-64-CBC","rc2-64-cbc",NID_rc2_64_cbc,0,NULL,0},
-+{"SMIME-CAPS","S/MIME Capabilities",NID_SMIMECapabilities,9,
-+	&(lvalues[978]),0},
-+{"PBE-MD2-RC2-64","pbeWithMD2AndRC2-CBC",NID_pbeWithMD2AndRC2_CBC,9,
-+	&(lvalues[987]),0},
-+{"PBE-MD5-RC2-64","pbeWithMD5AndRC2-CBC",NID_pbeWithMD5AndRC2_CBC,9,
-+	&(lvalues[996]),0},
-+{"PBE-SHA1-DES","pbeWithSHA1AndDES-CBC",NID_pbeWithSHA1AndDES_CBC,9,
-+	&(lvalues[1005]),0},
-+{"msExtReq","Microsoft Extension Request",NID_ms_ext_req,10,
-+	&(lvalues[1014]),0},
-+{"extReq","Extension Request",NID_ext_req,9,&(lvalues[1024]),0},
-+{"name","name",NID_name,3,&(lvalues[1033]),0},
-+{"dnQualifier","dnQualifier",NID_dnQualifier,3,&(lvalues[1036]),0},
-+{"id-pe","id-pe",NID_id_pe,7,&(lvalues[1039]),0},
-+{"id-ad","id-ad",NID_id_ad,7,&(lvalues[1046]),0},
-+{"authorityInfoAccess","Authority Information Access",NID_info_access,
-+	8,&(lvalues[1053]),0},
-+{"OCSP","OCSP",NID_ad_OCSP,8,&(lvalues[1061]),0},
-+{"caIssuers","CA Issuers",NID_ad_ca_issuers,8,&(lvalues[1069]),0},
-+{"OCSPSigning","OCSP Signing",NID_OCSP_sign,8,&(lvalues[1077]),0},
-+{"ISO","iso",NID_iso,0,NULL,0},
-+{"member-body","ISO Member Body",NID_member_body,1,&(lvalues[1085]),0},
-+{"ISO-US","ISO US Member Body",NID_ISO_US,3,&(lvalues[1086]),0},
-+{"X9-57","X9.57",NID_X9_57,5,&(lvalues[1089]),0},
-+{"X9cm","X9.57 CM ?",NID_X9cm,6,&(lvalues[1094]),0},
-+{"pkcs1","pkcs1",NID_pkcs1,8,&(lvalues[1100]),0},
-+{"pkcs5","pkcs5",NID_pkcs5,8,&(lvalues[1108]),0},
-+{"SMIME","S/MIME",NID_SMIME,9,&(lvalues[1116]),0},
-+{"id-smime-mod","id-smime-mod",NID_id_smime_mod,10,&(lvalues[1125]),0},
-+{"id-smime-ct","id-smime-ct",NID_id_smime_ct,10,&(lvalues[1135]),0},
-+{"id-smime-aa","id-smime-aa",NID_id_smime_aa,10,&(lvalues[1145]),0},
-+{"id-smime-alg","id-smime-alg",NID_id_smime_alg,10,&(lvalues[1155]),0},
-+{"id-smime-cd","id-smime-cd",NID_id_smime_cd,10,&(lvalues[1165]),0},
-+{"id-smime-spq","id-smime-spq",NID_id_smime_spq,10,&(lvalues[1175]),0},
-+{"id-smime-cti","id-smime-cti",NID_id_smime_cti,10,&(lvalues[1185]),0},
-+{"id-smime-mod-cms","id-smime-mod-cms",NID_id_smime_mod_cms,11,
-+	&(lvalues[1195]),0},
-+{"id-smime-mod-ess","id-smime-mod-ess",NID_id_smime_mod_ess,11,
-+	&(lvalues[1206]),0},
-+{"id-smime-mod-oid","id-smime-mod-oid",NID_id_smime_mod_oid,11,
-+	&(lvalues[1217]),0},
-+{"id-smime-mod-msg-v3","id-smime-mod-msg-v3",NID_id_smime_mod_msg_v3,
-+	11,&(lvalues[1228]),0},
-+{"id-smime-mod-ets-eSignature-88","id-smime-mod-ets-eSignature-88",
-+	NID_id_smime_mod_ets_eSignature_88,11,&(lvalues[1239]),0},
-+{"id-smime-mod-ets-eSignature-97","id-smime-mod-ets-eSignature-97",
-+	NID_id_smime_mod_ets_eSignature_97,11,&(lvalues[1250]),0},
-+{"id-smime-mod-ets-eSigPolicy-88","id-smime-mod-ets-eSigPolicy-88",
-+	NID_id_smime_mod_ets_eSigPolicy_88,11,&(lvalues[1261]),0},
-+{"id-smime-mod-ets-eSigPolicy-97","id-smime-mod-ets-eSigPolicy-97",
-+	NID_id_smime_mod_ets_eSigPolicy_97,11,&(lvalues[1272]),0},
-+{"id-smime-ct-receipt","id-smime-ct-receipt",NID_id_smime_ct_receipt,
-+	11,&(lvalues[1283]),0},
-+{"id-smime-ct-authData","id-smime-ct-authData",
-+	NID_id_smime_ct_authData,11,&(lvalues[1294]),0},
-+{"id-smime-ct-publishCert","id-smime-ct-publishCert",
-+	NID_id_smime_ct_publishCert,11,&(lvalues[1305]),0},
-+{"id-smime-ct-TSTInfo","id-smime-ct-TSTInfo",NID_id_smime_ct_TSTInfo,
-+	11,&(lvalues[1316]),0},
-+{"id-smime-ct-TDTInfo","id-smime-ct-TDTInfo",NID_id_smime_ct_TDTInfo,
-+	11,&(lvalues[1327]),0},
-+{"id-smime-ct-contentInfo","id-smime-ct-contentInfo",
-+	NID_id_smime_ct_contentInfo,11,&(lvalues[1338]),0},
-+{"id-smime-ct-DVCSRequestData","id-smime-ct-DVCSRequestData",
-+	NID_id_smime_ct_DVCSRequestData,11,&(lvalues[1349]),0},
-+{"id-smime-ct-DVCSResponseData","id-smime-ct-DVCSResponseData",
-+	NID_id_smime_ct_DVCSResponseData,11,&(lvalues[1360]),0},
-+{"id-smime-aa-receiptRequest","id-smime-aa-receiptRequest",
-+	NID_id_smime_aa_receiptRequest,11,&(lvalues[1371]),0},
-+{"id-smime-aa-securityLabel","id-smime-aa-securityLabel",
-+	NID_id_smime_aa_securityLabel,11,&(lvalues[1382]),0},
-+{"id-smime-aa-mlExpandHistory","id-smime-aa-mlExpandHistory",
-+	NID_id_smime_aa_mlExpandHistory,11,&(lvalues[1393]),0},
-+{"id-smime-aa-contentHint","id-smime-aa-contentHint",
-+	NID_id_smime_aa_contentHint,11,&(lvalues[1404]),0},
-+{"id-smime-aa-msgSigDigest","id-smime-aa-msgSigDigest",
-+	NID_id_smime_aa_msgSigDigest,11,&(lvalues[1415]),0},
-+{"id-smime-aa-encapContentType","id-smime-aa-encapContentType",
-+	NID_id_smime_aa_encapContentType,11,&(lvalues[1426]),0},
-+{"id-smime-aa-contentIdentifier","id-smime-aa-contentIdentifier",
-+	NID_id_smime_aa_contentIdentifier,11,&(lvalues[1437]),0},
-+{"id-smime-aa-macValue","id-smime-aa-macValue",
-+	NID_id_smime_aa_macValue,11,&(lvalues[1448]),0},
-+{"id-smime-aa-equivalentLabels","id-smime-aa-equivalentLabels",
-+	NID_id_smime_aa_equivalentLabels,11,&(lvalues[1459]),0},
-+{"id-smime-aa-contentReference","id-smime-aa-contentReference",
-+	NID_id_smime_aa_contentReference,11,&(lvalues[1470]),0},
-+{"id-smime-aa-encrypKeyPref","id-smime-aa-encrypKeyPref",
-+	NID_id_smime_aa_encrypKeyPref,11,&(lvalues[1481]),0},
-+{"id-smime-aa-signingCertificate","id-smime-aa-signingCertificate",
-+	NID_id_smime_aa_signingCertificate,11,&(lvalues[1492]),0},
-+{"id-smime-aa-smimeEncryptCerts","id-smime-aa-smimeEncryptCerts",
-+	NID_id_smime_aa_smimeEncryptCerts,11,&(lvalues[1503]),0},
-+{"id-smime-aa-timeStampToken","id-smime-aa-timeStampToken",
-+	NID_id_smime_aa_timeStampToken,11,&(lvalues[1514]),0},
-+{"id-smime-aa-ets-sigPolicyId","id-smime-aa-ets-sigPolicyId",
-+	NID_id_smime_aa_ets_sigPolicyId,11,&(lvalues[1525]),0},
-+{"id-smime-aa-ets-commitmentType","id-smime-aa-ets-commitmentType",
-+	NID_id_smime_aa_ets_commitmentType,11,&(lvalues[1536]),0},
-+{"id-smime-aa-ets-signerLocation","id-smime-aa-ets-signerLocation",
-+	NID_id_smime_aa_ets_signerLocation,11,&(lvalues[1547]),0},
-+{"id-smime-aa-ets-signerAttr","id-smime-aa-ets-signerAttr",
-+	NID_id_smime_aa_ets_signerAttr,11,&(lvalues[1558]),0},
-+{"id-smime-aa-ets-otherSigCert","id-smime-aa-ets-otherSigCert",
-+	NID_id_smime_aa_ets_otherSigCert,11,&(lvalues[1569]),0},
-+{"id-smime-aa-ets-contentTimestamp",
-+	"id-smime-aa-ets-contentTimestamp",
-+	NID_id_smime_aa_ets_contentTimestamp,11,&(lvalues[1580]),0},
-+{"id-smime-aa-ets-CertificateRefs","id-smime-aa-ets-CertificateRefs",
-+	NID_id_smime_aa_ets_CertificateRefs,11,&(lvalues[1591]),0},
-+{"id-smime-aa-ets-RevocationRefs","id-smime-aa-ets-RevocationRefs",
-+	NID_id_smime_aa_ets_RevocationRefs,11,&(lvalues[1602]),0},
-+{"id-smime-aa-ets-certValues","id-smime-aa-ets-certValues",
-+	NID_id_smime_aa_ets_certValues,11,&(lvalues[1613]),0},
-+{"id-smime-aa-ets-revocationValues",
-+	"id-smime-aa-ets-revocationValues",
-+	NID_id_smime_aa_ets_revocationValues,11,&(lvalues[1624]),0},
-+{"id-smime-aa-ets-escTimeStamp","id-smime-aa-ets-escTimeStamp",
-+	NID_id_smime_aa_ets_escTimeStamp,11,&(lvalues[1635]),0},
-+{"id-smime-aa-ets-certCRLTimestamp",
-+	"id-smime-aa-ets-certCRLTimestamp",
-+	NID_id_smime_aa_ets_certCRLTimestamp,11,&(lvalues[1646]),0},
-+{"id-smime-aa-ets-archiveTimeStamp",
-+	"id-smime-aa-ets-archiveTimeStamp",
-+	NID_id_smime_aa_ets_archiveTimeStamp,11,&(lvalues[1657]),0},
-+{"id-smime-aa-signatureType","id-smime-aa-signatureType",
-+	NID_id_smime_aa_signatureType,11,&(lvalues[1668]),0},
-+{"id-smime-aa-dvcs-dvc","id-smime-aa-dvcs-dvc",
-+	NID_id_smime_aa_dvcs_dvc,11,&(lvalues[1679]),0},
-+{"id-smime-alg-ESDHwith3DES","id-smime-alg-ESDHwith3DES",
-+	NID_id_smime_alg_ESDHwith3DES,11,&(lvalues[1690]),0},
-+{"id-smime-alg-ESDHwithRC2","id-smime-alg-ESDHwithRC2",
-+	NID_id_smime_alg_ESDHwithRC2,11,&(lvalues[1701]),0},
-+{"id-smime-alg-3DESwrap","id-smime-alg-3DESwrap",
-+	NID_id_smime_alg_3DESwrap,11,&(lvalues[1712]),0},
-+{"id-smime-alg-RC2wrap","id-smime-alg-RC2wrap",
-+	NID_id_smime_alg_RC2wrap,11,&(lvalues[1723]),0},
-+{"id-smime-alg-ESDH","id-smime-alg-ESDH",NID_id_smime_alg_ESDH,11,
-+	&(lvalues[1734]),0},
-+{"id-smime-alg-CMS3DESwrap","id-smime-alg-CMS3DESwrap",
-+	NID_id_smime_alg_CMS3DESwrap,11,&(lvalues[1745]),0},
-+{"id-smime-alg-CMSRC2wrap","id-smime-alg-CMSRC2wrap",
-+	NID_id_smime_alg_CMSRC2wrap,11,&(lvalues[1756]),0},
-+{"id-smime-cd-ldap","id-smime-cd-ldap",NID_id_smime_cd_ldap,11,
-+	&(lvalues[1767]),0},
-+{"id-smime-spq-ets-sqt-uri","id-smime-spq-ets-sqt-uri",
-+	NID_id_smime_spq_ets_sqt_uri,11,&(lvalues[1778]),0},
-+{"id-smime-spq-ets-sqt-unotice","id-smime-spq-ets-sqt-unotice",
-+	NID_id_smime_spq_ets_sqt_unotice,11,&(lvalues[1789]),0},
-+{"id-smime-cti-ets-proofOfOrigin","id-smime-cti-ets-proofOfOrigin",
-+	NID_id_smime_cti_ets_proofOfOrigin,11,&(lvalues[1800]),0},
-+{"id-smime-cti-ets-proofOfReceipt","id-smime-cti-ets-proofOfReceipt",
-+	NID_id_smime_cti_ets_proofOfReceipt,11,&(lvalues[1811]),0},
-+{"id-smime-cti-ets-proofOfDelivery",
-+	"id-smime-cti-ets-proofOfDelivery",
-+	NID_id_smime_cti_ets_proofOfDelivery,11,&(lvalues[1822]),0},
-+{"id-smime-cti-ets-proofOfSender","id-smime-cti-ets-proofOfSender",
-+	NID_id_smime_cti_ets_proofOfSender,11,&(lvalues[1833]),0},
-+{"id-smime-cti-ets-proofOfApproval",
-+	"id-smime-cti-ets-proofOfApproval",
-+	NID_id_smime_cti_ets_proofOfApproval,11,&(lvalues[1844]),0},
-+{"id-smime-cti-ets-proofOfCreation",
-+	"id-smime-cti-ets-proofOfCreation",
-+	NID_id_smime_cti_ets_proofOfCreation,11,&(lvalues[1855]),0},
-+{"MD4","md4",NID_md4,8,&(lvalues[1866]),0},
-+{"id-pkix-mod","id-pkix-mod",NID_id_pkix_mod,7,&(lvalues[1874]),0},
-+{"id-qt","id-qt",NID_id_qt,7,&(lvalues[1881]),0},
-+{"id-it","id-it",NID_id_it,7,&(lvalues[1888]),0},
-+{"id-pkip","id-pkip",NID_id_pkip,7,&(lvalues[1895]),0},
-+{"id-alg","id-alg",NID_id_alg,7,&(lvalues[1902]),0},
-+{"id-cmc","id-cmc",NID_id_cmc,7,&(lvalues[1909]),0},
-+{"id-on","id-on",NID_id_on,7,&(lvalues[1916]),0},
-+{"id-pda","id-pda",NID_id_pda,7,&(lvalues[1923]),0},
-+{"id-aca","id-aca",NID_id_aca,7,&(lvalues[1930]),0},
-+{"id-qcs","id-qcs",NID_id_qcs,7,&(lvalues[1937]),0},
-+{"id-cct","id-cct",NID_id_cct,7,&(lvalues[1944]),0},
-+{"id-pkix1-explicit-88","id-pkix1-explicit-88",
-+	NID_id_pkix1_explicit_88,8,&(lvalues[1951]),0},
-+{"id-pkix1-implicit-88","id-pkix1-implicit-88",
-+	NID_id_pkix1_implicit_88,8,&(lvalues[1959]),0},
-+{"id-pkix1-explicit-93","id-pkix1-explicit-93",
-+	NID_id_pkix1_explicit_93,8,&(lvalues[1967]),0},
-+{"id-pkix1-implicit-93","id-pkix1-implicit-93",
-+	NID_id_pkix1_implicit_93,8,&(lvalues[1975]),0},
-+{"id-mod-crmf","id-mod-crmf",NID_id_mod_crmf,8,&(lvalues[1983]),0},
-+{"id-mod-cmc","id-mod-cmc",NID_id_mod_cmc,8,&(lvalues[1991]),0},
-+{"id-mod-kea-profile-88","id-mod-kea-profile-88",
-+	NID_id_mod_kea_profile_88,8,&(lvalues[1999]),0},
-+{"id-mod-kea-profile-93","id-mod-kea-profile-93",
-+	NID_id_mod_kea_profile_93,8,&(lvalues[2007]),0},
-+{"id-mod-cmp","id-mod-cmp",NID_id_mod_cmp,8,&(lvalues[2015]),0},
-+{"id-mod-qualified-cert-88","id-mod-qualified-cert-88",
-+	NID_id_mod_qualified_cert_88,8,&(lvalues[2023]),0},
-+{"id-mod-qualified-cert-93","id-mod-qualified-cert-93",
-+	NID_id_mod_qualified_cert_93,8,&(lvalues[2031]),0},
-+{"id-mod-attribute-cert","id-mod-attribute-cert",
-+	NID_id_mod_attribute_cert,8,&(lvalues[2039]),0},
-+{"id-mod-timestamp-protocol","id-mod-timestamp-protocol",
-+	NID_id_mod_timestamp_protocol,8,&(lvalues[2047]),0},
-+{"id-mod-ocsp","id-mod-ocsp",NID_id_mod_ocsp,8,&(lvalues[2055]),0},
-+{"id-mod-dvcs","id-mod-dvcs",NID_id_mod_dvcs,8,&(lvalues[2063]),0},
-+{"id-mod-cmp2000","id-mod-cmp2000",NID_id_mod_cmp2000,8,
-+	&(lvalues[2071]),0},
-+{"biometricInfo","Biometric Info",NID_biometricInfo,8,&(lvalues[2079]),0},
-+{"qcStatements","qcStatements",NID_qcStatements,8,&(lvalues[2087]),0},
-+{"ac-auditEntity","ac-auditEntity",NID_ac_auditEntity,8,
-+	&(lvalues[2095]),0},
-+{"ac-targeting","ac-targeting",NID_ac_targeting,8,&(lvalues[2103]),0},
-+{"aaControls","aaControls",NID_aaControls,8,&(lvalues[2111]),0},
-+{"sbgp-ipAddrBlock","sbgp-ipAddrBlock",NID_sbgp_ipAddrBlock,8,
-+	&(lvalues[2119]),0},
-+{"sbgp-autonomousSysNum","sbgp-autonomousSysNum",
-+	NID_sbgp_autonomousSysNum,8,&(lvalues[2127]),0},
-+{"sbgp-routerIdentifier","sbgp-routerIdentifier",
-+	NID_sbgp_routerIdentifier,8,&(lvalues[2135]),0},
-+{"textNotice","textNotice",NID_textNotice,8,&(lvalues[2143]),0},
-+{"ipsecEndSystem","IPSec End System",NID_ipsecEndSystem,8,
-+	&(lvalues[2151]),0},
-+{"ipsecTunnel","IPSec Tunnel",NID_ipsecTunnel,8,&(lvalues[2159]),0},
-+{"ipsecUser","IPSec User",NID_ipsecUser,8,&(lvalues[2167]),0},
-+{"DVCS","dvcs",NID_dvcs,8,&(lvalues[2175]),0},
-+{"id-it-caProtEncCert","id-it-caProtEncCert",NID_id_it_caProtEncCert,
-+	8,&(lvalues[2183]),0},
-+{"id-it-signKeyPairTypes","id-it-signKeyPairTypes",
-+	NID_id_it_signKeyPairTypes,8,&(lvalues[2191]),0},
-+{"id-it-encKeyPairTypes","id-it-encKeyPairTypes",
-+	NID_id_it_encKeyPairTypes,8,&(lvalues[2199]),0},
-+{"id-it-preferredSymmAlg","id-it-preferredSymmAlg",
-+	NID_id_it_preferredSymmAlg,8,&(lvalues[2207]),0},
-+{"id-it-caKeyUpdateInfo","id-it-caKeyUpdateInfo",
-+	NID_id_it_caKeyUpdateInfo,8,&(lvalues[2215]),0},
-+{"id-it-currentCRL","id-it-currentCRL",NID_id_it_currentCRL,8,
-+	&(lvalues[2223]),0},
-+{"id-it-unsupportedOIDs","id-it-unsupportedOIDs",
-+	NID_id_it_unsupportedOIDs,8,&(lvalues[2231]),0},
-+{"id-it-subscriptionRequest","id-it-subscriptionRequest",
-+	NID_id_it_subscriptionRequest,8,&(lvalues[2239]),0},
-+{"id-it-subscriptionResponse","id-it-subscriptionResponse",
-+	NID_id_it_subscriptionResponse,8,&(lvalues[2247]),0},
-+{"id-it-keyPairParamReq","id-it-keyPairParamReq",
-+	NID_id_it_keyPairParamReq,8,&(lvalues[2255]),0},
-+{"id-it-keyPairParamRep","id-it-keyPairParamRep",
-+	NID_id_it_keyPairParamRep,8,&(lvalues[2263]),0},
-+{"id-it-revPassphrase","id-it-revPassphrase",NID_id_it_revPassphrase,
-+	8,&(lvalues[2271]),0},
-+{"id-it-implicitConfirm","id-it-implicitConfirm",
-+	NID_id_it_implicitConfirm,8,&(lvalues[2279]),0},
-+{"id-it-confirmWaitTime","id-it-confirmWaitTime",
-+	NID_id_it_confirmWaitTime,8,&(lvalues[2287]),0},
-+{"id-it-origPKIMessage","id-it-origPKIMessage",
-+	NID_id_it_origPKIMessage,8,&(lvalues[2295]),0},
-+{"id-regCtrl","id-regCtrl",NID_id_regCtrl,8,&(lvalues[2303]),0},
-+{"id-regInfo","id-regInfo",NID_id_regInfo,8,&(lvalues[2311]),0},
-+{"id-regCtrl-regToken","id-regCtrl-regToken",NID_id_regCtrl_regToken,
-+	9,&(lvalues[2319]),0},
-+{"id-regCtrl-authenticator","id-regCtrl-authenticator",
-+	NID_id_regCtrl_authenticator,9,&(lvalues[2328]),0},
-+{"id-regCtrl-pkiPublicationInfo","id-regCtrl-pkiPublicationInfo",
-+	NID_id_regCtrl_pkiPublicationInfo,9,&(lvalues[2337]),0},
-+{"id-regCtrl-pkiArchiveOptions","id-regCtrl-pkiArchiveOptions",
-+	NID_id_regCtrl_pkiArchiveOptions,9,&(lvalues[2346]),0},
-+{"id-regCtrl-oldCertID","id-regCtrl-oldCertID",
-+	NID_id_regCtrl_oldCertID,9,&(lvalues[2355]),0},
-+{"id-regCtrl-protocolEncrKey","id-regCtrl-protocolEncrKey",
-+	NID_id_regCtrl_protocolEncrKey,9,&(lvalues[2364]),0},
-+{"id-regInfo-utf8Pairs","id-regInfo-utf8Pairs",
-+	NID_id_regInfo_utf8Pairs,9,&(lvalues[2373]),0},
-+{"id-regInfo-certReq","id-regInfo-certReq",NID_id_regInfo_certReq,9,
-+	&(lvalues[2382]),0},
-+{"id-alg-des40","id-alg-des40",NID_id_alg_des40,8,&(lvalues[2391]),0},
-+{"id-alg-noSignature","id-alg-noSignature",NID_id_alg_noSignature,8,
-+	&(lvalues[2399]),0},
-+{"id-alg-dh-sig-hmac-sha1","id-alg-dh-sig-hmac-sha1",
-+	NID_id_alg_dh_sig_hmac_sha1,8,&(lvalues[2407]),0},
-+{"id-alg-dh-pop","id-alg-dh-pop",NID_id_alg_dh_pop,8,&(lvalues[2415]),0},
-+{"id-cmc-statusInfo","id-cmc-statusInfo",NID_id_cmc_statusInfo,8,
-+	&(lvalues[2423]),0},
-+{"id-cmc-identification","id-cmc-identification",
-+	NID_id_cmc_identification,8,&(lvalues[2431]),0},
-+{"id-cmc-identityProof","id-cmc-identityProof",
-+	NID_id_cmc_identityProof,8,&(lvalues[2439]),0},
-+{"id-cmc-dataReturn","id-cmc-dataReturn",NID_id_cmc_dataReturn,8,
-+	&(lvalues[2447]),0},
-+{"id-cmc-transactionId","id-cmc-transactionId",
-+	NID_id_cmc_transactionId,8,&(lvalues[2455]),0},
-+{"id-cmc-senderNonce","id-cmc-senderNonce",NID_id_cmc_senderNonce,8,
-+	&(lvalues[2463]),0},
-+{"id-cmc-recipientNonce","id-cmc-recipientNonce",
-+	NID_id_cmc_recipientNonce,8,&(lvalues[2471]),0},
-+{"id-cmc-addExtensions","id-cmc-addExtensions",
-+	NID_id_cmc_addExtensions,8,&(lvalues[2479]),0},
-+{"id-cmc-encryptedPOP","id-cmc-encryptedPOP",NID_id_cmc_encryptedPOP,
-+	8,&(lvalues[2487]),0},
-+{"id-cmc-decryptedPOP","id-cmc-decryptedPOP",NID_id_cmc_decryptedPOP,
-+	8,&(lvalues[2495]),0},
-+{"id-cmc-lraPOPWitness","id-cmc-lraPOPWitness",
-+	NID_id_cmc_lraPOPWitness,8,&(lvalues[2503]),0},
-+{"id-cmc-getCert","id-cmc-getCert",NID_id_cmc_getCert,8,
-+	&(lvalues[2511]),0},
-+{"id-cmc-getCRL","id-cmc-getCRL",NID_id_cmc_getCRL,8,&(lvalues[2519]),0},
-+{"id-cmc-revokeRequest","id-cmc-revokeRequest",
-+	NID_id_cmc_revokeRequest,8,&(lvalues[2527]),0},
-+{"id-cmc-regInfo","id-cmc-regInfo",NID_id_cmc_regInfo,8,
-+	&(lvalues[2535]),0},
-+{"id-cmc-responseInfo","id-cmc-responseInfo",NID_id_cmc_responseInfo,
-+	8,&(lvalues[2543]),0},
-+{"id-cmc-queryPending","id-cmc-queryPending",NID_id_cmc_queryPending,
-+	8,&(lvalues[2551]),0},
-+{"id-cmc-popLinkRandom","id-cmc-popLinkRandom",
-+	NID_id_cmc_popLinkRandom,8,&(lvalues[2559]),0},
-+{"id-cmc-popLinkWitness","id-cmc-popLinkWitness",
-+	NID_id_cmc_popLinkWitness,8,&(lvalues[2567]),0},
-+{"id-cmc-confirmCertAcceptance","id-cmc-confirmCertAcceptance",
-+	NID_id_cmc_confirmCertAcceptance,8,&(lvalues[2575]),0},
-+{"id-on-personalData","id-on-personalData",NID_id_on_personalData,8,
-+	&(lvalues[2583]),0},
-+{"id-pda-dateOfBirth","id-pda-dateOfBirth",NID_id_pda_dateOfBirth,8,
-+	&(lvalues[2591]),0},
-+{"id-pda-placeOfBirth","id-pda-placeOfBirth",NID_id_pda_placeOfBirth,
-+	8,&(lvalues[2599]),0},
-+{NULL,NULL,NID_undef,0,NULL,0},
-+{"id-pda-gender","id-pda-gender",NID_id_pda_gender,8,&(lvalues[2607]),0},
-+{"id-pda-countryOfCitizenship","id-pda-countryOfCitizenship",
-+	NID_id_pda_countryOfCitizenship,8,&(lvalues[2615]),0},
-+{"id-pda-countryOfResidence","id-pda-countryOfResidence",
-+	NID_id_pda_countryOfResidence,8,&(lvalues[2623]),0},
-+{"id-aca-authenticationInfo","id-aca-authenticationInfo",
-+	NID_id_aca_authenticationInfo,8,&(lvalues[2631]),0},
-+{"id-aca-accessIdentity","id-aca-accessIdentity",
-+	NID_id_aca_accessIdentity,8,&(lvalues[2639]),0},
-+{"id-aca-chargingIdentity","id-aca-chargingIdentity",
-+	NID_id_aca_chargingIdentity,8,&(lvalues[2647]),0},
-+{"id-aca-group","id-aca-group",NID_id_aca_group,8,&(lvalues[2655]),0},
-+{"id-aca-role","id-aca-role",NID_id_aca_role,8,&(lvalues[2663]),0},
-+{"id-qcs-pkixQCSyntax-v1","id-qcs-pkixQCSyntax-v1",
-+	NID_id_qcs_pkixQCSyntax_v1,8,&(lvalues[2671]),0},
-+{"id-cct-crs","id-cct-crs",NID_id_cct_crs,8,&(lvalues[2679]),0},
-+{"id-cct-PKIData","id-cct-PKIData",NID_id_cct_PKIData,8,
-+	&(lvalues[2687]),0},
-+{"id-cct-PKIResponse","id-cct-PKIResponse",NID_id_cct_PKIResponse,8,
-+	&(lvalues[2695]),0},
-+{"ad_timestamping","AD Time Stamping",NID_ad_timeStamping,8,
-+	&(lvalues[2703]),0},
-+{"AD_DVCS","ad dvcs",NID_ad_dvcs,8,&(lvalues[2711]),0},
-+{"basicOCSPResponse","Basic OCSP Response",NID_id_pkix_OCSP_basic,9,
-+	&(lvalues[2719]),0},
-+{"Nonce","OCSP Nonce",NID_id_pkix_OCSP_Nonce,9,&(lvalues[2728]),0},
-+{"CrlID","OCSP CRL ID",NID_id_pkix_OCSP_CrlID,9,&(lvalues[2737]),0},
-+{"acceptableResponses","Acceptable OCSP Responses",
-+	NID_id_pkix_OCSP_acceptableResponses,9,&(lvalues[2746]),0},
-+{"noCheck","OCSP No Check",NID_id_pkix_OCSP_noCheck,9,&(lvalues[2755]),0},
-+{"archiveCutoff","OCSP Archive Cutoff",NID_id_pkix_OCSP_archiveCutoff,
-+	9,&(lvalues[2764]),0},
-+{"serviceLocator","OCSP Service Locator",
-+	NID_id_pkix_OCSP_serviceLocator,9,&(lvalues[2773]),0},
-+{"extendedStatus","Extended OCSP Status",
-+	NID_id_pkix_OCSP_extendedStatus,9,&(lvalues[2782]),0},
-+{"valid","valid",NID_id_pkix_OCSP_valid,9,&(lvalues[2791]),0},
-+{"path","path",NID_id_pkix_OCSP_path,9,&(lvalues[2800]),0},
-+{"trustRoot","Trust Root",NID_id_pkix_OCSP_trustRoot,9,
-+	&(lvalues[2809]),0},
-+{"algorithm","algorithm",NID_algorithm,4,&(lvalues[2818]),0},
-+{"rsaSignature","rsaSignature",NID_rsaSignature,5,&(lvalues[2822]),0},
-+{"X500algorithms","directory services - algorithms",
-+	NID_X500algorithms,2,&(lvalues[2827]),0},
-+{"ORG","org",NID_org,1,&(lvalues[2829]),0},
-+{"DOD","dod",NID_dod,2,&(lvalues[2830]),0},
-+{"IANA","iana",NID_iana,3,&(lvalues[2832]),0},
-+{"directory","Directory",NID_Directory,4,&(lvalues[2835]),0},
-+{"mgmt","Management",NID_Management,4,&(lvalues[2839]),0},
-+{"experimental","Experimental",NID_Experimental,4,&(lvalues[2843]),0},
-+{"private","Private",NID_Private,4,&(lvalues[2847]),0},
-+{"security","Security",NID_Security,4,&(lvalues[2851]),0},
-+{"snmpv2","SNMPv2",NID_SNMPv2,4,&(lvalues[2855]),0},
-+{"Mail","Mail",NID_Mail,4,&(lvalues[2859]),0},
-+{"enterprises","Enterprises",NID_Enterprises,5,&(lvalues[2863]),0},
-+{"dcobject","dcObject",NID_dcObject,9,&(lvalues[2868]),0},
-+{"DC","domainComponent",NID_domainComponent,10,&(lvalues[2877]),0},
-+{"domain","Domain",NID_Domain,10,&(lvalues[2887]),0},
-+{"NULL","NULL",NID_joint_iso_ccitt,0,NULL,0},
-+{"selected-attribute-types","Selected Attribute Types",
-+	NID_selected_attribute_types,3,&(lvalues[2897]),0},
-+{"clearance","clearance",NID_clearance,4,&(lvalues[2900]),0},
-+{"RSA-MD4","md4WithRSAEncryption",NID_md4WithRSAEncryption,9,
-+	&(lvalues[2904]),0},
-+{"ac-proxying","ac-proxying",NID_ac_proxying,8,&(lvalues[2913]),0},
-+{"subjectInfoAccess","Subject Information Access",NID_sinfo_access,8,
-+	&(lvalues[2921]),0},
-+{"id-aca-encAttrs","id-aca-encAttrs",NID_id_aca_encAttrs,8,
-+	&(lvalues[2929]),0},
-+{"role","role",NID_role,3,&(lvalues[2937]),0},
-+{"policyConstraints","X509v3 Policy Constraints",
-+	NID_policy_constraints,3,&(lvalues[2940]),0},
-+{"targetInformation","X509v3 AC Targeting",NID_target_information,3,
-+	&(lvalues[2943]),0},
-+{"noRevAvail","X509v3 No Revocation Available",NID_no_rev_avail,3,
-+	&(lvalues[2946]),0},
-+{"NULL","NULL",NID_ccitt,0,NULL,0},
-+{"ansi-X9-62","ANSI X9.62",NID_ansi_X9_62,5,&(lvalues[2949]),0},
-+{"prime-field","prime-field",NID_X9_62_prime_field,7,&(lvalues[2954]),0},
-+{"characteristic-two-field","characteristic-two-field",
-+	NID_X9_62_characteristic_two_field,7,&(lvalues[2961]),0},
-+{"id-ecPublicKey","id-ecPublicKey",NID_X9_62_id_ecPublicKey,7,
-+	&(lvalues[2968]),0},
-+{"prime192v1","prime192v1",NID_X9_62_prime192v1,8,&(lvalues[2975]),0},
-+{"prime192v2","prime192v2",NID_X9_62_prime192v2,8,&(lvalues[2983]),0},
-+{"prime192v3","prime192v3",NID_X9_62_prime192v3,8,&(lvalues[2991]),0},
-+{"prime239v1","prime239v1",NID_X9_62_prime239v1,8,&(lvalues[2999]),0},
-+{"prime239v2","prime239v2",NID_X9_62_prime239v2,8,&(lvalues[3007]),0},
-+{"prime239v3","prime239v3",NID_X9_62_prime239v3,8,&(lvalues[3015]),0},
-+{"prime256v1","prime256v1",NID_X9_62_prime256v1,8,&(lvalues[3023]),0},
-+{"ecdsa-with-SHA1","ecdsa-with-SHA1",NID_ecdsa_with_SHA1,7,
-+	&(lvalues[3031]),0},
-+{"CSPName","Microsoft CSP Name",NID_ms_csp_name,9,&(lvalues[3038]),0},
-+{"AES-128-ECB","aes-128-ecb",NID_aes_128_ecb,9,&(lvalues[3047]),0},
-+{"AES-128-CBC","aes-128-cbc",NID_aes_128_cbc,9,&(lvalues[3056]),0},
-+{"AES-128-OFB","aes-128-ofb",NID_aes_128_ofb128,9,&(lvalues[3065]),0},
-+{"AES-128-CFB","aes-128-cfb",NID_aes_128_cfb128,9,&(lvalues[3074]),0},
-+{"AES-192-ECB","aes-192-ecb",NID_aes_192_ecb,9,&(lvalues[3083]),0},
-+{"AES-192-CBC","aes-192-cbc",NID_aes_192_cbc,9,&(lvalues[3092]),0},
-+{"AES-192-OFB","aes-192-ofb",NID_aes_192_ofb128,9,&(lvalues[3101]),0},
-+{"AES-192-CFB","aes-192-cfb",NID_aes_192_cfb128,9,&(lvalues[3110]),0},
-+{"AES-256-ECB","aes-256-ecb",NID_aes_256_ecb,9,&(lvalues[3119]),0},
-+{"AES-256-CBC","aes-256-cbc",NID_aes_256_cbc,9,&(lvalues[3128]),0},
-+{"AES-256-OFB","aes-256-ofb",NID_aes_256_ofb128,9,&(lvalues[3137]),0},
-+{"AES-256-CFB","aes-256-cfb",NID_aes_256_cfb128,9,&(lvalues[3146]),0},
-+{"holdInstructionCode","Hold Instruction Code",
-+	NID_hold_instruction_code,3,&(lvalues[3155]),0},
-+{"holdInstructionNone","Hold Instruction None",
-+	NID_hold_instruction_none,7,&(lvalues[3158]),0},
-+{"holdInstructionCallIssuer","Hold Instruction Call Issuer",
-+	NID_hold_instruction_call_issuer,7,&(lvalues[3165]),0},
-+{"holdInstructionReject","Hold Instruction Reject",
-+	NID_hold_instruction_reject,7,&(lvalues[3172]),0},
-+{"data","data",NID_data,1,&(lvalues[3179]),0},
-+{"pss","pss",NID_pss,3,&(lvalues[3180]),0},
-+{"ucl","ucl",NID_ucl,7,&(lvalues[3183]),0},
-+{"pilot","pilot",NID_pilot,8,&(lvalues[3190]),0},
-+{"pilotAttributeType","pilotAttributeType",NID_pilotAttributeType,9,
-+	&(lvalues[3198]),0},
-+{"pilotAttributeSyntax","pilotAttributeSyntax",
-+	NID_pilotAttributeSyntax,9,&(lvalues[3207]),0},
-+{"pilotObjectClass","pilotObjectClass",NID_pilotObjectClass,9,
-+	&(lvalues[3216]),0},
-+{"pilotGroups","pilotGroups",NID_pilotGroups,9,&(lvalues[3225]),0},
-+{"iA5StringSyntax","iA5StringSyntax",NID_iA5StringSyntax,10,
-+	&(lvalues[3234]),0},
-+{"caseIgnoreIA5StringSyntax","caseIgnoreIA5StringSyntax",
-+	NID_caseIgnoreIA5StringSyntax,10,&(lvalues[3244]),0},
-+{"pilotObject","pilotObject",NID_pilotObject,10,&(lvalues[3254]),0},
-+{"pilotPerson","pilotPerson",NID_pilotPerson,10,&(lvalues[3264]),0},
-+{"account","account",NID_account,10,&(lvalues[3274]),0},
-+{"document","document",NID_document,10,&(lvalues[3284]),0},
-+{"room","room",NID_room,10,&(lvalues[3294]),0},
-+{"documentSeries","documentSeries",NID_documentSeries,10,
-+	&(lvalues[3304]),0},
-+{"rFC822localPart","rFC822localPart",NID_rFC822localPart,10,
-+	&(lvalues[3314]),0},
-+{"dNSDomain","dNSDomain",NID_dNSDomain,10,&(lvalues[3324]),0},
-+{"domainRelatedObject","domainRelatedObject",NID_domainRelatedObject,
-+	10,&(lvalues[3334]),0},
-+{"friendlyCountry","friendlyCountry",NID_friendlyCountry,10,
-+	&(lvalues[3344]),0},
-+{"simpleSecurityObject","simpleSecurityObject",
-+	NID_simpleSecurityObject,10,&(lvalues[3354]),0},
-+{"pilotOrganization","pilotOrganization",NID_pilotOrganization,10,
-+	&(lvalues[3364]),0},
-+{"pilotDSA","pilotDSA",NID_pilotDSA,10,&(lvalues[3374]),0},
-+{"qualityLabelledData","qualityLabelledData",NID_qualityLabelledData,
-+	10,&(lvalues[3384]),0},
-+{"UID","userId",NID_userId,10,&(lvalues[3394]),0},
-+{"textEncodedORAddress","textEncodedORAddress",
-+	NID_textEncodedORAddress,10,&(lvalues[3404]),0},
-+{"mail","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3414]),0},
-+{"info","info",NID_info,10,&(lvalues[3424]),0},
-+{"favouriteDrink","favouriteDrink",NID_favouriteDrink,10,
-+	&(lvalues[3434]),0},
-+{"roomNumber","roomNumber",NID_roomNumber,10,&(lvalues[3444]),0},
-+{"photo","photo",NID_photo,10,&(lvalues[3454]),0},
-+{"userClass","userClass",NID_userClass,10,&(lvalues[3464]),0},
-+{"host","host",NID_host,10,&(lvalues[3474]),0},
-+{"manager","manager",NID_manager,10,&(lvalues[3484]),0},
-+{"documentIdentifier","documentIdentifier",NID_documentIdentifier,10,
-+	&(lvalues[3494]),0},
-+{"documentTitle","documentTitle",NID_documentTitle,10,&(lvalues[3504]),0},
-+{"documentVersion","documentVersion",NID_documentVersion,10,
-+	&(lvalues[3514]),0},
-+{"documentAuthor","documentAuthor",NID_documentAuthor,10,
-+	&(lvalues[3524]),0},
-+{"documentLocation","documentLocation",NID_documentLocation,10,
-+	&(lvalues[3534]),0},
-+{"homeTelephoneNumber","homeTelephoneNumber",NID_homeTelephoneNumber,
-+	10,&(lvalues[3544]),0},
-+{"secretary","secretary",NID_secretary,10,&(lvalues[3554]),0},
-+{"otherMailbox","otherMailbox",NID_otherMailbox,10,&(lvalues[3564]),0},
-+{"lastModifiedTime","lastModifiedTime",NID_lastModifiedTime,10,
-+	&(lvalues[3574]),0},
-+{"lastModifiedBy","lastModifiedBy",NID_lastModifiedBy,10,
-+	&(lvalues[3584]),0},
-+{"aRecord","aRecord",NID_aRecord,10,&(lvalues[3594]),0},
-+{"pilotAttributeType27","pilotAttributeType27",
-+	NID_pilotAttributeType27,10,&(lvalues[3604]),0},
-+{"mXRecord","mXRecord",NID_mXRecord,10,&(lvalues[3614]),0},
-+{"nSRecord","nSRecord",NID_nSRecord,10,&(lvalues[3624]),0},
-+{"sOARecord","sOARecord",NID_sOARecord,10,&(lvalues[3634]),0},
-+{"cNAMERecord","cNAMERecord",NID_cNAMERecord,10,&(lvalues[3644]),0},
-+{"associatedDomain","associatedDomain",NID_associatedDomain,10,
-+	&(lvalues[3654]),0},
-+{"associatedName","associatedName",NID_associatedName,10,
-+	&(lvalues[3664]),0},
-+{"homePostalAddress","homePostalAddress",NID_homePostalAddress,10,
-+	&(lvalues[3674]),0},
-+{"personalTitle","personalTitle",NID_personalTitle,10,&(lvalues[3684]),0},
-+{"mobileTelephoneNumber","mobileTelephoneNumber",
-+	NID_mobileTelephoneNumber,10,&(lvalues[3694]),0},
-+{"pagerTelephoneNumber","pagerTelephoneNumber",
-+	NID_pagerTelephoneNumber,10,&(lvalues[3704]),0},
-+{"friendlyCountryName","friendlyCountryName",NID_friendlyCountryName,
-+	10,&(lvalues[3714]),0},
-+{"organizationalStatus","organizationalStatus",
-+	NID_organizationalStatus,10,&(lvalues[3724]),0},
-+{"janetMailbox","janetMailbox",NID_janetMailbox,10,&(lvalues[3734]),0},
-+{"mailPreferenceOption","mailPreferenceOption",
-+	NID_mailPreferenceOption,10,&(lvalues[3744]),0},
-+{"buildingName","buildingName",NID_buildingName,10,&(lvalues[3754]),0},
-+{"dSAQuality","dSAQuality",NID_dSAQuality,10,&(lvalues[3764]),0},
-+{"singleLevelQuality","singleLevelQuality",NID_singleLevelQuality,10,
-+	&(lvalues[3774]),0},
-+{"subtreeMinimumQuality","subtreeMinimumQuality",
-+	NID_subtreeMinimumQuality,10,&(lvalues[3784]),0},
-+{"subtreeMaximumQuality","subtreeMaximumQuality",
-+	NID_subtreeMaximumQuality,10,&(lvalues[3794]),0},
-+{"personalSignature","personalSignature",NID_personalSignature,10,
-+	&(lvalues[3804]),0},
-+{"dITRedirect","dITRedirect",NID_dITRedirect,10,&(lvalues[3814]),0},
-+{"audio","audio",NID_audio,10,&(lvalues[3824]),0},
-+{"documentPublisher","documentPublisher",NID_documentPublisher,10,
-+	&(lvalues[3834]),0},
-+{"x500UniqueIdentifier","x500UniqueIdentifier",
-+	NID_x500UniqueIdentifier,3,&(lvalues[3844]),0},
-+{"mime-mhs","MIME MHS",NID_mime_mhs,5,&(lvalues[3847]),0},
-+{"mime-mhs-headings","mime-mhs-headings",NID_mime_mhs_headings,6,
-+	&(lvalues[3852]),0},
-+{"mime-mhs-bodies","mime-mhs-bodies",NID_mime_mhs_bodies,6,
-+	&(lvalues[3858]),0},
-+{"id-hex-partial-message","id-hex-partial-message",
-+	NID_id_hex_partial_message,7,&(lvalues[3864]),0},
-+{"id-hex-multipart-message","id-hex-multipart-message",
-+	NID_id_hex_multipart_message,7,&(lvalues[3871]),0},
-+{"generationQualifier","generationQualifier",NID_generationQualifier,
-+	3,&(lvalues[3878]),0},
-+{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3881]),0},
-+{NULL,NULL,NID_undef,0,NULL,0},
-+{"id-set","Secure Electronic Transactions",NID_id_set,2,
-+	&(lvalues[3884]),0},
-+{"set-ctype","content types",NID_set_ctype,3,&(lvalues[3886]),0},
-+{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[3889]),0},
-+{"set-attr","set-attr",NID_set_attr,3,&(lvalues[3892]),0},
-+{"set-policy","set-policy",NID_set_policy,3,&(lvalues[3895]),0},
-+{"set-certExt","certificate extensions",NID_set_certExt,3,
-+	&(lvalues[3898]),0},
-+{"set-brand","set-brand",NID_set_brand,3,&(lvalues[3901]),0},
-+{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[3904]),0},
-+{"setct-PANToken","setct-PANToken",NID_setct_PANToken,4,
-+	&(lvalues[3908]),0},
-+{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[3912]),0},
-+{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[3916]),0},
-+{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[3920]),0},
-+{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[3924]),0},
-+{"setct-PIDataUnsigned","setct-PIDataUnsigned",
-+	NID_setct_PIDataUnsigned,4,&(lvalues[3928]),0},
-+{"setct-HODInput","setct-HODInput",NID_setct_HODInput,4,
-+	&(lvalues[3932]),0},
-+{"setct-AuthResBaggage","setct-AuthResBaggage",
-+	NID_setct_AuthResBaggage,4,&(lvalues[3936]),0},
-+{"setct-AuthRevReqBaggage","setct-AuthRevReqBaggage",
-+	NID_setct_AuthRevReqBaggage,4,&(lvalues[3940]),0},
-+{"setct-AuthRevResBaggage","setct-AuthRevResBaggage",
-+	NID_setct_AuthRevResBaggage,4,&(lvalues[3944]),0},
-+{"setct-CapTokenSeq","setct-CapTokenSeq",NID_setct_CapTokenSeq,4,
-+	&(lvalues[3948]),0},
-+{"setct-PInitResData","setct-PInitResData",NID_setct_PInitResData,4,
-+	&(lvalues[3952]),0},
-+{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[3956]),0},
-+{"setct-PResData","setct-PResData",NID_setct_PResData,4,
-+	&(lvalues[3960]),0},
-+{"setct-AuthReqTBS","setct-AuthReqTBS",NID_setct_AuthReqTBS,4,
-+	&(lvalues[3964]),0},
-+{"setct-AuthResTBS","setct-AuthResTBS",NID_setct_AuthResTBS,4,
-+	&(lvalues[3968]),0},
-+{"setct-AuthResTBSX","setct-AuthResTBSX",NID_setct_AuthResTBSX,4,
-+	&(lvalues[3972]),0},
-+{"setct-AuthTokenTBS","setct-AuthTokenTBS",NID_setct_AuthTokenTBS,4,
-+	&(lvalues[3976]),0},
-+{"setct-CapTokenData","setct-CapTokenData",NID_setct_CapTokenData,4,
-+	&(lvalues[3980]),0},
-+{"setct-CapTokenTBS","setct-CapTokenTBS",NID_setct_CapTokenTBS,4,
-+	&(lvalues[3984]),0},
-+{"setct-AcqCardCodeMsg","setct-AcqCardCodeMsg",
-+	NID_setct_AcqCardCodeMsg,4,&(lvalues[3988]),0},
-+{"setct-AuthRevReqTBS","setct-AuthRevReqTBS",NID_setct_AuthRevReqTBS,
-+	4,&(lvalues[3992]),0},
-+{"setct-AuthRevResData","setct-AuthRevResData",
-+	NID_setct_AuthRevResData,4,&(lvalues[3996]),0},
-+{"setct-AuthRevResTBS","setct-AuthRevResTBS",NID_setct_AuthRevResTBS,
-+	4,&(lvalues[4000]),0},
-+{"setct-CapReqTBS","setct-CapReqTBS",NID_setct_CapReqTBS,4,
-+	&(lvalues[4004]),0},
-+{"setct-CapReqTBSX","setct-CapReqTBSX",NID_setct_CapReqTBSX,4,
-+	&(lvalues[4008]),0},
-+{"setct-CapResData","setct-CapResData",NID_setct_CapResData,4,
-+	&(lvalues[4012]),0},
-+{"setct-CapRevReqTBS","setct-CapRevReqTBS",NID_setct_CapRevReqTBS,4,
-+	&(lvalues[4016]),0},
-+{"setct-CapRevReqTBSX","setct-CapRevReqTBSX",NID_setct_CapRevReqTBSX,
-+	4,&(lvalues[4020]),0},
-+{"setct-CapRevResData","setct-CapRevResData",NID_setct_CapRevResData,
-+	4,&(lvalues[4024]),0},
-+{"setct-CredReqTBS","setct-CredReqTBS",NID_setct_CredReqTBS,4,
-+	&(lvalues[4028]),0},
-+{"setct-CredReqTBSX","setct-CredReqTBSX",NID_setct_CredReqTBSX,4,
-+	&(lvalues[4032]),0},
-+{"setct-CredResData","setct-CredResData",NID_setct_CredResData,4,
-+	&(lvalues[4036]),0},
-+{"setct-CredRevReqTBS","setct-CredRevReqTBS",NID_setct_CredRevReqTBS,
-+	4,&(lvalues[4040]),0},
-+{"setct-CredRevReqTBSX","setct-CredRevReqTBSX",
-+	NID_setct_CredRevReqTBSX,4,&(lvalues[4044]),0},
-+{"setct-CredRevResData","setct-CredRevResData",
-+	NID_setct_CredRevResData,4,&(lvalues[4048]),0},
-+{"setct-PCertReqData","setct-PCertReqData",NID_setct_PCertReqData,4,
-+	&(lvalues[4052]),0},
-+{"setct-PCertResTBS","setct-PCertResTBS",NID_setct_PCertResTBS,4,
-+	&(lvalues[4056]),0},
-+{"setct-BatchAdminReqData","setct-BatchAdminReqData",
-+	NID_setct_BatchAdminReqData,4,&(lvalues[4060]),0},
-+{"setct-BatchAdminResData","setct-BatchAdminResData",
-+	NID_setct_BatchAdminResData,4,&(lvalues[4064]),0},
-+{"setct-CardCInitResTBS","setct-CardCInitResTBS",
-+	NID_setct_CardCInitResTBS,4,&(lvalues[4068]),0},
-+{"setct-MeAqCInitResTBS","setct-MeAqCInitResTBS",
-+	NID_setct_MeAqCInitResTBS,4,&(lvalues[4072]),0},
-+{"setct-RegFormResTBS","setct-RegFormResTBS",NID_setct_RegFormResTBS,
-+	4,&(lvalues[4076]),0},
-+{"setct-CertReqData","setct-CertReqData",NID_setct_CertReqData,4,
-+	&(lvalues[4080]),0},
-+{"setct-CertReqTBS","setct-CertReqTBS",NID_setct_CertReqTBS,4,
-+	&(lvalues[4084]),0},
-+{"setct-CertResData","setct-CertResData",NID_setct_CertResData,4,
-+	&(lvalues[4088]),0},
-+{"setct-CertInqReqTBS","setct-CertInqReqTBS",NID_setct_CertInqReqTBS,
-+	4,&(lvalues[4092]),0},
-+{"setct-ErrorTBS","setct-ErrorTBS",NID_setct_ErrorTBS,4,
-+	&(lvalues[4096]),0},
-+{"setct-PIDualSignedTBE","setct-PIDualSignedTBE",
-+	NID_setct_PIDualSignedTBE,4,&(lvalues[4100]),0},
-+{"setct-PIUnsignedTBE","setct-PIUnsignedTBE",NID_setct_PIUnsignedTBE,
-+	4,&(lvalues[4104]),0},
-+{"setct-AuthReqTBE","setct-AuthReqTBE",NID_setct_AuthReqTBE,4,
-+	&(lvalues[4108]),0},
-+{"setct-AuthResTBE","setct-AuthResTBE",NID_setct_AuthResTBE,4,
-+	&(lvalues[4112]),0},
-+{"setct-AuthResTBEX","setct-AuthResTBEX",NID_setct_AuthResTBEX,4,
-+	&(lvalues[4116]),0},
-+{"setct-AuthTokenTBE","setct-AuthTokenTBE",NID_setct_AuthTokenTBE,4,
-+	&(lvalues[4120]),0},
-+{"setct-CapTokenTBE","setct-CapTokenTBE",NID_setct_CapTokenTBE,4,
-+	&(lvalues[4124]),0},
-+{"setct-CapTokenTBEX","setct-CapTokenTBEX",NID_setct_CapTokenTBEX,4,
-+	&(lvalues[4128]),0},
-+{"setct-AcqCardCodeMsgTBE","setct-AcqCardCodeMsgTBE",
-+	NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4132]),0},
-+{"setct-AuthRevReqTBE","setct-AuthRevReqTBE",NID_setct_AuthRevReqTBE,
-+	4,&(lvalues[4136]),0},
-+{"setct-AuthRevResTBE","setct-AuthRevResTBE",NID_setct_AuthRevResTBE,
-+	4,&(lvalues[4140]),0},
-+{"setct-AuthRevResTBEB","setct-AuthRevResTBEB",
-+	NID_setct_AuthRevResTBEB,4,&(lvalues[4144]),0},
-+{"setct-CapReqTBE","setct-CapReqTBE",NID_setct_CapReqTBE,4,
-+	&(lvalues[4148]),0},
-+{"setct-CapReqTBEX","setct-CapReqTBEX",NID_setct_CapReqTBEX,4,
-+	&(lvalues[4152]),0},
-+{"setct-CapResTBE","setct-CapResTBE",NID_setct_CapResTBE,4,
-+	&(lvalues[4156]),0},
-+{"setct-CapRevReqTBE","setct-CapRevReqTBE",NID_setct_CapRevReqTBE,4,
-+	&(lvalues[4160]),0},
-+{"setct-CapRevReqTBEX","setct-CapRevReqTBEX",NID_setct_CapRevReqTBEX,
-+	4,&(lvalues[4164]),0},
-+{"setct-CapRevResTBE","setct-CapRevResTBE",NID_setct_CapRevResTBE,4,
-+	&(lvalues[4168]),0},
-+{"setct-CredReqTBE","setct-CredReqTBE",NID_setct_CredReqTBE,4,
-+	&(lvalues[4172]),0},
-+{"setct-CredReqTBEX","setct-CredReqTBEX",NID_setct_CredReqTBEX,4,
-+	&(lvalues[4176]),0},
-+{"setct-CredResTBE","setct-CredResTBE",NID_setct_CredResTBE,4,
-+	&(lvalues[4180]),0},
-+{"setct-CredRevReqTBE","setct-CredRevReqTBE",NID_setct_CredRevReqTBE,
-+	4,&(lvalues[4184]),0},
-+{"setct-CredRevReqTBEX","setct-CredRevReqTBEX",
-+	NID_setct_CredRevReqTBEX,4,&(lvalues[4188]),0},
-+{"setct-CredRevResTBE","setct-CredRevResTBE",NID_setct_CredRevResTBE,
-+	4,&(lvalues[4192]),0},
-+{"setct-BatchAdminReqTBE","setct-BatchAdminReqTBE",
-+	NID_setct_BatchAdminReqTBE,4,&(lvalues[4196]),0},
-+{"setct-BatchAdminResTBE","setct-BatchAdminResTBE",
-+	NID_setct_BatchAdminResTBE,4,&(lvalues[4200]),0},
-+{"setct-RegFormReqTBE","setct-RegFormReqTBE",NID_setct_RegFormReqTBE,
-+	4,&(lvalues[4204]),0},
-+{"setct-CertReqTBE","setct-CertReqTBE",NID_setct_CertReqTBE,4,
-+	&(lvalues[4208]),0},
-+{"setct-CertReqTBEX","setct-CertReqTBEX",NID_setct_CertReqTBEX,4,
-+	&(lvalues[4212]),0},
-+{"setct-CertResTBE","setct-CertResTBE",NID_setct_CertResTBE,4,
-+	&(lvalues[4216]),0},
-+{"setct-CRLNotificationTBS","setct-CRLNotificationTBS",
-+	NID_setct_CRLNotificationTBS,4,&(lvalues[4220]),0},
-+{"setct-CRLNotificationResTBS","setct-CRLNotificationResTBS",
-+	NID_setct_CRLNotificationResTBS,4,&(lvalues[4224]),0},
-+{"setct-BCIDistributionTBS","setct-BCIDistributionTBS",
-+	NID_setct_BCIDistributionTBS,4,&(lvalues[4228]),0},
-+{"setext-genCrypt","generic cryptogram",NID_setext_genCrypt,4,
-+	&(lvalues[4232]),0},
-+{"setext-miAuth","merchant initiated auth",NID_setext_miAuth,4,
-+	&(lvalues[4236]),0},
-+{"setext-pinSecure","setext-pinSecure",NID_setext_pinSecure,4,
-+	&(lvalues[4240]),0},
-+{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4244]),0},
-+{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4248]),0},
-+{"setext-cv","additional verification",NID_setext_cv,4,
-+	&(lvalues[4252]),0},
-+{"set-policy-root","set-policy-root",NID_set_policy_root,4,
-+	&(lvalues[4256]),0},
-+{"setCext-hashedRoot","setCext-hashedRoot",NID_setCext_hashedRoot,4,
-+	&(lvalues[4260]),0},
-+{"setCext-certType","setCext-certType",NID_setCext_certType,4,
-+	&(lvalues[4264]),0},
-+{"setCext-merchData","setCext-merchData",NID_setCext_merchData,4,
-+	&(lvalues[4268]),0},
-+{"setCext-cCertRequired","setCext-cCertRequired",
-+	NID_setCext_cCertRequired,4,&(lvalues[4272]),0},
-+{"setCext-tunneling","setCext-tunneling",NID_setCext_tunneling,4,
-+	&(lvalues[4276]),0},
-+{"setCext-setExt","setCext-setExt",NID_setCext_setExt,4,
-+	&(lvalues[4280]),0},
-+{"setCext-setQualf","setCext-setQualf",NID_setCext_setQualf,4,
-+	&(lvalues[4284]),0},
-+{"setCext-PGWYcapabilities","setCext-PGWYcapabilities",
-+	NID_setCext_PGWYcapabilities,4,&(lvalues[4288]),0},
-+{"setCext-TokenIdentifier","setCext-TokenIdentifier",
-+	NID_setCext_TokenIdentifier,4,&(lvalues[4292]),0},
-+{"setCext-Track2Data","setCext-Track2Data",NID_setCext_Track2Data,4,
-+	&(lvalues[4296]),0},
-+{"setCext-TokenType","setCext-TokenType",NID_setCext_TokenType,4,
-+	&(lvalues[4300]),0},
-+{"setCext-IssuerCapabilities","setCext-IssuerCapabilities",
-+	NID_setCext_IssuerCapabilities,4,&(lvalues[4304]),0},
-+{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4308]),0},
-+{"setAttr-PGWYcap","payment gateway capabilities",NID_setAttr_PGWYcap,
-+	4,&(lvalues[4312]),0},
-+{"setAttr-TokenType","setAttr-TokenType",NID_setAttr_TokenType,4,
-+	&(lvalues[4316]),0},
-+{"setAttr-IssCap","issuer capabilities",NID_setAttr_IssCap,4,
-+	&(lvalues[4320]),0},
-+{"set-rootKeyThumb","set-rootKeyThumb",NID_set_rootKeyThumb,5,
-+	&(lvalues[4324]),0},
-+{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4329]),0},
-+{"setAttr-Token-EMV","setAttr-Token-EMV",NID_setAttr_Token_EMV,5,
-+	&(lvalues[4334]),0},
-+{"setAttr-Token-B0Prime","setAttr-Token-B0Prime",
-+	NID_setAttr_Token_B0Prime,5,&(lvalues[4339]),0},
-+{"setAttr-IssCap-CVM","setAttr-IssCap-CVM",NID_setAttr_IssCap_CVM,5,
-+	&(lvalues[4344]),0},
-+{"setAttr-IssCap-T2","setAttr-IssCap-T2",NID_setAttr_IssCap_T2,5,
-+	&(lvalues[4349]),0},
-+{"setAttr-IssCap-Sig","setAttr-IssCap-Sig",NID_setAttr_IssCap_Sig,5,
-+	&(lvalues[4354]),0},
-+{"setAttr-GenCryptgrm","generate cryptogram",NID_setAttr_GenCryptgrm,
-+	6,&(lvalues[4359]),0},
-+{"setAttr-T2Enc","encrypted track 2",NID_setAttr_T2Enc,6,
-+	&(lvalues[4365]),0},
-+{"setAttr-T2cleartxt","cleartext track 2",NID_setAttr_T2cleartxt,6,
-+	&(lvalues[4371]),0},
-+{"setAttr-TokICCsig","ICC or token signature",NID_setAttr_TokICCsig,6,
-+	&(lvalues[4377]),0},
-+{"setAttr-SecDevSig","secure device signature",NID_setAttr_SecDevSig,
-+	6,&(lvalues[4383]),0},
-+{"set-brand-IATA-ATA","set-brand-IATA-ATA",NID_set_brand_IATA_ATA,4,
-+	&(lvalues[4389]),0},
-+{"set-brand-Diners","set-brand-Diners",NID_set_brand_Diners,4,
-+	&(lvalues[4393]),0},
-+{"set-brand-AmericanExpress","set-brand-AmericanExpress",
-+	NID_set_brand_AmericanExpress,4,&(lvalues[4397]),0},
-+{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4401]),0},
-+{"set-brand-Visa","set-brand-Visa",NID_set_brand_Visa,4,
-+	&(lvalues[4405]),0},
-+{"set-brand-MasterCard","set-brand-MasterCard",
-+	NID_set_brand_MasterCard,4,&(lvalues[4409]),0},
-+{"set-brand-Novus","set-brand-Novus",NID_set_brand_Novus,5,
-+	&(lvalues[4413]),0},
-+{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4418]),0},
-+{"rsaOAEPEncryptionSET","rsaOAEPEncryptionSET",
-+	NID_rsaOAEPEncryptionSET,9,&(lvalues[4426]),0},
-+{"ITU-T","itu-t",NID_itu_t,0,NULL,0},
-+{"JOINT-ISO-ITU-T","joint-iso-itu-t",NID_joint_iso_itu_t,0,NULL,0},
-+{"international-organizations","International Organizations",
-+	NID_international_organizations,1,&(lvalues[4435]),0},
-+{"msSmartcardLogin","Microsoft Smartcardlogin",NID_ms_smartcard_login,
-+	10,&(lvalues[4436]),0},
-+{"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10,
-+	&(lvalues[4446]),0},
-+{"AES-128-CFB1","aes-128-cfb1",NID_aes_128_cfb1,0,NULL,0},
-+{"AES-192-CFB1","aes-192-cfb1",NID_aes_192_cfb1,0,NULL,0},
-+{"AES-256-CFB1","aes-256-cfb1",NID_aes_256_cfb1,0,NULL,0},
-+{"AES-128-CFB8","aes-128-cfb8",NID_aes_128_cfb8,0,NULL,0},
-+{"AES-192-CFB8","aes-192-cfb8",NID_aes_192_cfb8,0,NULL,0},
-+{"AES-256-CFB8","aes-256-cfb8",NID_aes_256_cfb8,0,NULL,0},
-+{"DES-CFB1","des-cfb1",NID_des_cfb1,0,NULL,0},
-+{"DES-CFB8","des-cfb8",NID_des_cfb8,0,NULL,0},
-+{"DES-EDE3-CFB1","des-ede3-cfb1",NID_des_ede3_cfb1,0,NULL,0},
-+{"DES-EDE3-CFB8","des-ede3-cfb8",NID_des_ede3_cfb8,0,NULL,0},
-+{"street","streetAddress",NID_streetAddress,3,&(lvalues[4456]),0},
-+{"postalCode","postalCode",NID_postalCode,3,&(lvalues[4459]),0},
-+{"id-ppl","id-ppl",NID_id_ppl,7,&(lvalues[4462]),0},
-+{"proxyCertInfo","Proxy Certificate Information",NID_proxyCertInfo,8,
-+	&(lvalues[4469]),0},
-+{"id-ppl-anyLanguage","Any language",NID_id_ppl_anyLanguage,8,
-+	&(lvalues[4477]),0},
-+{"id-ppl-inheritAll","Inherit all",NID_id_ppl_inheritAll,8,
-+	&(lvalues[4485]),0},
-+{"nameConstraints","X509v3 Name Constraints",NID_name_constraints,3,
-+	&(lvalues[4493]),0},
-+{"id-ppl-independent","Independent",NID_Independent,8,&(lvalues[4496]),0},
-+{"RSA-SHA256","sha256WithRSAEncryption",NID_sha256WithRSAEncryption,9,
-+	&(lvalues[4504]),0},
-+{"RSA-SHA384","sha384WithRSAEncryption",NID_sha384WithRSAEncryption,9,
-+	&(lvalues[4513]),0},
-+{"RSA-SHA512","sha512WithRSAEncryption",NID_sha512WithRSAEncryption,9,
-+	&(lvalues[4522]),0},
-+{"RSA-SHA224","sha224WithRSAEncryption",NID_sha224WithRSAEncryption,9,
-+	&(lvalues[4531]),0},
-+{"SHA256","sha256",NID_sha256,9,&(lvalues[4540]),0},
-+{"SHA384","sha384",NID_sha384,9,&(lvalues[4549]),0},
-+{"SHA512","sha512",NID_sha512,9,&(lvalues[4558]),0},
-+{"SHA224","sha224",NID_sha224,9,&(lvalues[4567]),0},
-+{"identified-organization","identified-organization",
-+	NID_identified_organization,1,&(lvalues[4576]),0},
-+{"certicom-arc","certicom-arc",NID_certicom_arc,3,&(lvalues[4577]),0},
-+{"wap","wap",NID_wap,2,&(lvalues[4580]),0},
-+{"wap-wsg","wap-wsg",NID_wap_wsg,3,&(lvalues[4582]),0},
-+{"id-characteristic-two-basis","id-characteristic-two-basis",
-+	NID_X9_62_id_characteristic_two_basis,8,&(lvalues[4585]),0},
-+{"onBasis","onBasis",NID_X9_62_onBasis,9,&(lvalues[4593]),0},
-+{"tpBasis","tpBasis",NID_X9_62_tpBasis,9,&(lvalues[4602]),0},
-+{"ppBasis","ppBasis",NID_X9_62_ppBasis,9,&(lvalues[4611]),0},
-+{"c2pnb163v1","c2pnb163v1",NID_X9_62_c2pnb163v1,8,&(lvalues[4620]),0},
-+{"c2pnb163v2","c2pnb163v2",NID_X9_62_c2pnb163v2,8,&(lvalues[4628]),0},
-+{"c2pnb163v3","c2pnb163v3",NID_X9_62_c2pnb163v3,8,&(lvalues[4636]),0},
-+{"c2pnb176v1","c2pnb176v1",NID_X9_62_c2pnb176v1,8,&(lvalues[4644]),0},
-+{"c2tnb191v1","c2tnb191v1",NID_X9_62_c2tnb191v1,8,&(lvalues[4652]),0},
-+{"c2tnb191v2","c2tnb191v2",NID_X9_62_c2tnb191v2,8,&(lvalues[4660]),0},
-+{"c2tnb191v3","c2tnb191v3",NID_X9_62_c2tnb191v3,8,&(lvalues[4668]),0},
-+{"c2onb191v4","c2onb191v4",NID_X9_62_c2onb191v4,8,&(lvalues[4676]),0},
-+{"c2onb191v5","c2onb191v5",NID_X9_62_c2onb191v5,8,&(lvalues[4684]),0},
-+{"c2pnb208w1","c2pnb208w1",NID_X9_62_c2pnb208w1,8,&(lvalues[4692]),0},
-+{"c2tnb239v1","c2tnb239v1",NID_X9_62_c2tnb239v1,8,&(lvalues[4700]),0},
-+{"c2tnb239v2","c2tnb239v2",NID_X9_62_c2tnb239v2,8,&(lvalues[4708]),0},
-+{"c2tnb239v3","c2tnb239v3",NID_X9_62_c2tnb239v3,8,&(lvalues[4716]),0},
-+{"c2onb239v4","c2onb239v4",NID_X9_62_c2onb239v4,8,&(lvalues[4724]),0},
-+{"c2onb239v5","c2onb239v5",NID_X9_62_c2onb239v5,8,&(lvalues[4732]),0},
-+{"c2pnb272w1","c2pnb272w1",NID_X9_62_c2pnb272w1,8,&(lvalues[4740]),0},
-+{"c2pnb304w1","c2pnb304w1",NID_X9_62_c2pnb304w1,8,&(lvalues[4748]),0},
-+{"c2tnb359v1","c2tnb359v1",NID_X9_62_c2tnb359v1,8,&(lvalues[4756]),0},
-+{"c2pnb368w1","c2pnb368w1",NID_X9_62_c2pnb368w1,8,&(lvalues[4764]),0},
-+{"c2tnb431r1","c2tnb431r1",NID_X9_62_c2tnb431r1,8,&(lvalues[4772]),0},
-+{"secp112r1","secp112r1",NID_secp112r1,5,&(lvalues[4780]),0},
-+{"secp112r2","secp112r2",NID_secp112r2,5,&(lvalues[4785]),0},
-+{"secp128r1","secp128r1",NID_secp128r1,5,&(lvalues[4790]),0},
-+{"secp128r2","secp128r2",NID_secp128r2,5,&(lvalues[4795]),0},
-+{"secp160k1","secp160k1",NID_secp160k1,5,&(lvalues[4800]),0},
-+{"secp160r1","secp160r1",NID_secp160r1,5,&(lvalues[4805]),0},
-+{"secp160r2","secp160r2",NID_secp160r2,5,&(lvalues[4810]),0},
-+{"secp192k1","secp192k1",NID_secp192k1,5,&(lvalues[4815]),0},
-+{"secp224k1","secp224k1",NID_secp224k1,5,&(lvalues[4820]),0},
-+{"secp224r1","secp224r1",NID_secp224r1,5,&(lvalues[4825]),0},
-+{"secp256k1","secp256k1",NID_secp256k1,5,&(lvalues[4830]),0},
-+{"secp384r1","secp384r1",NID_secp384r1,5,&(lvalues[4835]),0},
-+{"secp521r1","secp521r1",NID_secp521r1,5,&(lvalues[4840]),0},
-+{"sect113r1","sect113r1",NID_sect113r1,5,&(lvalues[4845]),0},
-+{"sect113r2","sect113r2",NID_sect113r2,5,&(lvalues[4850]),0},
-+{"sect131r1","sect131r1",NID_sect131r1,5,&(lvalues[4855]),0},
-+{"sect131r2","sect131r2",NID_sect131r2,5,&(lvalues[4860]),0},
-+{"sect163k1","sect163k1",NID_sect163k1,5,&(lvalues[4865]),0},
-+{"sect163r1","sect163r1",NID_sect163r1,5,&(lvalues[4870]),0},
-+{"sect163r2","sect163r2",NID_sect163r2,5,&(lvalues[4875]),0},
-+{"sect193r1","sect193r1",NID_sect193r1,5,&(lvalues[4880]),0},
-+{"sect193r2","sect193r2",NID_sect193r2,5,&(lvalues[4885]),0},
-+{"sect233k1","sect233k1",NID_sect233k1,5,&(lvalues[4890]),0},
-+{"sect233r1","sect233r1",NID_sect233r1,5,&(lvalues[4895]),0},
-+{"sect239k1","sect239k1",NID_sect239k1,5,&(lvalues[4900]),0},
-+{"sect283k1","sect283k1",NID_sect283k1,5,&(lvalues[4905]),0},
-+{"sect283r1","sect283r1",NID_sect283r1,5,&(lvalues[4910]),0},
-+{"sect409k1","sect409k1",NID_sect409k1,5,&(lvalues[4915]),0},
-+{"sect409r1","sect409r1",NID_sect409r1,5,&(lvalues[4920]),0},
-+{"sect571k1","sect571k1",NID_sect571k1,5,&(lvalues[4925]),0},
-+{"sect571r1","sect571r1",NID_sect571r1,5,&(lvalues[4930]),0},
-+{"wap-wsg-idm-ecid-wtls1","wap-wsg-idm-ecid-wtls1",
-+	NID_wap_wsg_idm_ecid_wtls1,5,&(lvalues[4935]),0},
-+{"wap-wsg-idm-ecid-wtls3","wap-wsg-idm-ecid-wtls3",
-+	NID_wap_wsg_idm_ecid_wtls3,5,&(lvalues[4940]),0},
-+{"wap-wsg-idm-ecid-wtls4","wap-wsg-idm-ecid-wtls4",
-+	NID_wap_wsg_idm_ecid_wtls4,5,&(lvalues[4945]),0},
-+{"wap-wsg-idm-ecid-wtls5","wap-wsg-idm-ecid-wtls5",
-+	NID_wap_wsg_idm_ecid_wtls5,5,&(lvalues[4950]),0},
-+{"wap-wsg-idm-ecid-wtls6","wap-wsg-idm-ecid-wtls6",
-+	NID_wap_wsg_idm_ecid_wtls6,5,&(lvalues[4955]),0},
-+{"wap-wsg-idm-ecid-wtls7","wap-wsg-idm-ecid-wtls7",
-+	NID_wap_wsg_idm_ecid_wtls7,5,&(lvalues[4960]),0},
-+{"wap-wsg-idm-ecid-wtls8","wap-wsg-idm-ecid-wtls8",
-+	NID_wap_wsg_idm_ecid_wtls8,5,&(lvalues[4965]),0},
-+{"wap-wsg-idm-ecid-wtls9","wap-wsg-idm-ecid-wtls9",
-+	NID_wap_wsg_idm_ecid_wtls9,5,&(lvalues[4970]),0},
-+{"wap-wsg-idm-ecid-wtls10","wap-wsg-idm-ecid-wtls10",
-+	NID_wap_wsg_idm_ecid_wtls10,5,&(lvalues[4975]),0},
-+{"wap-wsg-idm-ecid-wtls11","wap-wsg-idm-ecid-wtls11",
-+	NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4980]),0},
-+{"wap-wsg-idm-ecid-wtls12","wap-wsg-idm-ecid-wtls12",
-+	NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4985]),0},
-+{"anyPolicy","X509v3 Any Policy",NID_any_policy,4,&(lvalues[4990]),0},
-+{"policyMappings","X509v3 Policy Mappings",NID_policy_mappings,3,
-+	&(lvalues[4994]),0},
-+{"inhibitAnyPolicy","X509v3 Inhibit Any Policy",
-+	NID_inhibit_any_policy,3,&(lvalues[4997]),0},
-+{"Oakley-EC2N-3","ipsec3",NID_ipsec3,0,NULL,0},
-+{"Oakley-EC2N-4","ipsec4",NID_ipsec4,0,NULL,0},
-+{"CAMELLIA-128-CBC","camellia-128-cbc",NID_camellia_128_cbc,11,
-+	&(lvalues[5000]),0},
-+{"CAMELLIA-192-CBC","camellia-192-cbc",NID_camellia_192_cbc,11,
-+	&(lvalues[5011]),0},
-+{"CAMELLIA-256-CBC","camellia-256-cbc",NID_camellia_256_cbc,11,
-+	&(lvalues[5022]),0},
-+{"CAMELLIA-128-ECB","camellia-128-ecb",NID_camellia_128_ecb,8,
-+	&(lvalues[5033]),0},
-+{"CAMELLIA-192-ECB","camellia-192-ecb",NID_camellia_192_ecb,8,
-+	&(lvalues[5041]),0},
-+{"CAMELLIA-256-ECB","camellia-256-ecb",NID_camellia_256_ecb,8,
-+	&(lvalues[5049]),0},
-+{"CAMELLIA-128-CFB","camellia-128-cfb",NID_camellia_128_cfb128,8,
-+	&(lvalues[5057]),0},
-+{"CAMELLIA-192-CFB","camellia-192-cfb",NID_camellia_192_cfb128,8,
-+	&(lvalues[5065]),0},
-+{"CAMELLIA-256-CFB","camellia-256-cfb",NID_camellia_256_cfb128,8,
-+	&(lvalues[5073]),0},
-+{"CAMELLIA-128-CFB1","camellia-128-cfb1",NID_camellia_128_cfb1,0,NULL,0},
-+{"CAMELLIA-192-CFB1","camellia-192-cfb1",NID_camellia_192_cfb1,0,NULL,0},
-+{"CAMELLIA-256-CFB1","camellia-256-cfb1",NID_camellia_256_cfb1,0,NULL,0},
-+{"CAMELLIA-128-CFB8","camellia-128-cfb8",NID_camellia_128_cfb8,0,NULL,0},
-+{"CAMELLIA-192-CFB8","camellia-192-cfb8",NID_camellia_192_cfb8,0,NULL,0},
-+{"CAMELLIA-256-CFB8","camellia-256-cfb8",NID_camellia_256_cfb8,0,NULL,0},
-+{"CAMELLIA-128-OFB","camellia-128-ofb",NID_camellia_128_ofb128,8,
-+	&(lvalues[5081]),0},
-+{"CAMELLIA-192-OFB","camellia-192-ofb",NID_camellia_192_ofb128,8,
-+	&(lvalues[5089]),0},
-+{"CAMELLIA-256-OFB","camellia-256-ofb",NID_camellia_256_ofb128,8,
-+	&(lvalues[5097]),0},
-+{"subjectDirectoryAttributes","X509v3 Subject Directory Attributes",
-+	NID_subject_directory_attributes,3,&(lvalues[5105]),0},
-+{"issuingDistributionPoint","X509v3 Issuing Distrubution Point",
-+	NID_issuing_distribution_point,3,&(lvalues[5108]),0},
-+{"certificateIssuer","X509v3 Certificate Issuer",
-+	NID_certificate_issuer,3,&(lvalues[5111]),0},
-+{NULL,NULL,NID_undef,0,NULL,0},
-+{"KISA","kisa",NID_kisa,6,&(lvalues[5114]),0},
-+{NULL,NULL,NID_undef,0,NULL,0},
-+{NULL,NULL,NID_undef,0,NULL,0},
-+{"SEED-ECB","seed-ecb",NID_seed_ecb,8,&(lvalues[5120]),0},
-+{"SEED-CBC","seed-cbc",NID_seed_cbc,8,&(lvalues[5128]),0},
-+{"SEED-OFB","seed-ofb",NID_seed_ofb128,8,&(lvalues[5136]),0},
-+{"SEED-CFB","seed-cfb",NID_seed_cfb128,8,&(lvalues[5144]),0},
-+{"HMAC-MD5","hmac-md5",NID_hmac_md5,8,&(lvalues[5152]),0},
-+{"HMAC-SHA1","hmac-sha1",NID_hmac_sha1,8,&(lvalues[5160]),0},
-+{"id-PasswordBasedMAC","password based MAC",NID_id_PasswordBasedMAC,9,
-+	&(lvalues[5168]),0},
-+{"id-DHBasedMac","Diffie-Hellman based MAC",NID_id_DHBasedMac,9,
-+	&(lvalues[5177]),0},
-+{"id-it-suppLangTags","id-it-suppLangTags",NID_id_it_suppLangTags,8,
-+	&(lvalues[5186]),0},
-+{"caRepository","CA Repository",NID_caRepository,8,&(lvalues[5194]),0},
-+{"id-smime-ct-compressedData","id-smime-ct-compressedData",
-+	NID_id_smime_ct_compressedData,11,&(lvalues[5202]),0},
-+{"id-ct-asciiTextWithCRLF","id-ct-asciiTextWithCRLF",
-+	NID_id_ct_asciiTextWithCRLF,11,&(lvalues[5213]),0},
-+{"id-aes128-wrap","id-aes128-wrap",NID_id_aes128_wrap,9,
-+	&(lvalues[5224]),0},
-+{"id-aes192-wrap","id-aes192-wrap",NID_id_aes192_wrap,9,
-+	&(lvalues[5233]),0},
-+{"id-aes256-wrap","id-aes256-wrap",NID_id_aes256_wrap,9,
-+	&(lvalues[5242]),0},
-+{"ecdsa-with-Recommended","ecdsa-with-Recommended",
-+	NID_ecdsa_with_Recommended,7,&(lvalues[5251]),0},
-+{"ecdsa-with-Specified","ecdsa-with-Specified",
-+	NID_ecdsa_with_Specified,7,&(lvalues[5258]),0},
-+{"ecdsa-with-SHA224","ecdsa-with-SHA224",NID_ecdsa_with_SHA224,8,
-+	&(lvalues[5265]),0},
-+{"ecdsa-with-SHA256","ecdsa-with-SHA256",NID_ecdsa_with_SHA256,8,
-+	&(lvalues[5273]),0},
-+{"ecdsa-with-SHA384","ecdsa-with-SHA384",NID_ecdsa_with_SHA384,8,
-+	&(lvalues[5281]),0},
-+{"ecdsa-with-SHA512","ecdsa-with-SHA512",NID_ecdsa_with_SHA512,8,
-+	&(lvalues[5289]),0},
-+{"hmacWithMD5","hmacWithMD5",NID_hmacWithMD5,8,&(lvalues[5297]),0},
-+{"hmacWithSHA224","hmacWithSHA224",NID_hmacWithSHA224,8,
-+	&(lvalues[5305]),0},
-+{"hmacWithSHA256","hmacWithSHA256",NID_hmacWithSHA256,8,
-+	&(lvalues[5313]),0},
-+{"hmacWithSHA384","hmacWithSHA384",NID_hmacWithSHA384,8,
-+	&(lvalues[5321]),0},
-+{"hmacWithSHA512","hmacWithSHA512",NID_hmacWithSHA512,8,
-+	&(lvalues[5329]),0},
-+{"dsa_with_SHA224","dsa_with_SHA224",NID_dsa_with_SHA224,9,
-+	&(lvalues[5337]),0},
-+{"dsa_with_SHA256","dsa_with_SHA256",NID_dsa_with_SHA256,9,
-+	&(lvalues[5346]),0},
-+{"whirlpool","whirlpool",NID_whirlpool,6,&(lvalues[5355]),0},
-+{"cryptopro","cryptopro",NID_cryptopro,5,&(lvalues[5361]),0},
-+{"cryptocom","cryptocom",NID_cryptocom,5,&(lvalues[5366]),0},
-+{"id-GostR3411-94-with-GostR3410-2001",
-+	"GOST R 34.11-94 with GOST R 34.10-2001",
-+	NID_id_GostR3411_94_with_GostR3410_2001,6,&(lvalues[5371]),0},
-+{"id-GostR3411-94-with-GostR3410-94",
-+	"GOST R 34.11-94 with GOST R 34.10-94",
-+	NID_id_GostR3411_94_with_GostR3410_94,6,&(lvalues[5377]),0},
-+{"md_gost94","GOST R 34.11-94",NID_id_GostR3411_94,6,&(lvalues[5383]),0},
-+{"id-HMACGostR3411-94","HMAC GOST 34.11-94",NID_id_HMACGostR3411_94,6,
-+	&(lvalues[5389]),0},
-+{"gost2001","GOST R 34.10-2001",NID_id_GostR3410_2001,6,
-+	&(lvalues[5395]),0},
-+{"gost94","GOST R 34.10-94",NID_id_GostR3410_94,6,&(lvalues[5401]),0},
-+{"gost89","GOST 28147-89",NID_id_Gost28147_89,6,&(lvalues[5407]),0},
-+{"gost89-cnt","gost89-cnt",NID_gost89_cnt,0,NULL,0},
-+{"gost-mac","GOST 28147-89 MAC",NID_id_Gost28147_89_MAC,6,
-+	&(lvalues[5413]),0},
-+{"prf-gostr3411-94","GOST R 34.11-94 PRF",NID_id_GostR3411_94_prf,6,
-+	&(lvalues[5419]),0},
-+{"id-GostR3410-2001DH","GOST R 34.10-2001 DH",NID_id_GostR3410_2001DH,
-+	6,&(lvalues[5425]),0},
-+{"id-GostR3410-94DH","GOST R 34.10-94 DH",NID_id_GostR3410_94DH,6,
-+	&(lvalues[5431]),0},
-+{"id-Gost28147-89-CryptoPro-KeyMeshing",
-+	"id-Gost28147-89-CryptoPro-KeyMeshing",
-+	NID_id_Gost28147_89_CryptoPro_KeyMeshing,7,&(lvalues[5437]),0},
-+{"id-Gost28147-89-None-KeyMeshing","id-Gost28147-89-None-KeyMeshing",
-+	NID_id_Gost28147_89_None_KeyMeshing,7,&(lvalues[5444]),0},
-+{"id-GostR3411-94-TestParamSet","id-GostR3411-94-TestParamSet",
-+	NID_id_GostR3411_94_TestParamSet,7,&(lvalues[5451]),0},
-+{"id-GostR3411-94-CryptoProParamSet",
-+	"id-GostR3411-94-CryptoProParamSet",
-+	NID_id_GostR3411_94_CryptoProParamSet,7,&(lvalues[5458]),0},
-+{"id-Gost28147-89-TestParamSet","id-Gost28147-89-TestParamSet",
-+	NID_id_Gost28147_89_TestParamSet,7,&(lvalues[5465]),0},
-+{"id-Gost28147-89-CryptoPro-A-ParamSet",
-+	"id-Gost28147-89-CryptoPro-A-ParamSet",
-+	NID_id_Gost28147_89_CryptoPro_A_ParamSet,7,&(lvalues[5472]),0},
-+{"id-Gost28147-89-CryptoPro-B-ParamSet",
-+	"id-Gost28147-89-CryptoPro-B-ParamSet",
-+	NID_id_Gost28147_89_CryptoPro_B_ParamSet,7,&(lvalues[5479]),0},
-+{"id-Gost28147-89-CryptoPro-C-ParamSet",
-+	"id-Gost28147-89-CryptoPro-C-ParamSet",
-+	NID_id_Gost28147_89_CryptoPro_C_ParamSet,7,&(lvalues[5486]),0},
-+{"id-Gost28147-89-CryptoPro-D-ParamSet",
-+	"id-Gost28147-89-CryptoPro-D-ParamSet",
-+	NID_id_Gost28147_89_CryptoPro_D_ParamSet,7,&(lvalues[5493]),0},
-+{"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet",
-+	"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet",
-+	NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet,7,&(lvalues[5500]),
-+	0},
-+{"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet",
-+	"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet",
-+	NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet,7,&(lvalues[5507]),
-+	0},
-+{"id-Gost28147-89-CryptoPro-RIC-1-ParamSet",
-+	"id-Gost28147-89-CryptoPro-RIC-1-ParamSet",
-+	NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet,7,&(lvalues[5514]),0},
-+{"id-GostR3410-94-TestParamSet","id-GostR3410-94-TestParamSet",
-+	NID_id_GostR3410_94_TestParamSet,7,&(lvalues[5521]),0},
-+{"id-GostR3410-94-CryptoPro-A-ParamSet",
-+	"id-GostR3410-94-CryptoPro-A-ParamSet",
-+	NID_id_GostR3410_94_CryptoPro_A_ParamSet,7,&(lvalues[5528]),0},
-+{"id-GostR3410-94-CryptoPro-B-ParamSet",
-+	"id-GostR3410-94-CryptoPro-B-ParamSet",
-+	NID_id_GostR3410_94_CryptoPro_B_ParamSet,7,&(lvalues[5535]),0},
-+{"id-GostR3410-94-CryptoPro-C-ParamSet",
-+	"id-GostR3410-94-CryptoPro-C-ParamSet",
-+	NID_id_GostR3410_94_CryptoPro_C_ParamSet,7,&(lvalues[5542]),0},
-+{"id-GostR3410-94-CryptoPro-D-ParamSet",
-+	"id-GostR3410-94-CryptoPro-D-ParamSet",
-+	NID_id_GostR3410_94_CryptoPro_D_ParamSet,7,&(lvalues[5549]),0},
-+{"id-GostR3410-94-CryptoPro-XchA-ParamSet",
-+	"id-GostR3410-94-CryptoPro-XchA-ParamSet",
-+	NID_id_GostR3410_94_CryptoPro_XchA_ParamSet,7,&(lvalues[5556]),0},
-+{"id-GostR3410-94-CryptoPro-XchB-ParamSet",
-+	"id-GostR3410-94-CryptoPro-XchB-ParamSet",
-+	NID_id_GostR3410_94_CryptoPro_XchB_ParamSet,7,&(lvalues[5563]),0},
-+{"id-GostR3410-94-CryptoPro-XchC-ParamSet",
-+	"id-GostR3410-94-CryptoPro-XchC-ParamSet",
-+	NID_id_GostR3410_94_CryptoPro_XchC_ParamSet,7,&(lvalues[5570]),0},
-+{"id-GostR3410-2001-TestParamSet","id-GostR3410-2001-TestParamSet",
-+	NID_id_GostR3410_2001_TestParamSet,7,&(lvalues[5577]),0},
-+{"id-GostR3410-2001-CryptoPro-A-ParamSet",
-+	"id-GostR3410-2001-CryptoPro-A-ParamSet",
-+	NID_id_GostR3410_2001_CryptoPro_A_ParamSet,7,&(lvalues[5584]),0},
-+{"id-GostR3410-2001-CryptoPro-B-ParamSet",
-+	"id-GostR3410-2001-CryptoPro-B-ParamSet",
-+	NID_id_GostR3410_2001_CryptoPro_B_ParamSet,7,&(lvalues[5591]),0},
-+{"id-GostR3410-2001-CryptoPro-C-ParamSet",
-+	"id-GostR3410-2001-CryptoPro-C-ParamSet",
-+	NID_id_GostR3410_2001_CryptoPro_C_ParamSet,7,&(lvalues[5598]),0},
-+{"id-GostR3410-2001-CryptoPro-XchA-ParamSet",
-+	"id-GostR3410-2001-CryptoPro-XchA-ParamSet",
-+	NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet,7,&(lvalues[5605]),0},
-+	
-+{"id-GostR3410-2001-CryptoPro-XchB-ParamSet",
-+	"id-GostR3410-2001-CryptoPro-XchB-ParamSet",
-+	NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet,7,&(lvalues[5612]),0},
-+	
-+{"id-GostR3410-94-a","id-GostR3410-94-a",NID_id_GostR3410_94_a,7,
-+	&(lvalues[5619]),0},
-+{"id-GostR3410-94-aBis","id-GostR3410-94-aBis",
-+	NID_id_GostR3410_94_aBis,7,&(lvalues[5626]),0},
-+{"id-GostR3410-94-b","id-GostR3410-94-b",NID_id_GostR3410_94_b,7,
-+	&(lvalues[5633]),0},
-+{"id-GostR3410-94-bBis","id-GostR3410-94-bBis",
-+	NID_id_GostR3410_94_bBis,7,&(lvalues[5640]),0},
-+{"id-Gost28147-89-cc","GOST 28147-89 Cryptocom ParamSet",
-+	NID_id_Gost28147_89_cc,8,&(lvalues[5647]),0},
-+{"gost94cc","GOST 34.10-94 Cryptocom",NID_id_GostR3410_94_cc,8,
-+	&(lvalues[5655]),0},
-+{"gost2001cc","GOST 34.10-2001 Cryptocom",NID_id_GostR3410_2001_cc,8,
-+	&(lvalues[5663]),0},
-+{"id-GostR3411-94-with-GostR3410-94-cc",
-+	"GOST R 34.11-94 with GOST R 34.10-94 Cryptocom",
-+	NID_id_GostR3411_94_with_GostR3410_94_cc,8,&(lvalues[5671]),0},
-+{"id-GostR3411-94-with-GostR3410-2001-cc",
-+	"GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom",
-+	NID_id_GostR3411_94_with_GostR3410_2001_cc,8,&(lvalues[5679]),0},
-+{"id-GostR3410-2001-ParamSet-cc",
-+	"GOST R 3410-2001 Parameter Set Cryptocom",
-+	NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5687]),0},
-+{"HMAC","hmac",NID_hmac,0,NULL,0},
-+{"LocalKeySet","Microsoft Local Key set",NID_LocalKeySet,9,
-+	&(lvalues[5695]),0},
-+{"freshestCRL","X509v3 Freshest CRL",NID_freshest_crl,3,
-+	&(lvalues[5704]),0},
-+{"id-on-permanentIdentifier","Permanent Identifier",
-+	NID_id_on_permanentIdentifier,8,&(lvalues[5707]),0},
-+{"searchGuide","searchGuide",NID_searchGuide,3,&(lvalues[5715]),0},
-+{"businessCategory","businessCategory",NID_businessCategory,3,
-+	&(lvalues[5718]),0},
-+{"postalAddress","postalAddress",NID_postalAddress,3,&(lvalues[5721]),0},
-+{"postOfficeBox","postOfficeBox",NID_postOfficeBox,3,&(lvalues[5724]),0},
-+{"physicalDeliveryOfficeName","physicalDeliveryOfficeName",
-+	NID_physicalDeliveryOfficeName,3,&(lvalues[5727]),0},
-+{"telephoneNumber","telephoneNumber",NID_telephoneNumber,3,
-+	&(lvalues[5730]),0},
-+{"telexNumber","telexNumber",NID_telexNumber,3,&(lvalues[5733]),0},
-+{"teletexTerminalIdentifier","teletexTerminalIdentifier",
-+	NID_teletexTerminalIdentifier,3,&(lvalues[5736]),0},
-+{"facsimileTelephoneNumber","facsimileTelephoneNumber",
-+	NID_facsimileTelephoneNumber,3,&(lvalues[5739]),0},
-+{"x121Address","x121Address",NID_x121Address,3,&(lvalues[5742]),0},
-+{"internationaliSDNNumber","internationaliSDNNumber",
-+	NID_internationaliSDNNumber,3,&(lvalues[5745]),0},
-+{"registeredAddress","registeredAddress",NID_registeredAddress,3,
-+	&(lvalues[5748]),0},
-+{"destinationIndicator","destinationIndicator",
-+	NID_destinationIndicator,3,&(lvalues[5751]),0},
-+{"preferredDeliveryMethod","preferredDeliveryMethod",
-+	NID_preferredDeliveryMethod,3,&(lvalues[5754]),0},
-+{"presentationAddress","presentationAddress",NID_presentationAddress,
-+	3,&(lvalues[5757]),0},
-+{"supportedApplicationContext","supportedApplicationContext",
-+	NID_supportedApplicationContext,3,&(lvalues[5760]),0},
-+{"member","member",NID_member,3,&(lvalues[5763]),0},
-+{"owner","owner",NID_owner,3,&(lvalues[5766]),0},
-+{"roleOccupant","roleOccupant",NID_roleOccupant,3,&(lvalues[5769]),0},
-+{"seeAlso","seeAlso",NID_seeAlso,3,&(lvalues[5772]),0},
-+{"userPassword","userPassword",NID_userPassword,3,&(lvalues[5775]),0},
-+{"userCertificate","userCertificate",NID_userCertificate,3,
-+	&(lvalues[5778]),0},
-+{"cACertificate","cACertificate",NID_cACertificate,3,&(lvalues[5781]),0},
-+{"authorityRevocationList","authorityRevocationList",
-+	NID_authorityRevocationList,3,&(lvalues[5784]),0},
-+{"certificateRevocationList","certificateRevocationList",
-+	NID_certificateRevocationList,3,&(lvalues[5787]),0},
-+{"crossCertificatePair","crossCertificatePair",
-+	NID_crossCertificatePair,3,&(lvalues[5790]),0},
-+{"enhancedSearchGuide","enhancedSearchGuide",NID_enhancedSearchGuide,
-+	3,&(lvalues[5793]),0},
-+{"protocolInformation","protocolInformation",NID_protocolInformation,
-+	3,&(lvalues[5796]),0},
-+{"distinguishedName","distinguishedName",NID_distinguishedName,3,
-+	&(lvalues[5799]),0},
-+{"uniqueMember","uniqueMember",NID_uniqueMember,3,&(lvalues[5802]),0},
-+{"houseIdentifier","houseIdentifier",NID_houseIdentifier,3,
-+	&(lvalues[5805]),0},
-+{"supportedAlgorithms","supportedAlgorithms",NID_supportedAlgorithms,
-+	3,&(lvalues[5808]),0},
-+{"deltaRevocationList","deltaRevocationList",NID_deltaRevocationList,
-+	3,&(lvalues[5811]),0},
-+{"dmdName","dmdName",NID_dmdName,3,&(lvalues[5814]),0},
-+{"id-alg-PWRI-KEK","id-alg-PWRI-KEK",NID_id_alg_PWRI_KEK,11,
-+	&(lvalues[5817]),0},
-+{"CMAC","cmac",NID_cmac,0,NULL,0},
-+{"id-aes128-GCM","aes-128-gcm",NID_aes_128_gcm,9,&(lvalues[5828]),0},
-+{"id-aes128-CCM","aes-128-ccm",NID_aes_128_ccm,9,&(lvalues[5837]),0},
-+{"id-aes128-wrap-pad","id-aes128-wrap-pad",NID_id_aes128_wrap_pad,9,
-+	&(lvalues[5846]),0},
-+{"id-aes192-GCM","aes-192-gcm",NID_aes_192_gcm,9,&(lvalues[5855]),0},
-+{"id-aes192-CCM","aes-192-ccm",NID_aes_192_ccm,9,&(lvalues[5864]),0},
-+{"id-aes192-wrap-pad","id-aes192-wrap-pad",NID_id_aes192_wrap_pad,9,
-+	&(lvalues[5873]),0},
-+{"id-aes256-GCM","aes-256-gcm",NID_aes_256_gcm,9,&(lvalues[5882]),0},
-+{"id-aes256-CCM","aes-256-ccm",NID_aes_256_ccm,9,&(lvalues[5891]),0},
-+{"id-aes256-wrap-pad","id-aes256-wrap-pad",NID_id_aes256_wrap_pad,9,
-+	&(lvalues[5900]),0},
-+{"AES-128-CTR","aes-128-ctr",NID_aes_128_ctr,0,NULL,0},
-+{"AES-192-CTR","aes-192-ctr",NID_aes_192_ctr,0,NULL,0},
-+{"AES-256-CTR","aes-256-ctr",NID_aes_256_ctr,0,NULL,0},
-+{"id-camellia128-wrap","id-camellia128-wrap",NID_id_camellia128_wrap,
-+	11,&(lvalues[5909]),0},
-+{"id-camellia192-wrap","id-camellia192-wrap",NID_id_camellia192_wrap,
-+	11,&(lvalues[5920]),0},
-+{"id-camellia256-wrap","id-camellia256-wrap",NID_id_camellia256_wrap,
-+	11,&(lvalues[5931]),0},
-+{"anyExtendedKeyUsage","Any Extended Key Usage",
-+	NID_anyExtendedKeyUsage,4,&(lvalues[5942]),0},
-+{"MGF1","mgf1",NID_mgf1,9,&(lvalues[5946]),0},
-+{"RSASSA-PSS","rsassaPss",NID_rsassaPss,9,&(lvalues[5955]),0},
-+{"AES-128-XTS","aes-128-xts",NID_aes_128_xts,0,NULL,0},
-+{"AES-256-XTS","aes-256-xts",NID_aes_256_xts,0,NULL,0},
-+{"RC4-HMAC-MD5","rc4-hmac-md5",NID_rc4_hmac_md5,0,NULL,0},
-+{"AES-128-CBC-HMAC-SHA1","aes-128-cbc-hmac-sha1",
-+	NID_aes_128_cbc_hmac_sha1,0,NULL,0},
-+{"AES-192-CBC-HMAC-SHA1","aes-192-cbc-hmac-sha1",
-+	NID_aes_192_cbc_hmac_sha1,0,NULL,0},
-+{"AES-256-CBC-HMAC-SHA1","aes-256-cbc-hmac-sha1",
-+	NID_aes_256_cbc_hmac_sha1,0,NULL,0},
-+{"RSAES-OAEP","rsaesOaep",NID_rsaesOaep,9,&(lvalues[5964]),0},
-+{"teletrust","teletrust",NID_teletrust,2,&(lvalues[5973]),0},
-+{"brainpool","brainpool",NID_brainpool,7,&(lvalues[5975]),0},
-+{"brainpoolP160r1","brainpoolP160r1",NID_brainpoolP160r1,9,
-+	&(lvalues[5982]),0},
-+{"brainpoolP160t1","brainpoolP160t1",NID_brainpoolP160t1,9,
-+	&(lvalues[5991]),0},
-+{"brainpoolP192r1","brainpoolP192r1",NID_brainpoolP192r1,9,
-+	&(lvalues[6000]),0},
-+{"brainpoolP192t1","brainpoolP192t1",NID_brainpoolP192t1,9,
-+	&(lvalues[6009]),0},
-+{"brainpoolP224r1","brainpoolP224r1",NID_brainpoolP224r1,9,
-+	&(lvalues[6018]),0},
-+{"brainpoolP224t1","brainpoolP224t1",NID_brainpoolP224t1,9,
-+	&(lvalues[6027]),0},
-+{"brainpoolP256r1","brainpoolP256r1",NID_brainpoolP256r1,9,
-+	&(lvalues[6036]),0},
-+{"brainpoolP256t1","brainpoolP256t1",NID_brainpoolP256t1,9,
-+	&(lvalues[6045]),0},
-+{"brainpoolP320r1","brainpoolP320r1",NID_brainpoolP320r1,9,
-+	&(lvalues[6054]),0},
-+{"brainpoolP320t1","brainpoolP320t1",NID_brainpoolP320t1,9,
-+	&(lvalues[6063]),0},
-+{"brainpoolP384r1","brainpoolP384r1",NID_brainpoolP384r1,9,
-+	&(lvalues[6072]),0},
-+{"brainpoolP384t1","brainpoolP384t1",NID_brainpoolP384t1,9,
-+	&(lvalues[6081]),0},
-+{"brainpoolP512r1","brainpoolP512r1",NID_brainpoolP512r1,9,
-+	&(lvalues[6090]),0},
-+{"brainpoolP512t1","brainpoolP512t1",NID_brainpoolP512t1,9,
-+	&(lvalues[6099]),0},
-+{"FRP256v1","FRP256v1",NID_FRP256v1,10,&(lvalues[6108]),0},
-+{"ChaCha","chacha",NID_chacha20,0,NULL,0},
-+{"gost89-ecb","gost89-ecb",NID_gost89_ecb,0,NULL,0},
-+{"gost89-cbc","gost89-cbc",NID_gost89_cbc,0,NULL,0},
-+{"tc26","tc26",NID_tc26,5,&(lvalues[6118]),0},
-+{"streebog256","GOST R 34.11-2012 (256 bit)",
-+	NID_id_tc26_gost3411_2012_256,8,&(lvalues[6123]),0},
-+{"streebog512","GOST R 34-11-2012 (512 bit)",
-+	NID_id_tc26_gost3411_2012_512,8,&(lvalues[6131]),0},
-+{"id-tc26-gost-3410-2012-512-paramSetA",
-+	"id-tc26-gost-3410-2012-512-paramSetA",
-+	NID_id_tc26_gost_3410_2012_512_paramSetA,9,&(lvalues[6139]),0},
-+{"id-tc26-gost-3410-2012-512-paramSetB",
-+	"id-tc26-gost-3410-2012-512-paramSetB",
-+	NID_id_tc26_gost_3410_2012_512_paramSetB,9,&(lvalues[6148]),0},
-+{"id-tc26-gost-28147-param-Z","id-tc26-gost-28147-param-Z",
-+	NID_id_tc26_gost_28147_param_Z,9,&(lvalues[6157]),0},
-+{"id-tc26-gost3410-2012-256","GOST R 34.10-2012 (256 bit)",
-+	NID_id_tc26_gost3410_2012_256,8,&(lvalues[6166]),0},
-+{"id-tc26-gost3410-2012-512","GOST R 34.10-2012 (512 bit)",
-+	NID_id_tc26_gost3410_2012_512,8,&(lvalues[6174]),0},
-+{"id-tc26-signwithdigest-gost3410-2012-256",
-+	"GOST R 34.11-2012 with GOST R 34.10-2012 (256 bit)",
-+	NID_id_tc26_signwithdigest_gost3410_2012_256,8,&(lvalues[6182]),0},
-+{"id-tc26-signwithdigest-gost3410-2012-512",
-+	"GOST R 34.11-2012 with GOST R 34.10-2012 (512 bit)",
-+	NID_id_tc26_signwithdigest_gost3410_2012_512,8,&(lvalues[6190]),0},
-+};
-+
-+static const unsigned int sn_objs[NUM_SN]={
-+364,	/* "AD_DVCS" */
-+419,	/* "AES-128-CBC" */
-+916,	/* "AES-128-CBC-HMAC-SHA1" */
-+421,	/* "AES-128-CFB" */
-+650,	/* "AES-128-CFB1" */
-+653,	/* "AES-128-CFB8" */
-+904,	/* "AES-128-CTR" */
-+418,	/* "AES-128-ECB" */
-+420,	/* "AES-128-OFB" */
-+913,	/* "AES-128-XTS" */
-+423,	/* "AES-192-CBC" */
-+917,	/* "AES-192-CBC-HMAC-SHA1" */
-+425,	/* "AES-192-CFB" */
-+651,	/* "AES-192-CFB1" */
-+654,	/* "AES-192-CFB8" */
-+905,	/* "AES-192-CTR" */
-+422,	/* "AES-192-ECB" */
-+424,	/* "AES-192-OFB" */
-+427,	/* "AES-256-CBC" */
-+918,	/* "AES-256-CBC-HMAC-SHA1" */
-+429,	/* "AES-256-CFB" */
-+652,	/* "AES-256-CFB1" */
-+655,	/* "AES-256-CFB8" */
-+906,	/* "AES-256-CTR" */
-+426,	/* "AES-256-ECB" */
-+428,	/* "AES-256-OFB" */
-+914,	/* "AES-256-XTS" */
-+91,	/* "BF-CBC" */
-+93,	/* "BF-CFB" */
-+92,	/* "BF-ECB" */
-+94,	/* "BF-OFB" */
-+14,	/* "C" */
-+751,	/* "CAMELLIA-128-CBC" */
-+757,	/* "CAMELLIA-128-CFB" */
-+760,	/* "CAMELLIA-128-CFB1" */
-+763,	/* "CAMELLIA-128-CFB8" */
-+754,	/* "CAMELLIA-128-ECB" */
-+766,	/* "CAMELLIA-128-OFB" */
-+752,	/* "CAMELLIA-192-CBC" */
-+758,	/* "CAMELLIA-192-CFB" */
-+761,	/* "CAMELLIA-192-CFB1" */
-+764,	/* "CAMELLIA-192-CFB8" */
-+755,	/* "CAMELLIA-192-ECB" */
-+767,	/* "CAMELLIA-192-OFB" */
-+753,	/* "CAMELLIA-256-CBC" */
-+759,	/* "CAMELLIA-256-CFB" */
-+762,	/* "CAMELLIA-256-CFB1" */
-+765,	/* "CAMELLIA-256-CFB8" */
-+756,	/* "CAMELLIA-256-ECB" */
-+768,	/* "CAMELLIA-256-OFB" */
-+108,	/* "CAST5-CBC" */
-+110,	/* "CAST5-CFB" */
-+109,	/* "CAST5-ECB" */
-+111,	/* "CAST5-OFB" */
-+894,	/* "CMAC" */
-+13,	/* "CN" */
-+141,	/* "CRLReason" */
-+417,	/* "CSPName" */
-+937,	/* "ChaCha" */
-+367,	/* "CrlID" */
-+391,	/* "DC" */
-+31,	/* "DES-CBC" */
-+643,	/* "DES-CDMF" */
-+30,	/* "DES-CFB" */
-+656,	/* "DES-CFB1" */
-+657,	/* "DES-CFB8" */
-+29,	/* "DES-ECB" */
-+32,	/* "DES-EDE" */
-+43,	/* "DES-EDE-CBC" */
-+60,	/* "DES-EDE-CFB" */
-+62,	/* "DES-EDE-OFB" */
-+33,	/* "DES-EDE3" */
-+44,	/* "DES-EDE3-CBC" */
-+61,	/* "DES-EDE3-CFB" */
-+658,	/* "DES-EDE3-CFB1" */
-+659,	/* "DES-EDE3-CFB8" */
-+63,	/* "DES-EDE3-OFB" */
-+45,	/* "DES-OFB" */
-+80,	/* "DESX-CBC" */
-+380,	/* "DOD" */
-+116,	/* "DSA" */
-+66,	/* "DSA-SHA" */
-+113,	/* "DSA-SHA1" */
-+70,	/* "DSA-SHA1-old" */
-+67,	/* "DSA-old" */
-+297,	/* "DVCS" */
-+936,	/* "FRP256v1" */
-+99,	/* "GN" */
-+855,	/* "HMAC" */
-+780,	/* "HMAC-MD5" */
-+781,	/* "HMAC-SHA1" */
-+381,	/* "IANA" */
-+34,	/* "IDEA-CBC" */
-+35,	/* "IDEA-CFB" */
-+36,	/* "IDEA-ECB" */
-+46,	/* "IDEA-OFB" */
-+181,	/* "ISO" */
-+183,	/* "ISO-US" */
-+645,	/* "ITU-T" */
-+646,	/* "JOINT-ISO-ITU-T" */
-+773,	/* "KISA" */
-+15,	/* "L" */
-+856,	/* "LocalKeySet" */
-+ 3,	/* "MD2" */
-+257,	/* "MD4" */
-+ 4,	/* "MD5" */
-+114,	/* "MD5-SHA1" */
-+95,	/* "MDC2" */
-+911,	/* "MGF1" */
-+388,	/* "Mail" */
-+393,	/* "NULL" */
-+404,	/* "NULL" */
-+57,	/* "Netscape" */
-+366,	/* "Nonce" */
-+17,	/* "O" */
-+178,	/* "OCSP" */
-+180,	/* "OCSPSigning" */
-+379,	/* "ORG" */
-+18,	/* "OU" */
-+749,	/* "Oakley-EC2N-3" */
-+750,	/* "Oakley-EC2N-4" */
-+ 9,	/* "PBE-MD2-DES" */
-+168,	/* "PBE-MD2-RC2-64" */
-+10,	/* "PBE-MD5-DES" */
-+169,	/* "PBE-MD5-RC2-64" */
-+147,	/* "PBE-SHA1-2DES" */
-+146,	/* "PBE-SHA1-3DES" */
-+170,	/* "PBE-SHA1-DES" */
-+148,	/* "PBE-SHA1-RC2-128" */
-+149,	/* "PBE-SHA1-RC2-40" */
-+68,	/* "PBE-SHA1-RC2-64" */
-+144,	/* "PBE-SHA1-RC4-128" */
-+145,	/* "PBE-SHA1-RC4-40" */
-+161,	/* "PBES2" */
-+69,	/* "PBKDF2" */
-+162,	/* "PBMAC1" */
-+127,	/* "PKIX" */
-+98,	/* "RC2-40-CBC" */
-+166,	/* "RC2-64-CBC" */
-+37,	/* "RC2-CBC" */
-+39,	/* "RC2-CFB" */
-+38,	/* "RC2-ECB" */
-+40,	/* "RC2-OFB" */
-+ 5,	/* "RC4" */
-+97,	/* "RC4-40" */
-+915,	/* "RC4-HMAC-MD5" */
-+120,	/* "RC5-CBC" */
-+122,	/* "RC5-CFB" */
-+121,	/* "RC5-ECB" */
-+123,	/* "RC5-OFB" */
-+117,	/* "RIPEMD160" */
-+124,	/* "RLE" */
-+19,	/* "RSA" */
-+ 7,	/* "RSA-MD2" */
-+396,	/* "RSA-MD4" */
-+ 8,	/* "RSA-MD5" */
-+96,	/* "RSA-MDC2" */
-+104,	/* "RSA-NP-MD5" */
-+119,	/* "RSA-RIPEMD160" */
-+42,	/* "RSA-SHA" */
-+65,	/* "RSA-SHA1" */
-+115,	/* "RSA-SHA1-2" */
-+671,	/* "RSA-SHA224" */
-+668,	/* "RSA-SHA256" */
-+669,	/* "RSA-SHA384" */
-+670,	/* "RSA-SHA512" */
-+919,	/* "RSAES-OAEP" */
-+912,	/* "RSASSA-PSS" */
-+777,	/* "SEED-CBC" */
-+779,	/* "SEED-CFB" */
-+776,	/* "SEED-ECB" */
-+778,	/* "SEED-OFB" */
-+41,	/* "SHA" */
-+64,	/* "SHA1" */
-+675,	/* "SHA224" */
-+672,	/* "SHA256" */
-+673,	/* "SHA384" */
-+674,	/* "SHA512" */
-+188,	/* "SMIME" */
-+167,	/* "SMIME-CAPS" */
-+100,	/* "SN" */
-+16,	/* "ST" */
-+143,	/* "SXNetID" */
-+458,	/* "UID" */
-+ 0,	/* "UNDEF" */
-+11,	/* "X500" */
-+378,	/* "X500algorithms" */
-+12,	/* "X509" */
-+184,	/* "X9-57" */
-+185,	/* "X9cm" */
-+125,	/* "ZLIB" */
-+478,	/* "aRecord" */
-+289,	/* "aaControls" */
-+287,	/* "ac-auditEntity" */
-+397,	/* "ac-proxying" */
-+288,	/* "ac-targeting" */
-+368,	/* "acceptableResponses" */
-+446,	/* "account" */
-+363,	/* "ad_timestamping" */
-+376,	/* "algorithm" */
-+405,	/* "ansi-X9-62" */
-+910,	/* "anyExtendedKeyUsage" */
-+746,	/* "anyPolicy" */
-+370,	/* "archiveCutoff" */
-+484,	/* "associatedDomain" */
-+485,	/* "associatedName" */
-+501,	/* "audio" */
-+177,	/* "authorityInfoAccess" */
-+90,	/* "authorityKeyIdentifier" */
-+882,	/* "authorityRevocationList" */
-+87,	/* "basicConstraints" */
-+365,	/* "basicOCSPResponse" */
-+285,	/* "biometricInfo" */
-+921,	/* "brainpool" */
-+922,	/* "brainpoolP160r1" */
-+923,	/* "brainpoolP160t1" */
-+924,	/* "brainpoolP192r1" */
-+925,	/* "brainpoolP192t1" */
-+926,	/* "brainpoolP224r1" */
-+927,	/* "brainpoolP224t1" */
-+928,	/* "brainpoolP256r1" */
-+929,	/* "brainpoolP256t1" */
-+930,	/* "brainpoolP320r1" */
-+931,	/* "brainpoolP320t1" */
-+932,	/* "brainpoolP384r1" */
-+933,	/* "brainpoolP384t1" */
-+934,	/* "brainpoolP512r1" */
-+935,	/* "brainpoolP512t1" */
-+494,	/* "buildingName" */
-+860,	/* "businessCategory" */
-+691,	/* "c2onb191v4" */
-+692,	/* "c2onb191v5" */
-+697,	/* "c2onb239v4" */
-+698,	/* "c2onb239v5" */
-+684,	/* "c2pnb163v1" */
-+685,	/* "c2pnb163v2" */
-+686,	/* "c2pnb163v3" */
-+687,	/* "c2pnb176v1" */
-+693,	/* "c2pnb208w1" */
-+699,	/* "c2pnb272w1" */
-+700,	/* "c2pnb304w1" */
-+702,	/* "c2pnb368w1" */
-+688,	/* "c2tnb191v1" */
-+689,	/* "c2tnb191v2" */
-+690,	/* "c2tnb191v3" */
-+694,	/* "c2tnb239v1" */
-+695,	/* "c2tnb239v2" */
-+696,	/* "c2tnb239v3" */
-+701,	/* "c2tnb359v1" */
-+703,	/* "c2tnb431r1" */
-+881,	/* "cACertificate" */
-+483,	/* "cNAMERecord" */
-+179,	/* "caIssuers" */
-+785,	/* "caRepository" */
-+443,	/* "caseIgnoreIA5StringSyntax" */
-+152,	/* "certBag" */
-+677,	/* "certicom-arc" */
-+771,	/* "certificateIssuer" */
-+89,	/* "certificatePolicies" */
-+883,	/* "certificateRevocationList" */
-+54,	/* "challengePassword" */
-+407,	/* "characteristic-two-field" */
-+395,	/* "clearance" */
-+130,	/* "clientAuth" */
-+131,	/* "codeSigning" */
-+50,	/* "contentType" */
-+53,	/* "countersignature" */
-+153,	/* "crlBag" */
-+103,	/* "crlDistributionPoints" */
-+88,	/* "crlNumber" */
-+884,	/* "crossCertificatePair" */
-+806,	/* "cryptocom" */
-+805,	/* "cryptopro" */
-+500,	/* "dITRedirect" */
-+451,	/* "dNSDomain" */
-+495,	/* "dSAQuality" */
-+434,	/* "data" */
-+390,	/* "dcobject" */
-+140,	/* "deltaCRL" */
-+891,	/* "deltaRevocationList" */
-+107,	/* "description" */
-+871,	/* "destinationIndicator" */
-+28,	/* "dhKeyAgreement" */
-+382,	/* "directory" */
-+887,	/* "distinguishedName" */
-+892,	/* "dmdName" */
-+174,	/* "dnQualifier" */
-+447,	/* "document" */
-+471,	/* "documentAuthor" */
-+468,	/* "documentIdentifier" */
-+472,	/* "documentLocation" */
-+502,	/* "documentPublisher" */
-+449,	/* "documentSeries" */
-+469,	/* "documentTitle" */
-+470,	/* "documentVersion" */
-+392,	/* "domain" */
-+452,	/* "domainRelatedObject" */
-+802,	/* "dsa_with_SHA224" */
-+803,	/* "dsa_with_SHA256" */
-+791,	/* "ecdsa-with-Recommended" */
-+416,	/* "ecdsa-with-SHA1" */
-+793,	/* "ecdsa-with-SHA224" */
-+794,	/* "ecdsa-with-SHA256" */
-+795,	/* "ecdsa-with-SHA384" */
-+796,	/* "ecdsa-with-SHA512" */
-+792,	/* "ecdsa-with-Specified" */
-+48,	/* "emailAddress" */
-+132,	/* "emailProtection" */
-+885,	/* "enhancedSearchGuide" */
-+389,	/* "enterprises" */
-+384,	/* "experimental" */
-+172,	/* "extReq" */
-+56,	/* "extendedCertificateAttributes" */
-+126,	/* "extendedKeyUsage" */
-+372,	/* "extendedStatus" */
-+867,	/* "facsimileTelephoneNumber" */
-+462,	/* "favouriteDrink" */
-+857,	/* "freshestCRL" */
-+453,	/* "friendlyCountry" */
-+490,	/* "friendlyCountryName" */
-+156,	/* "friendlyName" */
-+509,	/* "generationQualifier" */
-+815,	/* "gost-mac" */
-+811,	/* "gost2001" */
-+851,	/* "gost2001cc" */
-+813,	/* "gost89" */
-+939,	/* "gost89-cbc" */
-+814,	/* "gost89-cnt" */
-+938,	/* "gost89-ecb" */
-+812,	/* "gost94" */
-+850,	/* "gost94cc" */
-+797,	/* "hmacWithMD5" */
-+163,	/* "hmacWithSHA1" */
-+798,	/* "hmacWithSHA224" */
-+799,	/* "hmacWithSHA256" */
-+800,	/* "hmacWithSHA384" */
-+801,	/* "hmacWithSHA512" */
-+432,	/* "holdInstructionCallIssuer" */
-+430,	/* "holdInstructionCode" */
-+431,	/* "holdInstructionNone" */
-+433,	/* "holdInstructionReject" */
-+486,	/* "homePostalAddress" */
-+473,	/* "homeTelephoneNumber" */
-+466,	/* "host" */
-+889,	/* "houseIdentifier" */
-+442,	/* "iA5StringSyntax" */
-+783,	/* "id-DHBasedMac" */
-+824,	/* "id-Gost28147-89-CryptoPro-A-ParamSet" */
-+825,	/* "id-Gost28147-89-CryptoPro-B-ParamSet" */
-+826,	/* "id-Gost28147-89-CryptoPro-C-ParamSet" */
-+827,	/* "id-Gost28147-89-CryptoPro-D-ParamSet" */
-+819,	/* "id-Gost28147-89-CryptoPro-KeyMeshing" */
-+829,	/* "id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet" */
-+828,	/* "id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet" */
-+830,	/* "id-Gost28147-89-CryptoPro-RIC-1-ParamSet" */
-+820,	/* "id-Gost28147-89-None-KeyMeshing" */
-+823,	/* "id-Gost28147-89-TestParamSet" */
-+849,	/* "id-Gost28147-89-cc" */
-+840,	/* "id-GostR3410-2001-CryptoPro-A-ParamSet" */
-+841,	/* "id-GostR3410-2001-CryptoPro-B-ParamSet" */
-+842,	/* "id-GostR3410-2001-CryptoPro-C-ParamSet" */
-+843,	/* "id-GostR3410-2001-CryptoPro-XchA-ParamSet" */
-+844,	/* "id-GostR3410-2001-CryptoPro-XchB-ParamSet" */
-+854,	/* "id-GostR3410-2001-ParamSet-cc" */
-+839,	/* "id-GostR3410-2001-TestParamSet" */
-+817,	/* "id-GostR3410-2001DH" */
-+832,	/* "id-GostR3410-94-CryptoPro-A-ParamSet" */
-+833,	/* "id-GostR3410-94-CryptoPro-B-ParamSet" */
-+834,	/* "id-GostR3410-94-CryptoPro-C-ParamSet" */
-+835,	/* "id-GostR3410-94-CryptoPro-D-ParamSet" */
-+836,	/* "id-GostR3410-94-CryptoPro-XchA-ParamSet" */
-+837,	/* "id-GostR3410-94-CryptoPro-XchB-ParamSet" */
-+838,	/* "id-GostR3410-94-CryptoPro-XchC-ParamSet" */
-+831,	/* "id-GostR3410-94-TestParamSet" */
-+845,	/* "id-GostR3410-94-a" */
-+846,	/* "id-GostR3410-94-aBis" */
-+847,	/* "id-GostR3410-94-b" */
-+848,	/* "id-GostR3410-94-bBis" */
-+818,	/* "id-GostR3410-94DH" */
-+822,	/* "id-GostR3411-94-CryptoProParamSet" */
-+821,	/* "id-GostR3411-94-TestParamSet" */
-+807,	/* "id-GostR3411-94-with-GostR3410-2001" */
-+853,	/* "id-GostR3411-94-with-GostR3410-2001-cc" */
-+808,	/* "id-GostR3411-94-with-GostR3410-94" */
-+852,	/* "id-GostR3411-94-with-GostR3410-94-cc" */
-+810,	/* "id-HMACGostR3411-94" */
-+782,	/* "id-PasswordBasedMAC" */
-+266,	/* "id-aca" */
-+355,	/* "id-aca-accessIdentity" */
-+354,	/* "id-aca-authenticationInfo" */
-+356,	/* "id-aca-chargingIdentity" */
-+399,	/* "id-aca-encAttrs" */
-+357,	/* "id-aca-group" */
-+358,	/* "id-aca-role" */
-+176,	/* "id-ad" */
-+896,	/* "id-aes128-CCM" */
-+895,	/* "id-aes128-GCM" */
-+788,	/* "id-aes128-wrap" */
-+897,	/* "id-aes128-wrap-pad" */
-+899,	/* "id-aes192-CCM" */
-+898,	/* "id-aes192-GCM" */
-+789,	/* "id-aes192-wrap" */
-+900,	/* "id-aes192-wrap-pad" */
-+902,	/* "id-aes256-CCM" */
-+901,	/* "id-aes256-GCM" */
-+790,	/* "id-aes256-wrap" */
-+903,	/* "id-aes256-wrap-pad" */
-+262,	/* "id-alg" */
-+893,	/* "id-alg-PWRI-KEK" */
-+323,	/* "id-alg-des40" */
-+326,	/* "id-alg-dh-pop" */
-+325,	/* "id-alg-dh-sig-hmac-sha1" */
-+324,	/* "id-alg-noSignature" */
-+907,	/* "id-camellia128-wrap" */
-+908,	/* "id-camellia192-wrap" */
-+909,	/* "id-camellia256-wrap" */
-+268,	/* "id-cct" */
-+361,	/* "id-cct-PKIData" */
-+362,	/* "id-cct-PKIResponse" */
-+360,	/* "id-cct-crs" */
-+81,	/* "id-ce" */
-+680,	/* "id-characteristic-two-basis" */
-+263,	/* "id-cmc" */
-+334,	/* "id-cmc-addExtensions" */
-+346,	/* "id-cmc-confirmCertAcceptance" */
-+330,	/* "id-cmc-dataReturn" */
-+336,	/* "id-cmc-decryptedPOP" */
-+335,	/* "id-cmc-encryptedPOP" */
-+339,	/* "id-cmc-getCRL" */
-+338,	/* "id-cmc-getCert" */
-+328,	/* "id-cmc-identification" */
-+329,	/* "id-cmc-identityProof" */
-+337,	/* "id-cmc-lraPOPWitness" */
-+344,	/* "id-cmc-popLinkRandom" */
-+345,	/* "id-cmc-popLinkWitness" */
-+343,	/* "id-cmc-queryPending" */
-+333,	/* "id-cmc-recipientNonce" */
-+341,	/* "id-cmc-regInfo" */
-+342,	/* "id-cmc-responseInfo" */
-+340,	/* "id-cmc-revokeRequest" */
-+332,	/* "id-cmc-senderNonce" */
-+327,	/* "id-cmc-statusInfo" */
-+331,	/* "id-cmc-transactionId" */
-+787,	/* "id-ct-asciiTextWithCRLF" */
-+408,	/* "id-ecPublicKey" */
-+508,	/* "id-hex-multipart-message" */
-+507,	/* "id-hex-partial-message" */
-+260,	/* "id-it" */
-+302,	/* "id-it-caKeyUpdateInfo" */
-+298,	/* "id-it-caProtEncCert" */
-+311,	/* "id-it-confirmWaitTime" */
-+303,	/* "id-it-currentCRL" */
-+300,	/* "id-it-encKeyPairTypes" */
-+310,	/* "id-it-implicitConfirm" */
-+308,	/* "id-it-keyPairParamRep" */
-+307,	/* "id-it-keyPairParamReq" */
-+312,	/* "id-it-origPKIMessage" */
-+301,	/* "id-it-preferredSymmAlg" */
-+309,	/* "id-it-revPassphrase" */
-+299,	/* "id-it-signKeyPairTypes" */
-+305,	/* "id-it-subscriptionRequest" */
-+306,	/* "id-it-subscriptionResponse" */
-+784,	/* "id-it-suppLangTags" */
-+304,	/* "id-it-unsupportedOIDs" */
-+128,	/* "id-kp" */
-+280,	/* "id-mod-attribute-cert" */
-+274,	/* "id-mod-cmc" */
-+277,	/* "id-mod-cmp" */
-+284,	/* "id-mod-cmp2000" */
-+273,	/* "id-mod-crmf" */
-+283,	/* "id-mod-dvcs" */
-+275,	/* "id-mod-kea-profile-88" */
-+276,	/* "id-mod-kea-profile-93" */
-+282,	/* "id-mod-ocsp" */
-+278,	/* "id-mod-qualified-cert-88" */
-+279,	/* "id-mod-qualified-cert-93" */
-+281,	/* "id-mod-timestamp-protocol" */
-+264,	/* "id-on" */
-+858,	/* "id-on-permanentIdentifier" */
-+347,	/* "id-on-personalData" */
-+265,	/* "id-pda" */
-+352,	/* "id-pda-countryOfCitizenship" */
-+353,	/* "id-pda-countryOfResidence" */
-+348,	/* "id-pda-dateOfBirth" */
-+351,	/* "id-pda-gender" */
-+349,	/* "id-pda-placeOfBirth" */
-+175,	/* "id-pe" */
-+261,	/* "id-pkip" */
-+258,	/* "id-pkix-mod" */
-+269,	/* "id-pkix1-explicit-88" */
-+271,	/* "id-pkix1-explicit-93" */
-+270,	/* "id-pkix1-implicit-88" */
-+272,	/* "id-pkix1-implicit-93" */
-+662,	/* "id-ppl" */
-+664,	/* "id-ppl-anyLanguage" */
-+667,	/* "id-ppl-independent" */
-+665,	/* "id-ppl-inheritAll" */
-+267,	/* "id-qcs" */
-+359,	/* "id-qcs-pkixQCSyntax-v1" */
-+259,	/* "id-qt" */
-+164,	/* "id-qt-cps" */
-+165,	/* "id-qt-unotice" */
-+313,	/* "id-regCtrl" */
-+316,	/* "id-regCtrl-authenticator" */
-+319,	/* "id-regCtrl-oldCertID" */
-+318,	/* "id-regCtrl-pkiArchiveOptions" */
-+317,	/* "id-regCtrl-pkiPublicationInfo" */
-+320,	/* "id-regCtrl-protocolEncrKey" */
-+315,	/* "id-regCtrl-regToken" */
-+314,	/* "id-regInfo" */
-+322,	/* "id-regInfo-certReq" */
-+321,	/* "id-regInfo-utf8Pairs" */
-+512,	/* "id-set" */
-+191,	/* "id-smime-aa" */
-+215,	/* "id-smime-aa-contentHint" */
-+218,	/* "id-smime-aa-contentIdentifier" */
-+221,	/* "id-smime-aa-contentReference" */
-+240,	/* "id-smime-aa-dvcs-dvc" */
-+217,	/* "id-smime-aa-encapContentType" */
-+222,	/* "id-smime-aa-encrypKeyPref" */
-+220,	/* "id-smime-aa-equivalentLabels" */
-+232,	/* "id-smime-aa-ets-CertificateRefs" */
-+233,	/* "id-smime-aa-ets-RevocationRefs" */
-+238,	/* "id-smime-aa-ets-archiveTimeStamp" */
-+237,	/* "id-smime-aa-ets-certCRLTimestamp" */
-+234,	/* "id-smime-aa-ets-certValues" */
-+227,	/* "id-smime-aa-ets-commitmentType" */
-+231,	/* "id-smime-aa-ets-contentTimestamp" */
-+236,	/* "id-smime-aa-ets-escTimeStamp" */
-+230,	/* "id-smime-aa-ets-otherSigCert" */
-+235,	/* "id-smime-aa-ets-revocationValues" */
-+226,	/* "id-smime-aa-ets-sigPolicyId" */
-+229,	/* "id-smime-aa-ets-signerAttr" */
-+228,	/* "id-smime-aa-ets-signerLocation" */
-+219,	/* "id-smime-aa-macValue" */
-+214,	/* "id-smime-aa-mlExpandHistory" */
-+216,	/* "id-smime-aa-msgSigDigest" */
-+212,	/* "id-smime-aa-receiptRequest" */
-+213,	/* "id-smime-aa-securityLabel" */
-+239,	/* "id-smime-aa-signatureType" */
-+223,	/* "id-smime-aa-signingCertificate" */
-+224,	/* "id-smime-aa-smimeEncryptCerts" */
-+225,	/* "id-smime-aa-timeStampToken" */
-+192,	/* "id-smime-alg" */
-+243,	/* "id-smime-alg-3DESwrap" */
-+246,	/* "id-smime-alg-CMS3DESwrap" */
-+247,	/* "id-smime-alg-CMSRC2wrap" */
-+245,	/* "id-smime-alg-ESDH" */
-+241,	/* "id-smime-alg-ESDHwith3DES" */
-+242,	/* "id-smime-alg-ESDHwithRC2" */
-+244,	/* "id-smime-alg-RC2wrap" */
-+193,	/* "id-smime-cd" */
-+248,	/* "id-smime-cd-ldap" */
-+190,	/* "id-smime-ct" */
-+210,	/* "id-smime-ct-DVCSRequestData" */
-+211,	/* "id-smime-ct-DVCSResponseData" */
-+208,	/* "id-smime-ct-TDTInfo" */
-+207,	/* "id-smime-ct-TSTInfo" */
-+205,	/* "id-smime-ct-authData" */
-+786,	/* "id-smime-ct-compressedData" */
-+209,	/* "id-smime-ct-contentInfo" */
-+206,	/* "id-smime-ct-publishCert" */
-+204,	/* "id-smime-ct-receipt" */
-+195,	/* "id-smime-cti" */
-+255,	/* "id-smime-cti-ets-proofOfApproval" */
-+256,	/* "id-smime-cti-ets-proofOfCreation" */
-+253,	/* "id-smime-cti-ets-proofOfDelivery" */
-+251,	/* "id-smime-cti-ets-proofOfOrigin" */
-+252,	/* "id-smime-cti-ets-proofOfReceipt" */
-+254,	/* "id-smime-cti-ets-proofOfSender" */
-+189,	/* "id-smime-mod" */
-+196,	/* "id-smime-mod-cms" */
-+197,	/* "id-smime-mod-ess" */
-+202,	/* "id-smime-mod-ets-eSigPolicy-88" */
-+203,	/* "id-smime-mod-ets-eSigPolicy-97" */
-+200,	/* "id-smime-mod-ets-eSignature-88" */
-+201,	/* "id-smime-mod-ets-eSignature-97" */
-+199,	/* "id-smime-mod-msg-v3" */
-+198,	/* "id-smime-mod-oid" */
-+194,	/* "id-smime-spq" */
-+250,	/* "id-smime-spq-ets-sqt-unotice" */
-+249,	/* "id-smime-spq-ets-sqt-uri" */
-+945,	/* "id-tc26-gost-28147-param-Z" */
-+943,	/* "id-tc26-gost-3410-2012-512-paramSetA" */
-+944,	/* "id-tc26-gost-3410-2012-512-paramSetB" */
-+946,	/* "id-tc26-gost3410-2012-256" */
-+947,	/* "id-tc26-gost3410-2012-512" */
-+948,	/* "id-tc26-signwithdigest-gost3410-2012-256" */
-+949,	/* "id-tc26-signwithdigest-gost3410-2012-512" */
-+676,	/* "identified-organization" */
-+461,	/* "info" */
-+748,	/* "inhibitAnyPolicy" */
-+101,	/* "initials" */
-+647,	/* "international-organizations" */
-+869,	/* "internationaliSDNNumber" */
-+142,	/* "invalidityDate" */
-+294,	/* "ipsecEndSystem" */
-+295,	/* "ipsecTunnel" */
-+296,	/* "ipsecUser" */
-+86,	/* "issuerAltName" */
-+770,	/* "issuingDistributionPoint" */
-+492,	/* "janetMailbox" */
-+150,	/* "keyBag" */
-+83,	/* "keyUsage" */
-+477,	/* "lastModifiedBy" */
-+476,	/* "lastModifiedTime" */
-+157,	/* "localKeyID" */
-+480,	/* "mXRecord" */
-+460,	/* "mail" */
-+493,	/* "mailPreferenceOption" */
-+467,	/* "manager" */
-+809,	/* "md_gost94" */
-+875,	/* "member" */
-+182,	/* "member-body" */
-+51,	/* "messageDigest" */
-+383,	/* "mgmt" */
-+504,	/* "mime-mhs" */
-+506,	/* "mime-mhs-bodies" */
-+505,	/* "mime-mhs-headings" */
-+488,	/* "mobileTelephoneNumber" */
-+136,	/* "msCTLSign" */
-+135,	/* "msCodeCom" */
-+134,	/* "msCodeInd" */
-+138,	/* "msEFS" */
-+171,	/* "msExtReq" */
-+137,	/* "msSGC" */
-+648,	/* "msSmartcardLogin" */
-+649,	/* "msUPN" */
-+481,	/* "nSRecord" */
-+173,	/* "name" */
-+666,	/* "nameConstraints" */
-+369,	/* "noCheck" */
-+403,	/* "noRevAvail" */
-+72,	/* "nsBaseUrl" */
-+76,	/* "nsCaPolicyUrl" */
-+74,	/* "nsCaRevocationUrl" */
-+58,	/* "nsCertExt" */
-+79,	/* "nsCertSequence" */
-+71,	/* "nsCertType" */
-+78,	/* "nsComment" */
-+59,	/* "nsDataType" */
-+75,	/* "nsRenewalUrl" */
-+73,	/* "nsRevocationUrl" */
-+139,	/* "nsSGC" */
-+77,	/* "nsSslServerName" */
-+681,	/* "onBasis" */
-+491,	/* "organizationalStatus" */
-+475,	/* "otherMailbox" */
-+876,	/* "owner" */
-+489,	/* "pagerTelephoneNumber" */
-+374,	/* "path" */
-+112,	/* "pbeWithMD5AndCast5CBC" */
-+499,	/* "personalSignature" */
-+487,	/* "personalTitle" */
-+464,	/* "photo" */
-+863,	/* "physicalDeliveryOfficeName" */
-+437,	/* "pilot" */
-+439,	/* "pilotAttributeSyntax" */
-+438,	/* "pilotAttributeType" */
-+479,	/* "pilotAttributeType27" */
-+456,	/* "pilotDSA" */
-+441,	/* "pilotGroups" */
-+444,	/* "pilotObject" */
-+440,	/* "pilotObjectClass" */
-+455,	/* "pilotOrganization" */
-+445,	/* "pilotPerson" */
-+ 2,	/* "pkcs" */
-+186,	/* "pkcs1" */
-+27,	/* "pkcs3" */
-+187,	/* "pkcs5" */
-+20,	/* "pkcs7" */
-+21,	/* "pkcs7-data" */
-+25,	/* "pkcs7-digestData" */
-+26,	/* "pkcs7-encryptedData" */
-+23,	/* "pkcs7-envelopedData" */
-+24,	/* "pkcs7-signedAndEnvelopedData" */
-+22,	/* "pkcs7-signedData" */
-+151,	/* "pkcs8ShroudedKeyBag" */
-+47,	/* "pkcs9" */
-+401,	/* "policyConstraints" */
-+747,	/* "policyMappings" */
-+862,	/* "postOfficeBox" */
-+861,	/* "postalAddress" */
-+661,	/* "postalCode" */
-+683,	/* "ppBasis" */
-+872,	/* "preferredDeliveryMethod" */
-+873,	/* "presentationAddress" */
-+816,	/* "prf-gostr3411-94" */
-+406,	/* "prime-field" */
-+409,	/* "prime192v1" */
-+410,	/* "prime192v2" */
-+411,	/* "prime192v3" */
-+412,	/* "prime239v1" */
-+413,	/* "prime239v2" */
-+414,	/* "prime239v3" */
-+415,	/* "prime256v1" */
-+385,	/* "private" */
-+84,	/* "privateKeyUsagePeriod" */
-+886,	/* "protocolInformation" */
-+663,	/* "proxyCertInfo" */
-+510,	/* "pseudonym" */
-+435,	/* "pss" */
-+286,	/* "qcStatements" */
-+457,	/* "qualityLabelledData" */
-+450,	/* "rFC822localPart" */
-+870,	/* "registeredAddress" */
-+400,	/* "role" */
-+877,	/* "roleOccupant" */
-+448,	/* "room" */
-+463,	/* "roomNumber" */
-+ 6,	/* "rsaEncryption" */
-+644,	/* "rsaOAEPEncryptionSET" */
-+377,	/* "rsaSignature" */
-+ 1,	/* "rsadsi" */
-+482,	/* "sOARecord" */
-+155,	/* "safeContentsBag" */
-+291,	/* "sbgp-autonomousSysNum" */
-+290,	/* "sbgp-ipAddrBlock" */
-+292,	/* "sbgp-routerIdentifier" */
-+159,	/* "sdsiCertificate" */
-+859,	/* "searchGuide" */
-+704,	/* "secp112r1" */
-+705,	/* "secp112r2" */
-+706,	/* "secp128r1" */
-+707,	/* "secp128r2" */
-+708,	/* "secp160k1" */
-+709,	/* "secp160r1" */
-+710,	/* "secp160r2" */
-+711,	/* "secp192k1" */
-+712,	/* "secp224k1" */
-+713,	/* "secp224r1" */
-+714,	/* "secp256k1" */
-+715,	/* "secp384r1" */
-+716,	/* "secp521r1" */
-+154,	/* "secretBag" */
-+474,	/* "secretary" */
-+717,	/* "sect113r1" */
-+718,	/* "sect113r2" */
-+719,	/* "sect131r1" */
-+720,	/* "sect131r2" */
-+721,	/* "sect163k1" */
-+722,	/* "sect163r1" */
-+723,	/* "sect163r2" */
-+724,	/* "sect193r1" */
-+725,	/* "sect193r2" */
-+726,	/* "sect233k1" */
-+727,	/* "sect233r1" */
-+728,	/* "sect239k1" */
-+729,	/* "sect283k1" */
-+730,	/* "sect283r1" */
-+731,	/* "sect409k1" */
-+732,	/* "sect409r1" */
-+733,	/* "sect571k1" */
-+734,	/* "sect571r1" */
-+386,	/* "security" */
-+878,	/* "seeAlso" */
-+394,	/* "selected-attribute-types" */
-+105,	/* "serialNumber" */
-+129,	/* "serverAuth" */
-+371,	/* "serviceLocator" */
-+625,	/* "set-addPolicy" */
-+515,	/* "set-attr" */
-+518,	/* "set-brand" */
-+638,	/* "set-brand-AmericanExpress" */
-+637,	/* "set-brand-Diners" */
-+636,	/* "set-brand-IATA-ATA" */
-+639,	/* "set-brand-JCB" */
-+641,	/* "set-brand-MasterCard" */
-+642,	/* "set-brand-Novus" */
-+640,	/* "set-brand-Visa" */
-+517,	/* "set-certExt" */
-+513,	/* "set-ctype" */
-+514,	/* "set-msgExt" */
-+516,	/* "set-policy" */
-+607,	/* "set-policy-root" */
-+624,	/* "set-rootKeyThumb" */
-+620,	/* "setAttr-Cert" */
-+631,	/* "setAttr-GenCryptgrm" */
-+623,	/* "setAttr-IssCap" */
-+628,	/* "setAttr-IssCap-CVM" */
-+630,	/* "setAttr-IssCap-Sig" */
-+629,	/* "setAttr-IssCap-T2" */
-+621,	/* "setAttr-PGWYcap" */
-+635,	/* "setAttr-SecDevSig" */
-+632,	/* "setAttr-T2Enc" */
-+633,	/* "setAttr-T2cleartxt" */
-+634,	/* "setAttr-TokICCsig" */
-+627,	/* "setAttr-Token-B0Prime" */
-+626,	/* "setAttr-Token-EMV" */
-+622,	/* "setAttr-TokenType" */
-+619,	/* "setCext-IssuerCapabilities" */
-+615,	/* "setCext-PGWYcapabilities" */
-+616,	/* "setCext-TokenIdentifier" */
-+618,	/* "setCext-TokenType" */
-+617,	/* "setCext-Track2Data" */
-+611,	/* "setCext-cCertRequired" */
-+609,	/* "setCext-certType" */
-+608,	/* "setCext-hashedRoot" */
-+610,	/* "setCext-merchData" */
-+613,	/* "setCext-setExt" */
-+614,	/* "setCext-setQualf" */
-+612,	/* "setCext-tunneling" */
-+540,	/* "setct-AcqCardCodeMsg" */
-+576,	/* "setct-AcqCardCodeMsgTBE" */
-+570,	/* "setct-AuthReqTBE" */
-+534,	/* "setct-AuthReqTBS" */
-+527,	/* "setct-AuthResBaggage" */
-+571,	/* "setct-AuthResTBE" */
-+572,	/* "setct-AuthResTBEX" */
-+535,	/* "setct-AuthResTBS" */
-+536,	/* "setct-AuthResTBSX" */
-+528,	/* "setct-AuthRevReqBaggage" */
-+577,	/* "setct-AuthRevReqTBE" */
-+541,	/* "setct-AuthRevReqTBS" */
-+529,	/* "setct-AuthRevResBaggage" */
-+542,	/* "setct-AuthRevResData" */
-+578,	/* "setct-AuthRevResTBE" */
-+579,	/* "setct-AuthRevResTBEB" */
-+543,	/* "setct-AuthRevResTBS" */
-+573,	/* "setct-AuthTokenTBE" */
-+537,	/* "setct-AuthTokenTBS" */
-+600,	/* "setct-BCIDistributionTBS" */
-+558,	/* "setct-BatchAdminReqData" */
-+592,	/* "setct-BatchAdminReqTBE" */
-+559,	/* "setct-BatchAdminResData" */
-+593,	/* "setct-BatchAdminResTBE" */
-+599,	/* "setct-CRLNotificationResTBS" */
-+598,	/* "setct-CRLNotificationTBS" */
-+580,	/* "setct-CapReqTBE" */
-+581,	/* "setct-CapReqTBEX" */
-+544,	/* "setct-CapReqTBS" */
-+545,	/* "setct-CapReqTBSX" */
-+546,	/* "setct-CapResData" */
-+582,	/* "setct-CapResTBE" */
-+583,	/* "setct-CapRevReqTBE" */
-+584,	/* "setct-CapRevReqTBEX" */
-+547,	/* "setct-CapRevReqTBS" */
-+548,	/* "setct-CapRevReqTBSX" */
-+549,	/* "setct-CapRevResData" */
-+585,	/* "setct-CapRevResTBE" */
-+538,	/* "setct-CapTokenData" */
-+530,	/* "setct-CapTokenSeq" */
-+574,	/* "setct-CapTokenTBE" */
-+575,	/* "setct-CapTokenTBEX" */
-+539,	/* "setct-CapTokenTBS" */
-+560,	/* "setct-CardCInitResTBS" */
-+566,	/* "setct-CertInqReqTBS" */
-+563,	/* "setct-CertReqData" */
-+595,	/* "setct-CertReqTBE" */
-+596,	/* "setct-CertReqTBEX" */
-+564,	/* "setct-CertReqTBS" */
-+565,	/* "setct-CertResData" */
-+597,	/* "setct-CertResTBE" */
-+586,	/* "setct-CredReqTBE" */
-+587,	/* "setct-CredReqTBEX" */
-+550,	/* "setct-CredReqTBS" */
-+551,	/* "setct-CredReqTBSX" */
-+552,	/* "setct-CredResData" */
-+588,	/* "setct-CredResTBE" */
-+589,	/* "setct-CredRevReqTBE" */
-+590,	/* "setct-CredRevReqTBEX" */
-+553,	/* "setct-CredRevReqTBS" */
-+554,	/* "setct-CredRevReqTBSX" */
-+555,	/* "setct-CredRevResData" */
-+591,	/* "setct-CredRevResTBE" */
-+567,	/* "setct-ErrorTBS" */
-+526,	/* "setct-HODInput" */
-+561,	/* "setct-MeAqCInitResTBS" */
-+522,	/* "setct-OIData" */
-+519,	/* "setct-PANData" */
-+521,	/* "setct-PANOnly" */
-+520,	/* "setct-PANToken" */
-+556,	/* "setct-PCertReqData" */
-+557,	/* "setct-PCertResTBS" */
-+523,	/* "setct-PI" */
-+532,	/* "setct-PI-TBS" */
-+524,	/* "setct-PIData" */
-+525,	/* "setct-PIDataUnsigned" */
-+568,	/* "setct-PIDualSignedTBE" */
-+569,	/* "setct-PIUnsignedTBE" */
-+531,	/* "setct-PInitResData" */
-+533,	/* "setct-PResData" */
-+594,	/* "setct-RegFormReqTBE" */
-+562,	/* "setct-RegFormResTBS" */
-+606,	/* "setext-cv" */
-+601,	/* "setext-genCrypt" */
-+602,	/* "setext-miAuth" */
-+604,	/* "setext-pinAny" */
-+603,	/* "setext-pinSecure" */
-+605,	/* "setext-track2" */
-+52,	/* "signingTime" */
-+454,	/* "simpleSecurityObject" */
-+496,	/* "singleLevelQuality" */
-+387,	/* "snmpv2" */
-+941,	/* "streebog256" */
-+942,	/* "streebog512" */
-+660,	/* "street" */
-+85,	/* "subjectAltName" */
-+769,	/* "subjectDirectoryAttributes" */
-+398,	/* "subjectInfoAccess" */
-+82,	/* "subjectKeyIdentifier" */
-+498,	/* "subtreeMaximumQuality" */
-+497,	/* "subtreeMinimumQuality" */
-+890,	/* "supportedAlgorithms" */
-+874,	/* "supportedApplicationContext" */
-+402,	/* "targetInformation" */
-+940,	/* "tc26" */
-+864,	/* "telephoneNumber" */
-+866,	/* "teletexTerminalIdentifier" */
-+920,	/* "teletrust" */
-+865,	/* "telexNumber" */
-+459,	/* "textEncodedORAddress" */
-+293,	/* "textNotice" */
-+133,	/* "timeStamping" */
-+106,	/* "title" */
-+682,	/* "tpBasis" */
-+375,	/* "trustRoot" */
-+436,	/* "ucl" */
-+888,	/* "uniqueMember" */
-+55,	/* "unstructuredAddress" */
-+49,	/* "unstructuredName" */
-+880,	/* "userCertificate" */
-+465,	/* "userClass" */
-+879,	/* "userPassword" */
-+373,	/* "valid" */
-+678,	/* "wap" */
-+679,	/* "wap-wsg" */
-+735,	/* "wap-wsg-idm-ecid-wtls1" */
-+743,	/* "wap-wsg-idm-ecid-wtls10" */
-+744,	/* "wap-wsg-idm-ecid-wtls11" */
-+745,	/* "wap-wsg-idm-ecid-wtls12" */
-+736,	/* "wap-wsg-idm-ecid-wtls3" */
-+737,	/* "wap-wsg-idm-ecid-wtls4" */
-+738,	/* "wap-wsg-idm-ecid-wtls5" */
-+739,	/* "wap-wsg-idm-ecid-wtls6" */
-+740,	/* "wap-wsg-idm-ecid-wtls7" */
-+741,	/* "wap-wsg-idm-ecid-wtls8" */
-+742,	/* "wap-wsg-idm-ecid-wtls9" */
-+804,	/* "whirlpool" */
-+868,	/* "x121Address" */
-+503,	/* "x500UniqueIdentifier" */
-+158,	/* "x509Certificate" */
-+160,	/* "x509Crl" */
-+};
-+
-+static const unsigned int ln_objs[NUM_LN]={
-+363,	/* "AD Time Stamping" */
-+405,	/* "ANSI X9.62" */
-+368,	/* "Acceptable OCSP Responses" */
-+910,	/* "Any Extended Key Usage" */
-+664,	/* "Any language" */
-+177,	/* "Authority Information Access" */
-+365,	/* "Basic OCSP Response" */
-+285,	/* "Biometric Info" */
-+179,	/* "CA Issuers" */
-+785,	/* "CA Repository" */
-+131,	/* "Code Signing" */
-+783,	/* "Diffie-Hellman based MAC" */
-+382,	/* "Directory" */
-+392,	/* "Domain" */
-+132,	/* "E-mail Protection" */
-+389,	/* "Enterprises" */
-+384,	/* "Experimental" */
-+372,	/* "Extended OCSP Status" */
-+172,	/* "Extension Request" */
-+936,	/* "FRP256v1" */
-+813,	/* "GOST 28147-89" */
-+849,	/* "GOST 28147-89 Cryptocom ParamSet" */
-+815,	/* "GOST 28147-89 MAC" */
-+851,	/* "GOST 34.10-2001 Cryptocom" */
-+850,	/* "GOST 34.10-94 Cryptocom" */
-+942,	/* "GOST R 34-11-2012 (512 bit)" */
-+811,	/* "GOST R 34.10-2001" */
-+817,	/* "GOST R 34.10-2001 DH" */
-+946,	/* "GOST R 34.10-2012 (256 bit)" */
-+947,	/* "GOST R 34.10-2012 (512 bit)" */
-+812,	/* "GOST R 34.10-94" */
-+818,	/* "GOST R 34.10-94 DH" */
-+941,	/* "GOST R 34.11-2012 (256 bit)" */
-+948,	/* "GOST R 34.11-2012 with GOST R 34.10-2012 (256 bit)" */
-+949,	/* "GOST R 34.11-2012 with GOST R 34.10-2012 (512 bit)" */
-+809,	/* "GOST R 34.11-94" */
-+816,	/* "GOST R 34.11-94 PRF" */
-+807,	/* "GOST R 34.11-94 with GOST R 34.10-2001" */
-+853,	/* "GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom" */
-+808,	/* "GOST R 34.11-94 with GOST R 34.10-94" */
-+852,	/* "GOST R 34.11-94 with GOST R 34.10-94 Cryptocom" */
-+854,	/* "GOST R 3410-2001 Parameter Set Cryptocom" */
-+810,	/* "HMAC GOST 34.11-94" */
-+432,	/* "Hold Instruction Call Issuer" */
-+430,	/* "Hold Instruction Code" */
-+431,	/* "Hold Instruction None" */
-+433,	/* "Hold Instruction Reject" */
-+634,	/* "ICC or token signature" */
-+294,	/* "IPSec End System" */
-+295,	/* "IPSec Tunnel" */
-+296,	/* "IPSec User" */
-+182,	/* "ISO Member Body" */
-+183,	/* "ISO US Member Body" */
-+667,	/* "Independent" */
-+665,	/* "Inherit all" */
-+647,	/* "International Organizations" */
-+142,	/* "Invalidity Date" */
-+504,	/* "MIME MHS" */
-+388,	/* "Mail" */
-+383,	/* "Management" */
-+417,	/* "Microsoft CSP Name" */
-+135,	/* "Microsoft Commercial Code Signing" */
-+138,	/* "Microsoft Encrypted File System" */
-+171,	/* "Microsoft Extension Request" */
-+134,	/* "Microsoft Individual Code Signing" */
-+856,	/* "Microsoft Local Key set" */
-+137,	/* "Microsoft Server Gated Crypto" */
-+648,	/* "Microsoft Smartcardlogin" */
-+136,	/* "Microsoft Trust List Signing" */
-+649,	/* "Microsoft Universal Principal Name" */
-+393,	/* "NULL" */
-+404,	/* "NULL" */
-+72,	/* "Netscape Base Url" */
-+76,	/* "Netscape CA Policy Url" */
-+74,	/* "Netscape CA Revocation Url" */
-+71,	/* "Netscape Cert Type" */
-+58,	/* "Netscape Certificate Extension" */
-+79,	/* "Netscape Certificate Sequence" */
-+78,	/* "Netscape Comment" */
-+57,	/* "Netscape Communications Corp." */
-+59,	/* "Netscape Data Type" */
-+75,	/* "Netscape Renewal Url" */
-+73,	/* "Netscape Revocation Url" */
-+77,	/* "Netscape SSL Server Name" */
-+139,	/* "Netscape Server Gated Crypto" */
-+178,	/* "OCSP" */
-+370,	/* "OCSP Archive Cutoff" */
-+367,	/* "OCSP CRL ID" */
-+369,	/* "OCSP No Check" */
-+366,	/* "OCSP Nonce" */
-+371,	/* "OCSP Service Locator" */
-+180,	/* "OCSP Signing" */
-+161,	/* "PBES2" */
-+69,	/* "PBKDF2" */
-+162,	/* "PBMAC1" */
-+127,	/* "PKIX" */
-+858,	/* "Permanent Identifier" */
-+164,	/* "Policy Qualifier CPS" */
-+165,	/* "Policy Qualifier User Notice" */
-+385,	/* "Private" */
-+663,	/* "Proxy Certificate Information" */
-+ 1,	/* "RSA Data Security, Inc." */
-+ 2,	/* "RSA Data Security, Inc. PKCS" */
-+188,	/* "S/MIME" */
-+167,	/* "S/MIME Capabilities" */
-+387,	/* "SNMPv2" */
-+512,	/* "Secure Electronic Transactions" */
-+386,	/* "Security" */
-+394,	/* "Selected Attribute Types" */
-+143,	/* "Strong Extranet ID" */
-+398,	/* "Subject Information Access" */
-+130,	/* "TLS Web Client Authentication" */
-+129,	/* "TLS Web Server Authentication" */
-+133,	/* "Time Stamping" */
-+375,	/* "Trust Root" */
-+12,	/* "X509" */
-+402,	/* "X509v3 AC Targeting" */
-+746,	/* "X509v3 Any Policy" */
-+90,	/* "X509v3 Authority Key Identifier" */
-+87,	/* "X509v3 Basic Constraints" */
-+103,	/* "X509v3 CRL Distribution Points" */
-+88,	/* "X509v3 CRL Number" */
-+141,	/* "X509v3 CRL Reason Code" */
-+771,	/* "X509v3 Certificate Issuer" */
-+89,	/* "X509v3 Certificate Policies" */
-+140,	/* "X509v3 Delta CRL Indicator" */
-+126,	/* "X509v3 Extended Key Usage" */
-+857,	/* "X509v3 Freshest CRL" */
-+748,	/* "X509v3 Inhibit Any Policy" */
-+86,	/* "X509v3 Issuer Alternative Name" */
-+770,	/* "X509v3 Issuing Distrubution Point" */
-+83,	/* "X509v3 Key Usage" */
-+666,	/* "X509v3 Name Constraints" */
-+403,	/* "X509v3 No Revocation Available" */
-+401,	/* "X509v3 Policy Constraints" */
-+747,	/* "X509v3 Policy Mappings" */
-+84,	/* "X509v3 Private Key Usage Period" */
-+85,	/* "X509v3 Subject Alternative Name" */
-+769,	/* "X509v3 Subject Directory Attributes" */
-+82,	/* "X509v3 Subject Key Identifier" */
-+184,	/* "X9.57" */
-+185,	/* "X9.57 CM ?" */
-+478,	/* "aRecord" */
-+289,	/* "aaControls" */
-+287,	/* "ac-auditEntity" */
-+397,	/* "ac-proxying" */
-+288,	/* "ac-targeting" */
-+446,	/* "account" */
-+364,	/* "ad dvcs" */
-+606,	/* "additional verification" */
-+419,	/* "aes-128-cbc" */
-+916,	/* "aes-128-cbc-hmac-sha1" */
-+896,	/* "aes-128-ccm" */
-+421,	/* "aes-128-cfb" */
-+650,	/* "aes-128-cfb1" */
-+653,	/* "aes-128-cfb8" */
-+904,	/* "aes-128-ctr" */
-+418,	/* "aes-128-ecb" */
-+895,	/* "aes-128-gcm" */
-+420,	/* "aes-128-ofb" */
-+913,	/* "aes-128-xts" */
-+423,	/* "aes-192-cbc" */
-+917,	/* "aes-192-cbc-hmac-sha1" */
-+899,	/* "aes-192-ccm" */
-+425,	/* "aes-192-cfb" */
-+651,	/* "aes-192-cfb1" */
-+654,	/* "aes-192-cfb8" */
-+905,	/* "aes-192-ctr" */
-+422,	/* "aes-192-ecb" */
-+898,	/* "aes-192-gcm" */
-+424,	/* "aes-192-ofb" */
-+427,	/* "aes-256-cbc" */
-+918,	/* "aes-256-cbc-hmac-sha1" */
-+902,	/* "aes-256-ccm" */
-+429,	/* "aes-256-cfb" */
-+652,	/* "aes-256-cfb1" */
-+655,	/* "aes-256-cfb8" */
-+906,	/* "aes-256-ctr" */
-+426,	/* "aes-256-ecb" */
-+901,	/* "aes-256-gcm" */
-+428,	/* "aes-256-ofb" */
-+914,	/* "aes-256-xts" */
-+376,	/* "algorithm" */
-+484,	/* "associatedDomain" */
-+485,	/* "associatedName" */
-+501,	/* "audio" */
-+882,	/* "authorityRevocationList" */
-+91,	/* "bf-cbc" */
-+93,	/* "bf-cfb" */
-+92,	/* "bf-ecb" */
-+94,	/* "bf-ofb" */
-+921,	/* "brainpool" */
-+922,	/* "brainpoolP160r1" */
-+923,	/* "brainpoolP160t1" */
-+924,	/* "brainpoolP192r1" */
-+925,	/* "brainpoolP192t1" */
-+926,	/* "brainpoolP224r1" */
-+927,	/* "brainpoolP224t1" */
-+928,	/* "brainpoolP256r1" */
-+929,	/* "brainpoolP256t1" */
-+930,	/* "brainpoolP320r1" */
-+931,	/* "brainpoolP320t1" */
-+932,	/* "brainpoolP384r1" */
-+933,	/* "brainpoolP384t1" */
-+934,	/* "brainpoolP512r1" */
-+935,	/* "brainpoolP512t1" */
-+494,	/* "buildingName" */
-+860,	/* "businessCategory" */
-+691,	/* "c2onb191v4" */
-+692,	/* "c2onb191v5" */
-+697,	/* "c2onb239v4" */
-+698,	/* "c2onb239v5" */
-+684,	/* "c2pnb163v1" */
-+685,	/* "c2pnb163v2" */
-+686,	/* "c2pnb163v3" */
-+687,	/* "c2pnb176v1" */
-+693,	/* "c2pnb208w1" */
-+699,	/* "c2pnb272w1" */
-+700,	/* "c2pnb304w1" */
-+702,	/* "c2pnb368w1" */
-+688,	/* "c2tnb191v1" */
-+689,	/* "c2tnb191v2" */
-+690,	/* "c2tnb191v3" */
-+694,	/* "c2tnb239v1" */
-+695,	/* "c2tnb239v2" */
-+696,	/* "c2tnb239v3" */
-+701,	/* "c2tnb359v1" */
-+703,	/* "c2tnb431r1" */
-+881,	/* "cACertificate" */
-+483,	/* "cNAMERecord" */
-+751,	/* "camellia-128-cbc" */
-+757,	/* "camellia-128-cfb" */
-+760,	/* "camellia-128-cfb1" */
-+763,	/* "camellia-128-cfb8" */
-+754,	/* "camellia-128-ecb" */
-+766,	/* "camellia-128-ofb" */
-+752,	/* "camellia-192-cbc" */
-+758,	/* "camellia-192-cfb" */
-+761,	/* "camellia-192-cfb1" */
-+764,	/* "camellia-192-cfb8" */
-+755,	/* "camellia-192-ecb" */
-+767,	/* "camellia-192-ofb" */
-+753,	/* "camellia-256-cbc" */
-+759,	/* "camellia-256-cfb" */
-+762,	/* "camellia-256-cfb1" */
-+765,	/* "camellia-256-cfb8" */
-+756,	/* "camellia-256-ecb" */
-+768,	/* "camellia-256-ofb" */
-+443,	/* "caseIgnoreIA5StringSyntax" */
-+108,	/* "cast5-cbc" */
-+110,	/* "cast5-cfb" */
-+109,	/* "cast5-ecb" */
-+111,	/* "cast5-ofb" */
-+152,	/* "certBag" */
-+677,	/* "certicom-arc" */
-+517,	/* "certificate extensions" */
-+883,	/* "certificateRevocationList" */
-+937,	/* "chacha" */
-+54,	/* "challengePassword" */
-+407,	/* "characteristic-two-field" */
-+395,	/* "clearance" */
-+633,	/* "cleartext track 2" */
-+894,	/* "cmac" */
-+13,	/* "commonName" */
-+513,	/* "content types" */
-+50,	/* "contentType" */
-+53,	/* "countersignature" */
-+14,	/* "countryName" */
-+153,	/* "crlBag" */
-+884,	/* "crossCertificatePair" */
-+806,	/* "cryptocom" */
-+805,	/* "cryptopro" */
-+500,	/* "dITRedirect" */
-+451,	/* "dNSDomain" */
-+495,	/* "dSAQuality" */
-+434,	/* "data" */
-+390,	/* "dcObject" */
-+891,	/* "deltaRevocationList" */
-+31,	/* "des-cbc" */
-+643,	/* "des-cdmf" */
-+30,	/* "des-cfb" */
-+656,	/* "des-cfb1" */
-+657,	/* "des-cfb8" */
-+29,	/* "des-ecb" */
-+32,	/* "des-ede" */
-+43,	/* "des-ede-cbc" */
-+60,	/* "des-ede-cfb" */
-+62,	/* "des-ede-ofb" */
-+33,	/* "des-ede3" */
-+44,	/* "des-ede3-cbc" */
-+61,	/* "des-ede3-cfb" */
-+658,	/* "des-ede3-cfb1" */
-+659,	/* "des-ede3-cfb8" */
-+63,	/* "des-ede3-ofb" */
-+45,	/* "des-ofb" */
-+107,	/* "description" */
-+871,	/* "destinationIndicator" */
-+80,	/* "desx-cbc" */
-+28,	/* "dhKeyAgreement" */
-+11,	/* "directory services (X.500)" */
-+378,	/* "directory services - algorithms" */
-+887,	/* "distinguishedName" */
-+892,	/* "dmdName" */
-+174,	/* "dnQualifier" */
-+447,	/* "document" */
-+471,	/* "documentAuthor" */
-+468,	/* "documentIdentifier" */
-+472,	/* "documentLocation" */
-+502,	/* "documentPublisher" */
-+449,	/* "documentSeries" */
-+469,	/* "documentTitle" */
-+470,	/* "documentVersion" */
-+380,	/* "dod" */
-+391,	/* "domainComponent" */
-+452,	/* "domainRelatedObject" */
-+116,	/* "dsaEncryption" */
-+67,	/* "dsaEncryption-old" */
-+66,	/* "dsaWithSHA" */
-+113,	/* "dsaWithSHA1" */
-+70,	/* "dsaWithSHA1-old" */
-+802,	/* "dsa_with_SHA224" */
-+803,	/* "dsa_with_SHA256" */
-+297,	/* "dvcs" */
-+791,	/* "ecdsa-with-Recommended" */
-+416,	/* "ecdsa-with-SHA1" */
-+793,	/* "ecdsa-with-SHA224" */
-+794,	/* "ecdsa-with-SHA256" */
-+795,	/* "ecdsa-with-SHA384" */
-+796,	/* "ecdsa-with-SHA512" */
-+792,	/* "ecdsa-with-Specified" */
-+48,	/* "emailAddress" */
-+632,	/* "encrypted track 2" */
-+885,	/* "enhancedSearchGuide" */
-+56,	/* "extendedCertificateAttributes" */
-+867,	/* "facsimileTelephoneNumber" */
-+462,	/* "favouriteDrink" */
-+453,	/* "friendlyCountry" */
-+490,	/* "friendlyCountryName" */
-+156,	/* "friendlyName" */
-+631,	/* "generate cryptogram" */
-+509,	/* "generationQualifier" */
-+601,	/* "generic cryptogram" */
-+99,	/* "givenName" */
-+939,	/* "gost89-cbc" */
-+814,	/* "gost89-cnt" */
-+938,	/* "gost89-ecb" */
-+855,	/* "hmac" */
-+780,	/* "hmac-md5" */
-+781,	/* "hmac-sha1" */
-+797,	/* "hmacWithMD5" */
-+163,	/* "hmacWithSHA1" */
-+798,	/* "hmacWithSHA224" */
-+799,	/* "hmacWithSHA256" */
-+800,	/* "hmacWithSHA384" */
-+801,	/* "hmacWithSHA512" */
-+486,	/* "homePostalAddress" */
-+473,	/* "homeTelephoneNumber" */
-+466,	/* "host" */
-+889,	/* "houseIdentifier" */
-+442,	/* "iA5StringSyntax" */
-+381,	/* "iana" */
-+824,	/* "id-Gost28147-89-CryptoPro-A-ParamSet" */
-+825,	/* "id-Gost28147-89-CryptoPro-B-ParamSet" */
-+826,	/* "id-Gost28147-89-CryptoPro-C-ParamSet" */
-+827,	/* "id-Gost28147-89-CryptoPro-D-ParamSet" */
-+819,	/* "id-Gost28147-89-CryptoPro-KeyMeshing" */
-+829,	/* "id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet" */
-+828,	/* "id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet" */
-+830,	/* "id-Gost28147-89-CryptoPro-RIC-1-ParamSet" */
-+820,	/* "id-Gost28147-89-None-KeyMeshing" */
-+823,	/* "id-Gost28147-89-TestParamSet" */
-+840,	/* "id-GostR3410-2001-CryptoPro-A-ParamSet" */
-+841,	/* "id-GostR3410-2001-CryptoPro-B-ParamSet" */
-+842,	/* "id-GostR3410-2001-CryptoPro-C-ParamSet" */
-+843,	/* "id-GostR3410-2001-CryptoPro-XchA-ParamSet" */
-+844,	/* "id-GostR3410-2001-CryptoPro-XchB-ParamSet" */
-+839,	/* "id-GostR3410-2001-TestParamSet" */
-+832,	/* "id-GostR3410-94-CryptoPro-A-ParamSet" */
-+833,	/* "id-GostR3410-94-CryptoPro-B-ParamSet" */
-+834,	/* "id-GostR3410-94-CryptoPro-C-ParamSet" */
-+835,	/* "id-GostR3410-94-CryptoPro-D-ParamSet" */
-+836,	/* "id-GostR3410-94-CryptoPro-XchA-ParamSet" */
-+837,	/* "id-GostR3410-94-CryptoPro-XchB-ParamSet" */
-+838,	/* "id-GostR3410-94-CryptoPro-XchC-ParamSet" */
-+831,	/* "id-GostR3410-94-TestParamSet" */
-+845,	/* "id-GostR3410-94-a" */
-+846,	/* "id-GostR3410-94-aBis" */
-+847,	/* "id-GostR3410-94-b" */
-+848,	/* "id-GostR3410-94-bBis" */
-+822,	/* "id-GostR3411-94-CryptoProParamSet" */
-+821,	/* "id-GostR3411-94-TestParamSet" */
-+266,	/* "id-aca" */
-+355,	/* "id-aca-accessIdentity" */
-+354,	/* "id-aca-authenticationInfo" */
-+356,	/* "id-aca-chargingIdentity" */
-+399,	/* "id-aca-encAttrs" */
-+357,	/* "id-aca-group" */
-+358,	/* "id-aca-role" */
-+176,	/* "id-ad" */
-+788,	/* "id-aes128-wrap" */
-+897,	/* "id-aes128-wrap-pad" */
-+789,	/* "id-aes192-wrap" */
-+900,	/* "id-aes192-wrap-pad" */
-+790,	/* "id-aes256-wrap" */
-+903,	/* "id-aes256-wrap-pad" */
-+262,	/* "id-alg" */
-+893,	/* "id-alg-PWRI-KEK" */
-+323,	/* "id-alg-des40" */
-+326,	/* "id-alg-dh-pop" */
-+325,	/* "id-alg-dh-sig-hmac-sha1" */
-+324,	/* "id-alg-noSignature" */
-+907,	/* "id-camellia128-wrap" */
-+908,	/* "id-camellia192-wrap" */
-+909,	/* "id-camellia256-wrap" */
-+268,	/* "id-cct" */
-+361,	/* "id-cct-PKIData" */
-+362,	/* "id-cct-PKIResponse" */
-+360,	/* "id-cct-crs" */
-+81,	/* "id-ce" */
-+680,	/* "id-characteristic-two-basis" */
-+263,	/* "id-cmc" */
-+334,	/* "id-cmc-addExtensions" */
-+346,	/* "id-cmc-confirmCertAcceptance" */
-+330,	/* "id-cmc-dataReturn" */
-+336,	/* "id-cmc-decryptedPOP" */
-+335,	/* "id-cmc-encryptedPOP" */
-+339,	/* "id-cmc-getCRL" */
-+338,	/* "id-cmc-getCert" */
-+328,	/* "id-cmc-identification" */
-+329,	/* "id-cmc-identityProof" */
-+337,	/* "id-cmc-lraPOPWitness" */
-+344,	/* "id-cmc-popLinkRandom" */
-+345,	/* "id-cmc-popLinkWitness" */
-+343,	/* "id-cmc-queryPending" */
-+333,	/* "id-cmc-recipientNonce" */
-+341,	/* "id-cmc-regInfo" */
-+342,	/* "id-cmc-responseInfo" */
-+340,	/* "id-cmc-revokeRequest" */
-+332,	/* "id-cmc-senderNonce" */
-+327,	/* "id-cmc-statusInfo" */
-+331,	/* "id-cmc-transactionId" */
-+787,	/* "id-ct-asciiTextWithCRLF" */
-+408,	/* "id-ecPublicKey" */
-+508,	/* "id-hex-multipart-message" */
-+507,	/* "id-hex-partial-message" */
-+260,	/* "id-it" */
-+302,	/* "id-it-caKeyUpdateInfo" */
-+298,	/* "id-it-caProtEncCert" */
-+311,	/* "id-it-confirmWaitTime" */
-+303,	/* "id-it-currentCRL" */
-+300,	/* "id-it-encKeyPairTypes" */
-+310,	/* "id-it-implicitConfirm" */
-+308,	/* "id-it-keyPairParamRep" */
-+307,	/* "id-it-keyPairParamReq" */
-+312,	/* "id-it-origPKIMessage" */
-+301,	/* "id-it-preferredSymmAlg" */
-+309,	/* "id-it-revPassphrase" */
-+299,	/* "id-it-signKeyPairTypes" */
-+305,	/* "id-it-subscriptionRequest" */
-+306,	/* "id-it-subscriptionResponse" */
-+784,	/* "id-it-suppLangTags" */
-+304,	/* "id-it-unsupportedOIDs" */
-+128,	/* "id-kp" */
-+280,	/* "id-mod-attribute-cert" */
-+274,	/* "id-mod-cmc" */
-+277,	/* "id-mod-cmp" */
-+284,	/* "id-mod-cmp2000" */
-+273,	/* "id-mod-crmf" */
-+283,	/* "id-mod-dvcs" */
-+275,	/* "id-mod-kea-profile-88" */
-+276,	/* "id-mod-kea-profile-93" */
-+282,	/* "id-mod-ocsp" */
-+278,	/* "id-mod-qualified-cert-88" */
-+279,	/* "id-mod-qualified-cert-93" */
-+281,	/* "id-mod-timestamp-protocol" */
-+264,	/* "id-on" */
-+347,	/* "id-on-personalData" */
-+265,	/* "id-pda" */
-+352,	/* "id-pda-countryOfCitizenship" */
-+353,	/* "id-pda-countryOfResidence" */
-+348,	/* "id-pda-dateOfBirth" */
-+351,	/* "id-pda-gender" */
-+349,	/* "id-pda-placeOfBirth" */
-+175,	/* "id-pe" */
-+261,	/* "id-pkip" */
-+258,	/* "id-pkix-mod" */
-+269,	/* "id-pkix1-explicit-88" */
-+271,	/* "id-pkix1-explicit-93" */
-+270,	/* "id-pkix1-implicit-88" */
-+272,	/* "id-pkix1-implicit-93" */
-+662,	/* "id-ppl" */
-+267,	/* "id-qcs" */
-+359,	/* "id-qcs-pkixQCSyntax-v1" */
-+259,	/* "id-qt" */
-+313,	/* "id-regCtrl" */
-+316,	/* "id-regCtrl-authenticator" */
-+319,	/* "id-regCtrl-oldCertID" */
-+318,	/* "id-regCtrl-pkiArchiveOptions" */
-+317,	/* "id-regCtrl-pkiPublicationInfo" */
-+320,	/* "id-regCtrl-protocolEncrKey" */
-+315,	/* "id-regCtrl-regToken" */
-+314,	/* "id-regInfo" */
-+322,	/* "id-regInfo-certReq" */
-+321,	/* "id-regInfo-utf8Pairs" */
-+191,	/* "id-smime-aa" */
-+215,	/* "id-smime-aa-contentHint" */
-+218,	/* "id-smime-aa-contentIdentifier" */
-+221,	/* "id-smime-aa-contentReference" */
-+240,	/* "id-smime-aa-dvcs-dvc" */
-+217,	/* "id-smime-aa-encapContentType" */
-+222,	/* "id-smime-aa-encrypKeyPref" */
-+220,	/* "id-smime-aa-equivalentLabels" */
-+232,	/* "id-smime-aa-ets-CertificateRefs" */
-+233,	/* "id-smime-aa-ets-RevocationRefs" */
-+238,	/* "id-smime-aa-ets-archiveTimeStamp" */
-+237,	/* "id-smime-aa-ets-certCRLTimestamp" */
-+234,	/* "id-smime-aa-ets-certValues" */
-+227,	/* "id-smime-aa-ets-commitmentType" */
-+231,	/* "id-smime-aa-ets-contentTimestamp" */
-+236,	/* "id-smime-aa-ets-escTimeStamp" */
-+230,	/* "id-smime-aa-ets-otherSigCert" */
-+235,	/* "id-smime-aa-ets-revocationValues" */
-+226,	/* "id-smime-aa-ets-sigPolicyId" */
-+229,	/* "id-smime-aa-ets-signerAttr" */
-+228,	/* "id-smime-aa-ets-signerLocation" */
-+219,	/* "id-smime-aa-macValue" */
-+214,	/* "id-smime-aa-mlExpandHistory" */
-+216,	/* "id-smime-aa-msgSigDigest" */
-+212,	/* "id-smime-aa-receiptRequest" */
-+213,	/* "id-smime-aa-securityLabel" */
-+239,	/* "id-smime-aa-signatureType" */
-+223,	/* "id-smime-aa-signingCertificate" */
-+224,	/* "id-smime-aa-smimeEncryptCerts" */
-+225,	/* "id-smime-aa-timeStampToken" */
-+192,	/* "id-smime-alg" */
-+243,	/* "id-smime-alg-3DESwrap" */
-+246,	/* "id-smime-alg-CMS3DESwrap" */
-+247,	/* "id-smime-alg-CMSRC2wrap" */
-+245,	/* "id-smime-alg-ESDH" */
-+241,	/* "id-smime-alg-ESDHwith3DES" */
-+242,	/* "id-smime-alg-ESDHwithRC2" */
-+244,	/* "id-smime-alg-RC2wrap" */
-+193,	/* "id-smime-cd" */
-+248,	/* "id-smime-cd-ldap" */
-+190,	/* "id-smime-ct" */
-+210,	/* "id-smime-ct-DVCSRequestData" */
-+211,	/* "id-smime-ct-DVCSResponseData" */
-+208,	/* "id-smime-ct-TDTInfo" */
-+207,	/* "id-smime-ct-TSTInfo" */
-+205,	/* "id-smime-ct-authData" */
-+786,	/* "id-smime-ct-compressedData" */
-+209,	/* "id-smime-ct-contentInfo" */
-+206,	/* "id-smime-ct-publishCert" */
-+204,	/* "id-smime-ct-receipt" */
-+195,	/* "id-smime-cti" */
-+255,	/* "id-smime-cti-ets-proofOfApproval" */
-+256,	/* "id-smime-cti-ets-proofOfCreation" */
-+253,	/* "id-smime-cti-ets-proofOfDelivery" */
-+251,	/* "id-smime-cti-ets-proofOfOrigin" */
-+252,	/* "id-smime-cti-ets-proofOfReceipt" */
-+254,	/* "id-smime-cti-ets-proofOfSender" */
-+189,	/* "id-smime-mod" */
-+196,	/* "id-smime-mod-cms" */
-+197,	/* "id-smime-mod-ess" */
-+202,	/* "id-smime-mod-ets-eSigPolicy-88" */
-+203,	/* "id-smime-mod-ets-eSigPolicy-97" */
-+200,	/* "id-smime-mod-ets-eSignature-88" */
-+201,	/* "id-smime-mod-ets-eSignature-97" */
-+199,	/* "id-smime-mod-msg-v3" */
-+198,	/* "id-smime-mod-oid" */
-+194,	/* "id-smime-spq" */
-+250,	/* "id-smime-spq-ets-sqt-unotice" */
-+249,	/* "id-smime-spq-ets-sqt-uri" */
-+945,	/* "id-tc26-gost-28147-param-Z" */
-+943,	/* "id-tc26-gost-3410-2012-512-paramSetA" */
-+944,	/* "id-tc26-gost-3410-2012-512-paramSetB" */
-+34,	/* "idea-cbc" */
-+35,	/* "idea-cfb" */
-+36,	/* "idea-ecb" */
-+46,	/* "idea-ofb" */
-+676,	/* "identified-organization" */
-+461,	/* "info" */
-+101,	/* "initials" */
-+869,	/* "internationaliSDNNumber" */
-+749,	/* "ipsec3" */
-+750,	/* "ipsec4" */
-+181,	/* "iso" */
-+623,	/* "issuer capabilities" */
-+645,	/* "itu-t" */
-+492,	/* "janetMailbox" */
-+646,	/* "joint-iso-itu-t" */
-+150,	/* "keyBag" */
-+773,	/* "kisa" */
-+477,	/* "lastModifiedBy" */
-+476,	/* "lastModifiedTime" */
-+157,	/* "localKeyID" */
-+15,	/* "localityName" */
-+480,	/* "mXRecord" */
-+493,	/* "mailPreferenceOption" */
-+467,	/* "manager" */
-+ 3,	/* "md2" */
-+ 7,	/* "md2WithRSAEncryption" */
-+257,	/* "md4" */
-+396,	/* "md4WithRSAEncryption" */
-+ 4,	/* "md5" */
-+114,	/* "md5-sha1" */
-+104,	/* "md5WithRSA" */
-+ 8,	/* "md5WithRSAEncryption" */
-+95,	/* "mdc2" */
-+96,	/* "mdc2WithRSA" */
-+875,	/* "member" */
-+602,	/* "merchant initiated auth" */
-+514,	/* "message extensions" */
-+51,	/* "messageDigest" */
-+911,	/* "mgf1" */
-+506,	/* "mime-mhs-bodies" */
-+505,	/* "mime-mhs-headings" */
-+488,	/* "mobileTelephoneNumber" */
-+481,	/* "nSRecord" */
-+173,	/* "name" */
-+681,	/* "onBasis" */
-+379,	/* "org" */
-+17,	/* "organizationName" */
-+491,	/* "organizationalStatus" */
-+18,	/* "organizationalUnitName" */
-+475,	/* "otherMailbox" */
-+876,	/* "owner" */
-+489,	/* "pagerTelephoneNumber" */
-+782,	/* "password based MAC" */
-+374,	/* "path" */
-+621,	/* "payment gateway capabilities" */
-+ 9,	/* "pbeWithMD2AndDES-CBC" */
-+168,	/* "pbeWithMD2AndRC2-CBC" */
-+112,	/* "pbeWithMD5AndCast5CBC" */
-+10,	/* "pbeWithMD5AndDES-CBC" */
-+169,	/* "pbeWithMD5AndRC2-CBC" */
-+148,	/* "pbeWithSHA1And128BitRC2-CBC" */
-+144,	/* "pbeWithSHA1And128BitRC4" */
-+147,	/* "pbeWithSHA1And2-KeyTripleDES-CBC" */
-+146,	/* "pbeWithSHA1And3-KeyTripleDES-CBC" */
-+149,	/* "pbeWithSHA1And40BitRC2-CBC" */
-+145,	/* "pbeWithSHA1And40BitRC4" */
-+170,	/* "pbeWithSHA1AndDES-CBC" */
-+68,	/* "pbeWithSHA1AndRC2-CBC" */
-+499,	/* "personalSignature" */
-+487,	/* "personalTitle" */
-+464,	/* "photo" */
-+863,	/* "physicalDeliveryOfficeName" */
-+437,	/* "pilot" */
-+439,	/* "pilotAttributeSyntax" */
-+438,	/* "pilotAttributeType" */
-+479,	/* "pilotAttributeType27" */
-+456,	/* "pilotDSA" */
-+441,	/* "pilotGroups" */
-+444,	/* "pilotObject" */
-+440,	/* "pilotObjectClass" */
-+455,	/* "pilotOrganization" */
-+445,	/* "pilotPerson" */
-+186,	/* "pkcs1" */
-+27,	/* "pkcs3" */
-+187,	/* "pkcs5" */
-+20,	/* "pkcs7" */
-+21,	/* "pkcs7-data" */
-+25,	/* "pkcs7-digestData" */
-+26,	/* "pkcs7-encryptedData" */
-+23,	/* "pkcs7-envelopedData" */
-+24,	/* "pkcs7-signedAndEnvelopedData" */
-+22,	/* "pkcs7-signedData" */
-+151,	/* "pkcs8ShroudedKeyBag" */
-+47,	/* "pkcs9" */
-+862,	/* "postOfficeBox" */
-+861,	/* "postalAddress" */
-+661,	/* "postalCode" */
-+683,	/* "ppBasis" */
-+872,	/* "preferredDeliveryMethod" */
-+873,	/* "presentationAddress" */
-+406,	/* "prime-field" */
-+409,	/* "prime192v1" */
-+410,	/* "prime192v2" */
-+411,	/* "prime192v3" */
-+412,	/* "prime239v1" */
-+413,	/* "prime239v2" */
-+414,	/* "prime239v3" */
-+415,	/* "prime256v1" */
-+886,	/* "protocolInformation" */
-+510,	/* "pseudonym" */
-+435,	/* "pss" */
-+286,	/* "qcStatements" */
-+457,	/* "qualityLabelledData" */
-+450,	/* "rFC822localPart" */
-+98,	/* "rc2-40-cbc" */
-+166,	/* "rc2-64-cbc" */
-+37,	/* "rc2-cbc" */
-+39,	/* "rc2-cfb" */
-+38,	/* "rc2-ecb" */
-+40,	/* "rc2-ofb" */
-+ 5,	/* "rc4" */
-+97,	/* "rc4-40" */
-+915,	/* "rc4-hmac-md5" */
-+120,	/* "rc5-cbc" */
-+122,	/* "rc5-cfb" */
-+121,	/* "rc5-ecb" */
-+123,	/* "rc5-ofb" */
-+870,	/* "registeredAddress" */
-+460,	/* "rfc822Mailbox" */
-+117,	/* "ripemd160" */
-+119,	/* "ripemd160WithRSA" */
-+400,	/* "role" */
-+877,	/* "roleOccupant" */
-+448,	/* "room" */
-+463,	/* "roomNumber" */
-+19,	/* "rsa" */
-+ 6,	/* "rsaEncryption" */
-+644,	/* "rsaOAEPEncryptionSET" */
-+377,	/* "rsaSignature" */
-+919,	/* "rsaesOaep" */
-+912,	/* "rsassaPss" */
-+124,	/* "run length compression" */
-+482,	/* "sOARecord" */
-+155,	/* "safeContentsBag" */
-+291,	/* "sbgp-autonomousSysNum" */
-+290,	/* "sbgp-ipAddrBlock" */
-+292,	/* "sbgp-routerIdentifier" */
-+159,	/* "sdsiCertificate" */
-+859,	/* "searchGuide" */
-+704,	/* "secp112r1" */
-+705,	/* "secp112r2" */
-+706,	/* "secp128r1" */
-+707,	/* "secp128r2" */
-+708,	/* "secp160k1" */
-+709,	/* "secp160r1" */
-+710,	/* "secp160r2" */
-+711,	/* "secp192k1" */
-+712,	/* "secp224k1" */
-+713,	/* "secp224r1" */
-+714,	/* "secp256k1" */
-+715,	/* "secp384r1" */
-+716,	/* "secp521r1" */
-+154,	/* "secretBag" */
-+474,	/* "secretary" */
-+717,	/* "sect113r1" */
-+718,	/* "sect113r2" */
-+719,	/* "sect131r1" */
-+720,	/* "sect131r2" */
-+721,	/* "sect163k1" */
-+722,	/* "sect163r1" */
-+723,	/* "sect163r2" */
-+724,	/* "sect193r1" */
-+725,	/* "sect193r2" */
-+726,	/* "sect233k1" */
-+727,	/* "sect233r1" */
-+728,	/* "sect239k1" */
-+729,	/* "sect283k1" */
-+730,	/* "sect283r1" */
-+731,	/* "sect409k1" */
-+732,	/* "sect409r1" */
-+733,	/* "sect571k1" */
-+734,	/* "sect571r1" */
-+635,	/* "secure device signature" */
-+878,	/* "seeAlso" */
-+777,	/* "seed-cbc" */
-+779,	/* "seed-cfb" */
-+776,	/* "seed-ecb" */
-+778,	/* "seed-ofb" */
-+105,	/* "serialNumber" */
-+625,	/* "set-addPolicy" */
-+515,	/* "set-attr" */
-+518,	/* "set-brand" */
-+638,	/* "set-brand-AmericanExpress" */
-+637,	/* "set-brand-Diners" */
-+636,	/* "set-brand-IATA-ATA" */
-+639,	/* "set-brand-JCB" */
-+641,	/* "set-brand-MasterCard" */
-+642,	/* "set-brand-Novus" */
-+640,	/* "set-brand-Visa" */
-+516,	/* "set-policy" */
-+607,	/* "set-policy-root" */
-+624,	/* "set-rootKeyThumb" */
-+620,	/* "setAttr-Cert" */
-+628,	/* "setAttr-IssCap-CVM" */
-+630,	/* "setAttr-IssCap-Sig" */
-+629,	/* "setAttr-IssCap-T2" */
-+627,	/* "setAttr-Token-B0Prime" */
-+626,	/* "setAttr-Token-EMV" */
-+622,	/* "setAttr-TokenType" */
-+619,	/* "setCext-IssuerCapabilities" */
-+615,	/* "setCext-PGWYcapabilities" */
-+616,	/* "setCext-TokenIdentifier" */
-+618,	/* "setCext-TokenType" */
-+617,	/* "setCext-Track2Data" */
-+611,	/* "setCext-cCertRequired" */
-+609,	/* "setCext-certType" */
-+608,	/* "setCext-hashedRoot" */
-+610,	/* "setCext-merchData" */
-+613,	/* "setCext-setExt" */
-+614,	/* "setCext-setQualf" */
-+612,	/* "setCext-tunneling" */
-+540,	/* "setct-AcqCardCodeMsg" */
-+576,	/* "setct-AcqCardCodeMsgTBE" */
-+570,	/* "setct-AuthReqTBE" */
-+534,	/* "setct-AuthReqTBS" */
-+527,	/* "setct-AuthResBaggage" */
-+571,	/* "setct-AuthResTBE" */
-+572,	/* "setct-AuthResTBEX" */
-+535,	/* "setct-AuthResTBS" */
-+536,	/* "setct-AuthResTBSX" */
-+528,	/* "setct-AuthRevReqBaggage" */
-+577,	/* "setct-AuthRevReqTBE" */
-+541,	/* "setct-AuthRevReqTBS" */
-+529,	/* "setct-AuthRevResBaggage" */
-+542,	/* "setct-AuthRevResData" */
-+578,	/* "setct-AuthRevResTBE" */
-+579,	/* "setct-AuthRevResTBEB" */
-+543,	/* "setct-AuthRevResTBS" */
-+573,	/* "setct-AuthTokenTBE" */
-+537,	/* "setct-AuthTokenTBS" */
-+600,	/* "setct-BCIDistributionTBS" */
-+558,	/* "setct-BatchAdminReqData" */
-+592,	/* "setct-BatchAdminReqTBE" */
-+559,	/* "setct-BatchAdminResData" */
-+593,	/* "setct-BatchAdminResTBE" */
-+599,	/* "setct-CRLNotificationResTBS" */
-+598,	/* "setct-CRLNotificationTBS" */
-+580,	/* "setct-CapReqTBE" */
-+581,	/* "setct-CapReqTBEX" */
-+544,	/* "setct-CapReqTBS" */
-+545,	/* "setct-CapReqTBSX" */
-+546,	/* "setct-CapResData" */
-+582,	/* "setct-CapResTBE" */
-+583,	/* "setct-CapRevReqTBE" */
-+584,	/* "setct-CapRevReqTBEX" */
-+547,	/* "setct-CapRevReqTBS" */
-+548,	/* "setct-CapRevReqTBSX" */
-+549,	/* "setct-CapRevResData" */
-+585,	/* "setct-CapRevResTBE" */
-+538,	/* "setct-CapTokenData" */
-+530,	/* "setct-CapTokenSeq" */
-+574,	/* "setct-CapTokenTBE" */
-+575,	/* "setct-CapTokenTBEX" */
-+539,	/* "setct-CapTokenTBS" */
-+560,	/* "setct-CardCInitResTBS" */
-+566,	/* "setct-CertInqReqTBS" */
-+563,	/* "setct-CertReqData" */
-+595,	/* "setct-CertReqTBE" */
-+596,	/* "setct-CertReqTBEX" */
-+564,	/* "setct-CertReqTBS" */
-+565,	/* "setct-CertResData" */
-+597,	/* "setct-CertResTBE" */
-+586,	/* "setct-CredReqTBE" */
-+587,	/* "setct-CredReqTBEX" */
-+550,	/* "setct-CredReqTBS" */
-+551,	/* "setct-CredReqTBSX" */
-+552,	/* "setct-CredResData" */
-+588,	/* "setct-CredResTBE" */
-+589,	/* "setct-CredRevReqTBE" */
-+590,	/* "setct-CredRevReqTBEX" */
-+553,	/* "setct-CredRevReqTBS" */
-+554,	/* "setct-CredRevReqTBSX" */
-+555,	/* "setct-CredRevResData" */
-+591,	/* "setct-CredRevResTBE" */
-+567,	/* "setct-ErrorTBS" */
-+526,	/* "setct-HODInput" */
-+561,	/* "setct-MeAqCInitResTBS" */
-+522,	/* "setct-OIData" */
-+519,	/* "setct-PANData" */
-+521,	/* "setct-PANOnly" */
-+520,	/* "setct-PANToken" */
-+556,	/* "setct-PCertReqData" */
-+557,	/* "setct-PCertResTBS" */
-+523,	/* "setct-PI" */
-+532,	/* "setct-PI-TBS" */
-+524,	/* "setct-PIData" */
-+525,	/* "setct-PIDataUnsigned" */
-+568,	/* "setct-PIDualSignedTBE" */
-+569,	/* "setct-PIUnsignedTBE" */
-+531,	/* "setct-PInitResData" */
-+533,	/* "setct-PResData" */
-+594,	/* "setct-RegFormReqTBE" */
-+562,	/* "setct-RegFormResTBS" */
-+604,	/* "setext-pinAny" */
-+603,	/* "setext-pinSecure" */
-+605,	/* "setext-track2" */
-+41,	/* "sha" */
-+64,	/* "sha1" */
-+115,	/* "sha1WithRSA" */
-+65,	/* "sha1WithRSAEncryption" */
-+675,	/* "sha224" */
-+671,	/* "sha224WithRSAEncryption" */
-+672,	/* "sha256" */
-+668,	/* "sha256WithRSAEncryption" */
-+673,	/* "sha384" */
-+669,	/* "sha384WithRSAEncryption" */
-+674,	/* "sha512" */
-+670,	/* "sha512WithRSAEncryption" */
-+42,	/* "shaWithRSAEncryption" */
-+52,	/* "signingTime" */
-+454,	/* "simpleSecurityObject" */
-+496,	/* "singleLevelQuality" */
-+16,	/* "stateOrProvinceName" */
-+660,	/* "streetAddress" */
-+498,	/* "subtreeMaximumQuality" */
-+497,	/* "subtreeMinimumQuality" */
-+890,	/* "supportedAlgorithms" */
-+874,	/* "supportedApplicationContext" */
-+100,	/* "surname" */
-+940,	/* "tc26" */
-+864,	/* "telephoneNumber" */
-+866,	/* "teletexTerminalIdentifier" */
-+920,	/* "teletrust" */
-+865,	/* "telexNumber" */
-+459,	/* "textEncodedORAddress" */
-+293,	/* "textNotice" */
-+106,	/* "title" */
-+682,	/* "tpBasis" */
-+436,	/* "ucl" */
-+ 0,	/* "undefined" */
-+888,	/* "uniqueMember" */
-+55,	/* "unstructuredAddress" */
-+49,	/* "unstructuredName" */
-+880,	/* "userCertificate" */
-+465,	/* "userClass" */
-+458,	/* "userId" */
-+879,	/* "userPassword" */
-+373,	/* "valid" */
-+678,	/* "wap" */
-+679,	/* "wap-wsg" */
-+735,	/* "wap-wsg-idm-ecid-wtls1" */
-+743,	/* "wap-wsg-idm-ecid-wtls10" */
-+744,	/* "wap-wsg-idm-ecid-wtls11" */
-+745,	/* "wap-wsg-idm-ecid-wtls12" */
-+736,	/* "wap-wsg-idm-ecid-wtls3" */
-+737,	/* "wap-wsg-idm-ecid-wtls4" */
-+738,	/* "wap-wsg-idm-ecid-wtls5" */
-+739,	/* "wap-wsg-idm-ecid-wtls6" */
-+740,	/* "wap-wsg-idm-ecid-wtls7" */
-+741,	/* "wap-wsg-idm-ecid-wtls8" */
-+742,	/* "wap-wsg-idm-ecid-wtls9" */
-+804,	/* "whirlpool" */
-+868,	/* "x121Address" */
-+503,	/* "x500UniqueIdentifier" */
-+158,	/* "x509Certificate" */
-+160,	/* "x509Crl" */
-+125,	/* "zlib compression" */
-+};
-+
-+static const unsigned int obj_objs[NUM_OBJ]={
-+ 0,	/* OBJ_undef                        0 */
-+181,	/* OBJ_iso                          1 */
-+393,	/* OBJ_joint_iso_ccitt              OBJ_joint_iso_itu_t */
-+404,	/* OBJ_ccitt                        OBJ_itu_t */
-+645,	/* OBJ_itu_t                        0 */
-+646,	/* OBJ_joint_iso_itu_t              2 */
-+434,	/* OBJ_data                         0 9 */
-+182,	/* OBJ_member_body                  1 2 */
-+379,	/* OBJ_org                          1 3 */
-+676,	/* OBJ_identified_organization      1 3 */
-+11,	/* OBJ_X500                         2 5 */
-+647,	/* OBJ_international_organizations  2 23 */
-+380,	/* OBJ_dod                          1 3 6 */
-+920,	/* OBJ_teletrust                    1 3 36 */
-+12,	/* OBJ_X509                         2 5 4 */
-+378,	/* OBJ_X500algorithms               2 5 8 */
-+81,	/* OBJ_id_ce                        2 5 29 */
-+512,	/* OBJ_id_set                       2 23 42 */
-+678,	/* OBJ_wap                          2 23 43 */
-+435,	/* OBJ_pss                          0 9 2342 */
-+183,	/* OBJ_ISO_US                       1 2 840 */
-+381,	/* OBJ_iana                         1 3 6 1 */
-+677,	/* OBJ_certicom_arc                 1 3 132 */
-+394,	/* OBJ_selected_attribute_types     2 5 1 5 */
-+13,	/* OBJ_commonName                   2 5 4 3 */
-+100,	/* OBJ_surname                      2 5 4 4 */
-+105,	/* OBJ_serialNumber                 2 5 4 5 */
-+14,	/* OBJ_countryName                  2 5 4 6 */
-+15,	/* OBJ_localityName                 2 5 4 7 */
-+16,	/* OBJ_stateOrProvinceName          2 5 4 8 */
-+660,	/* OBJ_streetAddress                2 5 4 9 */
-+17,	/* OBJ_organizationName             2 5 4 10 */
-+18,	/* OBJ_organizationalUnitName       2 5 4 11 */
-+106,	/* OBJ_title                        2 5 4 12 */
-+107,	/* OBJ_description                  2 5 4 13 */
-+859,	/* OBJ_searchGuide                  2 5 4 14 */
-+860,	/* OBJ_businessCategory             2 5 4 15 */
-+861,	/* OBJ_postalAddress                2 5 4 16 */
-+661,	/* OBJ_postalCode                   2 5 4 17 */
-+862,	/* OBJ_postOfficeBox                2 5 4 18 */
-+863,	/* OBJ_physicalDeliveryOfficeName   2 5 4 19 */
-+864,	/* OBJ_telephoneNumber              2 5 4 20 */
-+865,	/* OBJ_telexNumber                  2 5 4 21 */
-+866,	/* OBJ_teletexTerminalIdentifier    2 5 4 22 */
-+867,	/* OBJ_facsimileTelephoneNumber     2 5 4 23 */
-+868,	/* OBJ_x121Address                  2 5 4 24 */
-+869,	/* OBJ_internationaliSDNNumber      2 5 4 25 */
-+870,	/* OBJ_registeredAddress            2 5 4 26 */
-+871,	/* OBJ_destinationIndicator         2 5 4 27 */
-+872,	/* OBJ_preferredDeliveryMethod      2 5 4 28 */
-+873,	/* OBJ_presentationAddress          2 5 4 29 */
-+874,	/* OBJ_supportedApplicationContext  2 5 4 30 */
-+875,	/* OBJ_member                       2 5 4 31 */
-+876,	/* OBJ_owner                        2 5 4 32 */
-+877,	/* OBJ_roleOccupant                 2 5 4 33 */
-+878,	/* OBJ_seeAlso                      2 5 4 34 */
-+879,	/* OBJ_userPassword                 2 5 4 35 */
-+880,	/* OBJ_userCertificate              2 5 4 36 */
-+881,	/* OBJ_cACertificate                2 5 4 37 */
-+882,	/* OBJ_authorityRevocationList      2 5 4 38 */
-+883,	/* OBJ_certificateRevocationList    2 5 4 39 */
-+884,	/* OBJ_crossCertificatePair         2 5 4 40 */
-+173,	/* OBJ_name                         2 5 4 41 */
-+99,	/* OBJ_givenName                    2 5 4 42 */
-+101,	/* OBJ_initials                     2 5 4 43 */
-+509,	/* OBJ_generationQualifier          2 5 4 44 */
-+503,	/* OBJ_x500UniqueIdentifier         2 5 4 45 */
-+174,	/* OBJ_dnQualifier                  2 5 4 46 */
-+885,	/* OBJ_enhancedSearchGuide          2 5 4 47 */
-+886,	/* OBJ_protocolInformation          2 5 4 48 */
-+887,	/* OBJ_distinguishedName            2 5 4 49 */
-+888,	/* OBJ_uniqueMember                 2 5 4 50 */
-+889,	/* OBJ_houseIdentifier              2 5 4 51 */
-+890,	/* OBJ_supportedAlgorithms          2 5 4 52 */
-+891,	/* OBJ_deltaRevocationList          2 5 4 53 */
-+892,	/* OBJ_dmdName                      2 5 4 54 */
-+510,	/* OBJ_pseudonym                    2 5 4 65 */
-+400,	/* OBJ_role                         2 5 4 72 */
-+769,	/* OBJ_subject_directory_attributes 2 5 29 9 */
-+82,	/* OBJ_subject_key_identifier       2 5 29 14 */
-+83,	/* OBJ_key_usage                    2 5 29 15 */
-+84,	/* OBJ_private_key_usage_period     2 5 29 16 */
-+85,	/* OBJ_subject_alt_name             2 5 29 17 */
-+86,	/* OBJ_issuer_alt_name              2 5 29 18 */
-+87,	/* OBJ_basic_constraints            2 5 29 19 */
-+88,	/* OBJ_crl_number                   2 5 29 20 */
-+141,	/* OBJ_crl_reason                   2 5 29 21 */
-+430,	/* OBJ_hold_instruction_code        2 5 29 23 */
-+142,	/* OBJ_invalidity_date              2 5 29 24 */
-+140,	/* OBJ_delta_crl                    2 5 29 27 */
-+770,	/* OBJ_issuing_distribution_point   2 5 29 28 */
-+771,	/* OBJ_certificate_issuer           2 5 29 29 */
-+666,	/* OBJ_name_constraints             2 5 29 30 */
-+103,	/* OBJ_crl_distribution_points      2 5 29 31 */
-+89,	/* OBJ_certificate_policies         2 5 29 32 */
-+747,	/* OBJ_policy_mappings              2 5 29 33 */
-+90,	/* OBJ_authority_key_identifier     2 5 29 35 */
-+401,	/* OBJ_policy_constraints           2 5 29 36 */
-+126,	/* OBJ_ext_key_usage                2 5 29 37 */
-+857,	/* OBJ_freshest_crl                 2 5 29 46 */
-+748,	/* OBJ_inhibit_any_policy           2 5 29 54 */
-+402,	/* OBJ_target_information           2 5 29 55 */
-+403,	/* OBJ_no_rev_avail                 2 5 29 56 */
-+513,	/* OBJ_set_ctype                    2 23 42 0 */
-+514,	/* OBJ_set_msgExt                   2 23 42 1 */
-+515,	/* OBJ_set_attr                     2 23 42 3 */
-+516,	/* OBJ_set_policy                   2 23 42 5 */
-+517,	/* OBJ_set_certExt                  2 23 42 7 */
-+518,	/* OBJ_set_brand                    2 23 42 8 */
-+679,	/* OBJ_wap_wsg                      2 23 43 1 */
-+382,	/* OBJ_Directory                    1 3 6 1 1 */
-+383,	/* OBJ_Management                   1 3 6 1 2 */
-+384,	/* OBJ_Experimental                 1 3 6 1 3 */
-+385,	/* OBJ_Private                      1 3 6 1 4 */
-+386,	/* OBJ_Security                     1 3 6 1 5 */
-+387,	/* OBJ_SNMPv2                       1 3 6 1 6 */
-+388,	/* OBJ_Mail                         1 3 6 1 7 */
-+376,	/* OBJ_algorithm                    1 3 14 3 2 */
-+395,	/* OBJ_clearance                    2 5 1 5 55 */
-+19,	/* OBJ_rsa                          2 5 8 1 1 */
-+96,	/* OBJ_mdc2WithRSA                  2 5 8 3 100 */
-+95,	/* OBJ_mdc2                         2 5 8 3 101 */
-+746,	/* OBJ_any_policy                   2 5 29 32 0 */
-+910,	/* OBJ_anyExtendedKeyUsage          2 5 29 37 0 */
-+519,	/* OBJ_setct_PANData                2 23 42 0 0 */
-+520,	/* OBJ_setct_PANToken               2 23 42 0 1 */
-+521,	/* OBJ_setct_PANOnly                2 23 42 0 2 */
-+522,	/* OBJ_setct_OIData                 2 23 42 0 3 */
-+523,	/* OBJ_setct_PI                     2 23 42 0 4 */
-+524,	/* OBJ_setct_PIData                 2 23 42 0 5 */
-+525,	/* OBJ_setct_PIDataUnsigned         2 23 42 0 6 */
-+526,	/* OBJ_setct_HODInput               2 23 42 0 7 */
-+527,	/* OBJ_setct_AuthResBaggage         2 23 42 0 8 */
-+528,	/* OBJ_setct_AuthRevReqBaggage      2 23 42 0 9 */
-+529,	/* OBJ_setct_AuthRevResBaggage      2 23 42 0 10 */
-+530,	/* OBJ_setct_CapTokenSeq            2 23 42 0 11 */
-+531,	/* OBJ_setct_PInitResData           2 23 42 0 12 */
-+532,	/* OBJ_setct_PI_TBS                 2 23 42 0 13 */
-+533,	/* OBJ_setct_PResData               2 23 42 0 14 */
-+534,	/* OBJ_setct_AuthReqTBS             2 23 42 0 16 */
-+535,	/* OBJ_setct_AuthResTBS             2 23 42 0 17 */
-+536,	/* OBJ_setct_AuthResTBSX            2 23 42 0 18 */
-+537,	/* OBJ_setct_AuthTokenTBS           2 23 42 0 19 */
-+538,	/* OBJ_setct_CapTokenData           2 23 42 0 20 */
-+539,	/* OBJ_setct_CapTokenTBS            2 23 42 0 21 */
-+540,	/* OBJ_setct_AcqCardCodeMsg         2 23 42 0 22 */
-+541,	/* OBJ_setct_AuthRevReqTBS          2 23 42 0 23 */
-+542,	/* OBJ_setct_AuthRevResData         2 23 42 0 24 */
-+543,	/* OBJ_setct_AuthRevResTBS          2 23 42 0 25 */
-+544,	/* OBJ_setct_CapReqTBS              2 23 42 0 26 */
-+545,	/* OBJ_setct_CapReqTBSX             2 23 42 0 27 */
-+546,	/* OBJ_setct_CapResData             2 23 42 0 28 */
-+547,	/* OBJ_setct_CapRevReqTBS           2 23 42 0 29 */
-+548,	/* OBJ_setct_CapRevReqTBSX          2 23 42 0 30 */
-+549,	/* OBJ_setct_CapRevResData          2 23 42 0 31 */
-+550,	/* OBJ_setct_CredReqTBS             2 23 42 0 32 */
-+551,	/* OBJ_setct_CredReqTBSX            2 23 42 0 33 */
-+552,	/* OBJ_setct_CredResData            2 23 42 0 34 */
-+553,	/* OBJ_setct_CredRevReqTBS          2 23 42 0 35 */
-+554,	/* OBJ_setct_CredRevReqTBSX         2 23 42 0 36 */
-+555,	/* OBJ_setct_CredRevResData         2 23 42 0 37 */
-+556,	/* OBJ_setct_PCertReqData           2 23 42 0 38 */
-+557,	/* OBJ_setct_PCertResTBS            2 23 42 0 39 */
-+558,	/* OBJ_setct_BatchAdminReqData      2 23 42 0 40 */
-+559,	/* OBJ_setct_BatchAdminResData      2 23 42 0 41 */
-+560,	/* OBJ_setct_CardCInitResTBS        2 23 42 0 42 */
-+561,	/* OBJ_setct_MeAqCInitResTBS        2 23 42 0 43 */
-+562,	/* OBJ_setct_RegFormResTBS          2 23 42 0 44 */
-+563,	/* OBJ_setct_CertReqData            2 23 42 0 45 */
-+564,	/* OBJ_setct_CertReqTBS             2 23 42 0 46 */
-+565,	/* OBJ_setct_CertResData            2 23 42 0 47 */
-+566,	/* OBJ_setct_CertInqReqTBS          2 23 42 0 48 */
-+567,	/* OBJ_setct_ErrorTBS               2 23 42 0 49 */
-+568,	/* OBJ_setct_PIDualSignedTBE        2 23 42 0 50 */
-+569,	/* OBJ_setct_PIUnsignedTBE          2 23 42 0 51 */
-+570,	/* OBJ_setct_AuthReqTBE             2 23 42 0 52 */
-+571,	/* OBJ_setct_AuthResTBE             2 23 42 0 53 */
-+572,	/* OBJ_setct_AuthResTBEX            2 23 42 0 54 */
-+573,	/* OBJ_setct_AuthTokenTBE           2 23 42 0 55 */
-+574,	/* OBJ_setct_CapTokenTBE            2 23 42 0 56 */
-+575,	/* OBJ_setct_CapTokenTBEX           2 23 42 0 57 */
-+576,	/* OBJ_setct_AcqCardCodeMsgTBE      2 23 42 0 58 */
-+577,	/* OBJ_setct_AuthRevReqTBE          2 23 42 0 59 */
-+578,	/* OBJ_setct_AuthRevResTBE          2 23 42 0 60 */
-+579,	/* OBJ_setct_AuthRevResTBEB         2 23 42 0 61 */
-+580,	/* OBJ_setct_CapReqTBE              2 23 42 0 62 */
-+581,	/* OBJ_setct_CapReqTBEX             2 23 42 0 63 */
-+582,	/* OBJ_setct_CapResTBE              2 23 42 0 64 */
-+583,	/* OBJ_setct_CapRevReqTBE           2 23 42 0 65 */
-+584,	/* OBJ_setct_CapRevReqTBEX          2 23 42 0 66 */
-+585,	/* OBJ_setct_CapRevResTBE           2 23 42 0 67 */
-+586,	/* OBJ_setct_CredReqTBE             2 23 42 0 68 */
-+587,	/* OBJ_setct_CredReqTBEX            2 23 42 0 69 */
-+588,	/* OBJ_setct_CredResTBE             2 23 42 0 70 */
-+589,	/* OBJ_setct_CredRevReqTBE          2 23 42 0 71 */
-+590,	/* OBJ_setct_CredRevReqTBEX         2 23 42 0 72 */
-+591,	/* OBJ_setct_CredRevResTBE          2 23 42 0 73 */
-+592,	/* OBJ_setct_BatchAdminReqTBE       2 23 42 0 74 */
-+593,	/* OBJ_setct_BatchAdminResTBE       2 23 42 0 75 */
-+594,	/* OBJ_setct_RegFormReqTBE          2 23 42 0 76 */
-+595,	/* OBJ_setct_CertReqTBE             2 23 42 0 77 */
-+596,	/* OBJ_setct_CertReqTBEX            2 23 42 0 78 */
-+597,	/* OBJ_setct_CertResTBE             2 23 42 0 79 */
-+598,	/* OBJ_setct_CRLNotificationTBS     2 23 42 0 80 */
-+599,	/* OBJ_setct_CRLNotificationResTBS  2 23 42 0 81 */
-+600,	/* OBJ_setct_BCIDistributionTBS     2 23 42 0 82 */
-+601,	/* OBJ_setext_genCrypt              2 23 42 1 1 */
-+602,	/* OBJ_setext_miAuth                2 23 42 1 3 */
-+603,	/* OBJ_setext_pinSecure             2 23 42 1 4 */
-+604,	/* OBJ_setext_pinAny                2 23 42 1 5 */
-+605,	/* OBJ_setext_track2                2 23 42 1 7 */
-+606,	/* OBJ_setext_cv                    2 23 42 1 8 */
-+620,	/* OBJ_setAttr_Cert                 2 23 42 3 0 */
-+621,	/* OBJ_setAttr_PGWYcap              2 23 42 3 1 */
-+622,	/* OBJ_setAttr_TokenType            2 23 42 3 2 */
-+623,	/* OBJ_setAttr_IssCap               2 23 42 3 3 */
-+607,	/* OBJ_set_policy_root              2 23 42 5 0 */
-+608,	/* OBJ_setCext_hashedRoot           2 23 42 7 0 */
-+609,	/* OBJ_setCext_certType             2 23 42 7 1 */
-+610,	/* OBJ_setCext_merchData            2 23 42 7 2 */
-+611,	/* OBJ_setCext_cCertRequired        2 23 42 7 3 */
-+612,	/* OBJ_setCext_tunneling            2 23 42 7 4 */
-+613,	/* OBJ_setCext_setExt               2 23 42 7 5 */
-+614,	/* OBJ_setCext_setQualf             2 23 42 7 6 */
-+615,	/* OBJ_setCext_PGWYcapabilities     2 23 42 7 7 */
-+616,	/* OBJ_setCext_TokenIdentifier      2 23 42 7 8 */
-+617,	/* OBJ_setCext_Track2Data           2 23 42 7 9 */
-+618,	/* OBJ_setCext_TokenType            2 23 42 7 10 */
-+619,	/* OBJ_setCext_IssuerCapabilities   2 23 42 7 11 */
-+636,	/* OBJ_set_brand_IATA_ATA           2 23 42 8 1 */
-+640,	/* OBJ_set_brand_Visa               2 23 42 8 4 */
-+641,	/* OBJ_set_brand_MasterCard         2 23 42 8 5 */
-+637,	/* OBJ_set_brand_Diners             2 23 42 8 30 */
-+638,	/* OBJ_set_brand_AmericanExpress    2 23 42 8 34 */
-+639,	/* OBJ_set_brand_JCB                2 23 42 8 35 */
-+805,	/* OBJ_cryptopro                    1 2 643 2 2 */
-+806,	/* OBJ_cryptocom                    1 2 643 2 9 */
-+940,	/* OBJ_tc26                         1 2 643 7 1 */
-+184,	/* OBJ_X9_57                        1 2 840 10040 */
-+405,	/* OBJ_ansi_X9_62                   1 2 840 10045 */
-+389,	/* OBJ_Enterprises                  1 3 6 1 4 1 */
-+504,	/* OBJ_mime_mhs                     1 3 6 1 7 1 */
-+104,	/* OBJ_md5WithRSA                   1 3 14 3 2 3 */
-+29,	/* OBJ_des_ecb                      1 3 14 3 2 6 */
-+31,	/* OBJ_des_cbc                      1 3 14 3 2 7 */
-+45,	/* OBJ_des_ofb64                    1 3 14 3 2 8 */
-+30,	/* OBJ_des_cfb64                    1 3 14 3 2 9 */
-+377,	/* OBJ_rsaSignature                 1 3 14 3 2 11 */
-+67,	/* OBJ_dsa_2                        1 3 14 3 2 12 */
-+66,	/* OBJ_dsaWithSHA                   1 3 14 3 2 13 */
-+42,	/* OBJ_shaWithRSAEncryption         1 3 14 3 2 15 */
-+32,	/* OBJ_des_ede_ecb                  1 3 14 3 2 17 */
-+41,	/* OBJ_sha                          1 3 14 3 2 18 */
-+64,	/* OBJ_sha1                         1 3 14 3 2 26 */
-+70,	/* OBJ_dsaWithSHA1_2                1 3 14 3 2 27 */
-+115,	/* OBJ_sha1WithRSA                  1 3 14 3 2 29 */
-+117,	/* OBJ_ripemd160                    1 3 36 3 2 1 */
-+143,	/* OBJ_sxnet                        1 3 101 1 4 1 */
-+721,	/* OBJ_sect163k1                    1 3 132 0 1 */
-+722,	/* OBJ_sect163r1                    1 3 132 0 2 */
-+728,	/* OBJ_sect239k1                    1 3 132 0 3 */
-+717,	/* OBJ_sect113r1                    1 3 132 0 4 */
-+718,	/* OBJ_sect113r2                    1 3 132 0 5 */
-+704,	/* OBJ_secp112r1                    1 3 132 0 6 */
-+705,	/* OBJ_secp112r2                    1 3 132 0 7 */
-+709,	/* OBJ_secp160r1                    1 3 132 0 8 */
-+708,	/* OBJ_secp160k1                    1 3 132 0 9 */
-+714,	/* OBJ_secp256k1                    1 3 132 0 10 */
-+723,	/* OBJ_sect163r2                    1 3 132 0 15 */
-+729,	/* OBJ_sect283k1                    1 3 132 0 16 */
-+730,	/* OBJ_sect283r1                    1 3 132 0 17 */
-+719,	/* OBJ_sect131r1                    1 3 132 0 22 */
-+720,	/* OBJ_sect131r2                    1 3 132 0 23 */
-+724,	/* OBJ_sect193r1                    1 3 132 0 24 */
-+725,	/* OBJ_sect193r2                    1 3 132 0 25 */
-+726,	/* OBJ_sect233k1                    1 3 132 0 26 */
-+727,	/* OBJ_sect233r1                    1 3 132 0 27 */
-+706,	/* OBJ_secp128r1                    1 3 132 0 28 */
-+707,	/* OBJ_secp128r2                    1 3 132 0 29 */
-+710,	/* OBJ_secp160r2                    1 3 132 0 30 */
-+711,	/* OBJ_secp192k1                    1 3 132 0 31 */
-+712,	/* OBJ_secp224k1                    1 3 132 0 32 */
-+713,	/* OBJ_secp224r1                    1 3 132 0 33 */
-+715,	/* OBJ_secp384r1                    1 3 132 0 34 */
-+716,	/* OBJ_secp521r1                    1 3 132 0 35 */
-+731,	/* OBJ_sect409k1                    1 3 132 0 36 */
-+732,	/* OBJ_sect409r1                    1 3 132 0 37 */
-+733,	/* OBJ_sect571k1                    1 3 132 0 38 */
-+734,	/* OBJ_sect571r1                    1 3 132 0 39 */
-+624,	/* OBJ_set_rootKeyThumb             2 23 42 3 0 0 */
-+625,	/* OBJ_set_addPolicy                2 23 42 3 0 1 */
-+626,	/* OBJ_setAttr_Token_EMV            2 23 42 3 2 1 */
-+627,	/* OBJ_setAttr_Token_B0Prime        2 23 42 3 2 2 */
-+628,	/* OBJ_setAttr_IssCap_CVM           2 23 42 3 3 3 */
-+629,	/* OBJ_setAttr_IssCap_T2            2 23 42 3 3 4 */
-+630,	/* OBJ_setAttr_IssCap_Sig           2 23 42 3 3 5 */
-+642,	/* OBJ_set_brand_Novus              2 23 42 8 6011 */
-+735,	/* OBJ_wap_wsg_idm_ecid_wtls1       2 23 43 1 4 1 */
-+736,	/* OBJ_wap_wsg_idm_ecid_wtls3       2 23 43 1 4 3 */
-+737,	/* OBJ_wap_wsg_idm_ecid_wtls4       2 23 43 1 4 4 */
-+738,	/* OBJ_wap_wsg_idm_ecid_wtls5       2 23 43 1 4 5 */
-+739,	/* OBJ_wap_wsg_idm_ecid_wtls6       2 23 43 1 4 6 */
-+740,	/* OBJ_wap_wsg_idm_ecid_wtls7       2 23 43 1 4 7 */
-+741,	/* OBJ_wap_wsg_idm_ecid_wtls8       2 23 43 1 4 8 */
-+742,	/* OBJ_wap_wsg_idm_ecid_wtls9       2 23 43 1 4 9 */
-+743,	/* OBJ_wap_wsg_idm_ecid_wtls10      2 23 43 1 4 10 */
-+744,	/* OBJ_wap_wsg_idm_ecid_wtls11      2 23 43 1 4 11 */
-+745,	/* OBJ_wap_wsg_idm_ecid_wtls12      2 23 43 1 4 12 */
-+804,	/* OBJ_whirlpool                    1 0 10118 3 0 55 */
-+124,	/* OBJ_rle_compression              1 1 1 1 666 1 */
-+773,	/* OBJ_kisa                         1 2 410 200004 */
-+807,	/* OBJ_id_GostR3411_94_with_GostR3410_2001 1 2 643 2 2 3 */
-+808,	/* OBJ_id_GostR3411_94_with_GostR3410_94 1 2 643 2 2 4 */
-+809,	/* OBJ_id_GostR3411_94              1 2 643 2 2 9 */
-+810,	/* OBJ_id_HMACGostR3411_94          1 2 643 2 2 10 */
-+811,	/* OBJ_id_GostR3410_2001            1 2 643 2 2 19 */
-+812,	/* OBJ_id_GostR3410_94              1 2 643 2 2 20 */
-+813,	/* OBJ_id_Gost28147_89              1 2 643 2 2 21 */
-+815,	/* OBJ_id_Gost28147_89_MAC          1 2 643 2 2 22 */
-+816,	/* OBJ_id_GostR3411_94_prf          1 2 643 2 2 23 */
-+817,	/* OBJ_id_GostR3410_2001DH          1 2 643 2 2 98 */
-+818,	/* OBJ_id_GostR3410_94DH            1 2 643 2 2 99 */
-+ 1,	/* OBJ_rsadsi                       1 2 840 113549 */
-+185,	/* OBJ_X9cm                         1 2 840 10040 4 */
-+127,	/* OBJ_id_pkix                      1 3 6 1 5 5 7 */
-+505,	/* OBJ_mime_mhs_headings            1 3 6 1 7 1 1 */
-+506,	/* OBJ_mime_mhs_bodies              1 3 6 1 7 1 2 */
-+119,	/* OBJ_ripemd160WithRSA             1 3 36 3 3 1 2 */
-+631,	/* OBJ_setAttr_GenCryptgrm          2 23 42 3 3 3 1 */
-+632,	/* OBJ_setAttr_T2Enc                2 23 42 3 3 4 1 */
-+633,	/* OBJ_setAttr_T2cleartxt           2 23 42 3 3 4 2 */
-+634,	/* OBJ_setAttr_TokICCsig            2 23 42 3 3 5 1 */
-+635,	/* OBJ_setAttr_SecDevSig            2 23 42 3 3 5 2 */
-+436,	/* OBJ_ucl                          0 9 2342 19200300 */
-+820,	/* OBJ_id_Gost28147_89_None_KeyMeshing 1 2 643 2 2 14 0 */
-+819,	/* OBJ_id_Gost28147_89_CryptoPro_KeyMeshing 1 2 643 2 2 14 1 */
-+845,	/* OBJ_id_GostR3410_94_a            1 2 643 2 2 20 1 */
-+846,	/* OBJ_id_GostR3410_94_aBis         1 2 643 2 2 20 2 */
-+847,	/* OBJ_id_GostR3410_94_b            1 2 643 2 2 20 3 */
-+848,	/* OBJ_id_GostR3410_94_bBis         1 2 643 2 2 20 4 */
-+821,	/* OBJ_id_GostR3411_94_TestParamSet 1 2 643 2 2 30 0 */
-+822,	/* OBJ_id_GostR3411_94_CryptoProParamSet 1 2 643 2 2 30 1 */
-+823,	/* OBJ_id_Gost28147_89_TestParamSet 1 2 643 2 2 31 0 */
-+824,	/* OBJ_id_Gost28147_89_CryptoPro_A_ParamSet 1 2 643 2 2 31 1 */
-+825,	/* OBJ_id_Gost28147_89_CryptoPro_B_ParamSet 1 2 643 2 2 31 2 */
-+826,	/* OBJ_id_Gost28147_89_CryptoPro_C_ParamSet 1 2 643 2 2 31 3 */
-+827,	/* OBJ_id_Gost28147_89_CryptoPro_D_ParamSet 1 2 643 2 2 31 4 */
-+828,	/* OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet 1 2 643 2 2 31 5 */
-+829,	/* OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet 1 2 643 2 2 31 6 */
-+830,	/* OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet 1 2 643 2 2 31 7 */
-+831,	/* OBJ_id_GostR3410_94_TestParamSet 1 2 643 2 2 32 0 */
-+832,	/* OBJ_id_GostR3410_94_CryptoPro_A_ParamSet 1 2 643 2 2 32 2 */
-+833,	/* OBJ_id_GostR3410_94_CryptoPro_B_ParamSet 1 2 643 2 2 32 3 */
-+834,	/* OBJ_id_GostR3410_94_CryptoPro_C_ParamSet 1 2 643 2 2 32 4 */
-+835,	/* OBJ_id_GostR3410_94_CryptoPro_D_ParamSet 1 2 643 2 2 32 5 */
-+836,	/* OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet 1 2 643 2 2 33 1 */
-+837,	/* OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet 1 2 643 2 2 33 2 */
-+838,	/* OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet 1 2 643 2 2 33 3 */
-+839,	/* OBJ_id_GostR3410_2001_TestParamSet 1 2 643 2 2 35 0 */
-+840,	/* OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet 1 2 643 2 2 35 1 */
-+841,	/* OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet 1 2 643 2 2 35 2 */
-+842,	/* OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet 1 2 643 2 2 35 3 */
-+843,	/* OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet 1 2 643 2 2 36 0 */
-+844,	/* OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet 1 2 643 2 2 36 1 */
-+ 2,	/* OBJ_pkcs                         1 2 840 113549 1 */
-+431,	/* OBJ_hold_instruction_none        1 2 840 10040 2 1 */
-+432,	/* OBJ_hold_instruction_call_issuer 1 2 840 10040 2 2 */
-+433,	/* OBJ_hold_instruction_reject      1 2 840 10040 2 3 */
-+116,	/* OBJ_dsa                          1 2 840 10040 4 1 */
-+113,	/* OBJ_dsaWithSHA1                  1 2 840 10040 4 3 */
-+406,	/* OBJ_X9_62_prime_field            1 2 840 10045 1 1 */
-+407,	/* OBJ_X9_62_characteristic_two_field 1 2 840 10045 1 2 */
-+408,	/* OBJ_X9_62_id_ecPublicKey         1 2 840 10045 2 1 */
-+416,	/* OBJ_ecdsa_with_SHA1              1 2 840 10045 4 1 */
-+791,	/* OBJ_ecdsa_with_Recommended       1 2 840 10045 4 2 */
-+792,	/* OBJ_ecdsa_with_Specified         1 2 840 10045 4 3 */
-+258,	/* OBJ_id_pkix_mod                  1 3 6 1 5 5 7 0 */
-+175,	/* OBJ_id_pe                        1 3 6 1 5 5 7 1 */
-+259,	/* OBJ_id_qt                        1 3 6 1 5 5 7 2 */
-+128,	/* OBJ_id_kp                        1 3 6 1 5 5 7 3 */
-+260,	/* OBJ_id_it                        1 3 6 1 5 5 7 4 */
-+261,	/* OBJ_id_pkip                      1 3 6 1 5 5 7 5 */
-+262,	/* OBJ_id_alg                       1 3 6 1 5 5 7 6 */
-+263,	/* OBJ_id_cmc                       1 3 6 1 5 5 7 7 */
-+264,	/* OBJ_id_on                        1 3 6 1 5 5 7 8 */
-+265,	/* OBJ_id_pda                       1 3 6 1 5 5 7 9 */
-+266,	/* OBJ_id_aca                       1 3 6 1 5 5 7 10 */
-+267,	/* OBJ_id_qcs                       1 3 6 1 5 5 7 11 */
-+268,	/* OBJ_id_cct                       1 3 6 1 5 5 7 12 */
-+662,	/* OBJ_id_ppl                       1 3 6 1 5 5 7 21 */
-+176,	/* OBJ_id_ad                        1 3 6 1 5 5 7 48 */
-+507,	/* OBJ_id_hex_partial_message       1 3 6 1 7 1 1 1 */
-+508,	/* OBJ_id_hex_multipart_message     1 3 6 1 7 1 1 2 */
-+921,	/* OBJ_brainpool                    1 3 36 3 3 2 8 1 */
-+57,	/* OBJ_netscape                     2 16 840 1 113730 */
-+754,	/* OBJ_camellia_128_ecb             0 3 4401 5 3 1 9 1 */
-+766,	/* OBJ_camellia_128_ofb128          0 3 4401 5 3 1 9 3 */
-+757,	/* OBJ_camellia_128_cfb128          0 3 4401 5 3 1 9 4 */
-+755,	/* OBJ_camellia_192_ecb             0 3 4401 5 3 1 9 21 */
-+767,	/* OBJ_camellia_192_ofb128          0 3 4401 5 3 1 9 23 */
-+758,	/* OBJ_camellia_192_cfb128          0 3 4401 5 3 1 9 24 */
-+756,	/* OBJ_camellia_256_ecb             0 3 4401 5 3 1 9 41 */
-+768,	/* OBJ_camellia_256_ofb128          0 3 4401 5 3 1 9 43 */
-+759,	/* OBJ_camellia_256_cfb128          0 3 4401 5 3 1 9 44 */
-+437,	/* OBJ_pilot                        0 9 2342 19200300 100 */
-+776,	/* OBJ_seed_ecb                     1 2 410 200004 1 3 */
-+777,	/* OBJ_seed_cbc                     1 2 410 200004 1 4 */
-+779,	/* OBJ_seed_cfb128                  1 2 410 200004 1 5 */
-+778,	/* OBJ_seed_ofb128                  1 2 410 200004 1 6 */
-+852,	/* OBJ_id_GostR3411_94_with_GostR3410_94_cc 1 2 643 2 9 1 3 3 */
-+853,	/* OBJ_id_GostR3411_94_with_GostR3410_2001_cc 1 2 643 2 9 1 3 4 */
-+850,	/* OBJ_id_GostR3410_94_cc           1 2 643 2 9 1 5 3 */
-+851,	/* OBJ_id_GostR3410_2001_cc         1 2 643 2 9 1 5 4 */
-+849,	/* OBJ_id_Gost28147_89_cc           1 2 643 2 9 1 6 1 */
-+854,	/* OBJ_id_GostR3410_2001_ParamSet_cc 1 2 643 2 9 1 8 1 */
-+946,	/* OBJ_id_tc26_gost3410_2012_256    1 2 643 7 1 1 1 1 */
-+947,	/* OBJ_id_tc26_gost3410_2012_512    1 2 643 7 1 1 1 2 */
-+941,	/* OBJ_id_tc26_gost3411_2012_256    1 2 643 7 1 1 2 2 */
-+942,	/* OBJ_id_tc26_gost3411_2012_512    1 2 643 7 1 1 2 3 */
-+948,	/* OBJ_id_tc26_signwithdigest_gost3410_2012_256 1 2 643 7 1 1 3 2 */
-+949,	/* OBJ_id_tc26_signwithdigest_gost3410_2012_512 1 2 643 7 1 1 3 3 */
-+186,	/* OBJ_pkcs1                        1 2 840 113549 1 1 */
-+27,	/* OBJ_pkcs3                        1 2 840 113549 1 3 */
-+187,	/* OBJ_pkcs5                        1 2 840 113549 1 5 */
-+20,	/* OBJ_pkcs7                        1 2 840 113549 1 7 */
-+47,	/* OBJ_pkcs9                        1 2 840 113549 1 9 */
-+ 3,	/* OBJ_md2                          1 2 840 113549 2 2 */
-+257,	/* OBJ_md4                          1 2 840 113549 2 4 */
-+ 4,	/* OBJ_md5                          1 2 840 113549 2 5 */
-+797,	/* OBJ_hmacWithMD5                  1 2 840 113549 2 6 */
-+163,	/* OBJ_hmacWithSHA1                 1 2 840 113549 2 7 */
-+798,	/* OBJ_hmacWithSHA224               1 2 840 113549 2 8 */
-+799,	/* OBJ_hmacWithSHA256               1 2 840 113549 2 9 */
-+800,	/* OBJ_hmacWithSHA384               1 2 840 113549 2 10 */
-+801,	/* OBJ_hmacWithSHA512               1 2 840 113549 2 11 */
-+37,	/* OBJ_rc2_cbc                      1 2 840 113549 3 2 */
-+ 5,	/* OBJ_rc4                          1 2 840 113549 3 4 */
-+44,	/* OBJ_des_ede3_cbc                 1 2 840 113549 3 7 */
-+120,	/* OBJ_rc5_cbc                      1 2 840 113549 3 8 */
-+643,	/* OBJ_des_cdmf                     1 2 840 113549 3 10 */
-+680,	/* OBJ_X9_62_id_characteristic_two_basis 1 2 840 10045 1 2 3 */
-+684,	/* OBJ_X9_62_c2pnb163v1             1 2 840 10045 3 0 1 */
-+685,	/* OBJ_X9_62_c2pnb163v2             1 2 840 10045 3 0 2 */
-+686,	/* OBJ_X9_62_c2pnb163v3             1 2 840 10045 3 0 3 */
-+687,	/* OBJ_X9_62_c2pnb176v1             1 2 840 10045 3 0 4 */
-+688,	/* OBJ_X9_62_c2tnb191v1             1 2 840 10045 3 0 5 */
-+689,	/* OBJ_X9_62_c2tnb191v2             1 2 840 10045 3 0 6 */
-+690,	/* OBJ_X9_62_c2tnb191v3             1 2 840 10045 3 0 7 */
-+691,	/* OBJ_X9_62_c2onb191v4             1 2 840 10045 3 0 8 */
-+692,	/* OBJ_X9_62_c2onb191v5             1 2 840 10045 3 0 9 */
-+693,	/* OBJ_X9_62_c2pnb208w1             1 2 840 10045 3 0 10 */
-+694,	/* OBJ_X9_62_c2tnb239v1             1 2 840 10045 3 0 11 */
-+695,	/* OBJ_X9_62_c2tnb239v2             1 2 840 10045 3 0 12 */
-+696,	/* OBJ_X9_62_c2tnb239v3             1 2 840 10045 3 0 13 */
-+697,	/* OBJ_X9_62_c2onb239v4             1 2 840 10045 3 0 14 */
-+698,	/* OBJ_X9_62_c2onb239v5             1 2 840 10045 3 0 15 */
-+699,	/* OBJ_X9_62_c2pnb272w1             1 2 840 10045 3 0 16 */
-+700,	/* OBJ_X9_62_c2pnb304w1             1 2 840 10045 3 0 17 */
-+701,	/* OBJ_X9_62_c2tnb359v1             1 2 840 10045 3 0 18 */
-+702,	/* OBJ_X9_62_c2pnb368w1             1 2 840 10045 3 0 19 */
-+703,	/* OBJ_X9_62_c2tnb431r1             1 2 840 10045 3 0 20 */
-+409,	/* OBJ_X9_62_prime192v1             1 2 840 10045 3 1 1 */
-+410,	/* OBJ_X9_62_prime192v2             1 2 840 10045 3 1 2 */
-+411,	/* OBJ_X9_62_prime192v3             1 2 840 10045 3 1 3 */
-+412,	/* OBJ_X9_62_prime239v1             1 2 840 10045 3 1 4 */
-+413,	/* OBJ_X9_62_prime239v2             1 2 840 10045 3 1 5 */
-+414,	/* OBJ_X9_62_prime239v3             1 2 840 10045 3 1 6 */
-+415,	/* OBJ_X9_62_prime256v1             1 2 840 10045 3 1 7 */
-+793,	/* OBJ_ecdsa_with_SHA224            1 2 840 10045 4 3 1 */
-+794,	/* OBJ_ecdsa_with_SHA256            1 2 840 10045 4 3 2 */
-+795,	/* OBJ_ecdsa_with_SHA384            1 2 840 10045 4 3 3 */
-+796,	/* OBJ_ecdsa_with_SHA512            1 2 840 10045 4 3 4 */
-+269,	/* OBJ_id_pkix1_explicit_88         1 3 6 1 5 5 7 0 1 */
-+270,	/* OBJ_id_pkix1_implicit_88         1 3 6 1 5 5 7 0 2 */
-+271,	/* OBJ_id_pkix1_explicit_93         1 3 6 1 5 5 7 0 3 */
-+272,	/* OBJ_id_pkix1_implicit_93         1 3 6 1 5 5 7 0 4 */
-+273,	/* OBJ_id_mod_crmf                  1 3 6 1 5 5 7 0 5 */
-+274,	/* OBJ_id_mod_cmc                   1 3 6 1 5 5 7 0 6 */
-+275,	/* OBJ_id_mod_kea_profile_88        1 3 6 1 5 5 7 0 7 */
-+276,	/* OBJ_id_mod_kea_profile_93        1 3 6 1 5 5 7 0 8 */
-+277,	/* OBJ_id_mod_cmp                   1 3 6 1 5 5 7 0 9 */
-+278,	/* OBJ_id_mod_qualified_cert_88     1 3 6 1 5 5 7 0 10 */
-+279,	/* OBJ_id_mod_qualified_cert_93     1 3 6 1 5 5 7 0 11 */
-+280,	/* OBJ_id_mod_attribute_cert        1 3 6 1 5 5 7 0 12 */
-+281,	/* OBJ_id_mod_timestamp_protocol    1 3 6 1 5 5 7 0 13 */
-+282,	/* OBJ_id_mod_ocsp                  1 3 6 1 5 5 7 0 14 */
-+283,	/* OBJ_id_mod_dvcs                  1 3 6 1 5 5 7 0 15 */
-+284,	/* OBJ_id_mod_cmp2000               1 3 6 1 5 5 7 0 16 */
-+177,	/* OBJ_info_access                  1 3 6 1 5 5 7 1 1 */
-+285,	/* OBJ_biometricInfo                1 3 6 1 5 5 7 1 2 */
-+286,	/* OBJ_qcStatements                 1 3 6 1 5 5 7 1 3 */
-+287,	/* OBJ_ac_auditEntity               1 3 6 1 5 5 7 1 4 */
-+288,	/* OBJ_ac_targeting                 1 3 6 1 5 5 7 1 5 */
-+289,	/* OBJ_aaControls                   1 3 6 1 5 5 7 1 6 */
-+290,	/* OBJ_sbgp_ipAddrBlock             1 3 6 1 5 5 7 1 7 */
-+291,	/* OBJ_sbgp_autonomousSysNum        1 3 6 1 5 5 7 1 8 */
-+292,	/* OBJ_sbgp_routerIdentifier        1 3 6 1 5 5 7 1 9 */
-+397,	/* OBJ_ac_proxying                  1 3 6 1 5 5 7 1 10 */
-+398,	/* OBJ_sinfo_access                 1 3 6 1 5 5 7 1 11 */
-+663,	/* OBJ_proxyCertInfo                1 3 6 1 5 5 7 1 14 */
-+164,	/* OBJ_id_qt_cps                    1 3 6 1 5 5 7 2 1 */
-+165,	/* OBJ_id_qt_unotice                1 3 6 1 5 5 7 2 2 */
-+293,	/* OBJ_textNotice                   1 3 6 1 5 5 7 2 3 */
-+129,	/* OBJ_server_auth                  1 3 6 1 5 5 7 3 1 */
-+130,	/* OBJ_client_auth                  1 3 6 1 5 5 7 3 2 */
-+131,	/* OBJ_code_sign                    1 3 6 1 5 5 7 3 3 */
-+132,	/* OBJ_email_protect                1 3 6 1 5 5 7 3 4 */
-+294,	/* OBJ_ipsecEndSystem               1 3 6 1 5 5 7 3 5 */
-+295,	/* OBJ_ipsecTunnel                  1 3 6 1 5 5 7 3 6 */
-+296,	/* OBJ_ipsecUser                    1 3 6 1 5 5 7 3 7 */
-+133,	/* OBJ_time_stamp                   1 3 6 1 5 5 7 3 8 */
-+180,	/* OBJ_OCSP_sign                    1 3 6 1 5 5 7 3 9 */
-+297,	/* OBJ_dvcs                         1 3 6 1 5 5 7 3 10 */
-+298,	/* OBJ_id_it_caProtEncCert          1 3 6 1 5 5 7 4 1 */
-+299,	/* OBJ_id_it_signKeyPairTypes       1 3 6 1 5 5 7 4 2 */
-+300,	/* OBJ_id_it_encKeyPairTypes        1 3 6 1 5 5 7 4 3 */
-+301,	/* OBJ_id_it_preferredSymmAlg       1 3 6 1 5 5 7 4 4 */
-+302,	/* OBJ_id_it_caKeyUpdateInfo        1 3 6 1 5 5 7 4 5 */
-+303,	/* OBJ_id_it_currentCRL             1 3 6 1 5 5 7 4 6 */
-+304,	/* OBJ_id_it_unsupportedOIDs        1 3 6 1 5 5 7 4 7 */
-+305,	/* OBJ_id_it_subscriptionRequest    1 3 6 1 5 5 7 4 8 */
-+306,	/* OBJ_id_it_subscriptionResponse   1 3 6 1 5 5 7 4 9 */
-+307,	/* OBJ_id_it_keyPairParamReq        1 3 6 1 5 5 7 4 10 */
-+308,	/* OBJ_id_it_keyPairParamRep        1 3 6 1 5 5 7 4 11 */
-+309,	/* OBJ_id_it_revPassphrase          1 3 6 1 5 5 7 4 12 */
-+310,	/* OBJ_id_it_implicitConfirm        1 3 6 1 5 5 7 4 13 */
-+311,	/* OBJ_id_it_confirmWaitTime        1 3 6 1 5 5 7 4 14 */
-+312,	/* OBJ_id_it_origPKIMessage         1 3 6 1 5 5 7 4 15 */
-+784,	/* OBJ_id_it_suppLangTags           1 3 6 1 5 5 7 4 16 */
-+313,	/* OBJ_id_regCtrl                   1 3 6 1 5 5 7 5 1 */
-+314,	/* OBJ_id_regInfo                   1 3 6 1 5 5 7 5 2 */
-+323,	/* OBJ_id_alg_des40                 1 3 6 1 5 5 7 6 1 */
-+324,	/* OBJ_id_alg_noSignature           1 3 6 1 5 5 7 6 2 */
-+325,	/* OBJ_id_alg_dh_sig_hmac_sha1      1 3 6 1 5 5 7 6 3 */
-+326,	/* OBJ_id_alg_dh_pop                1 3 6 1 5 5 7 6 4 */
-+327,	/* OBJ_id_cmc_statusInfo            1 3 6 1 5 5 7 7 1 */
-+328,	/* OBJ_id_cmc_identification        1 3 6 1 5 5 7 7 2 */
-+329,	/* OBJ_id_cmc_identityProof         1 3 6 1 5 5 7 7 3 */
-+330,	/* OBJ_id_cmc_dataReturn            1 3 6 1 5 5 7 7 4 */
-+331,	/* OBJ_id_cmc_transactionId         1 3 6 1 5 5 7 7 5 */
-+332,	/* OBJ_id_cmc_senderNonce           1 3 6 1 5 5 7 7 6 */
-+333,	/* OBJ_id_cmc_recipientNonce        1 3 6 1 5 5 7 7 7 */
-+334,	/* OBJ_id_cmc_addExtensions         1 3 6 1 5 5 7 7 8 */
-+335,	/* OBJ_id_cmc_encryptedPOP          1 3 6 1 5 5 7 7 9 */
-+336,	/* OBJ_id_cmc_decryptedPOP          1 3 6 1 5 5 7 7 10 */
-+337,	/* OBJ_id_cmc_lraPOPWitness         1 3 6 1 5 5 7 7 11 */
-+338,	/* OBJ_id_cmc_getCert               1 3 6 1 5 5 7 7 15 */
-+339,	/* OBJ_id_cmc_getCRL                1 3 6 1 5 5 7 7 16 */
-+340,	/* OBJ_id_cmc_revokeRequest         1 3 6 1 5 5 7 7 17 */
-+341,	/* OBJ_id_cmc_regInfo               1 3 6 1 5 5 7 7 18 */
-+342,	/* OBJ_id_cmc_responseInfo          1 3 6 1 5 5 7 7 19 */
-+343,	/* OBJ_id_cmc_queryPending          1 3 6 1 5 5 7 7 21 */
-+344,	/* OBJ_id_cmc_popLinkRandom         1 3 6 1 5 5 7 7 22 */
-+345,	/* OBJ_id_cmc_popLinkWitness        1 3 6 1 5 5 7 7 23 */
-+346,	/* OBJ_id_cmc_confirmCertAcceptance 1 3 6 1 5 5 7 7 24 */
-+347,	/* OBJ_id_on_personalData           1 3 6 1 5 5 7 8 1 */
-+858,	/* OBJ_id_on_permanentIdentifier    1 3 6 1 5 5 7 8 3 */
-+348,	/* OBJ_id_pda_dateOfBirth           1 3 6 1 5 5 7 9 1 */
-+349,	/* OBJ_id_pda_placeOfBirth          1 3 6 1 5 5 7 9 2 */
-+351,	/* OBJ_id_pda_gender                1 3 6 1 5 5 7 9 3 */
-+352,	/* OBJ_id_pda_countryOfCitizenship  1 3 6 1 5 5 7 9 4 */
-+353,	/* OBJ_id_pda_countryOfResidence    1 3 6 1 5 5 7 9 5 */
-+354,	/* OBJ_id_aca_authenticationInfo    1 3 6 1 5 5 7 10 1 */
-+355,	/* OBJ_id_aca_accessIdentity        1 3 6 1 5 5 7 10 2 */
-+356,	/* OBJ_id_aca_chargingIdentity      1 3 6 1 5 5 7 10 3 */
-+357,	/* OBJ_id_aca_group                 1 3 6 1 5 5 7 10 4 */
-+358,	/* OBJ_id_aca_role                  1 3 6 1 5 5 7 10 5 */
-+399,	/* OBJ_id_aca_encAttrs              1 3 6 1 5 5 7 10 6 */
-+359,	/* OBJ_id_qcs_pkixQCSyntax_v1       1 3 6 1 5 5 7 11 1 */
-+360,	/* OBJ_id_cct_crs                   1 3 6 1 5 5 7 12 1 */
-+361,	/* OBJ_id_cct_PKIData               1 3 6 1 5 5 7 12 2 */
-+362,	/* OBJ_id_cct_PKIResponse           1 3 6 1 5 5 7 12 3 */
-+664,	/* OBJ_id_ppl_anyLanguage           1 3 6 1 5 5 7 21 0 */
-+665,	/* OBJ_id_ppl_inheritAll            1 3 6 1 5 5 7 21 1 */
-+667,	/* OBJ_Independent                  1 3 6 1 5 5 7 21 2 */
-+178,	/* OBJ_ad_OCSP                      1 3 6 1 5 5 7 48 1 */
-+179,	/* OBJ_ad_ca_issuers                1 3 6 1 5 5 7 48 2 */
-+363,	/* OBJ_ad_timeStamping              1 3 6 1 5 5 7 48 3 */
-+364,	/* OBJ_ad_dvcs                      1 3 6 1 5 5 7 48 4 */
-+785,	/* OBJ_caRepository                 1 3 6 1 5 5 7 48 5 */
-+780,	/* OBJ_hmac_md5                     1 3 6 1 5 5 8 1 1 */
-+781,	/* OBJ_hmac_sha1                    1 3 6 1 5 5 8 1 2 */
-+58,	/* OBJ_netscape_cert_extension      2 16 840 1 113730 1 */
-+59,	/* OBJ_netscape_data_type           2 16 840 1 113730 2 */
-+438,	/* OBJ_pilotAttributeType           0 9 2342 19200300 100 1 */
-+439,	/* OBJ_pilotAttributeSyntax         0 9 2342 19200300 100 3 */
-+440,	/* OBJ_pilotObjectClass             0 9 2342 19200300 100 4 */
-+441,	/* OBJ_pilotGroups                  0 9 2342 19200300 100 10 */
-+943,	/* OBJ_id_tc26_gost_3410_2012_512_paramSetA 1 2 643 7 1 2 1 2 1 */
-+944,	/* OBJ_id_tc26_gost_3410_2012_512_paramSetB 1 2 643 7 1 2 1 2 2 */
-+945,	/* OBJ_id_tc26_gost_28147_param_Z   1 2 643 7 1 2 5 1 1 */
-+108,	/* OBJ_cast5_cbc                    1 2 840 113533 7 66 10 */
-+112,	/* OBJ_pbeWithMD5AndCast5_CBC       1 2 840 113533 7 66 12 */
-+782,	/* OBJ_id_PasswordBasedMAC          1 2 840 113533 7 66 13 */
-+783,	/* OBJ_id_DHBasedMac                1 2 840 113533 7 66 30 */
-+ 6,	/* OBJ_rsaEncryption                1 2 840 113549 1 1 1 */
-+ 7,	/* OBJ_md2WithRSAEncryption         1 2 840 113549 1 1 2 */
-+396,	/* OBJ_md4WithRSAEncryption         1 2 840 113549 1 1 3 */
-+ 8,	/* OBJ_md5WithRSAEncryption         1 2 840 113549 1 1 4 */
-+65,	/* OBJ_sha1WithRSAEncryption        1 2 840 113549 1 1 5 */
-+644,	/* OBJ_rsaOAEPEncryptionSET         1 2 840 113549 1 1 6 */
-+919,	/* OBJ_rsaesOaep                    1 2 840 113549 1 1 7 */
-+911,	/* OBJ_mgf1                         1 2 840 113549 1 1 8 */
-+912,	/* OBJ_rsassaPss                    1 2 840 113549 1 1 10 */
-+668,	/* OBJ_sha256WithRSAEncryption      1 2 840 113549 1 1 11 */
-+669,	/* OBJ_sha384WithRSAEncryption      1 2 840 113549 1 1 12 */
-+670,	/* OBJ_sha512WithRSAEncryption      1 2 840 113549 1 1 13 */
-+671,	/* OBJ_sha224WithRSAEncryption      1 2 840 113549 1 1 14 */
-+28,	/* OBJ_dhKeyAgreement               1 2 840 113549 1 3 1 */
-+ 9,	/* OBJ_pbeWithMD2AndDES_CBC         1 2 840 113549 1 5 1 */
-+10,	/* OBJ_pbeWithMD5AndDES_CBC         1 2 840 113549 1 5 3 */
-+168,	/* OBJ_pbeWithMD2AndRC2_CBC         1 2 840 113549 1 5 4 */
-+169,	/* OBJ_pbeWithMD5AndRC2_CBC         1 2 840 113549 1 5 6 */
-+170,	/* OBJ_pbeWithSHA1AndDES_CBC        1 2 840 113549 1 5 10 */
-+68,	/* OBJ_pbeWithSHA1AndRC2_CBC        1 2 840 113549 1 5 11 */
-+69,	/* OBJ_id_pbkdf2                    1 2 840 113549 1 5 12 */
-+161,	/* OBJ_pbes2                        1 2 840 113549 1 5 13 */
-+162,	/* OBJ_pbmac1                       1 2 840 113549 1 5 14 */
-+21,	/* OBJ_pkcs7_data                   1 2 840 113549 1 7 1 */
-+22,	/* OBJ_pkcs7_signed                 1 2 840 113549 1 7 2 */
-+23,	/* OBJ_pkcs7_enveloped              1 2 840 113549 1 7 3 */
-+24,	/* OBJ_pkcs7_signedAndEnveloped     1 2 840 113549 1 7 4 */
-+25,	/* OBJ_pkcs7_digest                 1 2 840 113549 1 7 5 */
-+26,	/* OBJ_pkcs7_encrypted              1 2 840 113549 1 7 6 */
-+48,	/* OBJ_pkcs9_emailAddress           1 2 840 113549 1 9 1 */
-+49,	/* OBJ_pkcs9_unstructuredName       1 2 840 113549 1 9 2 */
-+50,	/* OBJ_pkcs9_contentType            1 2 840 113549 1 9 3 */
-+51,	/* OBJ_pkcs9_messageDigest          1 2 840 113549 1 9 4 */
-+52,	/* OBJ_pkcs9_signingTime            1 2 840 113549 1 9 5 */
-+53,	/* OBJ_pkcs9_countersignature       1 2 840 113549 1 9 6 */
-+54,	/* OBJ_pkcs9_challengePassword      1 2 840 113549 1 9 7 */
-+55,	/* OBJ_pkcs9_unstructuredAddress    1 2 840 113549 1 9 8 */
-+56,	/* OBJ_pkcs9_extCertAttributes      1 2 840 113549 1 9 9 */
-+172,	/* OBJ_ext_req                      1 2 840 113549 1 9 14 */
-+167,	/* OBJ_SMIMECapabilities            1 2 840 113549 1 9 15 */
-+188,	/* OBJ_SMIME                        1 2 840 113549 1 9 16 */
-+156,	/* OBJ_friendlyName                 1 2 840 113549 1 9 20 */
-+157,	/* OBJ_localKeyID                   1 2 840 113549 1 9 21 */
-+681,	/* OBJ_X9_62_onBasis                1 2 840 10045 1 2 3 1 */
-+682,	/* OBJ_X9_62_tpBasis                1 2 840 10045 1 2 3 2 */
-+683,	/* OBJ_X9_62_ppBasis                1 2 840 10045 1 2 3 3 */
-+417,	/* OBJ_ms_csp_name                  1 3 6 1 4 1 311 17 1 */
-+856,	/* OBJ_LocalKeySet                  1 3 6 1 4 1 311 17 2 */
-+390,	/* OBJ_dcObject                     1 3 6 1 4 1 1466 344 */
-+91,	/* OBJ_bf_cbc                       1 3 6 1 4 1 3029 1 2 */
-+315,	/* OBJ_id_regCtrl_regToken          1 3 6 1 5 5 7 5 1 1 */
-+316,	/* OBJ_id_regCtrl_authenticator     1 3 6 1 5 5 7 5 1 2 */
-+317,	/* OBJ_id_regCtrl_pkiPublicationInfo 1 3 6 1 5 5 7 5 1 3 */
-+318,	/* OBJ_id_regCtrl_pkiArchiveOptions 1 3 6 1 5 5 7 5 1 4 */
-+319,	/* OBJ_id_regCtrl_oldCertID         1 3 6 1 5 5 7 5 1 5 */
-+320,	/* OBJ_id_regCtrl_protocolEncrKey   1 3 6 1 5 5 7 5 1 6 */
-+321,	/* OBJ_id_regInfo_utf8Pairs         1 3 6 1 5 5 7 5 2 1 */
-+322,	/* OBJ_id_regInfo_certReq           1 3 6 1 5 5 7 5 2 2 */
-+365,	/* OBJ_id_pkix_OCSP_basic           1 3 6 1 5 5 7 48 1 1 */
-+366,	/* OBJ_id_pkix_OCSP_Nonce           1 3 6 1 5 5 7 48 1 2 */
-+367,	/* OBJ_id_pkix_OCSP_CrlID           1 3 6 1 5 5 7 48 1 3 */
-+368,	/* OBJ_id_pkix_OCSP_acceptableResponses 1 3 6 1 5 5 7 48 1 4 */
-+369,	/* OBJ_id_pkix_OCSP_noCheck         1 3 6 1 5 5 7 48 1 5 */
-+370,	/* OBJ_id_pkix_OCSP_archiveCutoff   1 3 6 1 5 5 7 48 1 6 */
-+371,	/* OBJ_id_pkix_OCSP_serviceLocator  1 3 6 1 5 5 7 48 1 7 */
-+372,	/* OBJ_id_pkix_OCSP_extendedStatus  1 3 6 1 5 5 7 48 1 8 */
-+373,	/* OBJ_id_pkix_OCSP_valid           1 3 6 1 5 5 7 48 1 9 */
-+374,	/* OBJ_id_pkix_OCSP_path            1 3 6 1 5 5 7 48 1 10 */
-+375,	/* OBJ_id_pkix_OCSP_trustRoot       1 3 6 1 5 5 7 48 1 11 */
-+922,	/* OBJ_brainpoolP160r1              1 3 36 3 3 2 8 1 1 1 */
-+923,	/* OBJ_brainpoolP160t1              1 3 36 3 3 2 8 1 1 2 */
-+924,	/* OBJ_brainpoolP192r1              1 3 36 3 3 2 8 1 1 3 */
-+925,	/* OBJ_brainpoolP192t1              1 3 36 3 3 2 8 1 1 4 */
-+926,	/* OBJ_brainpoolP224r1              1 3 36 3 3 2 8 1 1 5 */
-+927,	/* OBJ_brainpoolP224t1              1 3 36 3 3 2 8 1 1 6 */
-+928,	/* OBJ_brainpoolP256r1              1 3 36 3 3 2 8 1 1 7 */
-+929,	/* OBJ_brainpoolP256t1              1 3 36 3 3 2 8 1 1 8 */
-+930,	/* OBJ_brainpoolP320r1              1 3 36 3 3 2 8 1 1 9 */
-+931,	/* OBJ_brainpoolP320t1              1 3 36 3 3 2 8 1 1 10 */
-+932,	/* OBJ_brainpoolP384r1              1 3 36 3 3 2 8 1 1 11 */
-+933,	/* OBJ_brainpoolP384t1              1 3 36 3 3 2 8 1 1 12 */
-+934,	/* OBJ_brainpoolP512r1              1 3 36 3 3 2 8 1 1 13 */
-+935,	/* OBJ_brainpoolP512t1              1 3 36 3 3 2 8 1 1 14 */
-+418,	/* OBJ_aes_128_ecb                  2 16 840 1 101 3 4 1 1 */
-+419,	/* OBJ_aes_128_cbc                  2 16 840 1 101 3 4 1 2 */
-+420,	/* OBJ_aes_128_ofb128               2 16 840 1 101 3 4 1 3 */
-+421,	/* OBJ_aes_128_cfb128               2 16 840 1 101 3 4 1 4 */
-+788,	/* OBJ_id_aes128_wrap               2 16 840 1 101 3 4 1 5 */
-+895,	/* OBJ_aes_128_gcm                  2 16 840 1 101 3 4 1 6 */
-+896,	/* OBJ_aes_128_ccm                  2 16 840 1 101 3 4 1 7 */
-+897,	/* OBJ_id_aes128_wrap_pad           2 16 840 1 101 3 4 1 8 */
-+422,	/* OBJ_aes_192_ecb                  2 16 840 1 101 3 4 1 21 */
-+423,	/* OBJ_aes_192_cbc                  2 16 840 1 101 3 4 1 22 */
-+424,	/* OBJ_aes_192_ofb128               2 16 840 1 101 3 4 1 23 */
-+425,	/* OBJ_aes_192_cfb128               2 16 840 1 101 3 4 1 24 */
-+789,	/* OBJ_id_aes192_wrap               2 16 840 1 101 3 4 1 25 */
-+898,	/* OBJ_aes_192_gcm                  2 16 840 1 101 3 4 1 26 */
-+899,	/* OBJ_aes_192_ccm                  2 16 840 1 101 3 4 1 27 */
-+900,	/* OBJ_id_aes192_wrap_pad           2 16 840 1 101 3 4 1 28 */
-+426,	/* OBJ_aes_256_ecb                  2 16 840 1 101 3 4 1 41 */
-+427,	/* OBJ_aes_256_cbc                  2 16 840 1 101 3 4 1 42 */
-+428,	/* OBJ_aes_256_ofb128               2 16 840 1 101 3 4 1 43 */
-+429,	/* OBJ_aes_256_cfb128               2 16 840 1 101 3 4 1 44 */
-+790,	/* OBJ_id_aes256_wrap               2 16 840 1 101 3 4 1 45 */
-+901,	/* OBJ_aes_256_gcm                  2 16 840 1 101 3 4 1 46 */
-+902,	/* OBJ_aes_256_ccm                  2 16 840 1 101 3 4 1 47 */
-+903,	/* OBJ_id_aes256_wrap_pad           2 16 840 1 101 3 4 1 48 */
-+672,	/* OBJ_sha256                       2 16 840 1 101 3 4 2 1 */
-+673,	/* OBJ_sha384                       2 16 840 1 101 3 4 2 2 */
-+674,	/* OBJ_sha512                       2 16 840 1 101 3 4 2 3 */
-+675,	/* OBJ_sha224                       2 16 840 1 101 3 4 2 4 */
-+802,	/* OBJ_dsa_with_SHA224              2 16 840 1 101 3 4 3 1 */
-+803,	/* OBJ_dsa_with_SHA256              2 16 840 1 101 3 4 3 2 */
-+71,	/* OBJ_netscape_cert_type           2 16 840 1 113730 1 1 */
-+72,	/* OBJ_netscape_base_url            2 16 840 1 113730 1 2 */
-+73,	/* OBJ_netscape_revocation_url      2 16 840 1 113730 1 3 */
-+74,	/* OBJ_netscape_ca_revocation_url   2 16 840 1 113730 1 4 */
-+75,	/* OBJ_netscape_renewal_url         2 16 840 1 113730 1 7 */
-+76,	/* OBJ_netscape_ca_policy_url       2 16 840 1 113730 1 8 */
-+77,	/* OBJ_netscape_ssl_server_name     2 16 840 1 113730 1 12 */
-+78,	/* OBJ_netscape_comment             2 16 840 1 113730 1 13 */
-+79,	/* OBJ_netscape_cert_sequence       2 16 840 1 113730 2 5 */
-+139,	/* OBJ_ns_sgc                       2 16 840 1 113730 4 1 */
-+458,	/* OBJ_userId                       0 9 2342 19200300 100 1 1 */
-+459,	/* OBJ_textEncodedORAddress         0 9 2342 19200300 100 1 2 */
-+460,	/* OBJ_rfc822Mailbox                0 9 2342 19200300 100 1 3 */
-+461,	/* OBJ_info                         0 9 2342 19200300 100 1 4 */
-+462,	/* OBJ_favouriteDrink               0 9 2342 19200300 100 1 5 */
-+463,	/* OBJ_roomNumber                   0 9 2342 19200300 100 1 6 */
-+464,	/* OBJ_photo                        0 9 2342 19200300 100 1 7 */
-+465,	/* OBJ_userClass                    0 9 2342 19200300 100 1 8 */
-+466,	/* OBJ_host                         0 9 2342 19200300 100 1 9 */
-+467,	/* OBJ_manager                      0 9 2342 19200300 100 1 10 */
-+468,	/* OBJ_documentIdentifier           0 9 2342 19200300 100 1 11 */
-+469,	/* OBJ_documentTitle                0 9 2342 19200300 100 1 12 */
-+470,	/* OBJ_documentVersion              0 9 2342 19200300 100 1 13 */
-+471,	/* OBJ_documentAuthor               0 9 2342 19200300 100 1 14 */
-+472,	/* OBJ_documentLocation             0 9 2342 19200300 100 1 15 */
-+473,	/* OBJ_homeTelephoneNumber          0 9 2342 19200300 100 1 20 */
-+474,	/* OBJ_secretary                    0 9 2342 19200300 100 1 21 */
-+475,	/* OBJ_otherMailbox                 0 9 2342 19200300 100 1 22 */
-+476,	/* OBJ_lastModifiedTime             0 9 2342 19200300 100 1 23 */
-+477,	/* OBJ_lastModifiedBy               0 9 2342 19200300 100 1 24 */
-+391,	/* OBJ_domainComponent              0 9 2342 19200300 100 1 25 */
-+478,	/* OBJ_aRecord                      0 9 2342 19200300 100 1 26 */
-+479,	/* OBJ_pilotAttributeType27         0 9 2342 19200300 100 1 27 */
-+480,	/* OBJ_mXRecord                     0 9 2342 19200300 100 1 28 */
-+481,	/* OBJ_nSRecord                     0 9 2342 19200300 100 1 29 */
-+482,	/* OBJ_sOARecord                    0 9 2342 19200300 100 1 30 */
-+483,	/* OBJ_cNAMERecord                  0 9 2342 19200300 100 1 31 */
-+484,	/* OBJ_associatedDomain             0 9 2342 19200300 100 1 37 */
-+485,	/* OBJ_associatedName               0 9 2342 19200300 100 1 38 */
-+486,	/* OBJ_homePostalAddress            0 9 2342 19200300 100 1 39 */
-+487,	/* OBJ_personalTitle                0 9 2342 19200300 100 1 40 */
-+488,	/* OBJ_mobileTelephoneNumber        0 9 2342 19200300 100 1 41 */
-+489,	/* OBJ_pagerTelephoneNumber         0 9 2342 19200300 100 1 42 */
-+490,	/* OBJ_friendlyCountryName          0 9 2342 19200300 100 1 43 */
-+491,	/* OBJ_organizationalStatus         0 9 2342 19200300 100 1 45 */
-+492,	/* OBJ_janetMailbox                 0 9 2342 19200300 100 1 46 */
-+493,	/* OBJ_mailPreferenceOption         0 9 2342 19200300 100 1 47 */
-+494,	/* OBJ_buildingName                 0 9 2342 19200300 100 1 48 */
-+495,	/* OBJ_dSAQuality                   0 9 2342 19200300 100 1 49 */
-+496,	/* OBJ_singleLevelQuality           0 9 2342 19200300 100 1 50 */
-+497,	/* OBJ_subtreeMinimumQuality        0 9 2342 19200300 100 1 51 */
-+498,	/* OBJ_subtreeMaximumQuality        0 9 2342 19200300 100 1 52 */
-+499,	/* OBJ_personalSignature            0 9 2342 19200300 100 1 53 */
-+500,	/* OBJ_dITRedirect                  0 9 2342 19200300 100 1 54 */
-+501,	/* OBJ_audio                        0 9 2342 19200300 100 1 55 */
-+502,	/* OBJ_documentPublisher            0 9 2342 19200300 100 1 56 */
-+442,	/* OBJ_iA5StringSyntax              0 9 2342 19200300 100 3 4 */
-+443,	/* OBJ_caseIgnoreIA5StringSyntax    0 9 2342 19200300 100 3 5 */
-+444,	/* OBJ_pilotObject                  0 9 2342 19200300 100 4 3 */
-+445,	/* OBJ_pilotPerson                  0 9 2342 19200300 100 4 4 */
-+446,	/* OBJ_account                      0 9 2342 19200300 100 4 5 */
-+447,	/* OBJ_document                     0 9 2342 19200300 100 4 6 */
-+448,	/* OBJ_room                         0 9 2342 19200300 100 4 7 */
-+449,	/* OBJ_documentSeries               0 9 2342 19200300 100 4 9 */
-+392,	/* OBJ_Domain                       0 9 2342 19200300 100 4 13 */
-+450,	/* OBJ_rFC822localPart              0 9 2342 19200300 100 4 14 */
-+451,	/* OBJ_dNSDomain                    0 9 2342 19200300 100 4 15 */
-+452,	/* OBJ_domainRelatedObject          0 9 2342 19200300 100 4 17 */
-+453,	/* OBJ_friendlyCountry              0 9 2342 19200300 100 4 18 */
-+454,	/* OBJ_simpleSecurityObject         0 9 2342 19200300 100 4 19 */
-+455,	/* OBJ_pilotOrganization            0 9 2342 19200300 100 4 20 */
-+456,	/* OBJ_pilotDSA                     0 9 2342 19200300 100 4 21 */
-+457,	/* OBJ_qualityLabelledData          0 9 2342 19200300 100 4 22 */
-+936,	/* OBJ_FRP256v1                     1 2 250 1 223 101 256 1 */
-+189,	/* OBJ_id_smime_mod                 1 2 840 113549 1 9 16 0 */
-+190,	/* OBJ_id_smime_ct                  1 2 840 113549 1 9 16 1 */
-+191,	/* OBJ_id_smime_aa                  1 2 840 113549 1 9 16 2 */
-+192,	/* OBJ_id_smime_alg                 1 2 840 113549 1 9 16 3 */
-+193,	/* OBJ_id_smime_cd                  1 2 840 113549 1 9 16 4 */
-+194,	/* OBJ_id_smime_spq                 1 2 840 113549 1 9 16 5 */
-+195,	/* OBJ_id_smime_cti                 1 2 840 113549 1 9 16 6 */
-+158,	/* OBJ_x509Certificate              1 2 840 113549 1 9 22 1 */
-+159,	/* OBJ_sdsiCertificate              1 2 840 113549 1 9 22 2 */
-+160,	/* OBJ_x509Crl                      1 2 840 113549 1 9 23 1 */
-+144,	/* OBJ_pbe_WithSHA1And128BitRC4     1 2 840 113549 1 12 1 1 */
-+145,	/* OBJ_pbe_WithSHA1And40BitRC4      1 2 840 113549 1 12 1 2 */
-+146,	/* OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC 1 2 840 113549 1 12 1 3 */
-+147,	/* OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC 1 2 840 113549 1 12 1 4 */
-+148,	/* OBJ_pbe_WithSHA1And128BitRC2_CBC 1 2 840 113549 1 12 1 5 */
-+149,	/* OBJ_pbe_WithSHA1And40BitRC2_CBC  1 2 840 113549 1 12 1 6 */
-+171,	/* OBJ_ms_ext_req                   1 3 6 1 4 1 311 2 1 14 */
-+134,	/* OBJ_ms_code_ind                  1 3 6 1 4 1 311 2 1 21 */
-+135,	/* OBJ_ms_code_com                  1 3 6 1 4 1 311 2 1 22 */
-+136,	/* OBJ_ms_ctl_sign                  1 3 6 1 4 1 311 10 3 1 */
-+137,	/* OBJ_ms_sgc                       1 3 6 1 4 1 311 10 3 3 */
-+138,	/* OBJ_ms_efs                       1 3 6 1 4 1 311 10 3 4 */
-+648,	/* OBJ_ms_smartcard_login           1 3 6 1 4 1 311 20 2 2 */
-+649,	/* OBJ_ms_upn                       1 3 6 1 4 1 311 20 2 3 */
-+751,	/* OBJ_camellia_128_cbc             1 2 392 200011 61 1 1 1 2 */
-+752,	/* OBJ_camellia_192_cbc             1 2 392 200011 61 1 1 1 3 */
-+753,	/* OBJ_camellia_256_cbc             1 2 392 200011 61 1 1 1 4 */
-+907,	/* OBJ_id_camellia128_wrap          1 2 392 200011 61 1 1 3 2 */
-+908,	/* OBJ_id_camellia192_wrap          1 2 392 200011 61 1 1 3 3 */
-+909,	/* OBJ_id_camellia256_wrap          1 2 392 200011 61 1 1 3 4 */
-+196,	/* OBJ_id_smime_mod_cms             1 2 840 113549 1 9 16 0 1 */
-+197,	/* OBJ_id_smime_mod_ess             1 2 840 113549 1 9 16 0 2 */
-+198,	/* OBJ_id_smime_mod_oid             1 2 840 113549 1 9 16 0 3 */
-+199,	/* OBJ_id_smime_mod_msg_v3          1 2 840 113549 1 9 16 0 4 */
-+200,	/* OBJ_id_smime_mod_ets_eSignature_88 1 2 840 113549 1 9 16 0 5 */
-+201,	/* OBJ_id_smime_mod_ets_eSignature_97 1 2 840 113549 1 9 16 0 6 */
-+202,	/* OBJ_id_smime_mod_ets_eSigPolicy_88 1 2 840 113549 1 9 16 0 7 */
-+203,	/* OBJ_id_smime_mod_ets_eSigPolicy_97 1 2 840 113549 1 9 16 0 8 */
-+204,	/* OBJ_id_smime_ct_receipt          1 2 840 113549 1 9 16 1 1 */
-+205,	/* OBJ_id_smime_ct_authData         1 2 840 113549 1 9 16 1 2 */
-+206,	/* OBJ_id_smime_ct_publishCert      1 2 840 113549 1 9 16 1 3 */
-+207,	/* OBJ_id_smime_ct_TSTInfo          1 2 840 113549 1 9 16 1 4 */
-+208,	/* OBJ_id_smime_ct_TDTInfo          1 2 840 113549 1 9 16 1 5 */
-+209,	/* OBJ_id_smime_ct_contentInfo      1 2 840 113549 1 9 16 1 6 */
-+210,	/* OBJ_id_smime_ct_DVCSRequestData  1 2 840 113549 1 9 16 1 7 */
-+211,	/* OBJ_id_smime_ct_DVCSResponseData 1 2 840 113549 1 9 16 1 8 */
-+786,	/* OBJ_id_smime_ct_compressedData   1 2 840 113549 1 9 16 1 9 */
-+787,	/* OBJ_id_ct_asciiTextWithCRLF      1 2 840 113549 1 9 16 1 27 */
-+212,	/* OBJ_id_smime_aa_receiptRequest   1 2 840 113549 1 9 16 2 1 */
-+213,	/* OBJ_id_smime_aa_securityLabel    1 2 840 113549 1 9 16 2 2 */
-+214,	/* OBJ_id_smime_aa_mlExpandHistory  1 2 840 113549 1 9 16 2 3 */
-+215,	/* OBJ_id_smime_aa_contentHint      1 2 840 113549 1 9 16 2 4 */
-+216,	/* OBJ_id_smime_aa_msgSigDigest     1 2 840 113549 1 9 16 2 5 */
-+217,	/* OBJ_id_smime_aa_encapContentType 1 2 840 113549 1 9 16 2 6 */
-+218,	/* OBJ_id_smime_aa_contentIdentifier 1 2 840 113549 1 9 16 2 7 */
-+219,	/* OBJ_id_smime_aa_macValue         1 2 840 113549 1 9 16 2 8 */
-+220,	/* OBJ_id_smime_aa_equivalentLabels 1 2 840 113549 1 9 16 2 9 */
-+221,	/* OBJ_id_smime_aa_contentReference 1 2 840 113549 1 9 16 2 10 */
-+222,	/* OBJ_id_smime_aa_encrypKeyPref    1 2 840 113549 1 9 16 2 11 */
-+223,	/* OBJ_id_smime_aa_signingCertificate 1 2 840 113549 1 9 16 2 12 */
-+224,	/* OBJ_id_smime_aa_smimeEncryptCerts 1 2 840 113549 1 9 16 2 13 */
-+225,	/* OBJ_id_smime_aa_timeStampToken   1 2 840 113549 1 9 16 2 14 */
-+226,	/* OBJ_id_smime_aa_ets_sigPolicyId  1 2 840 113549 1 9 16 2 15 */
-+227,	/* OBJ_id_smime_aa_ets_commitmentType 1 2 840 113549 1 9 16 2 16 */
-+228,	/* OBJ_id_smime_aa_ets_signerLocation 1 2 840 113549 1 9 16 2 17 */
-+229,	/* OBJ_id_smime_aa_ets_signerAttr   1 2 840 113549 1 9 16 2 18 */
-+230,	/* OBJ_id_smime_aa_ets_otherSigCert 1 2 840 113549 1 9 16 2 19 */
-+231,	/* OBJ_id_smime_aa_ets_contentTimestamp 1 2 840 113549 1 9 16 2 20 */
-+232,	/* OBJ_id_smime_aa_ets_CertificateRefs 1 2 840 113549 1 9 16 2 21 */
-+233,	/* OBJ_id_smime_aa_ets_RevocationRefs 1 2 840 113549 1 9 16 2 22 */
-+234,	/* OBJ_id_smime_aa_ets_certValues   1 2 840 113549 1 9 16 2 23 */
-+235,	/* OBJ_id_smime_aa_ets_revocationValues 1 2 840 113549 1 9 16 2 24 */
-+236,	/* OBJ_id_smime_aa_ets_escTimeStamp 1 2 840 113549 1 9 16 2 25 */
-+237,	/* OBJ_id_smime_aa_ets_certCRLTimestamp 1 2 840 113549 1 9 16 2 26 */
-+238,	/* OBJ_id_smime_aa_ets_archiveTimeStamp 1 2 840 113549 1 9 16 2 27 */
-+239,	/* OBJ_id_smime_aa_signatureType    1 2 840 113549 1 9 16 2 28 */
-+240,	/* OBJ_id_smime_aa_dvcs_dvc         1 2 840 113549 1 9 16 2 29 */
-+241,	/* OBJ_id_smime_alg_ESDHwith3DES    1 2 840 113549 1 9 16 3 1 */
-+242,	/* OBJ_id_smime_alg_ESDHwithRC2     1 2 840 113549 1 9 16 3 2 */
-+243,	/* OBJ_id_smime_alg_3DESwrap        1 2 840 113549 1 9 16 3 3 */
-+244,	/* OBJ_id_smime_alg_RC2wrap         1 2 840 113549 1 9 16 3 4 */
-+245,	/* OBJ_id_smime_alg_ESDH            1 2 840 113549 1 9 16 3 5 */
-+246,	/* OBJ_id_smime_alg_CMS3DESwrap     1 2 840 113549 1 9 16 3 6 */
-+247,	/* OBJ_id_smime_alg_CMSRC2wrap      1 2 840 113549 1 9 16 3 7 */
-+125,	/* OBJ_zlib_compression             1 2 840 113549 1 9 16 3 8 */
-+893,	/* OBJ_id_alg_PWRI_KEK              1 2 840 113549 1 9 16 3 9 */
-+248,	/* OBJ_id_smime_cd_ldap             1 2 840 113549 1 9 16 4 1 */
-+249,	/* OBJ_id_smime_spq_ets_sqt_uri     1 2 840 113549 1 9 16 5 1 */
-+250,	/* OBJ_id_smime_spq_ets_sqt_unotice 1 2 840 113549 1 9 16 5 2 */
-+251,	/* OBJ_id_smime_cti_ets_proofOfOrigin 1 2 840 113549 1 9 16 6 1 */
-+252,	/* OBJ_id_smime_cti_ets_proofOfReceipt 1 2 840 113549 1 9 16 6 2 */
-+253,	/* OBJ_id_smime_cti_ets_proofOfDelivery 1 2 840 113549 1 9 16 6 3 */
-+254,	/* OBJ_id_smime_cti_ets_proofOfSender 1 2 840 113549 1 9 16 6 4 */
-+255,	/* OBJ_id_smime_cti_ets_proofOfApproval 1 2 840 113549 1 9 16 6 5 */
-+256,	/* OBJ_id_smime_cti_ets_proofOfCreation 1 2 840 113549 1 9 16 6 6 */
-+150,	/* OBJ_keyBag                       1 2 840 113549 1 12 10 1 1 */
-+151,	/* OBJ_pkcs8ShroudedKeyBag          1 2 840 113549 1 12 10 1 2 */
-+152,	/* OBJ_certBag                      1 2 840 113549 1 12 10 1 3 */
-+153,	/* OBJ_crlBag                       1 2 840 113549 1 12 10 1 4 */
-+154,	/* OBJ_secretBag                    1 2 840 113549 1 12 10 1 5 */
-+155,	/* OBJ_safeContentsBag              1 2 840 113549 1 12 10 1 6 */
-+34,	/* OBJ_idea_cbc                     1 3 6 1 4 1 188 7 1 1 2 */
-+};
-+
-diff --git a/src/lib/libcrypto/objects/obj_mac.h b/src/lib/libcrypto/objects/obj_mac.h
-new file mode 100644
-index 0000000..f727262
---- /dev/null
-+++ b/src/lib/libcrypto/objects/obj_mac.h
-@@ -0,0 +1,4156 @@
-+/* crypto/objects/obj_mac.h */
-+
-+/* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
-+ * following command:
-+ * perl objects.pl objects.txt obj_mac.num obj_mac.h
-+ */
-+
-+/* Copyright (C) 1995-1997 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.]
-+ */
-+
-+#define SN_undef			"UNDEF"
-+#define LN_undef			"undefined"
-+#define NID_undef			0
-+#define OBJ_undef			0L
-+
-+#define SN_itu_t		"ITU-T"
-+#define LN_itu_t		"itu-t"
-+#define NID_itu_t		645
-+#define OBJ_itu_t		0L
-+
-+#define NID_ccitt		404
-+#define OBJ_ccitt		OBJ_itu_t
-+
-+#define SN_iso		"ISO"
-+#define LN_iso		"iso"
-+#define NID_iso		181
-+#define OBJ_iso		1L
-+
-+#define SN_joint_iso_itu_t		"JOINT-ISO-ITU-T"
-+#define LN_joint_iso_itu_t		"joint-iso-itu-t"
-+#define NID_joint_iso_itu_t		646
-+#define OBJ_joint_iso_itu_t		2L
-+
-+#define NID_joint_iso_ccitt		393
-+#define OBJ_joint_iso_ccitt		OBJ_joint_iso_itu_t
-+
-+#define SN_member_body		"member-body"
-+#define LN_member_body		"ISO Member Body"
-+#define NID_member_body		182
-+#define OBJ_member_body		OBJ_iso,2L
-+
-+#define SN_identified_organization		"identified-organization"
-+#define NID_identified_organization		676
-+#define OBJ_identified_organization		OBJ_iso,3L
-+
-+#define SN_hmac_md5		"HMAC-MD5"
-+#define LN_hmac_md5		"hmac-md5"
-+#define NID_hmac_md5		780
-+#define OBJ_hmac_md5		OBJ_identified_organization,6L,1L,5L,5L,8L,1L,1L
-+
-+#define SN_hmac_sha1		"HMAC-SHA1"
-+#define LN_hmac_sha1		"hmac-sha1"
-+#define NID_hmac_sha1		781
-+#define OBJ_hmac_sha1		OBJ_identified_organization,6L,1L,5L,5L,8L,1L,2L
-+
-+#define SN_certicom_arc		"certicom-arc"
-+#define NID_certicom_arc		677
-+#define OBJ_certicom_arc		OBJ_identified_organization,132L
-+
-+#define SN_international_organizations		"international-organizations"
-+#define LN_international_organizations		"International Organizations"
-+#define NID_international_organizations		647
-+#define OBJ_international_organizations		OBJ_joint_iso_itu_t,23L
-+
-+#define SN_wap		"wap"
-+#define NID_wap		678
-+#define OBJ_wap		OBJ_international_organizations,43L
-+
-+#define SN_wap_wsg		"wap-wsg"
-+#define NID_wap_wsg		679
-+#define OBJ_wap_wsg		OBJ_wap,1L
-+
-+#define SN_selected_attribute_types		"selected-attribute-types"
-+#define LN_selected_attribute_types		"Selected Attribute Types"
-+#define NID_selected_attribute_types		394
-+#define OBJ_selected_attribute_types		OBJ_joint_iso_itu_t,5L,1L,5L
-+
-+#define SN_clearance		"clearance"
-+#define NID_clearance		395
-+#define OBJ_clearance		OBJ_selected_attribute_types,55L
-+
-+#define SN_ISO_US		"ISO-US"
-+#define LN_ISO_US		"ISO US Member Body"
-+#define NID_ISO_US		183
-+#define OBJ_ISO_US		OBJ_member_body,840L
-+
-+#define SN_X9_57		"X9-57"
-+#define LN_X9_57		"X9.57"
-+#define NID_X9_57		184
-+#define OBJ_X9_57		OBJ_ISO_US,10040L
-+
-+#define SN_X9cm		"X9cm"
-+#define LN_X9cm		"X9.57 CM ?"
-+#define NID_X9cm		185
-+#define OBJ_X9cm		OBJ_X9_57,4L
-+
-+#define SN_dsa		"DSA"
-+#define LN_dsa		"dsaEncryption"
-+#define NID_dsa		116
-+#define OBJ_dsa		OBJ_X9cm,1L
-+
-+#define SN_dsaWithSHA1		"DSA-SHA1"
-+#define LN_dsaWithSHA1		"dsaWithSHA1"
-+#define NID_dsaWithSHA1		113
-+#define OBJ_dsaWithSHA1		OBJ_X9cm,3L
-+
-+#define SN_ansi_X9_62		"ansi-X9-62"
-+#define LN_ansi_X9_62		"ANSI X9.62"
-+#define NID_ansi_X9_62		405
-+#define OBJ_ansi_X9_62		OBJ_ISO_US,10045L
-+
-+#define OBJ_X9_62_id_fieldType		OBJ_ansi_X9_62,1L
-+
-+#define SN_X9_62_prime_field		"prime-field"
-+#define NID_X9_62_prime_field		406
-+#define OBJ_X9_62_prime_field		OBJ_X9_62_id_fieldType,1L
-+
-+#define SN_X9_62_characteristic_two_field		"characteristic-two-field"
-+#define NID_X9_62_characteristic_two_field		407
-+#define OBJ_X9_62_characteristic_two_field		OBJ_X9_62_id_fieldType,2L
-+
-+#define SN_X9_62_id_characteristic_two_basis		"id-characteristic-two-basis"
-+#define NID_X9_62_id_characteristic_two_basis		680
-+#define OBJ_X9_62_id_characteristic_two_basis		OBJ_X9_62_characteristic_two_field,3L
-+
-+#define SN_X9_62_onBasis		"onBasis"
-+#define NID_X9_62_onBasis		681
-+#define OBJ_X9_62_onBasis		OBJ_X9_62_id_characteristic_two_basis,1L
-+
-+#define SN_X9_62_tpBasis		"tpBasis"
-+#define NID_X9_62_tpBasis		682
-+#define OBJ_X9_62_tpBasis		OBJ_X9_62_id_characteristic_two_basis,2L
-+
-+#define SN_X9_62_ppBasis		"ppBasis"
-+#define NID_X9_62_ppBasis		683
-+#define OBJ_X9_62_ppBasis		OBJ_X9_62_id_characteristic_two_basis,3L
-+
-+#define OBJ_X9_62_id_publicKeyType		OBJ_ansi_X9_62,2L
-+
-+#define SN_X9_62_id_ecPublicKey		"id-ecPublicKey"
-+#define NID_X9_62_id_ecPublicKey		408
-+#define OBJ_X9_62_id_ecPublicKey		OBJ_X9_62_id_publicKeyType,1L
-+
-+#define OBJ_X9_62_ellipticCurve		OBJ_ansi_X9_62,3L
-+
-+#define OBJ_X9_62_c_TwoCurve		OBJ_X9_62_ellipticCurve,0L
-+
-+#define SN_X9_62_c2pnb163v1		"c2pnb163v1"
-+#define NID_X9_62_c2pnb163v1		684
-+#define OBJ_X9_62_c2pnb163v1		OBJ_X9_62_c_TwoCurve,1L
-+
-+#define SN_X9_62_c2pnb163v2		"c2pnb163v2"
-+#define NID_X9_62_c2pnb163v2		685
-+#define OBJ_X9_62_c2pnb163v2		OBJ_X9_62_c_TwoCurve,2L
-+
-+#define SN_X9_62_c2pnb163v3		"c2pnb163v3"
-+#define NID_X9_62_c2pnb163v3		686
-+#define OBJ_X9_62_c2pnb163v3		OBJ_X9_62_c_TwoCurve,3L
-+
-+#define SN_X9_62_c2pnb176v1		"c2pnb176v1"
-+#define NID_X9_62_c2pnb176v1		687
-+#define OBJ_X9_62_c2pnb176v1		OBJ_X9_62_c_TwoCurve,4L
-+
-+#define SN_X9_62_c2tnb191v1		"c2tnb191v1"
-+#define NID_X9_62_c2tnb191v1		688
-+#define OBJ_X9_62_c2tnb191v1		OBJ_X9_62_c_TwoCurve,5L
-+
-+#define SN_X9_62_c2tnb191v2		"c2tnb191v2"
-+#define NID_X9_62_c2tnb191v2		689
-+#define OBJ_X9_62_c2tnb191v2		OBJ_X9_62_c_TwoCurve,6L
-+
-+#define SN_X9_62_c2tnb191v3		"c2tnb191v3"
-+#define NID_X9_62_c2tnb191v3		690
-+#define OBJ_X9_62_c2tnb191v3		OBJ_X9_62_c_TwoCurve,7L
-+
-+#define SN_X9_62_c2onb191v4		"c2onb191v4"
-+#define NID_X9_62_c2onb191v4		691
-+#define OBJ_X9_62_c2onb191v4		OBJ_X9_62_c_TwoCurve,8L
-+
-+#define SN_X9_62_c2onb191v5		"c2onb191v5"
-+#define NID_X9_62_c2onb191v5		692
-+#define OBJ_X9_62_c2onb191v5		OBJ_X9_62_c_TwoCurve,9L
-+
-+#define SN_X9_62_c2pnb208w1		"c2pnb208w1"
-+#define NID_X9_62_c2pnb208w1		693
-+#define OBJ_X9_62_c2pnb208w1		OBJ_X9_62_c_TwoCurve,10L
-+
-+#define SN_X9_62_c2tnb239v1		"c2tnb239v1"
-+#define NID_X9_62_c2tnb239v1		694
-+#define OBJ_X9_62_c2tnb239v1		OBJ_X9_62_c_TwoCurve,11L
-+
-+#define SN_X9_62_c2tnb239v2		"c2tnb239v2"
-+#define NID_X9_62_c2tnb239v2		695
-+#define OBJ_X9_62_c2tnb239v2		OBJ_X9_62_c_TwoCurve,12L
-+
-+#define SN_X9_62_c2tnb239v3		"c2tnb239v3"
-+#define NID_X9_62_c2tnb239v3		696
-+#define OBJ_X9_62_c2tnb239v3		OBJ_X9_62_c_TwoCurve,13L
-+
-+#define SN_X9_62_c2onb239v4		"c2onb239v4"
-+#define NID_X9_62_c2onb239v4		697
-+#define OBJ_X9_62_c2onb239v4		OBJ_X9_62_c_TwoCurve,14L
-+
-+#define SN_X9_62_c2onb239v5		"c2onb239v5"
-+#define NID_X9_62_c2onb239v5		698
-+#define OBJ_X9_62_c2onb239v5		OBJ_X9_62_c_TwoCurve,15L
-+
-+#define SN_X9_62_c2pnb272w1		"c2pnb272w1"
-+#define NID_X9_62_c2pnb272w1		699
-+#define OBJ_X9_62_c2pnb272w1		OBJ_X9_62_c_TwoCurve,16L
-+
-+#define SN_X9_62_c2pnb304w1		"c2pnb304w1"
-+#define NID_X9_62_c2pnb304w1		700
-+#define OBJ_X9_62_c2pnb304w1		OBJ_X9_62_c_TwoCurve,17L
-+
-+#define SN_X9_62_c2tnb359v1		"c2tnb359v1"
-+#define NID_X9_62_c2tnb359v1		701
-+#define OBJ_X9_62_c2tnb359v1		OBJ_X9_62_c_TwoCurve,18L
-+
-+#define SN_X9_62_c2pnb368w1		"c2pnb368w1"
-+#define NID_X9_62_c2pnb368w1		702
-+#define OBJ_X9_62_c2pnb368w1		OBJ_X9_62_c_TwoCurve,19L
-+
-+#define SN_X9_62_c2tnb431r1		"c2tnb431r1"
-+#define NID_X9_62_c2tnb431r1		703
-+#define OBJ_X9_62_c2tnb431r1		OBJ_X9_62_c_TwoCurve,20L
-+
-+#define OBJ_X9_62_primeCurve		OBJ_X9_62_ellipticCurve,1L
-+
-+#define SN_X9_62_prime192v1		"prime192v1"
-+#define NID_X9_62_prime192v1		409
-+#define OBJ_X9_62_prime192v1		OBJ_X9_62_primeCurve,1L
-+
-+#define SN_X9_62_prime192v2		"prime192v2"
-+#define NID_X9_62_prime192v2		410
-+#define OBJ_X9_62_prime192v2		OBJ_X9_62_primeCurve,2L
-+
-+#define SN_X9_62_prime192v3		"prime192v3"
-+#define NID_X9_62_prime192v3		411
-+#define OBJ_X9_62_prime192v3		OBJ_X9_62_primeCurve,3L
-+
-+#define SN_X9_62_prime239v1		"prime239v1"
-+#define NID_X9_62_prime239v1		412
-+#define OBJ_X9_62_prime239v1		OBJ_X9_62_primeCurve,4L
-+
-+#define SN_X9_62_prime239v2		"prime239v2"
-+#define NID_X9_62_prime239v2		413
-+#define OBJ_X9_62_prime239v2		OBJ_X9_62_primeCurve,5L
-+
-+#define SN_X9_62_prime239v3		"prime239v3"
-+#define NID_X9_62_prime239v3		414
-+#define OBJ_X9_62_prime239v3		OBJ_X9_62_primeCurve,6L
-+
-+#define SN_X9_62_prime256v1		"prime256v1"
-+#define NID_X9_62_prime256v1		415
-+#define OBJ_X9_62_prime256v1		OBJ_X9_62_primeCurve,7L
-+
-+#define OBJ_X9_62_id_ecSigType		OBJ_ansi_X9_62,4L
-+
-+#define SN_ecdsa_with_SHA1		"ecdsa-with-SHA1"
-+#define NID_ecdsa_with_SHA1		416
-+#define OBJ_ecdsa_with_SHA1		OBJ_X9_62_id_ecSigType,1L
-+
-+#define SN_ecdsa_with_Recommended		"ecdsa-with-Recommended"
-+#define NID_ecdsa_with_Recommended		791
-+#define OBJ_ecdsa_with_Recommended		OBJ_X9_62_id_ecSigType,2L
-+
-+#define SN_ecdsa_with_Specified		"ecdsa-with-Specified"
-+#define NID_ecdsa_with_Specified		792
-+#define OBJ_ecdsa_with_Specified		OBJ_X9_62_id_ecSigType,3L
-+
-+#define SN_ecdsa_with_SHA224		"ecdsa-with-SHA224"
-+#define NID_ecdsa_with_SHA224		793
-+#define OBJ_ecdsa_with_SHA224		OBJ_ecdsa_with_Specified,1L
-+
-+#define SN_ecdsa_with_SHA256		"ecdsa-with-SHA256"
-+#define NID_ecdsa_with_SHA256		794
-+#define OBJ_ecdsa_with_SHA256		OBJ_ecdsa_with_Specified,2L
-+
-+#define SN_ecdsa_with_SHA384		"ecdsa-with-SHA384"
-+#define NID_ecdsa_with_SHA384		795
-+#define OBJ_ecdsa_with_SHA384		OBJ_ecdsa_with_Specified,3L
-+
-+#define SN_ecdsa_with_SHA512		"ecdsa-with-SHA512"
-+#define NID_ecdsa_with_SHA512		796
-+#define OBJ_ecdsa_with_SHA512		OBJ_ecdsa_with_Specified,4L
-+
-+#define OBJ_secg_ellipticCurve		OBJ_certicom_arc,0L
-+
-+#define SN_secp112r1		"secp112r1"
-+#define NID_secp112r1		704
-+#define OBJ_secp112r1		OBJ_secg_ellipticCurve,6L
-+
-+#define SN_secp112r2		"secp112r2"
-+#define NID_secp112r2		705
-+#define OBJ_secp112r2		OBJ_secg_ellipticCurve,7L
-+
-+#define SN_secp128r1		"secp128r1"
-+#define NID_secp128r1		706
-+#define OBJ_secp128r1		OBJ_secg_ellipticCurve,28L
-+
-+#define SN_secp128r2		"secp128r2"
-+#define NID_secp128r2		707
-+#define OBJ_secp128r2		OBJ_secg_ellipticCurve,29L
-+
-+#define SN_secp160k1		"secp160k1"
-+#define NID_secp160k1		708
-+#define OBJ_secp160k1		OBJ_secg_ellipticCurve,9L
-+
-+#define SN_secp160r1		"secp160r1"
-+#define NID_secp160r1		709
-+#define OBJ_secp160r1		OBJ_secg_ellipticCurve,8L
-+
-+#define SN_secp160r2		"secp160r2"
-+#define NID_secp160r2		710
-+#define OBJ_secp160r2		OBJ_secg_ellipticCurve,30L
-+
-+#define SN_secp192k1		"secp192k1"
-+#define NID_secp192k1		711
-+#define OBJ_secp192k1		OBJ_secg_ellipticCurve,31L
-+
-+#define SN_secp224k1		"secp224k1"
-+#define NID_secp224k1		712
-+#define OBJ_secp224k1		OBJ_secg_ellipticCurve,32L
-+
-+#define SN_secp224r1		"secp224r1"
-+#define NID_secp224r1		713
-+#define OBJ_secp224r1		OBJ_secg_ellipticCurve,33L
-+
-+#define SN_secp256k1		"secp256k1"
-+#define NID_secp256k1		714
-+#define OBJ_secp256k1		OBJ_secg_ellipticCurve,10L
-+
-+#define SN_secp384r1		"secp384r1"
-+#define NID_secp384r1		715
-+#define OBJ_secp384r1		OBJ_secg_ellipticCurve,34L
-+
-+#define SN_secp521r1		"secp521r1"
-+#define NID_secp521r1		716
-+#define OBJ_secp521r1		OBJ_secg_ellipticCurve,35L
-+
-+#define SN_sect113r1		"sect113r1"
-+#define NID_sect113r1		717
-+#define OBJ_sect113r1		OBJ_secg_ellipticCurve,4L
-+
-+#define SN_sect113r2		"sect113r2"
-+#define NID_sect113r2		718
-+#define OBJ_sect113r2		OBJ_secg_ellipticCurve,5L
-+
-+#define SN_sect131r1		"sect131r1"
-+#define NID_sect131r1		719
-+#define OBJ_sect131r1		OBJ_secg_ellipticCurve,22L
-+
-+#define SN_sect131r2		"sect131r2"
-+#define NID_sect131r2		720
-+#define OBJ_sect131r2		OBJ_secg_ellipticCurve,23L
-+
-+#define SN_sect163k1		"sect163k1"
-+#define NID_sect163k1		721
-+#define OBJ_sect163k1		OBJ_secg_ellipticCurve,1L
-+
-+#define SN_sect163r1		"sect163r1"
-+#define NID_sect163r1		722
-+#define OBJ_sect163r1		OBJ_secg_ellipticCurve,2L
-+
-+#define SN_sect163r2		"sect163r2"
-+#define NID_sect163r2		723
-+#define OBJ_sect163r2		OBJ_secg_ellipticCurve,15L
-+
-+#define SN_sect193r1		"sect193r1"
-+#define NID_sect193r1		724
-+#define OBJ_sect193r1		OBJ_secg_ellipticCurve,24L
-+
-+#define SN_sect193r2		"sect193r2"
-+#define NID_sect193r2		725
-+#define OBJ_sect193r2		OBJ_secg_ellipticCurve,25L
-+
-+#define SN_sect233k1		"sect233k1"
-+#define NID_sect233k1		726
-+#define OBJ_sect233k1		OBJ_secg_ellipticCurve,26L
-+
-+#define SN_sect233r1		"sect233r1"
-+#define NID_sect233r1		727
-+#define OBJ_sect233r1		OBJ_secg_ellipticCurve,27L
-+
-+#define SN_sect239k1		"sect239k1"
-+#define NID_sect239k1		728
-+#define OBJ_sect239k1		OBJ_secg_ellipticCurve,3L
-+
-+#define SN_sect283k1		"sect283k1"
-+#define NID_sect283k1		729
-+#define OBJ_sect283k1		OBJ_secg_ellipticCurve,16L
-+
-+#define SN_sect283r1		"sect283r1"
-+#define NID_sect283r1		730
-+#define OBJ_sect283r1		OBJ_secg_ellipticCurve,17L
-+
-+#define SN_sect409k1		"sect409k1"
-+#define NID_sect409k1		731
-+#define OBJ_sect409k1		OBJ_secg_ellipticCurve,36L
-+
-+#define SN_sect409r1		"sect409r1"
-+#define NID_sect409r1		732
-+#define OBJ_sect409r1		OBJ_secg_ellipticCurve,37L
-+
-+#define SN_sect571k1		"sect571k1"
-+#define NID_sect571k1		733
-+#define OBJ_sect571k1		OBJ_secg_ellipticCurve,38L
-+
-+#define SN_sect571r1		"sect571r1"
-+#define NID_sect571r1		734
-+#define OBJ_sect571r1		OBJ_secg_ellipticCurve,39L
-+
-+#define OBJ_wap_wsg_idm_ecid		OBJ_wap_wsg,4L
-+
-+#define SN_wap_wsg_idm_ecid_wtls1		"wap-wsg-idm-ecid-wtls1"
-+#define NID_wap_wsg_idm_ecid_wtls1		735
-+#define OBJ_wap_wsg_idm_ecid_wtls1		OBJ_wap_wsg_idm_ecid,1L
-+
-+#define SN_wap_wsg_idm_ecid_wtls3		"wap-wsg-idm-ecid-wtls3"
-+#define NID_wap_wsg_idm_ecid_wtls3		736
-+#define OBJ_wap_wsg_idm_ecid_wtls3		OBJ_wap_wsg_idm_ecid,3L
-+
-+#define SN_wap_wsg_idm_ecid_wtls4		"wap-wsg-idm-ecid-wtls4"
-+#define NID_wap_wsg_idm_ecid_wtls4		737
-+#define OBJ_wap_wsg_idm_ecid_wtls4		OBJ_wap_wsg_idm_ecid,4L
-+
-+#define SN_wap_wsg_idm_ecid_wtls5		"wap-wsg-idm-ecid-wtls5"
-+#define NID_wap_wsg_idm_ecid_wtls5		738
-+#define OBJ_wap_wsg_idm_ecid_wtls5		OBJ_wap_wsg_idm_ecid,5L
-+
-+#define SN_wap_wsg_idm_ecid_wtls6		"wap-wsg-idm-ecid-wtls6"
-+#define NID_wap_wsg_idm_ecid_wtls6		739
-+#define OBJ_wap_wsg_idm_ecid_wtls6		OBJ_wap_wsg_idm_ecid,6L
-+
-+#define SN_wap_wsg_idm_ecid_wtls7		"wap-wsg-idm-ecid-wtls7"
-+#define NID_wap_wsg_idm_ecid_wtls7		740
-+#define OBJ_wap_wsg_idm_ecid_wtls7		OBJ_wap_wsg_idm_ecid,7L
-+
-+#define SN_wap_wsg_idm_ecid_wtls8		"wap-wsg-idm-ecid-wtls8"
-+#define NID_wap_wsg_idm_ecid_wtls8		741
-+#define OBJ_wap_wsg_idm_ecid_wtls8		OBJ_wap_wsg_idm_ecid,8L
-+
-+#define SN_wap_wsg_idm_ecid_wtls9		"wap-wsg-idm-ecid-wtls9"
-+#define NID_wap_wsg_idm_ecid_wtls9		742
-+#define OBJ_wap_wsg_idm_ecid_wtls9		OBJ_wap_wsg_idm_ecid,9L
-+
-+#define SN_wap_wsg_idm_ecid_wtls10		"wap-wsg-idm-ecid-wtls10"
-+#define NID_wap_wsg_idm_ecid_wtls10		743
-+#define OBJ_wap_wsg_idm_ecid_wtls10		OBJ_wap_wsg_idm_ecid,10L
-+
-+#define SN_wap_wsg_idm_ecid_wtls11		"wap-wsg-idm-ecid-wtls11"
-+#define NID_wap_wsg_idm_ecid_wtls11		744
-+#define OBJ_wap_wsg_idm_ecid_wtls11		OBJ_wap_wsg_idm_ecid,11L
-+
-+#define SN_wap_wsg_idm_ecid_wtls12		"wap-wsg-idm-ecid-wtls12"
-+#define NID_wap_wsg_idm_ecid_wtls12		745
-+#define OBJ_wap_wsg_idm_ecid_wtls12		OBJ_wap_wsg_idm_ecid,12L
-+
-+#define SN_cast5_cbc		"CAST5-CBC"
-+#define LN_cast5_cbc		"cast5-cbc"
-+#define NID_cast5_cbc		108
-+#define OBJ_cast5_cbc		OBJ_ISO_US,113533L,7L,66L,10L
-+
-+#define SN_cast5_ecb		"CAST5-ECB"
-+#define LN_cast5_ecb		"cast5-ecb"
-+#define NID_cast5_ecb		109
-+
-+#define SN_cast5_cfb64		"CAST5-CFB"
-+#define LN_cast5_cfb64		"cast5-cfb"
-+#define NID_cast5_cfb64		110
-+
-+#define SN_cast5_ofb64		"CAST5-OFB"
-+#define LN_cast5_ofb64		"cast5-ofb"
-+#define NID_cast5_ofb64		111
-+
-+#define LN_pbeWithMD5AndCast5_CBC		"pbeWithMD5AndCast5CBC"
-+#define NID_pbeWithMD5AndCast5_CBC		112
-+#define OBJ_pbeWithMD5AndCast5_CBC		OBJ_ISO_US,113533L,7L,66L,12L
-+
-+#define SN_id_PasswordBasedMAC		"id-PasswordBasedMAC"
-+#define LN_id_PasswordBasedMAC		"password based MAC"
-+#define NID_id_PasswordBasedMAC		782
-+#define OBJ_id_PasswordBasedMAC		OBJ_ISO_US,113533L,7L,66L,13L
-+
-+#define SN_id_DHBasedMac		"id-DHBasedMac"
-+#define LN_id_DHBasedMac		"Diffie-Hellman based MAC"
-+#define NID_id_DHBasedMac		783
-+#define OBJ_id_DHBasedMac		OBJ_ISO_US,113533L,7L,66L,30L
-+
-+#define SN_rsadsi		"rsadsi"
-+#define LN_rsadsi		"RSA Data Security, Inc."
-+#define NID_rsadsi		1
-+#define OBJ_rsadsi		OBJ_ISO_US,113549L
-+
-+#define SN_pkcs		"pkcs"
-+#define LN_pkcs		"RSA Data Security, Inc. PKCS"
-+#define NID_pkcs		2
-+#define OBJ_pkcs		OBJ_rsadsi,1L
-+
-+#define SN_pkcs1		"pkcs1"
-+#define NID_pkcs1		186
-+#define OBJ_pkcs1		OBJ_pkcs,1L
-+
-+#define LN_rsaEncryption		"rsaEncryption"
-+#define NID_rsaEncryption		6
-+#define OBJ_rsaEncryption		OBJ_pkcs1,1L
-+
-+#define SN_md2WithRSAEncryption		"RSA-MD2"
-+#define LN_md2WithRSAEncryption		"md2WithRSAEncryption"
-+#define NID_md2WithRSAEncryption		7
-+#define OBJ_md2WithRSAEncryption		OBJ_pkcs1,2L
-+
-+#define SN_md4WithRSAEncryption		"RSA-MD4"
-+#define LN_md4WithRSAEncryption		"md4WithRSAEncryption"
-+#define NID_md4WithRSAEncryption		396
-+#define OBJ_md4WithRSAEncryption		OBJ_pkcs1,3L
-+
-+#define SN_md5WithRSAEncryption		"RSA-MD5"
-+#define LN_md5WithRSAEncryption		"md5WithRSAEncryption"
-+#define NID_md5WithRSAEncryption		8
-+#define OBJ_md5WithRSAEncryption		OBJ_pkcs1,4L
-+
-+#define SN_sha1WithRSAEncryption		"RSA-SHA1"
-+#define LN_sha1WithRSAEncryption		"sha1WithRSAEncryption"
-+#define NID_sha1WithRSAEncryption		65
-+#define OBJ_sha1WithRSAEncryption		OBJ_pkcs1,5L
-+
-+#define SN_rsaesOaep		"RSAES-OAEP"
-+#define LN_rsaesOaep		"rsaesOaep"
-+#define NID_rsaesOaep		919
-+#define OBJ_rsaesOaep		OBJ_pkcs1,7L
-+
-+#define SN_mgf1		"MGF1"
-+#define LN_mgf1		"mgf1"
-+#define NID_mgf1		911
-+#define OBJ_mgf1		OBJ_pkcs1,8L
-+
-+#define SN_rsassaPss		"RSASSA-PSS"
-+#define LN_rsassaPss		"rsassaPss"
-+#define NID_rsassaPss		912
-+#define OBJ_rsassaPss		OBJ_pkcs1,10L
-+
-+#define SN_sha256WithRSAEncryption		"RSA-SHA256"
-+#define LN_sha256WithRSAEncryption		"sha256WithRSAEncryption"
-+#define NID_sha256WithRSAEncryption		668
-+#define OBJ_sha256WithRSAEncryption		OBJ_pkcs1,11L
-+
-+#define SN_sha384WithRSAEncryption		"RSA-SHA384"
-+#define LN_sha384WithRSAEncryption		"sha384WithRSAEncryption"
-+#define NID_sha384WithRSAEncryption		669
-+#define OBJ_sha384WithRSAEncryption		OBJ_pkcs1,12L
-+
-+#define SN_sha512WithRSAEncryption		"RSA-SHA512"
-+#define LN_sha512WithRSAEncryption		"sha512WithRSAEncryption"
-+#define NID_sha512WithRSAEncryption		670
-+#define OBJ_sha512WithRSAEncryption		OBJ_pkcs1,13L
-+
-+#define SN_sha224WithRSAEncryption		"RSA-SHA224"
-+#define LN_sha224WithRSAEncryption		"sha224WithRSAEncryption"
-+#define NID_sha224WithRSAEncryption		671
-+#define OBJ_sha224WithRSAEncryption		OBJ_pkcs1,14L
-+
-+#define SN_pkcs3		"pkcs3"
-+#define NID_pkcs3		27
-+#define OBJ_pkcs3		OBJ_pkcs,3L
-+
-+#define LN_dhKeyAgreement		"dhKeyAgreement"
-+#define NID_dhKeyAgreement		28
-+#define OBJ_dhKeyAgreement		OBJ_pkcs3,1L
-+
-+#define SN_pkcs5		"pkcs5"
-+#define NID_pkcs5		187
-+#define OBJ_pkcs5		OBJ_pkcs,5L
-+
-+#define SN_pbeWithMD2AndDES_CBC		"PBE-MD2-DES"
-+#define LN_pbeWithMD2AndDES_CBC		"pbeWithMD2AndDES-CBC"
-+#define NID_pbeWithMD2AndDES_CBC		9
-+#define OBJ_pbeWithMD2AndDES_CBC		OBJ_pkcs5,1L
-+
-+#define SN_pbeWithMD5AndDES_CBC		"PBE-MD5-DES"
-+#define LN_pbeWithMD5AndDES_CBC		"pbeWithMD5AndDES-CBC"
-+#define NID_pbeWithMD5AndDES_CBC		10
-+#define OBJ_pbeWithMD5AndDES_CBC		OBJ_pkcs5,3L
-+
-+#define SN_pbeWithMD2AndRC2_CBC		"PBE-MD2-RC2-64"
-+#define LN_pbeWithMD2AndRC2_CBC		"pbeWithMD2AndRC2-CBC"
-+#define NID_pbeWithMD2AndRC2_CBC		168
-+#define OBJ_pbeWithMD2AndRC2_CBC		OBJ_pkcs5,4L
-+
-+#define SN_pbeWithMD5AndRC2_CBC		"PBE-MD5-RC2-64"
-+#define LN_pbeWithMD5AndRC2_CBC		"pbeWithMD5AndRC2-CBC"
-+#define NID_pbeWithMD5AndRC2_CBC		169
-+#define OBJ_pbeWithMD5AndRC2_CBC		OBJ_pkcs5,6L
-+
-+#define SN_pbeWithSHA1AndDES_CBC		"PBE-SHA1-DES"
-+#define LN_pbeWithSHA1AndDES_CBC		"pbeWithSHA1AndDES-CBC"
-+#define NID_pbeWithSHA1AndDES_CBC		170
-+#define OBJ_pbeWithSHA1AndDES_CBC		OBJ_pkcs5,10L
-+
-+#define SN_pbeWithSHA1AndRC2_CBC		"PBE-SHA1-RC2-64"
-+#define LN_pbeWithSHA1AndRC2_CBC		"pbeWithSHA1AndRC2-CBC"
-+#define NID_pbeWithSHA1AndRC2_CBC		68
-+#define OBJ_pbeWithSHA1AndRC2_CBC		OBJ_pkcs5,11L
-+
-+#define LN_id_pbkdf2		"PBKDF2"
-+#define NID_id_pbkdf2		69
-+#define OBJ_id_pbkdf2		OBJ_pkcs5,12L
-+
-+#define LN_pbes2		"PBES2"
-+#define NID_pbes2		161
-+#define OBJ_pbes2		OBJ_pkcs5,13L
-+
-+#define LN_pbmac1		"PBMAC1"
-+#define NID_pbmac1		162
-+#define OBJ_pbmac1		OBJ_pkcs5,14L
-+
-+#define SN_pkcs7		"pkcs7"
-+#define NID_pkcs7		20
-+#define OBJ_pkcs7		OBJ_pkcs,7L
-+
-+#define LN_pkcs7_data		"pkcs7-data"
-+#define NID_pkcs7_data		21
-+#define OBJ_pkcs7_data		OBJ_pkcs7,1L
-+
-+#define LN_pkcs7_signed		"pkcs7-signedData"
-+#define NID_pkcs7_signed		22
-+#define OBJ_pkcs7_signed		OBJ_pkcs7,2L
-+
-+#define LN_pkcs7_enveloped		"pkcs7-envelopedData"
-+#define NID_pkcs7_enveloped		23
-+#define OBJ_pkcs7_enveloped		OBJ_pkcs7,3L
-+
-+#define LN_pkcs7_signedAndEnveloped		"pkcs7-signedAndEnvelopedData"
-+#define NID_pkcs7_signedAndEnveloped		24
-+#define OBJ_pkcs7_signedAndEnveloped		OBJ_pkcs7,4L
-+
-+#define LN_pkcs7_digest		"pkcs7-digestData"
-+#define NID_pkcs7_digest		25
-+#define OBJ_pkcs7_digest		OBJ_pkcs7,5L
-+
-+#define LN_pkcs7_encrypted		"pkcs7-encryptedData"
-+#define NID_pkcs7_encrypted		26
-+#define OBJ_pkcs7_encrypted		OBJ_pkcs7,6L
-+
-+#define SN_pkcs9		"pkcs9"
-+#define NID_pkcs9		47
-+#define OBJ_pkcs9		OBJ_pkcs,9L
-+
-+#define LN_pkcs9_emailAddress		"emailAddress"
-+#define NID_pkcs9_emailAddress		48
-+#define OBJ_pkcs9_emailAddress		OBJ_pkcs9,1L
-+
-+#define LN_pkcs9_unstructuredName		"unstructuredName"
-+#define NID_pkcs9_unstructuredName		49
-+#define OBJ_pkcs9_unstructuredName		OBJ_pkcs9,2L
-+
-+#define LN_pkcs9_contentType		"contentType"
-+#define NID_pkcs9_contentType		50
-+#define OBJ_pkcs9_contentType		OBJ_pkcs9,3L
-+
-+#define LN_pkcs9_messageDigest		"messageDigest"
-+#define NID_pkcs9_messageDigest		51
-+#define OBJ_pkcs9_messageDigest		OBJ_pkcs9,4L
-+
-+#define LN_pkcs9_signingTime		"signingTime"
-+#define NID_pkcs9_signingTime		52
-+#define OBJ_pkcs9_signingTime		OBJ_pkcs9,5L
-+
-+#define LN_pkcs9_countersignature		"countersignature"
-+#define NID_pkcs9_countersignature		53
-+#define OBJ_pkcs9_countersignature		OBJ_pkcs9,6L
-+
-+#define LN_pkcs9_challengePassword		"challengePassword"
-+#define NID_pkcs9_challengePassword		54
-+#define OBJ_pkcs9_challengePassword		OBJ_pkcs9,7L
-+
-+#define LN_pkcs9_unstructuredAddress		"unstructuredAddress"
-+#define NID_pkcs9_unstructuredAddress		55
-+#define OBJ_pkcs9_unstructuredAddress		OBJ_pkcs9,8L
-+
-+#define LN_pkcs9_extCertAttributes		"extendedCertificateAttributes"
-+#define NID_pkcs9_extCertAttributes		56
-+#define OBJ_pkcs9_extCertAttributes		OBJ_pkcs9,9L
-+
-+#define SN_ext_req		"extReq"
-+#define LN_ext_req		"Extension Request"
-+#define NID_ext_req		172
-+#define OBJ_ext_req		OBJ_pkcs9,14L
-+
-+#define SN_SMIMECapabilities		"SMIME-CAPS"
-+#define LN_SMIMECapabilities		"S/MIME Capabilities"
-+#define NID_SMIMECapabilities		167
-+#define OBJ_SMIMECapabilities		OBJ_pkcs9,15L
-+
-+#define SN_SMIME		"SMIME"
-+#define LN_SMIME		"S/MIME"
-+#define NID_SMIME		188
-+#define OBJ_SMIME		OBJ_pkcs9,16L
-+
-+#define SN_id_smime_mod		"id-smime-mod"
-+#define NID_id_smime_mod		189
-+#define OBJ_id_smime_mod		OBJ_SMIME,0L
-+
-+#define SN_id_smime_ct		"id-smime-ct"
-+#define NID_id_smime_ct		190
-+#define OBJ_id_smime_ct		OBJ_SMIME,1L
-+
-+#define SN_id_smime_aa		"id-smime-aa"
-+#define NID_id_smime_aa		191
-+#define OBJ_id_smime_aa		OBJ_SMIME,2L
-+
-+#define SN_id_smime_alg		"id-smime-alg"
-+#define NID_id_smime_alg		192
-+#define OBJ_id_smime_alg		OBJ_SMIME,3L
-+
-+#define SN_id_smime_cd		"id-smime-cd"
-+#define NID_id_smime_cd		193
-+#define OBJ_id_smime_cd		OBJ_SMIME,4L
-+
-+#define SN_id_smime_spq		"id-smime-spq"
-+#define NID_id_smime_spq		194
-+#define OBJ_id_smime_spq		OBJ_SMIME,5L
-+
-+#define SN_id_smime_cti		"id-smime-cti"
-+#define NID_id_smime_cti		195
-+#define OBJ_id_smime_cti		OBJ_SMIME,6L
-+
-+#define SN_id_smime_mod_cms		"id-smime-mod-cms"
-+#define NID_id_smime_mod_cms		196
-+#define OBJ_id_smime_mod_cms		OBJ_id_smime_mod,1L
-+
-+#define SN_id_smime_mod_ess		"id-smime-mod-ess"
-+#define NID_id_smime_mod_ess		197
-+#define OBJ_id_smime_mod_ess		OBJ_id_smime_mod,2L
-+
-+#define SN_id_smime_mod_oid		"id-smime-mod-oid"
-+#define NID_id_smime_mod_oid		198
-+#define OBJ_id_smime_mod_oid		OBJ_id_smime_mod,3L
-+
-+#define SN_id_smime_mod_msg_v3		"id-smime-mod-msg-v3"
-+#define NID_id_smime_mod_msg_v3		199
-+#define OBJ_id_smime_mod_msg_v3		OBJ_id_smime_mod,4L
-+
-+#define SN_id_smime_mod_ets_eSignature_88		"id-smime-mod-ets-eSignature-88"
-+#define NID_id_smime_mod_ets_eSignature_88		200
-+#define OBJ_id_smime_mod_ets_eSignature_88		OBJ_id_smime_mod,5L
-+
-+#define SN_id_smime_mod_ets_eSignature_97		"id-smime-mod-ets-eSignature-97"
-+#define NID_id_smime_mod_ets_eSignature_97		201
-+#define OBJ_id_smime_mod_ets_eSignature_97		OBJ_id_smime_mod,6L
-+
-+#define SN_id_smime_mod_ets_eSigPolicy_88		"id-smime-mod-ets-eSigPolicy-88"
-+#define NID_id_smime_mod_ets_eSigPolicy_88		202
-+#define OBJ_id_smime_mod_ets_eSigPolicy_88		OBJ_id_smime_mod,7L
-+
-+#define SN_id_smime_mod_ets_eSigPolicy_97		"id-smime-mod-ets-eSigPolicy-97"
-+#define NID_id_smime_mod_ets_eSigPolicy_97		203
-+#define OBJ_id_smime_mod_ets_eSigPolicy_97		OBJ_id_smime_mod,8L
-+
-+#define SN_id_smime_ct_receipt		"id-smime-ct-receipt"
-+#define NID_id_smime_ct_receipt		204
-+#define OBJ_id_smime_ct_receipt		OBJ_id_smime_ct,1L
-+
-+#define SN_id_smime_ct_authData		"id-smime-ct-authData"
-+#define NID_id_smime_ct_authData		205
-+#define OBJ_id_smime_ct_authData		OBJ_id_smime_ct,2L
-+
-+#define SN_id_smime_ct_publishCert		"id-smime-ct-publishCert"
-+#define NID_id_smime_ct_publishCert		206
-+#define OBJ_id_smime_ct_publishCert		OBJ_id_smime_ct,3L
-+
-+#define SN_id_smime_ct_TSTInfo		"id-smime-ct-TSTInfo"
-+#define NID_id_smime_ct_TSTInfo		207
-+#define OBJ_id_smime_ct_TSTInfo		OBJ_id_smime_ct,4L
-+
-+#define SN_id_smime_ct_TDTInfo		"id-smime-ct-TDTInfo"
-+#define NID_id_smime_ct_TDTInfo		208
-+#define OBJ_id_smime_ct_TDTInfo		OBJ_id_smime_ct,5L
-+
-+#define SN_id_smime_ct_contentInfo		"id-smime-ct-contentInfo"
-+#define NID_id_smime_ct_contentInfo		209
-+#define OBJ_id_smime_ct_contentInfo		OBJ_id_smime_ct,6L
-+
-+#define SN_id_smime_ct_DVCSRequestData		"id-smime-ct-DVCSRequestData"
-+#define NID_id_smime_ct_DVCSRequestData		210
-+#define OBJ_id_smime_ct_DVCSRequestData		OBJ_id_smime_ct,7L
-+
-+#define SN_id_smime_ct_DVCSResponseData		"id-smime-ct-DVCSResponseData"
-+#define NID_id_smime_ct_DVCSResponseData		211
-+#define OBJ_id_smime_ct_DVCSResponseData		OBJ_id_smime_ct,8L
-+
-+#define SN_id_smime_ct_compressedData		"id-smime-ct-compressedData"
-+#define NID_id_smime_ct_compressedData		786
-+#define OBJ_id_smime_ct_compressedData		OBJ_id_smime_ct,9L
-+
-+#define SN_id_ct_asciiTextWithCRLF		"id-ct-asciiTextWithCRLF"
-+#define NID_id_ct_asciiTextWithCRLF		787
-+#define OBJ_id_ct_asciiTextWithCRLF		OBJ_id_smime_ct,27L
-+
-+#define SN_id_smime_aa_receiptRequest		"id-smime-aa-receiptRequest"
-+#define NID_id_smime_aa_receiptRequest		212
-+#define OBJ_id_smime_aa_receiptRequest		OBJ_id_smime_aa,1L
-+
-+#define SN_id_smime_aa_securityLabel		"id-smime-aa-securityLabel"
-+#define NID_id_smime_aa_securityLabel		213
-+#define OBJ_id_smime_aa_securityLabel		OBJ_id_smime_aa,2L
-+
-+#define SN_id_smime_aa_mlExpandHistory		"id-smime-aa-mlExpandHistory"
-+#define NID_id_smime_aa_mlExpandHistory		214
-+#define OBJ_id_smime_aa_mlExpandHistory		OBJ_id_smime_aa,3L
-+
-+#define SN_id_smime_aa_contentHint		"id-smime-aa-contentHint"
-+#define NID_id_smime_aa_contentHint		215
-+#define OBJ_id_smime_aa_contentHint		OBJ_id_smime_aa,4L
-+
-+#define SN_id_smime_aa_msgSigDigest		"id-smime-aa-msgSigDigest"
-+#define NID_id_smime_aa_msgSigDigest		216
-+#define OBJ_id_smime_aa_msgSigDigest		OBJ_id_smime_aa,5L
-+
-+#define SN_id_smime_aa_encapContentType		"id-smime-aa-encapContentType"
-+#define NID_id_smime_aa_encapContentType		217
-+#define OBJ_id_smime_aa_encapContentType		OBJ_id_smime_aa,6L
-+
-+#define SN_id_smime_aa_contentIdentifier		"id-smime-aa-contentIdentifier"
-+#define NID_id_smime_aa_contentIdentifier		218
-+#define OBJ_id_smime_aa_contentIdentifier		OBJ_id_smime_aa,7L
-+
-+#define SN_id_smime_aa_macValue		"id-smime-aa-macValue"
-+#define NID_id_smime_aa_macValue		219
-+#define OBJ_id_smime_aa_macValue		OBJ_id_smime_aa,8L
-+
-+#define SN_id_smime_aa_equivalentLabels		"id-smime-aa-equivalentLabels"
-+#define NID_id_smime_aa_equivalentLabels		220
-+#define OBJ_id_smime_aa_equivalentLabels		OBJ_id_smime_aa,9L
-+
-+#define SN_id_smime_aa_contentReference		"id-smime-aa-contentReference"
-+#define NID_id_smime_aa_contentReference		221
-+#define OBJ_id_smime_aa_contentReference		OBJ_id_smime_aa,10L
-+
-+#define SN_id_smime_aa_encrypKeyPref		"id-smime-aa-encrypKeyPref"
-+#define NID_id_smime_aa_encrypKeyPref		222
-+#define OBJ_id_smime_aa_encrypKeyPref		OBJ_id_smime_aa,11L
-+
-+#define SN_id_smime_aa_signingCertificate		"id-smime-aa-signingCertificate"
-+#define NID_id_smime_aa_signingCertificate		223
-+#define OBJ_id_smime_aa_signingCertificate		OBJ_id_smime_aa,12L
-+
-+#define SN_id_smime_aa_smimeEncryptCerts		"id-smime-aa-smimeEncryptCerts"
-+#define NID_id_smime_aa_smimeEncryptCerts		224
-+#define OBJ_id_smime_aa_smimeEncryptCerts		OBJ_id_smime_aa,13L
-+
-+#define SN_id_smime_aa_timeStampToken		"id-smime-aa-timeStampToken"
-+#define NID_id_smime_aa_timeStampToken		225
-+#define OBJ_id_smime_aa_timeStampToken		OBJ_id_smime_aa,14L
-+
-+#define SN_id_smime_aa_ets_sigPolicyId		"id-smime-aa-ets-sigPolicyId"
-+#define NID_id_smime_aa_ets_sigPolicyId		226
-+#define OBJ_id_smime_aa_ets_sigPolicyId		OBJ_id_smime_aa,15L
-+
-+#define SN_id_smime_aa_ets_commitmentType		"id-smime-aa-ets-commitmentType"
-+#define NID_id_smime_aa_ets_commitmentType		227
-+#define OBJ_id_smime_aa_ets_commitmentType		OBJ_id_smime_aa,16L
-+
-+#define SN_id_smime_aa_ets_signerLocation		"id-smime-aa-ets-signerLocation"
-+#define NID_id_smime_aa_ets_signerLocation		228
-+#define OBJ_id_smime_aa_ets_signerLocation		OBJ_id_smime_aa,17L
-+
-+#define SN_id_smime_aa_ets_signerAttr		"id-smime-aa-ets-signerAttr"
-+#define NID_id_smime_aa_ets_signerAttr		229
-+#define OBJ_id_smime_aa_ets_signerAttr		OBJ_id_smime_aa,18L
-+
-+#define SN_id_smime_aa_ets_otherSigCert		"id-smime-aa-ets-otherSigCert"
-+#define NID_id_smime_aa_ets_otherSigCert		230
-+#define OBJ_id_smime_aa_ets_otherSigCert		OBJ_id_smime_aa,19L
-+
-+#define SN_id_smime_aa_ets_contentTimestamp		"id-smime-aa-ets-contentTimestamp"
-+#define NID_id_smime_aa_ets_contentTimestamp		231
-+#define OBJ_id_smime_aa_ets_contentTimestamp		OBJ_id_smime_aa,20L
-+
-+#define SN_id_smime_aa_ets_CertificateRefs		"id-smime-aa-ets-CertificateRefs"
-+#define NID_id_smime_aa_ets_CertificateRefs		232
-+#define OBJ_id_smime_aa_ets_CertificateRefs		OBJ_id_smime_aa,21L
-+
-+#define SN_id_smime_aa_ets_RevocationRefs		"id-smime-aa-ets-RevocationRefs"
-+#define NID_id_smime_aa_ets_RevocationRefs		233
-+#define OBJ_id_smime_aa_ets_RevocationRefs		OBJ_id_smime_aa,22L
-+
-+#define SN_id_smime_aa_ets_certValues		"id-smime-aa-ets-certValues"
-+#define NID_id_smime_aa_ets_certValues		234
-+#define OBJ_id_smime_aa_ets_certValues		OBJ_id_smime_aa,23L
-+
-+#define SN_id_smime_aa_ets_revocationValues		"id-smime-aa-ets-revocationValues"
-+#define NID_id_smime_aa_ets_revocationValues		235
-+#define OBJ_id_smime_aa_ets_revocationValues		OBJ_id_smime_aa,24L
-+
-+#define SN_id_smime_aa_ets_escTimeStamp		"id-smime-aa-ets-escTimeStamp"
-+#define NID_id_smime_aa_ets_escTimeStamp		236
-+#define OBJ_id_smime_aa_ets_escTimeStamp		OBJ_id_smime_aa,25L
-+
-+#define SN_id_smime_aa_ets_certCRLTimestamp		"id-smime-aa-ets-certCRLTimestamp"
-+#define NID_id_smime_aa_ets_certCRLTimestamp		237
-+#define OBJ_id_smime_aa_ets_certCRLTimestamp		OBJ_id_smime_aa,26L
-+
-+#define SN_id_smime_aa_ets_archiveTimeStamp		"id-smime-aa-ets-archiveTimeStamp"
-+#define NID_id_smime_aa_ets_archiveTimeStamp		238
-+#define OBJ_id_smime_aa_ets_archiveTimeStamp		OBJ_id_smime_aa,27L
-+
-+#define SN_id_smime_aa_signatureType		"id-smime-aa-signatureType"
-+#define NID_id_smime_aa_signatureType		239
-+#define OBJ_id_smime_aa_signatureType		OBJ_id_smime_aa,28L
-+
-+#define SN_id_smime_aa_dvcs_dvc		"id-smime-aa-dvcs-dvc"
-+#define NID_id_smime_aa_dvcs_dvc		240
-+#define OBJ_id_smime_aa_dvcs_dvc		OBJ_id_smime_aa,29L
-+
-+#define SN_id_smime_alg_ESDHwith3DES		"id-smime-alg-ESDHwith3DES"
-+#define NID_id_smime_alg_ESDHwith3DES		241
-+#define OBJ_id_smime_alg_ESDHwith3DES		OBJ_id_smime_alg,1L
-+
-+#define SN_id_smime_alg_ESDHwithRC2		"id-smime-alg-ESDHwithRC2"
-+#define NID_id_smime_alg_ESDHwithRC2		242
-+#define OBJ_id_smime_alg_ESDHwithRC2		OBJ_id_smime_alg,2L
-+
-+#define SN_id_smime_alg_3DESwrap		"id-smime-alg-3DESwrap"
-+#define NID_id_smime_alg_3DESwrap		243
-+#define OBJ_id_smime_alg_3DESwrap		OBJ_id_smime_alg,3L
-+
-+#define SN_id_smime_alg_RC2wrap		"id-smime-alg-RC2wrap"
-+#define NID_id_smime_alg_RC2wrap		244
-+#define OBJ_id_smime_alg_RC2wrap		OBJ_id_smime_alg,4L
-+
-+#define SN_id_smime_alg_ESDH		"id-smime-alg-ESDH"
-+#define NID_id_smime_alg_ESDH		245
-+#define OBJ_id_smime_alg_ESDH		OBJ_id_smime_alg,5L
-+
-+#define SN_id_smime_alg_CMS3DESwrap		"id-smime-alg-CMS3DESwrap"
-+#define NID_id_smime_alg_CMS3DESwrap		246
-+#define OBJ_id_smime_alg_CMS3DESwrap		OBJ_id_smime_alg,6L
-+
-+#define SN_id_smime_alg_CMSRC2wrap		"id-smime-alg-CMSRC2wrap"
-+#define NID_id_smime_alg_CMSRC2wrap		247
-+#define OBJ_id_smime_alg_CMSRC2wrap		OBJ_id_smime_alg,7L
-+
-+#define SN_id_alg_PWRI_KEK		"id-alg-PWRI-KEK"
-+#define NID_id_alg_PWRI_KEK		893
-+#define OBJ_id_alg_PWRI_KEK		OBJ_id_smime_alg,9L
-+
-+#define SN_id_smime_cd_ldap		"id-smime-cd-ldap"
-+#define NID_id_smime_cd_ldap		248
-+#define OBJ_id_smime_cd_ldap		OBJ_id_smime_cd,1L
-+
-+#define SN_id_smime_spq_ets_sqt_uri		"id-smime-spq-ets-sqt-uri"
-+#define NID_id_smime_spq_ets_sqt_uri		249
-+#define OBJ_id_smime_spq_ets_sqt_uri		OBJ_id_smime_spq,1L
-+
-+#define SN_id_smime_spq_ets_sqt_unotice		"id-smime-spq-ets-sqt-unotice"
-+#define NID_id_smime_spq_ets_sqt_unotice		250
-+#define OBJ_id_smime_spq_ets_sqt_unotice		OBJ_id_smime_spq,2L
-+
-+#define SN_id_smime_cti_ets_proofOfOrigin		"id-smime-cti-ets-proofOfOrigin"
-+#define NID_id_smime_cti_ets_proofOfOrigin		251
-+#define OBJ_id_smime_cti_ets_proofOfOrigin		OBJ_id_smime_cti,1L
-+
-+#define SN_id_smime_cti_ets_proofOfReceipt		"id-smime-cti-ets-proofOfReceipt"
-+#define NID_id_smime_cti_ets_proofOfReceipt		252
-+#define OBJ_id_smime_cti_ets_proofOfReceipt		OBJ_id_smime_cti,2L
-+
-+#define SN_id_smime_cti_ets_proofOfDelivery		"id-smime-cti-ets-proofOfDelivery"
-+#define NID_id_smime_cti_ets_proofOfDelivery		253
-+#define OBJ_id_smime_cti_ets_proofOfDelivery		OBJ_id_smime_cti,3L
-+
-+#define SN_id_smime_cti_ets_proofOfSender		"id-smime-cti-ets-proofOfSender"
-+#define NID_id_smime_cti_ets_proofOfSender		254
-+#define OBJ_id_smime_cti_ets_proofOfSender		OBJ_id_smime_cti,4L
-+
-+#define SN_id_smime_cti_ets_proofOfApproval		"id-smime-cti-ets-proofOfApproval"
-+#define NID_id_smime_cti_ets_proofOfApproval		255
-+#define OBJ_id_smime_cti_ets_proofOfApproval		OBJ_id_smime_cti,5L
-+
-+#define SN_id_smime_cti_ets_proofOfCreation		"id-smime-cti-ets-proofOfCreation"
-+#define NID_id_smime_cti_ets_proofOfCreation		256
-+#define OBJ_id_smime_cti_ets_proofOfCreation		OBJ_id_smime_cti,6L
-+
-+#define LN_friendlyName		"friendlyName"
-+#define NID_friendlyName		156
-+#define OBJ_friendlyName		OBJ_pkcs9,20L
-+
-+#define LN_localKeyID		"localKeyID"
-+#define NID_localKeyID		157
-+#define OBJ_localKeyID		OBJ_pkcs9,21L
-+
-+#define SN_ms_csp_name		"CSPName"
-+#define LN_ms_csp_name		"Microsoft CSP Name"
-+#define NID_ms_csp_name		417
-+#define OBJ_ms_csp_name		1L,3L,6L,1L,4L,1L,311L,17L,1L
-+
-+#define SN_LocalKeySet		"LocalKeySet"
-+#define LN_LocalKeySet		"Microsoft Local Key set"
-+#define NID_LocalKeySet		856
-+#define OBJ_LocalKeySet		1L,3L,6L,1L,4L,1L,311L,17L,2L
-+
-+#define OBJ_certTypes		OBJ_pkcs9,22L
-+
-+#define LN_x509Certificate		"x509Certificate"
-+#define NID_x509Certificate		158
-+#define OBJ_x509Certificate		OBJ_certTypes,1L
-+
-+#define LN_sdsiCertificate		"sdsiCertificate"
-+#define NID_sdsiCertificate		159
-+#define OBJ_sdsiCertificate		OBJ_certTypes,2L
-+
-+#define OBJ_crlTypes		OBJ_pkcs9,23L
-+
-+#define LN_x509Crl		"x509Crl"
-+#define NID_x509Crl		160
-+#define OBJ_x509Crl		OBJ_crlTypes,1L
-+
-+#define OBJ_pkcs12		OBJ_pkcs,12L
-+
-+#define OBJ_pkcs12_pbeids		OBJ_pkcs12,1L
-+
-+#define SN_pbe_WithSHA1And128BitRC4		"PBE-SHA1-RC4-128"
-+#define LN_pbe_WithSHA1And128BitRC4		"pbeWithSHA1And128BitRC4"
-+#define NID_pbe_WithSHA1And128BitRC4		144
-+#define OBJ_pbe_WithSHA1And128BitRC4		OBJ_pkcs12_pbeids,1L
-+
-+#define SN_pbe_WithSHA1And40BitRC4		"PBE-SHA1-RC4-40"
-+#define LN_pbe_WithSHA1And40BitRC4		"pbeWithSHA1And40BitRC4"
-+#define NID_pbe_WithSHA1And40BitRC4		145
-+#define OBJ_pbe_WithSHA1And40BitRC4		OBJ_pkcs12_pbeids,2L
-+
-+#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC		"PBE-SHA1-3DES"
-+#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC		"pbeWithSHA1And3-KeyTripleDES-CBC"
-+#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC		146
-+#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC		OBJ_pkcs12_pbeids,3L
-+
-+#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC		"PBE-SHA1-2DES"
-+#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC		"pbeWithSHA1And2-KeyTripleDES-CBC"
-+#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC		147
-+#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC		OBJ_pkcs12_pbeids,4L
-+
-+#define SN_pbe_WithSHA1And128BitRC2_CBC		"PBE-SHA1-RC2-128"
-+#define LN_pbe_WithSHA1And128BitRC2_CBC		"pbeWithSHA1And128BitRC2-CBC"
-+#define NID_pbe_WithSHA1And128BitRC2_CBC		148
-+#define OBJ_pbe_WithSHA1And128BitRC2_CBC		OBJ_pkcs12_pbeids,5L
-+
-+#define SN_pbe_WithSHA1And40BitRC2_CBC		"PBE-SHA1-RC2-40"
-+#define LN_pbe_WithSHA1And40BitRC2_CBC		"pbeWithSHA1And40BitRC2-CBC"
-+#define NID_pbe_WithSHA1And40BitRC2_CBC		149
-+#define OBJ_pbe_WithSHA1And40BitRC2_CBC		OBJ_pkcs12_pbeids,6L
-+
-+#define OBJ_pkcs12_Version1		OBJ_pkcs12,10L
-+
-+#define OBJ_pkcs12_BagIds		OBJ_pkcs12_Version1,1L
-+
-+#define LN_keyBag		"keyBag"
-+#define NID_keyBag		150
-+#define OBJ_keyBag		OBJ_pkcs12_BagIds,1L
-+
-+#define LN_pkcs8ShroudedKeyBag		"pkcs8ShroudedKeyBag"
-+#define NID_pkcs8ShroudedKeyBag		151
-+#define OBJ_pkcs8ShroudedKeyBag		OBJ_pkcs12_BagIds,2L
-+
-+#define LN_certBag		"certBag"
-+#define NID_certBag		152
-+#define OBJ_certBag		OBJ_pkcs12_BagIds,3L
-+
-+#define LN_crlBag		"crlBag"
-+#define NID_crlBag		153
-+#define OBJ_crlBag		OBJ_pkcs12_BagIds,4L
-+
-+#define LN_secretBag		"secretBag"
-+#define NID_secretBag		154
-+#define OBJ_secretBag		OBJ_pkcs12_BagIds,5L
-+
-+#define LN_safeContentsBag		"safeContentsBag"
-+#define NID_safeContentsBag		155
-+#define OBJ_safeContentsBag		OBJ_pkcs12_BagIds,6L
-+
-+#define SN_md2		"MD2"
-+#define LN_md2		"md2"
-+#define NID_md2		3
-+#define OBJ_md2		OBJ_rsadsi,2L,2L
-+
-+#define SN_md4		"MD4"
-+#define LN_md4		"md4"
-+#define NID_md4		257
-+#define OBJ_md4		OBJ_rsadsi,2L,4L
-+
-+#define SN_md5		"MD5"
-+#define LN_md5		"md5"
-+#define NID_md5		4
-+#define OBJ_md5		OBJ_rsadsi,2L,5L
-+
-+#define SN_md5_sha1		"MD5-SHA1"
-+#define LN_md5_sha1		"md5-sha1"
-+#define NID_md5_sha1		114
-+
-+#define LN_hmacWithMD5		"hmacWithMD5"
-+#define NID_hmacWithMD5		797
-+#define OBJ_hmacWithMD5		OBJ_rsadsi,2L,6L
-+
-+#define LN_hmacWithSHA1		"hmacWithSHA1"
-+#define NID_hmacWithSHA1		163
-+#define OBJ_hmacWithSHA1		OBJ_rsadsi,2L,7L
-+
-+#define LN_hmacWithSHA224		"hmacWithSHA224"
-+#define NID_hmacWithSHA224		798
-+#define OBJ_hmacWithSHA224		OBJ_rsadsi,2L,8L
-+
-+#define LN_hmacWithSHA256		"hmacWithSHA256"
-+#define NID_hmacWithSHA256		799
-+#define OBJ_hmacWithSHA256		OBJ_rsadsi,2L,9L
-+
-+#define LN_hmacWithSHA384		"hmacWithSHA384"
-+#define NID_hmacWithSHA384		800
-+#define OBJ_hmacWithSHA384		OBJ_rsadsi,2L,10L
-+
-+#define LN_hmacWithSHA512		"hmacWithSHA512"
-+#define NID_hmacWithSHA512		801
-+#define OBJ_hmacWithSHA512		OBJ_rsadsi,2L,11L
-+
-+#define SN_rc2_cbc		"RC2-CBC"
-+#define LN_rc2_cbc		"rc2-cbc"
-+#define NID_rc2_cbc		37
-+#define OBJ_rc2_cbc		OBJ_rsadsi,3L,2L
-+
-+#define SN_rc2_ecb		"RC2-ECB"
-+#define LN_rc2_ecb		"rc2-ecb"
-+#define NID_rc2_ecb		38
-+
-+#define SN_rc2_cfb64		"RC2-CFB"
-+#define LN_rc2_cfb64		"rc2-cfb"
-+#define NID_rc2_cfb64		39
-+
-+#define SN_rc2_ofb64		"RC2-OFB"
-+#define LN_rc2_ofb64		"rc2-ofb"
-+#define NID_rc2_ofb64		40
-+
-+#define SN_rc2_40_cbc		"RC2-40-CBC"
-+#define LN_rc2_40_cbc		"rc2-40-cbc"
-+#define NID_rc2_40_cbc		98
-+
-+#define SN_rc2_64_cbc		"RC2-64-CBC"
-+#define LN_rc2_64_cbc		"rc2-64-cbc"
-+#define NID_rc2_64_cbc		166
-+
-+#define SN_rc4		"RC4"
-+#define LN_rc4		"rc4"
-+#define NID_rc4		5
-+#define OBJ_rc4		OBJ_rsadsi,3L,4L
-+
-+#define SN_rc4_40		"RC4-40"
-+#define LN_rc4_40		"rc4-40"
-+#define NID_rc4_40		97
-+
-+#define SN_des_ede3_cbc		"DES-EDE3-CBC"
-+#define LN_des_ede3_cbc		"des-ede3-cbc"
-+#define NID_des_ede3_cbc		44
-+#define OBJ_des_ede3_cbc		OBJ_rsadsi,3L,7L
-+
-+#define SN_rc5_cbc		"RC5-CBC"
-+#define LN_rc5_cbc		"rc5-cbc"
-+#define NID_rc5_cbc		120
-+#define OBJ_rc5_cbc		OBJ_rsadsi,3L,8L
-+
-+#define SN_rc5_ecb		"RC5-ECB"
-+#define LN_rc5_ecb		"rc5-ecb"
-+#define NID_rc5_ecb		121
-+
-+#define SN_rc5_cfb64		"RC5-CFB"
-+#define LN_rc5_cfb64		"rc5-cfb"
-+#define NID_rc5_cfb64		122
-+
-+#define SN_rc5_ofb64		"RC5-OFB"
-+#define LN_rc5_ofb64		"rc5-ofb"
-+#define NID_rc5_ofb64		123
-+
-+#define SN_ms_ext_req		"msExtReq"
-+#define LN_ms_ext_req		"Microsoft Extension Request"
-+#define NID_ms_ext_req		171
-+#define OBJ_ms_ext_req		1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-+
-+#define SN_ms_code_ind		"msCodeInd"
-+#define LN_ms_code_ind		"Microsoft Individual Code Signing"
-+#define NID_ms_code_ind		134
-+#define OBJ_ms_code_ind		1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-+
-+#define SN_ms_code_com		"msCodeCom"
-+#define LN_ms_code_com		"Microsoft Commercial Code Signing"
-+#define NID_ms_code_com		135
-+#define OBJ_ms_code_com		1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-+
-+#define SN_ms_ctl_sign		"msCTLSign"
-+#define LN_ms_ctl_sign		"Microsoft Trust List Signing"
-+#define NID_ms_ctl_sign		136
-+#define OBJ_ms_ctl_sign		1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-+
-+#define SN_ms_sgc		"msSGC"
-+#define LN_ms_sgc		"Microsoft Server Gated Crypto"
-+#define NID_ms_sgc		137
-+#define OBJ_ms_sgc		1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-+
-+#define SN_ms_efs		"msEFS"
-+#define LN_ms_efs		"Microsoft Encrypted File System"
-+#define NID_ms_efs		138
-+#define OBJ_ms_efs		1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-+
-+#define SN_ms_smartcard_login		"msSmartcardLogin"
-+#define LN_ms_smartcard_login		"Microsoft Smartcardlogin"
-+#define NID_ms_smartcard_login		648
-+#define OBJ_ms_smartcard_login		1L,3L,6L,1L,4L,1L,311L,20L,2L,2L
-+
-+#define SN_ms_upn		"msUPN"
-+#define LN_ms_upn		"Microsoft Universal Principal Name"
-+#define NID_ms_upn		649
-+#define OBJ_ms_upn		1L,3L,6L,1L,4L,1L,311L,20L,2L,3L
-+
-+#define SN_idea_cbc		"IDEA-CBC"
-+#define LN_idea_cbc		"idea-cbc"
-+#define NID_idea_cbc		34
-+#define OBJ_idea_cbc		1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-+
-+#define SN_idea_ecb		"IDEA-ECB"
-+#define LN_idea_ecb		"idea-ecb"
-+#define NID_idea_ecb		36
-+
-+#define SN_idea_cfb64		"IDEA-CFB"
-+#define LN_idea_cfb64		"idea-cfb"
-+#define NID_idea_cfb64		35
-+
-+#define SN_idea_ofb64		"IDEA-OFB"
-+#define LN_idea_ofb64		"idea-ofb"
-+#define NID_idea_ofb64		46
-+
-+#define SN_bf_cbc		"BF-CBC"
-+#define LN_bf_cbc		"bf-cbc"
-+#define NID_bf_cbc		91
-+#define OBJ_bf_cbc		1L,3L,6L,1L,4L,1L,3029L,1L,2L
-+
-+#define SN_bf_ecb		"BF-ECB"
-+#define LN_bf_ecb		"bf-ecb"
-+#define NID_bf_ecb		92
-+
-+#define SN_bf_cfb64		"BF-CFB"
-+#define LN_bf_cfb64		"bf-cfb"
-+#define NID_bf_cfb64		93
-+
-+#define SN_bf_ofb64		"BF-OFB"
-+#define LN_bf_ofb64		"bf-ofb"
-+#define NID_bf_ofb64		94
-+
-+#define SN_id_pkix		"PKIX"
-+#define NID_id_pkix		127
-+#define OBJ_id_pkix		1L,3L,6L,1L,5L,5L,7L
-+
-+#define SN_id_pkix_mod		"id-pkix-mod"
-+#define NID_id_pkix_mod		258
-+#define OBJ_id_pkix_mod		OBJ_id_pkix,0L
-+
-+#define SN_id_pe		"id-pe"
-+#define NID_id_pe		175
-+#define OBJ_id_pe		OBJ_id_pkix,1L
-+
-+#define SN_id_qt		"id-qt"
-+#define NID_id_qt		259
-+#define OBJ_id_qt		OBJ_id_pkix,2L
-+
-+#define SN_id_kp		"id-kp"
-+#define NID_id_kp		128
-+#define OBJ_id_kp		OBJ_id_pkix,3L
-+
-+#define SN_id_it		"id-it"
-+#define NID_id_it		260
-+#define OBJ_id_it		OBJ_id_pkix,4L
-+
-+#define SN_id_pkip		"id-pkip"
-+#define NID_id_pkip		261
-+#define OBJ_id_pkip		OBJ_id_pkix,5L
-+
-+#define SN_id_alg		"id-alg"
-+#define NID_id_alg		262
-+#define OBJ_id_alg		OBJ_id_pkix,6L
-+
-+#define SN_id_cmc		"id-cmc"
-+#define NID_id_cmc		263
-+#define OBJ_id_cmc		OBJ_id_pkix,7L
-+
-+#define SN_id_on		"id-on"
-+#define NID_id_on		264
-+#define OBJ_id_on		OBJ_id_pkix,8L
-+
-+#define SN_id_pda		"id-pda"
-+#define NID_id_pda		265
-+#define OBJ_id_pda		OBJ_id_pkix,9L
-+
-+#define SN_id_aca		"id-aca"
-+#define NID_id_aca		266
-+#define OBJ_id_aca		OBJ_id_pkix,10L
-+
-+#define SN_id_qcs		"id-qcs"
-+#define NID_id_qcs		267
-+#define OBJ_id_qcs		OBJ_id_pkix,11L
-+
-+#define SN_id_cct		"id-cct"
-+#define NID_id_cct		268
-+#define OBJ_id_cct		OBJ_id_pkix,12L
-+
-+#define SN_id_ppl		"id-ppl"
-+#define NID_id_ppl		662
-+#define OBJ_id_ppl		OBJ_id_pkix,21L
-+
-+#define SN_id_ad		"id-ad"
-+#define NID_id_ad		176
-+#define OBJ_id_ad		OBJ_id_pkix,48L
-+
-+#define SN_id_pkix1_explicit_88		"id-pkix1-explicit-88"
-+#define NID_id_pkix1_explicit_88		269
-+#define OBJ_id_pkix1_explicit_88		OBJ_id_pkix_mod,1L
-+
-+#define SN_id_pkix1_implicit_88		"id-pkix1-implicit-88"
-+#define NID_id_pkix1_implicit_88		270
-+#define OBJ_id_pkix1_implicit_88		OBJ_id_pkix_mod,2L
-+
-+#define SN_id_pkix1_explicit_93		"id-pkix1-explicit-93"
-+#define NID_id_pkix1_explicit_93		271
-+#define OBJ_id_pkix1_explicit_93		OBJ_id_pkix_mod,3L
-+
-+#define SN_id_pkix1_implicit_93		"id-pkix1-implicit-93"
-+#define NID_id_pkix1_implicit_93		272
-+#define OBJ_id_pkix1_implicit_93		OBJ_id_pkix_mod,4L
-+
-+#define SN_id_mod_crmf		"id-mod-crmf"
-+#define NID_id_mod_crmf		273
-+#define OBJ_id_mod_crmf		OBJ_id_pkix_mod,5L
-+
-+#define SN_id_mod_cmc		"id-mod-cmc"
-+#define NID_id_mod_cmc		274
-+#define OBJ_id_mod_cmc		OBJ_id_pkix_mod,6L
-+
-+#define SN_id_mod_kea_profile_88		"id-mod-kea-profile-88"
-+#define NID_id_mod_kea_profile_88		275
-+#define OBJ_id_mod_kea_profile_88		OBJ_id_pkix_mod,7L
-+
-+#define SN_id_mod_kea_profile_93		"id-mod-kea-profile-93"
-+#define NID_id_mod_kea_profile_93		276
-+#define OBJ_id_mod_kea_profile_93		OBJ_id_pkix_mod,8L
-+
-+#define SN_id_mod_cmp		"id-mod-cmp"
-+#define NID_id_mod_cmp		277
-+#define OBJ_id_mod_cmp		OBJ_id_pkix_mod,9L
-+
-+#define SN_id_mod_qualified_cert_88		"id-mod-qualified-cert-88"
-+#define NID_id_mod_qualified_cert_88		278
-+#define OBJ_id_mod_qualified_cert_88		OBJ_id_pkix_mod,10L
-+
-+#define SN_id_mod_qualified_cert_93		"id-mod-qualified-cert-93"
-+#define NID_id_mod_qualified_cert_93		279
-+#define OBJ_id_mod_qualified_cert_93		OBJ_id_pkix_mod,11L
-+
-+#define SN_id_mod_attribute_cert		"id-mod-attribute-cert"
-+#define NID_id_mod_attribute_cert		280
-+#define OBJ_id_mod_attribute_cert		OBJ_id_pkix_mod,12L
-+
-+#define SN_id_mod_timestamp_protocol		"id-mod-timestamp-protocol"
-+#define NID_id_mod_timestamp_protocol		281
-+#define OBJ_id_mod_timestamp_protocol		OBJ_id_pkix_mod,13L
-+
-+#define SN_id_mod_ocsp		"id-mod-ocsp"
-+#define NID_id_mod_ocsp		282
-+#define OBJ_id_mod_ocsp		OBJ_id_pkix_mod,14L
-+
-+#define SN_id_mod_dvcs		"id-mod-dvcs"
-+#define NID_id_mod_dvcs		283
-+#define OBJ_id_mod_dvcs		OBJ_id_pkix_mod,15L
-+
-+#define SN_id_mod_cmp2000		"id-mod-cmp2000"
-+#define NID_id_mod_cmp2000		284
-+#define OBJ_id_mod_cmp2000		OBJ_id_pkix_mod,16L
-+
-+#define SN_info_access		"authorityInfoAccess"
-+#define LN_info_access		"Authority Information Access"
-+#define NID_info_access		177
-+#define OBJ_info_access		OBJ_id_pe,1L
-+
-+#define SN_biometricInfo		"biometricInfo"
-+#define LN_biometricInfo		"Biometric Info"
-+#define NID_biometricInfo		285
-+#define OBJ_biometricInfo		OBJ_id_pe,2L
-+
-+#define SN_qcStatements		"qcStatements"
-+#define NID_qcStatements		286
-+#define OBJ_qcStatements		OBJ_id_pe,3L
-+
-+#define SN_ac_auditEntity		"ac-auditEntity"
-+#define NID_ac_auditEntity		287
-+#define OBJ_ac_auditEntity		OBJ_id_pe,4L
-+
-+#define SN_ac_targeting		"ac-targeting"
-+#define NID_ac_targeting		288
-+#define OBJ_ac_targeting		OBJ_id_pe,5L
-+
-+#define SN_aaControls		"aaControls"
-+#define NID_aaControls		289
-+#define OBJ_aaControls		OBJ_id_pe,6L
-+
-+#define SN_sbgp_ipAddrBlock		"sbgp-ipAddrBlock"
-+#define NID_sbgp_ipAddrBlock		290
-+#define OBJ_sbgp_ipAddrBlock		OBJ_id_pe,7L
-+
-+#define SN_sbgp_autonomousSysNum		"sbgp-autonomousSysNum"
-+#define NID_sbgp_autonomousSysNum		291
-+#define OBJ_sbgp_autonomousSysNum		OBJ_id_pe,8L
-+
-+#define SN_sbgp_routerIdentifier		"sbgp-routerIdentifier"
-+#define NID_sbgp_routerIdentifier		292
-+#define OBJ_sbgp_routerIdentifier		OBJ_id_pe,9L
-+
-+#define SN_ac_proxying		"ac-proxying"
-+#define NID_ac_proxying		397
-+#define OBJ_ac_proxying		OBJ_id_pe,10L
-+
-+#define SN_sinfo_access		"subjectInfoAccess"
-+#define LN_sinfo_access		"Subject Information Access"
-+#define NID_sinfo_access		398
-+#define OBJ_sinfo_access		OBJ_id_pe,11L
-+
-+#define SN_proxyCertInfo		"proxyCertInfo"
-+#define LN_proxyCertInfo		"Proxy Certificate Information"
-+#define NID_proxyCertInfo		663
-+#define OBJ_proxyCertInfo		OBJ_id_pe,14L
-+
-+#define SN_id_qt_cps		"id-qt-cps"
-+#define LN_id_qt_cps		"Policy Qualifier CPS"
-+#define NID_id_qt_cps		164
-+#define OBJ_id_qt_cps		OBJ_id_qt,1L
-+
-+#define SN_id_qt_unotice		"id-qt-unotice"
-+#define LN_id_qt_unotice		"Policy Qualifier User Notice"
-+#define NID_id_qt_unotice		165
-+#define OBJ_id_qt_unotice		OBJ_id_qt,2L
-+
-+#define SN_textNotice		"textNotice"
-+#define NID_textNotice		293
-+#define OBJ_textNotice		OBJ_id_qt,3L
-+
-+#define SN_server_auth		"serverAuth"
-+#define LN_server_auth		"TLS Web Server Authentication"
-+#define NID_server_auth		129
-+#define OBJ_server_auth		OBJ_id_kp,1L
-+
-+#define SN_client_auth		"clientAuth"
-+#define LN_client_auth		"TLS Web Client Authentication"
-+#define NID_client_auth		130
-+#define OBJ_client_auth		OBJ_id_kp,2L
-+
-+#define SN_code_sign		"codeSigning"
-+#define LN_code_sign		"Code Signing"
-+#define NID_code_sign		131
-+#define OBJ_code_sign		OBJ_id_kp,3L
-+
-+#define SN_email_protect		"emailProtection"
-+#define LN_email_protect		"E-mail Protection"
-+#define NID_email_protect		132
-+#define OBJ_email_protect		OBJ_id_kp,4L
-+
-+#define SN_ipsecEndSystem		"ipsecEndSystem"
-+#define LN_ipsecEndSystem		"IPSec End System"
-+#define NID_ipsecEndSystem		294
-+#define OBJ_ipsecEndSystem		OBJ_id_kp,5L
-+
-+#define SN_ipsecTunnel		"ipsecTunnel"
-+#define LN_ipsecTunnel		"IPSec Tunnel"
-+#define NID_ipsecTunnel		295
-+#define OBJ_ipsecTunnel		OBJ_id_kp,6L
-+
-+#define SN_ipsecUser		"ipsecUser"
-+#define LN_ipsecUser		"IPSec User"
-+#define NID_ipsecUser		296
-+#define OBJ_ipsecUser		OBJ_id_kp,7L
-+
-+#define SN_time_stamp		"timeStamping"
-+#define LN_time_stamp		"Time Stamping"
-+#define NID_time_stamp		133
-+#define OBJ_time_stamp		OBJ_id_kp,8L
-+
-+#define SN_OCSP_sign		"OCSPSigning"
-+#define LN_OCSP_sign		"OCSP Signing"
-+#define NID_OCSP_sign		180
-+#define OBJ_OCSP_sign		OBJ_id_kp,9L
-+
-+#define SN_dvcs		"DVCS"
-+#define LN_dvcs		"dvcs"
-+#define NID_dvcs		297
-+#define OBJ_dvcs		OBJ_id_kp,10L
-+
-+#define SN_id_it_caProtEncCert		"id-it-caProtEncCert"
-+#define NID_id_it_caProtEncCert		298
-+#define OBJ_id_it_caProtEncCert		OBJ_id_it,1L
-+
-+#define SN_id_it_signKeyPairTypes		"id-it-signKeyPairTypes"
-+#define NID_id_it_signKeyPairTypes		299
-+#define OBJ_id_it_signKeyPairTypes		OBJ_id_it,2L
-+
-+#define SN_id_it_encKeyPairTypes		"id-it-encKeyPairTypes"
-+#define NID_id_it_encKeyPairTypes		300
-+#define OBJ_id_it_encKeyPairTypes		OBJ_id_it,3L
-+
-+#define SN_id_it_preferredSymmAlg		"id-it-preferredSymmAlg"
-+#define NID_id_it_preferredSymmAlg		301
-+#define OBJ_id_it_preferredSymmAlg		OBJ_id_it,4L
-+
-+#define SN_id_it_caKeyUpdateInfo		"id-it-caKeyUpdateInfo"
-+#define NID_id_it_caKeyUpdateInfo		302
-+#define OBJ_id_it_caKeyUpdateInfo		OBJ_id_it,5L
-+
-+#define SN_id_it_currentCRL		"id-it-currentCRL"
-+#define NID_id_it_currentCRL		303
-+#define OBJ_id_it_currentCRL		OBJ_id_it,6L
-+
-+#define SN_id_it_unsupportedOIDs		"id-it-unsupportedOIDs"
-+#define NID_id_it_unsupportedOIDs		304
-+#define OBJ_id_it_unsupportedOIDs		OBJ_id_it,7L
-+
-+#define SN_id_it_subscriptionRequest		"id-it-subscriptionRequest"
-+#define NID_id_it_subscriptionRequest		305
-+#define OBJ_id_it_subscriptionRequest		OBJ_id_it,8L
-+
-+#define SN_id_it_subscriptionResponse		"id-it-subscriptionResponse"
-+#define NID_id_it_subscriptionResponse		306
-+#define OBJ_id_it_subscriptionResponse		OBJ_id_it,9L
-+
-+#define SN_id_it_keyPairParamReq		"id-it-keyPairParamReq"
-+#define NID_id_it_keyPairParamReq		307
-+#define OBJ_id_it_keyPairParamReq		OBJ_id_it,10L
-+
-+#define SN_id_it_keyPairParamRep		"id-it-keyPairParamRep"
-+#define NID_id_it_keyPairParamRep		308
-+#define OBJ_id_it_keyPairParamRep		OBJ_id_it,11L
-+
-+#define SN_id_it_revPassphrase		"id-it-revPassphrase"
-+#define NID_id_it_revPassphrase		309
-+#define OBJ_id_it_revPassphrase		OBJ_id_it,12L
-+
-+#define SN_id_it_implicitConfirm		"id-it-implicitConfirm"
-+#define NID_id_it_implicitConfirm		310
-+#define OBJ_id_it_implicitConfirm		OBJ_id_it,13L
-+
-+#define SN_id_it_confirmWaitTime		"id-it-confirmWaitTime"
-+#define NID_id_it_confirmWaitTime		311
-+#define OBJ_id_it_confirmWaitTime		OBJ_id_it,14L
-+
-+#define SN_id_it_origPKIMessage		"id-it-origPKIMessage"
-+#define NID_id_it_origPKIMessage		312
-+#define OBJ_id_it_origPKIMessage		OBJ_id_it,15L
-+
-+#define SN_id_it_suppLangTags		"id-it-suppLangTags"
-+#define NID_id_it_suppLangTags		784
-+#define OBJ_id_it_suppLangTags		OBJ_id_it,16L
-+
-+#define SN_id_regCtrl		"id-regCtrl"
-+#define NID_id_regCtrl		313
-+#define OBJ_id_regCtrl		OBJ_id_pkip,1L
-+
-+#define SN_id_regInfo		"id-regInfo"
-+#define NID_id_regInfo		314
-+#define OBJ_id_regInfo		OBJ_id_pkip,2L
-+
-+#define SN_id_regCtrl_regToken		"id-regCtrl-regToken"
-+#define NID_id_regCtrl_regToken		315
-+#define OBJ_id_regCtrl_regToken		OBJ_id_regCtrl,1L
-+
-+#define SN_id_regCtrl_authenticator		"id-regCtrl-authenticator"
-+#define NID_id_regCtrl_authenticator		316
-+#define OBJ_id_regCtrl_authenticator		OBJ_id_regCtrl,2L
-+
-+#define SN_id_regCtrl_pkiPublicationInfo		"id-regCtrl-pkiPublicationInfo"
-+#define NID_id_regCtrl_pkiPublicationInfo		317
-+#define OBJ_id_regCtrl_pkiPublicationInfo		OBJ_id_regCtrl,3L
-+
-+#define SN_id_regCtrl_pkiArchiveOptions		"id-regCtrl-pkiArchiveOptions"
-+#define NID_id_regCtrl_pkiArchiveOptions		318
-+#define OBJ_id_regCtrl_pkiArchiveOptions		OBJ_id_regCtrl,4L
-+
-+#define SN_id_regCtrl_oldCertID		"id-regCtrl-oldCertID"
-+#define NID_id_regCtrl_oldCertID		319
-+#define OBJ_id_regCtrl_oldCertID		OBJ_id_regCtrl,5L
-+
-+#define SN_id_regCtrl_protocolEncrKey		"id-regCtrl-protocolEncrKey"
-+#define NID_id_regCtrl_protocolEncrKey		320
-+#define OBJ_id_regCtrl_protocolEncrKey		OBJ_id_regCtrl,6L
-+
-+#define SN_id_regInfo_utf8Pairs		"id-regInfo-utf8Pairs"
-+#define NID_id_regInfo_utf8Pairs		321
-+#define OBJ_id_regInfo_utf8Pairs		OBJ_id_regInfo,1L
-+
-+#define SN_id_regInfo_certReq		"id-regInfo-certReq"
-+#define NID_id_regInfo_certReq		322
-+#define OBJ_id_regInfo_certReq		OBJ_id_regInfo,2L
-+
-+#define SN_id_alg_des40		"id-alg-des40"
-+#define NID_id_alg_des40		323
-+#define OBJ_id_alg_des40		OBJ_id_alg,1L
-+
-+#define SN_id_alg_noSignature		"id-alg-noSignature"
-+#define NID_id_alg_noSignature		324
-+#define OBJ_id_alg_noSignature		OBJ_id_alg,2L
-+
-+#define SN_id_alg_dh_sig_hmac_sha1		"id-alg-dh-sig-hmac-sha1"
-+#define NID_id_alg_dh_sig_hmac_sha1		325
-+#define OBJ_id_alg_dh_sig_hmac_sha1		OBJ_id_alg,3L
-+
-+#define SN_id_alg_dh_pop		"id-alg-dh-pop"
-+#define NID_id_alg_dh_pop		326
-+#define OBJ_id_alg_dh_pop		OBJ_id_alg,4L
-+
-+#define SN_id_cmc_statusInfo		"id-cmc-statusInfo"
-+#define NID_id_cmc_statusInfo		327
-+#define OBJ_id_cmc_statusInfo		OBJ_id_cmc,1L
-+
-+#define SN_id_cmc_identification		"id-cmc-identification"
-+#define NID_id_cmc_identification		328
-+#define OBJ_id_cmc_identification		OBJ_id_cmc,2L
-+
-+#define SN_id_cmc_identityProof		"id-cmc-identityProof"
-+#define NID_id_cmc_identityProof		329
-+#define OBJ_id_cmc_identityProof		OBJ_id_cmc,3L
-+
-+#define SN_id_cmc_dataReturn		"id-cmc-dataReturn"
-+#define NID_id_cmc_dataReturn		330
-+#define OBJ_id_cmc_dataReturn		OBJ_id_cmc,4L
-+
-+#define SN_id_cmc_transactionId		"id-cmc-transactionId"
-+#define NID_id_cmc_transactionId		331
-+#define OBJ_id_cmc_transactionId		OBJ_id_cmc,5L
-+
-+#define SN_id_cmc_senderNonce		"id-cmc-senderNonce"
-+#define NID_id_cmc_senderNonce		332
-+#define OBJ_id_cmc_senderNonce		OBJ_id_cmc,6L
-+
-+#define SN_id_cmc_recipientNonce		"id-cmc-recipientNonce"
-+#define NID_id_cmc_recipientNonce		333
-+#define OBJ_id_cmc_recipientNonce		OBJ_id_cmc,7L
-+
-+#define SN_id_cmc_addExtensions		"id-cmc-addExtensions"
-+#define NID_id_cmc_addExtensions		334
-+#define OBJ_id_cmc_addExtensions		OBJ_id_cmc,8L
-+
-+#define SN_id_cmc_encryptedPOP		"id-cmc-encryptedPOP"
-+#define NID_id_cmc_encryptedPOP		335
-+#define OBJ_id_cmc_encryptedPOP		OBJ_id_cmc,9L
-+
-+#define SN_id_cmc_decryptedPOP		"id-cmc-decryptedPOP"
-+#define NID_id_cmc_decryptedPOP		336
-+#define OBJ_id_cmc_decryptedPOP		OBJ_id_cmc,10L
-+
-+#define SN_id_cmc_lraPOPWitness		"id-cmc-lraPOPWitness"
-+#define NID_id_cmc_lraPOPWitness		337
-+#define OBJ_id_cmc_lraPOPWitness		OBJ_id_cmc,11L
-+
-+#define SN_id_cmc_getCert		"id-cmc-getCert"
-+#define NID_id_cmc_getCert		338
-+#define OBJ_id_cmc_getCert		OBJ_id_cmc,15L
-+
-+#define SN_id_cmc_getCRL		"id-cmc-getCRL"
-+#define NID_id_cmc_getCRL		339
-+#define OBJ_id_cmc_getCRL		OBJ_id_cmc,16L
-+
-+#define SN_id_cmc_revokeRequest		"id-cmc-revokeRequest"
-+#define NID_id_cmc_revokeRequest		340
-+#define OBJ_id_cmc_revokeRequest		OBJ_id_cmc,17L
-+
-+#define SN_id_cmc_regInfo		"id-cmc-regInfo"
-+#define NID_id_cmc_regInfo		341
-+#define OBJ_id_cmc_regInfo		OBJ_id_cmc,18L
-+
-+#define SN_id_cmc_responseInfo		"id-cmc-responseInfo"
-+#define NID_id_cmc_responseInfo		342
-+#define OBJ_id_cmc_responseInfo		OBJ_id_cmc,19L
-+
-+#define SN_id_cmc_queryPending		"id-cmc-queryPending"
-+#define NID_id_cmc_queryPending		343
-+#define OBJ_id_cmc_queryPending		OBJ_id_cmc,21L
-+
-+#define SN_id_cmc_popLinkRandom		"id-cmc-popLinkRandom"
-+#define NID_id_cmc_popLinkRandom		344
-+#define OBJ_id_cmc_popLinkRandom		OBJ_id_cmc,22L
-+
-+#define SN_id_cmc_popLinkWitness		"id-cmc-popLinkWitness"
-+#define NID_id_cmc_popLinkWitness		345
-+#define OBJ_id_cmc_popLinkWitness		OBJ_id_cmc,23L
-+
-+#define SN_id_cmc_confirmCertAcceptance		"id-cmc-confirmCertAcceptance"
-+#define NID_id_cmc_confirmCertAcceptance		346
-+#define OBJ_id_cmc_confirmCertAcceptance		OBJ_id_cmc,24L
-+
-+#define SN_id_on_personalData		"id-on-personalData"
-+#define NID_id_on_personalData		347
-+#define OBJ_id_on_personalData		OBJ_id_on,1L
-+
-+#define SN_id_on_permanentIdentifier		"id-on-permanentIdentifier"
-+#define LN_id_on_permanentIdentifier		"Permanent Identifier"
-+#define NID_id_on_permanentIdentifier		858
-+#define OBJ_id_on_permanentIdentifier		OBJ_id_on,3L
-+
-+#define SN_id_pda_dateOfBirth		"id-pda-dateOfBirth"
-+#define NID_id_pda_dateOfBirth		348
-+#define OBJ_id_pda_dateOfBirth		OBJ_id_pda,1L
-+
-+#define SN_id_pda_placeOfBirth		"id-pda-placeOfBirth"
-+#define NID_id_pda_placeOfBirth		349
-+#define OBJ_id_pda_placeOfBirth		OBJ_id_pda,2L
-+
-+#define SN_id_pda_gender		"id-pda-gender"
-+#define NID_id_pda_gender		351
-+#define OBJ_id_pda_gender		OBJ_id_pda,3L
-+
-+#define SN_id_pda_countryOfCitizenship		"id-pda-countryOfCitizenship"
-+#define NID_id_pda_countryOfCitizenship		352
-+#define OBJ_id_pda_countryOfCitizenship		OBJ_id_pda,4L
-+
-+#define SN_id_pda_countryOfResidence		"id-pda-countryOfResidence"
-+#define NID_id_pda_countryOfResidence		353
-+#define OBJ_id_pda_countryOfResidence		OBJ_id_pda,5L
-+
-+#define SN_id_aca_authenticationInfo		"id-aca-authenticationInfo"
-+#define NID_id_aca_authenticationInfo		354
-+#define OBJ_id_aca_authenticationInfo		OBJ_id_aca,1L
-+
-+#define SN_id_aca_accessIdentity		"id-aca-accessIdentity"
-+#define NID_id_aca_accessIdentity		355
-+#define OBJ_id_aca_accessIdentity		OBJ_id_aca,2L
-+
-+#define SN_id_aca_chargingIdentity		"id-aca-chargingIdentity"
-+#define NID_id_aca_chargingIdentity		356
-+#define OBJ_id_aca_chargingIdentity		OBJ_id_aca,3L
-+
-+#define SN_id_aca_group		"id-aca-group"
-+#define NID_id_aca_group		357
-+#define OBJ_id_aca_group		OBJ_id_aca,4L
-+
-+#define SN_id_aca_role		"id-aca-role"
-+#define NID_id_aca_role		358
-+#define OBJ_id_aca_role		OBJ_id_aca,5L
-+
-+#define SN_id_aca_encAttrs		"id-aca-encAttrs"
-+#define NID_id_aca_encAttrs		399
-+#define OBJ_id_aca_encAttrs		OBJ_id_aca,6L
-+
-+#define SN_id_qcs_pkixQCSyntax_v1		"id-qcs-pkixQCSyntax-v1"
-+#define NID_id_qcs_pkixQCSyntax_v1		359
-+#define OBJ_id_qcs_pkixQCSyntax_v1		OBJ_id_qcs,1L
-+
-+#define SN_id_cct_crs		"id-cct-crs"
-+#define NID_id_cct_crs		360
-+#define OBJ_id_cct_crs		OBJ_id_cct,1L
-+
-+#define SN_id_cct_PKIData		"id-cct-PKIData"
-+#define NID_id_cct_PKIData		361
-+#define OBJ_id_cct_PKIData		OBJ_id_cct,2L
-+
-+#define SN_id_cct_PKIResponse		"id-cct-PKIResponse"
-+#define NID_id_cct_PKIResponse		362
-+#define OBJ_id_cct_PKIResponse		OBJ_id_cct,3L
-+
-+#define SN_id_ppl_anyLanguage		"id-ppl-anyLanguage"
-+#define LN_id_ppl_anyLanguage		"Any language"
-+#define NID_id_ppl_anyLanguage		664
-+#define OBJ_id_ppl_anyLanguage		OBJ_id_ppl,0L
-+
-+#define SN_id_ppl_inheritAll		"id-ppl-inheritAll"
-+#define LN_id_ppl_inheritAll		"Inherit all"
-+#define NID_id_ppl_inheritAll		665
-+#define OBJ_id_ppl_inheritAll		OBJ_id_ppl,1L
-+
-+#define SN_Independent		"id-ppl-independent"
-+#define LN_Independent		"Independent"
-+#define NID_Independent		667
-+#define OBJ_Independent		OBJ_id_ppl,2L
-+
-+#define SN_ad_OCSP		"OCSP"
-+#define LN_ad_OCSP		"OCSP"
-+#define NID_ad_OCSP		178
-+#define OBJ_ad_OCSP		OBJ_id_ad,1L
-+
-+#define SN_ad_ca_issuers		"caIssuers"
-+#define LN_ad_ca_issuers		"CA Issuers"
-+#define NID_ad_ca_issuers		179
-+#define OBJ_ad_ca_issuers		OBJ_id_ad,2L
-+
-+#define SN_ad_timeStamping		"ad_timestamping"
-+#define LN_ad_timeStamping		"AD Time Stamping"
-+#define NID_ad_timeStamping		363
-+#define OBJ_ad_timeStamping		OBJ_id_ad,3L
-+
-+#define SN_ad_dvcs		"AD_DVCS"
-+#define LN_ad_dvcs		"ad dvcs"
-+#define NID_ad_dvcs		364
-+#define OBJ_ad_dvcs		OBJ_id_ad,4L
-+
-+#define SN_caRepository		"caRepository"
-+#define LN_caRepository		"CA Repository"
-+#define NID_caRepository		785
-+#define OBJ_caRepository		OBJ_id_ad,5L
-+
-+#define OBJ_id_pkix_OCSP		OBJ_ad_OCSP
-+
-+#define SN_id_pkix_OCSP_basic		"basicOCSPResponse"
-+#define LN_id_pkix_OCSP_basic		"Basic OCSP Response"
-+#define NID_id_pkix_OCSP_basic		365
-+#define OBJ_id_pkix_OCSP_basic		OBJ_id_pkix_OCSP,1L
-+
-+#define SN_id_pkix_OCSP_Nonce		"Nonce"
-+#define LN_id_pkix_OCSP_Nonce		"OCSP Nonce"
-+#define NID_id_pkix_OCSP_Nonce		366
-+#define OBJ_id_pkix_OCSP_Nonce		OBJ_id_pkix_OCSP,2L
-+
-+#define SN_id_pkix_OCSP_CrlID		"CrlID"
-+#define LN_id_pkix_OCSP_CrlID		"OCSP CRL ID"
-+#define NID_id_pkix_OCSP_CrlID		367
-+#define OBJ_id_pkix_OCSP_CrlID		OBJ_id_pkix_OCSP,3L
-+
-+#define SN_id_pkix_OCSP_acceptableResponses		"acceptableResponses"
-+#define LN_id_pkix_OCSP_acceptableResponses		"Acceptable OCSP Responses"
-+#define NID_id_pkix_OCSP_acceptableResponses		368
-+#define OBJ_id_pkix_OCSP_acceptableResponses		OBJ_id_pkix_OCSP,4L
-+
-+#define SN_id_pkix_OCSP_noCheck		"noCheck"
-+#define LN_id_pkix_OCSP_noCheck		"OCSP No Check"
-+#define NID_id_pkix_OCSP_noCheck		369
-+#define OBJ_id_pkix_OCSP_noCheck		OBJ_id_pkix_OCSP,5L
-+
-+#define SN_id_pkix_OCSP_archiveCutoff		"archiveCutoff"
-+#define LN_id_pkix_OCSP_archiveCutoff		"OCSP Archive Cutoff"
-+#define NID_id_pkix_OCSP_archiveCutoff		370
-+#define OBJ_id_pkix_OCSP_archiveCutoff		OBJ_id_pkix_OCSP,6L
-+
-+#define SN_id_pkix_OCSP_serviceLocator		"serviceLocator"
-+#define LN_id_pkix_OCSP_serviceLocator		"OCSP Service Locator"
-+#define NID_id_pkix_OCSP_serviceLocator		371
-+#define OBJ_id_pkix_OCSP_serviceLocator		OBJ_id_pkix_OCSP,7L
-+
-+#define SN_id_pkix_OCSP_extendedStatus		"extendedStatus"
-+#define LN_id_pkix_OCSP_extendedStatus		"Extended OCSP Status"
-+#define NID_id_pkix_OCSP_extendedStatus		372
-+#define OBJ_id_pkix_OCSP_extendedStatus		OBJ_id_pkix_OCSP,8L
-+
-+#define SN_id_pkix_OCSP_valid		"valid"
-+#define NID_id_pkix_OCSP_valid		373
-+#define OBJ_id_pkix_OCSP_valid		OBJ_id_pkix_OCSP,9L
-+
-+#define SN_id_pkix_OCSP_path		"path"
-+#define NID_id_pkix_OCSP_path		374
-+#define OBJ_id_pkix_OCSP_path		OBJ_id_pkix_OCSP,10L
-+
-+#define SN_id_pkix_OCSP_trustRoot		"trustRoot"
-+#define LN_id_pkix_OCSP_trustRoot		"Trust Root"
-+#define NID_id_pkix_OCSP_trustRoot		375
-+#define OBJ_id_pkix_OCSP_trustRoot		OBJ_id_pkix_OCSP,11L
-+
-+#define SN_algorithm		"algorithm"
-+#define LN_algorithm		"algorithm"
-+#define NID_algorithm		376
-+#define OBJ_algorithm		1L,3L,14L,3L,2L
-+
-+#define SN_md5WithRSA		"RSA-NP-MD5"
-+#define LN_md5WithRSA		"md5WithRSA"
-+#define NID_md5WithRSA		104
-+#define OBJ_md5WithRSA		OBJ_algorithm,3L
-+
-+#define SN_des_ecb		"DES-ECB"
-+#define LN_des_ecb		"des-ecb"
-+#define NID_des_ecb		29
-+#define OBJ_des_ecb		OBJ_algorithm,6L
-+
-+#define SN_des_cbc		"DES-CBC"
-+#define LN_des_cbc		"des-cbc"
-+#define NID_des_cbc		31
-+#define OBJ_des_cbc		OBJ_algorithm,7L
-+
-+#define SN_des_ofb64		"DES-OFB"
-+#define LN_des_ofb64		"des-ofb"
-+#define NID_des_ofb64		45
-+#define OBJ_des_ofb64		OBJ_algorithm,8L
-+
-+#define SN_des_cfb64		"DES-CFB"
-+#define LN_des_cfb64		"des-cfb"
-+#define NID_des_cfb64		30
-+#define OBJ_des_cfb64		OBJ_algorithm,9L
-+
-+#define SN_rsaSignature		"rsaSignature"
-+#define NID_rsaSignature		377
-+#define OBJ_rsaSignature		OBJ_algorithm,11L
-+
-+#define SN_dsa_2		"DSA-old"
-+#define LN_dsa_2		"dsaEncryption-old"
-+#define NID_dsa_2		67
-+#define OBJ_dsa_2		OBJ_algorithm,12L
-+
-+#define SN_dsaWithSHA		"DSA-SHA"
-+#define LN_dsaWithSHA		"dsaWithSHA"
-+#define NID_dsaWithSHA		66
-+#define OBJ_dsaWithSHA		OBJ_algorithm,13L
-+
-+#define SN_shaWithRSAEncryption		"RSA-SHA"
-+#define LN_shaWithRSAEncryption		"shaWithRSAEncryption"
-+#define NID_shaWithRSAEncryption		42
-+#define OBJ_shaWithRSAEncryption		OBJ_algorithm,15L
-+
-+#define SN_des_ede_ecb		"DES-EDE"
-+#define LN_des_ede_ecb		"des-ede"
-+#define NID_des_ede_ecb		32
-+#define OBJ_des_ede_ecb		OBJ_algorithm,17L
-+
-+#define SN_des_ede3_ecb		"DES-EDE3"
-+#define LN_des_ede3_ecb		"des-ede3"
-+#define NID_des_ede3_ecb		33
-+
-+#define SN_des_ede_cbc		"DES-EDE-CBC"
-+#define LN_des_ede_cbc		"des-ede-cbc"
-+#define NID_des_ede_cbc		43
-+
-+#define SN_des_ede_cfb64		"DES-EDE-CFB"
-+#define LN_des_ede_cfb64		"des-ede-cfb"
-+#define NID_des_ede_cfb64		60
-+
-+#define SN_des_ede3_cfb64		"DES-EDE3-CFB"
-+#define LN_des_ede3_cfb64		"des-ede3-cfb"
-+#define NID_des_ede3_cfb64		61
-+
-+#define SN_des_ede_ofb64		"DES-EDE-OFB"
-+#define LN_des_ede_ofb64		"des-ede-ofb"
-+#define NID_des_ede_ofb64		62
-+
-+#define SN_des_ede3_ofb64		"DES-EDE3-OFB"
-+#define LN_des_ede3_ofb64		"des-ede3-ofb"
-+#define NID_des_ede3_ofb64		63
-+
-+#define SN_desx_cbc		"DESX-CBC"
-+#define LN_desx_cbc		"desx-cbc"
-+#define NID_desx_cbc		80
-+
-+#define SN_sha		"SHA"
-+#define LN_sha		"sha"
-+#define NID_sha		41
-+#define OBJ_sha		OBJ_algorithm,18L
-+
-+#define SN_sha1		"SHA1"
-+#define LN_sha1		"sha1"
-+#define NID_sha1		64
-+#define OBJ_sha1		OBJ_algorithm,26L
-+
-+#define SN_dsaWithSHA1_2		"DSA-SHA1-old"
-+#define LN_dsaWithSHA1_2		"dsaWithSHA1-old"
-+#define NID_dsaWithSHA1_2		70
-+#define OBJ_dsaWithSHA1_2		OBJ_algorithm,27L
-+
-+#define SN_sha1WithRSA		"RSA-SHA1-2"
-+#define LN_sha1WithRSA		"sha1WithRSA"
-+#define NID_sha1WithRSA		115
-+#define OBJ_sha1WithRSA		OBJ_algorithm,29L
-+
-+#define SN_ripemd160		"RIPEMD160"
-+#define LN_ripemd160		"ripemd160"
-+#define NID_ripemd160		117
-+#define OBJ_ripemd160		1L,3L,36L,3L,2L,1L
-+
-+#define SN_ripemd160WithRSA		"RSA-RIPEMD160"
-+#define LN_ripemd160WithRSA		"ripemd160WithRSA"
-+#define NID_ripemd160WithRSA		119
-+#define OBJ_ripemd160WithRSA		1L,3L,36L,3L,3L,1L,2L
-+
-+#define SN_sxnet		"SXNetID"
-+#define LN_sxnet		"Strong Extranet ID"
-+#define NID_sxnet		143
-+#define OBJ_sxnet		1L,3L,101L,1L,4L,1L
-+
-+#define SN_X500		"X500"
-+#define LN_X500		"directory services (X.500)"
-+#define NID_X500		11
-+#define OBJ_X500		2L,5L
-+
-+#define SN_X509		"X509"
-+#define NID_X509		12
-+#define OBJ_X509		OBJ_X500,4L
-+
-+#define SN_commonName		"CN"
-+#define LN_commonName		"commonName"
-+#define NID_commonName		13
-+#define OBJ_commonName		OBJ_X509,3L
-+
-+#define SN_surname		"SN"
-+#define LN_surname		"surname"
-+#define NID_surname		100
-+#define OBJ_surname		OBJ_X509,4L
-+
-+#define LN_serialNumber		"serialNumber"
-+#define NID_serialNumber		105
-+#define OBJ_serialNumber		OBJ_X509,5L
-+
-+#define SN_countryName		"C"
-+#define LN_countryName		"countryName"
-+#define NID_countryName		14
-+#define OBJ_countryName		OBJ_X509,6L
-+
-+#define SN_localityName		"L"
-+#define LN_localityName		"localityName"
-+#define NID_localityName		15
-+#define OBJ_localityName		OBJ_X509,7L
-+
-+#define SN_stateOrProvinceName		"ST"
-+#define LN_stateOrProvinceName		"stateOrProvinceName"
-+#define NID_stateOrProvinceName		16
-+#define OBJ_stateOrProvinceName		OBJ_X509,8L
-+
-+#define SN_streetAddress		"street"
-+#define LN_streetAddress		"streetAddress"
-+#define NID_streetAddress		660
-+#define OBJ_streetAddress		OBJ_X509,9L
-+
-+#define SN_organizationName		"O"
-+#define LN_organizationName		"organizationName"
-+#define NID_organizationName		17
-+#define OBJ_organizationName		OBJ_X509,10L
-+
-+#define SN_organizationalUnitName		"OU"
-+#define LN_organizationalUnitName		"organizationalUnitName"
-+#define NID_organizationalUnitName		18
-+#define OBJ_organizationalUnitName		OBJ_X509,11L
-+
-+#define SN_title		"title"
-+#define LN_title		"title"
-+#define NID_title		106
-+#define OBJ_title		OBJ_X509,12L
-+
-+#define LN_description		"description"
-+#define NID_description		107
-+#define OBJ_description		OBJ_X509,13L
-+
-+#define LN_searchGuide		"searchGuide"
-+#define NID_searchGuide		859
-+#define OBJ_searchGuide		OBJ_X509,14L
-+
-+#define LN_businessCategory		"businessCategory"
-+#define NID_businessCategory		860
-+#define OBJ_businessCategory		OBJ_X509,15L
-+
-+#define LN_postalAddress		"postalAddress"
-+#define NID_postalAddress		861
-+#define OBJ_postalAddress		OBJ_X509,16L
-+
-+#define LN_postalCode		"postalCode"
-+#define NID_postalCode		661
-+#define OBJ_postalCode		OBJ_X509,17L
-+
-+#define LN_postOfficeBox		"postOfficeBox"
-+#define NID_postOfficeBox		862
-+#define OBJ_postOfficeBox		OBJ_X509,18L
-+
-+#define LN_physicalDeliveryOfficeName		"physicalDeliveryOfficeName"
-+#define NID_physicalDeliveryOfficeName		863
-+#define OBJ_physicalDeliveryOfficeName		OBJ_X509,19L
-+
-+#define LN_telephoneNumber		"telephoneNumber"
-+#define NID_telephoneNumber		864
-+#define OBJ_telephoneNumber		OBJ_X509,20L
-+
-+#define LN_telexNumber		"telexNumber"
-+#define NID_telexNumber		865
-+#define OBJ_telexNumber		OBJ_X509,21L
-+
-+#define LN_teletexTerminalIdentifier		"teletexTerminalIdentifier"
-+#define NID_teletexTerminalIdentifier		866
-+#define OBJ_teletexTerminalIdentifier		OBJ_X509,22L
-+
-+#define LN_facsimileTelephoneNumber		"facsimileTelephoneNumber"
-+#define NID_facsimileTelephoneNumber		867
-+#define OBJ_facsimileTelephoneNumber		OBJ_X509,23L
-+
-+#define LN_x121Address		"x121Address"
-+#define NID_x121Address		868
-+#define OBJ_x121Address		OBJ_X509,24L
-+
-+#define LN_internationaliSDNNumber		"internationaliSDNNumber"
-+#define NID_internationaliSDNNumber		869
-+#define OBJ_internationaliSDNNumber		OBJ_X509,25L
-+
-+#define LN_registeredAddress		"registeredAddress"
-+#define NID_registeredAddress		870
-+#define OBJ_registeredAddress		OBJ_X509,26L
-+
-+#define LN_destinationIndicator		"destinationIndicator"
-+#define NID_destinationIndicator		871
-+#define OBJ_destinationIndicator		OBJ_X509,27L
-+
-+#define LN_preferredDeliveryMethod		"preferredDeliveryMethod"
-+#define NID_preferredDeliveryMethod		872
-+#define OBJ_preferredDeliveryMethod		OBJ_X509,28L
-+
-+#define LN_presentationAddress		"presentationAddress"
-+#define NID_presentationAddress		873
-+#define OBJ_presentationAddress		OBJ_X509,29L
-+
-+#define LN_supportedApplicationContext		"supportedApplicationContext"
-+#define NID_supportedApplicationContext		874
-+#define OBJ_supportedApplicationContext		OBJ_X509,30L
-+
-+#define SN_member		"member"
-+#define NID_member		875
-+#define OBJ_member		OBJ_X509,31L
-+
-+#define SN_owner		"owner"
-+#define NID_owner		876
-+#define OBJ_owner		OBJ_X509,32L
-+
-+#define LN_roleOccupant		"roleOccupant"
-+#define NID_roleOccupant		877
-+#define OBJ_roleOccupant		OBJ_X509,33L
-+
-+#define SN_seeAlso		"seeAlso"
-+#define NID_seeAlso		878
-+#define OBJ_seeAlso		OBJ_X509,34L
-+
-+#define LN_userPassword		"userPassword"
-+#define NID_userPassword		879
-+#define OBJ_userPassword		OBJ_X509,35L
-+
-+#define LN_userCertificate		"userCertificate"
-+#define NID_userCertificate		880
-+#define OBJ_userCertificate		OBJ_X509,36L
-+
-+#define LN_cACertificate		"cACertificate"
-+#define NID_cACertificate		881
-+#define OBJ_cACertificate		OBJ_X509,37L
-+
-+#define LN_authorityRevocationList		"authorityRevocationList"
-+#define NID_authorityRevocationList		882
-+#define OBJ_authorityRevocationList		OBJ_X509,38L
-+
-+#define LN_certificateRevocationList		"certificateRevocationList"
-+#define NID_certificateRevocationList		883
-+#define OBJ_certificateRevocationList		OBJ_X509,39L
-+
-+#define LN_crossCertificatePair		"crossCertificatePair"
-+#define NID_crossCertificatePair		884
-+#define OBJ_crossCertificatePair		OBJ_X509,40L
-+
-+#define SN_name		"name"
-+#define LN_name		"name"
-+#define NID_name		173
-+#define OBJ_name		OBJ_X509,41L
-+
-+#define SN_givenName		"GN"
-+#define LN_givenName		"givenName"
-+#define NID_givenName		99
-+#define OBJ_givenName		OBJ_X509,42L
-+
-+#define SN_initials		"initials"
-+#define LN_initials		"initials"
-+#define NID_initials		101
-+#define OBJ_initials		OBJ_X509,43L
-+
-+#define LN_generationQualifier		"generationQualifier"
-+#define NID_generationQualifier		509
-+#define OBJ_generationQualifier		OBJ_X509,44L
-+
-+#define LN_x500UniqueIdentifier		"x500UniqueIdentifier"
-+#define NID_x500UniqueIdentifier		503
-+#define OBJ_x500UniqueIdentifier		OBJ_X509,45L
-+
-+#define SN_dnQualifier		"dnQualifier"
-+#define LN_dnQualifier		"dnQualifier"
-+#define NID_dnQualifier		174
-+#define OBJ_dnQualifier		OBJ_X509,46L
-+
-+#define LN_enhancedSearchGuide		"enhancedSearchGuide"
-+#define NID_enhancedSearchGuide		885
-+#define OBJ_enhancedSearchGuide		OBJ_X509,47L
-+
-+#define LN_protocolInformation		"protocolInformation"
-+#define NID_protocolInformation		886
-+#define OBJ_protocolInformation		OBJ_X509,48L
-+
-+#define LN_distinguishedName		"distinguishedName"
-+#define NID_distinguishedName		887
-+#define OBJ_distinguishedName		OBJ_X509,49L
-+
-+#define LN_uniqueMember		"uniqueMember"
-+#define NID_uniqueMember		888
-+#define OBJ_uniqueMember		OBJ_X509,50L
-+
-+#define LN_houseIdentifier		"houseIdentifier"
-+#define NID_houseIdentifier		889
-+#define OBJ_houseIdentifier		OBJ_X509,51L
-+
-+#define LN_supportedAlgorithms		"supportedAlgorithms"
-+#define NID_supportedAlgorithms		890
-+#define OBJ_supportedAlgorithms		OBJ_X509,52L
-+
-+#define LN_deltaRevocationList		"deltaRevocationList"
-+#define NID_deltaRevocationList		891
-+#define OBJ_deltaRevocationList		OBJ_X509,53L
-+
-+#define SN_dmdName		"dmdName"
-+#define NID_dmdName		892
-+#define OBJ_dmdName		OBJ_X509,54L
-+
-+#define LN_pseudonym		"pseudonym"
-+#define NID_pseudonym		510
-+#define OBJ_pseudonym		OBJ_X509,65L
-+
-+#define SN_role		"role"
-+#define LN_role		"role"
-+#define NID_role		400
-+#define OBJ_role		OBJ_X509,72L
-+
-+#define SN_X500algorithms		"X500algorithms"
-+#define LN_X500algorithms		"directory services - algorithms"
-+#define NID_X500algorithms		378
-+#define OBJ_X500algorithms		OBJ_X500,8L
-+
-+#define SN_rsa		"RSA"
-+#define LN_rsa		"rsa"
-+#define NID_rsa		19
-+#define OBJ_rsa		OBJ_X500algorithms,1L,1L
-+
-+#define SN_mdc2WithRSA		"RSA-MDC2"
-+#define LN_mdc2WithRSA		"mdc2WithRSA"
-+#define NID_mdc2WithRSA		96
-+#define OBJ_mdc2WithRSA		OBJ_X500algorithms,3L,100L
-+
-+#define SN_mdc2		"MDC2"
-+#define LN_mdc2		"mdc2"
-+#define NID_mdc2		95
-+#define OBJ_mdc2		OBJ_X500algorithms,3L,101L
-+
-+#define SN_id_ce		"id-ce"
-+#define NID_id_ce		81
-+#define OBJ_id_ce		OBJ_X500,29L
-+
-+#define SN_subject_directory_attributes		"subjectDirectoryAttributes"
-+#define LN_subject_directory_attributes		"X509v3 Subject Directory Attributes"
-+#define NID_subject_directory_attributes		769
-+#define OBJ_subject_directory_attributes		OBJ_id_ce,9L
-+
-+#define SN_subject_key_identifier		"subjectKeyIdentifier"
-+#define LN_subject_key_identifier		"X509v3 Subject Key Identifier"
-+#define NID_subject_key_identifier		82
-+#define OBJ_subject_key_identifier		OBJ_id_ce,14L
-+
-+#define SN_key_usage		"keyUsage"
-+#define LN_key_usage		"X509v3 Key Usage"
-+#define NID_key_usage		83
-+#define OBJ_key_usage		OBJ_id_ce,15L
-+
-+#define SN_private_key_usage_period		"privateKeyUsagePeriod"
-+#define LN_private_key_usage_period		"X509v3 Private Key Usage Period"
-+#define NID_private_key_usage_period		84
-+#define OBJ_private_key_usage_period		OBJ_id_ce,16L
-+
-+#define SN_subject_alt_name		"subjectAltName"
-+#define LN_subject_alt_name		"X509v3 Subject Alternative Name"
-+#define NID_subject_alt_name		85
-+#define OBJ_subject_alt_name		OBJ_id_ce,17L
-+
-+#define SN_issuer_alt_name		"issuerAltName"
-+#define LN_issuer_alt_name		"X509v3 Issuer Alternative Name"
-+#define NID_issuer_alt_name		86
-+#define OBJ_issuer_alt_name		OBJ_id_ce,18L
-+
-+#define SN_basic_constraints		"basicConstraints"
-+#define LN_basic_constraints		"X509v3 Basic Constraints"
-+#define NID_basic_constraints		87
-+#define OBJ_basic_constraints		OBJ_id_ce,19L
-+
-+#define SN_crl_number		"crlNumber"
-+#define LN_crl_number		"X509v3 CRL Number"
-+#define NID_crl_number		88
-+#define OBJ_crl_number		OBJ_id_ce,20L
-+
-+#define SN_crl_reason		"CRLReason"
-+#define LN_crl_reason		"X509v3 CRL Reason Code"
-+#define NID_crl_reason		141
-+#define OBJ_crl_reason		OBJ_id_ce,21L
-+
-+#define SN_invalidity_date		"invalidityDate"
-+#define LN_invalidity_date		"Invalidity Date"
-+#define NID_invalidity_date		142
-+#define OBJ_invalidity_date		OBJ_id_ce,24L
-+
-+#define SN_delta_crl		"deltaCRL"
-+#define LN_delta_crl		"X509v3 Delta CRL Indicator"
-+#define NID_delta_crl		140
-+#define OBJ_delta_crl		OBJ_id_ce,27L
-+
-+#define SN_issuing_distribution_point		"issuingDistributionPoint"
-+#define LN_issuing_distribution_point		"X509v3 Issuing Distrubution Point"
-+#define NID_issuing_distribution_point		770
-+#define OBJ_issuing_distribution_point		OBJ_id_ce,28L
-+
-+#define SN_certificate_issuer		"certificateIssuer"
-+#define LN_certificate_issuer		"X509v3 Certificate Issuer"
-+#define NID_certificate_issuer		771
-+#define OBJ_certificate_issuer		OBJ_id_ce,29L
-+
-+#define SN_name_constraints		"nameConstraints"
-+#define LN_name_constraints		"X509v3 Name Constraints"
-+#define NID_name_constraints		666
-+#define OBJ_name_constraints		OBJ_id_ce,30L
-+
-+#define SN_crl_distribution_points		"crlDistributionPoints"
-+#define LN_crl_distribution_points		"X509v3 CRL Distribution Points"
-+#define NID_crl_distribution_points		103
-+#define OBJ_crl_distribution_points		OBJ_id_ce,31L
-+
-+#define SN_certificate_policies		"certificatePolicies"
-+#define LN_certificate_policies		"X509v3 Certificate Policies"
-+#define NID_certificate_policies		89
-+#define OBJ_certificate_policies		OBJ_id_ce,32L
-+
-+#define SN_any_policy		"anyPolicy"
-+#define LN_any_policy		"X509v3 Any Policy"
-+#define NID_any_policy		746
-+#define OBJ_any_policy		OBJ_certificate_policies,0L
-+
-+#define SN_policy_mappings		"policyMappings"
-+#define LN_policy_mappings		"X509v3 Policy Mappings"
-+#define NID_policy_mappings		747
-+#define OBJ_policy_mappings		OBJ_id_ce,33L
-+
-+#define SN_authority_key_identifier		"authorityKeyIdentifier"
-+#define LN_authority_key_identifier		"X509v3 Authority Key Identifier"
-+#define NID_authority_key_identifier		90
-+#define OBJ_authority_key_identifier		OBJ_id_ce,35L
-+
-+#define SN_policy_constraints		"policyConstraints"
-+#define LN_policy_constraints		"X509v3 Policy Constraints"
-+#define NID_policy_constraints		401
-+#define OBJ_policy_constraints		OBJ_id_ce,36L
-+
-+#define SN_ext_key_usage		"extendedKeyUsage"
-+#define LN_ext_key_usage		"X509v3 Extended Key Usage"
-+#define NID_ext_key_usage		126
-+#define OBJ_ext_key_usage		OBJ_id_ce,37L
-+
-+#define SN_freshest_crl		"freshestCRL"
-+#define LN_freshest_crl		"X509v3 Freshest CRL"
-+#define NID_freshest_crl		857
-+#define OBJ_freshest_crl		OBJ_id_ce,46L
-+
-+#define SN_inhibit_any_policy		"inhibitAnyPolicy"
-+#define LN_inhibit_any_policy		"X509v3 Inhibit Any Policy"
-+#define NID_inhibit_any_policy		748
-+#define OBJ_inhibit_any_policy		OBJ_id_ce,54L
-+
-+#define SN_target_information		"targetInformation"
-+#define LN_target_information		"X509v3 AC Targeting"
-+#define NID_target_information		402
-+#define OBJ_target_information		OBJ_id_ce,55L
-+
-+#define SN_no_rev_avail		"noRevAvail"
-+#define LN_no_rev_avail		"X509v3 No Revocation Available"
-+#define NID_no_rev_avail		403
-+#define OBJ_no_rev_avail		OBJ_id_ce,56L
-+
-+#define SN_anyExtendedKeyUsage		"anyExtendedKeyUsage"
-+#define LN_anyExtendedKeyUsage		"Any Extended Key Usage"
-+#define NID_anyExtendedKeyUsage		910
-+#define OBJ_anyExtendedKeyUsage		OBJ_ext_key_usage,0L
-+
-+#define SN_netscape		"Netscape"
-+#define LN_netscape		"Netscape Communications Corp."
-+#define NID_netscape		57
-+#define OBJ_netscape		2L,16L,840L,1L,113730L
-+
-+#define SN_netscape_cert_extension		"nsCertExt"
-+#define LN_netscape_cert_extension		"Netscape Certificate Extension"
-+#define NID_netscape_cert_extension		58
-+#define OBJ_netscape_cert_extension		OBJ_netscape,1L
-+
-+#define SN_netscape_data_type		"nsDataType"
-+#define LN_netscape_data_type		"Netscape Data Type"
-+#define NID_netscape_data_type		59
-+#define OBJ_netscape_data_type		OBJ_netscape,2L
-+
-+#define SN_netscape_cert_type		"nsCertType"
-+#define LN_netscape_cert_type		"Netscape Cert Type"
-+#define NID_netscape_cert_type		71
-+#define OBJ_netscape_cert_type		OBJ_netscape_cert_extension,1L
-+
-+#define SN_netscape_base_url		"nsBaseUrl"
-+#define LN_netscape_base_url		"Netscape Base Url"
-+#define NID_netscape_base_url		72
-+#define OBJ_netscape_base_url		OBJ_netscape_cert_extension,2L
-+
-+#define SN_netscape_revocation_url		"nsRevocationUrl"
-+#define LN_netscape_revocation_url		"Netscape Revocation Url"
-+#define NID_netscape_revocation_url		73
-+#define OBJ_netscape_revocation_url		OBJ_netscape_cert_extension,3L
-+
-+#define SN_netscape_ca_revocation_url		"nsCaRevocationUrl"
-+#define LN_netscape_ca_revocation_url		"Netscape CA Revocation Url"
-+#define NID_netscape_ca_revocation_url		74
-+#define OBJ_netscape_ca_revocation_url		OBJ_netscape_cert_extension,4L
-+
-+#define SN_netscape_renewal_url		"nsRenewalUrl"
-+#define LN_netscape_renewal_url		"Netscape Renewal Url"
-+#define NID_netscape_renewal_url		75
-+#define OBJ_netscape_renewal_url		OBJ_netscape_cert_extension,7L
-+
-+#define SN_netscape_ca_policy_url		"nsCaPolicyUrl"
-+#define LN_netscape_ca_policy_url		"Netscape CA Policy Url"
-+#define NID_netscape_ca_policy_url		76
-+#define OBJ_netscape_ca_policy_url		OBJ_netscape_cert_extension,8L
-+
-+#define SN_netscape_ssl_server_name		"nsSslServerName"
-+#define LN_netscape_ssl_server_name		"Netscape SSL Server Name"
-+#define NID_netscape_ssl_server_name		77
-+#define OBJ_netscape_ssl_server_name		OBJ_netscape_cert_extension,12L
-+
-+#define SN_netscape_comment		"nsComment"
-+#define LN_netscape_comment		"Netscape Comment"
-+#define NID_netscape_comment		78
-+#define OBJ_netscape_comment		OBJ_netscape_cert_extension,13L
-+
-+#define SN_netscape_cert_sequence		"nsCertSequence"
-+#define LN_netscape_cert_sequence		"Netscape Certificate Sequence"
-+#define NID_netscape_cert_sequence		79
-+#define OBJ_netscape_cert_sequence		OBJ_netscape_data_type,5L
-+
-+#define SN_ns_sgc		"nsSGC"
-+#define LN_ns_sgc		"Netscape Server Gated Crypto"
-+#define NID_ns_sgc		139
-+#define OBJ_ns_sgc		OBJ_netscape,4L,1L
-+
-+#define SN_org		"ORG"
-+#define LN_org		"org"
-+#define NID_org		379
-+#define OBJ_org		OBJ_iso,3L
-+
-+#define SN_dod		"DOD"
-+#define LN_dod		"dod"
-+#define NID_dod		380
-+#define OBJ_dod		OBJ_org,6L
-+
-+#define SN_iana		"IANA"
-+#define LN_iana		"iana"
-+#define NID_iana		381
-+#define OBJ_iana		OBJ_dod,1L
-+
-+#define OBJ_internet		OBJ_iana
-+
-+#define SN_Directory		"directory"
-+#define LN_Directory		"Directory"
-+#define NID_Directory		382
-+#define OBJ_Directory		OBJ_internet,1L
-+
-+#define SN_Management		"mgmt"
-+#define LN_Management		"Management"
-+#define NID_Management		383
-+#define OBJ_Management		OBJ_internet,2L
-+
-+#define SN_Experimental		"experimental"
-+#define LN_Experimental		"Experimental"
-+#define NID_Experimental		384
-+#define OBJ_Experimental		OBJ_internet,3L
-+
-+#define SN_Private		"private"
-+#define LN_Private		"Private"
-+#define NID_Private		385
-+#define OBJ_Private		OBJ_internet,4L
-+
-+#define SN_Security		"security"
-+#define LN_Security		"Security"
-+#define NID_Security		386
-+#define OBJ_Security		OBJ_internet,5L
-+
-+#define SN_SNMPv2		"snmpv2"
-+#define LN_SNMPv2		"SNMPv2"
-+#define NID_SNMPv2		387
-+#define OBJ_SNMPv2		OBJ_internet,6L
-+
-+#define LN_Mail		"Mail"
-+#define NID_Mail		388
-+#define OBJ_Mail		OBJ_internet,7L
-+
-+#define SN_Enterprises		"enterprises"
-+#define LN_Enterprises		"Enterprises"
-+#define NID_Enterprises		389
-+#define OBJ_Enterprises		OBJ_Private,1L
-+
-+#define SN_dcObject		"dcobject"
-+#define LN_dcObject		"dcObject"
-+#define NID_dcObject		390
-+#define OBJ_dcObject		OBJ_Enterprises,1466L,344L
-+
-+#define SN_mime_mhs		"mime-mhs"
-+#define LN_mime_mhs		"MIME MHS"
-+#define NID_mime_mhs		504
-+#define OBJ_mime_mhs		OBJ_Mail,1L
-+
-+#define SN_mime_mhs_headings		"mime-mhs-headings"
-+#define LN_mime_mhs_headings		"mime-mhs-headings"
-+#define NID_mime_mhs_headings		505
-+#define OBJ_mime_mhs_headings		OBJ_mime_mhs,1L
-+
-+#define SN_mime_mhs_bodies		"mime-mhs-bodies"
-+#define LN_mime_mhs_bodies		"mime-mhs-bodies"
-+#define NID_mime_mhs_bodies		506
-+#define OBJ_mime_mhs_bodies		OBJ_mime_mhs,2L
-+
-+#define SN_id_hex_partial_message		"id-hex-partial-message"
-+#define LN_id_hex_partial_message		"id-hex-partial-message"
-+#define NID_id_hex_partial_message		507
-+#define OBJ_id_hex_partial_message		OBJ_mime_mhs_headings,1L
-+
-+#define SN_id_hex_multipart_message		"id-hex-multipart-message"
-+#define LN_id_hex_multipart_message		"id-hex-multipart-message"
-+#define NID_id_hex_multipart_message		508
-+#define OBJ_id_hex_multipart_message		OBJ_mime_mhs_headings,2L
-+
-+#define SN_rle_compression		"RLE"
-+#define LN_rle_compression		"run length compression"
-+#define NID_rle_compression		124
-+#define OBJ_rle_compression		1L,1L,1L,1L,666L,1L
-+
-+#define SN_zlib_compression		"ZLIB"
-+#define LN_zlib_compression		"zlib compression"
-+#define NID_zlib_compression		125
-+#define OBJ_zlib_compression		OBJ_id_smime_alg,8L
-+
-+#define OBJ_csor		2L,16L,840L,1L,101L,3L
-+
-+#define OBJ_nistAlgorithms		OBJ_csor,4L
-+
-+#define OBJ_aes		OBJ_nistAlgorithms,1L
-+
-+#define SN_aes_128_ecb		"AES-128-ECB"
-+#define LN_aes_128_ecb		"aes-128-ecb"
-+#define NID_aes_128_ecb		418
-+#define OBJ_aes_128_ecb		OBJ_aes,1L
-+
-+#define SN_aes_128_cbc		"AES-128-CBC"
-+#define LN_aes_128_cbc		"aes-128-cbc"
-+#define NID_aes_128_cbc		419
-+#define OBJ_aes_128_cbc		OBJ_aes,2L
-+
-+#define SN_aes_128_ofb128		"AES-128-OFB"
-+#define LN_aes_128_ofb128		"aes-128-ofb"
-+#define NID_aes_128_ofb128		420
-+#define OBJ_aes_128_ofb128		OBJ_aes,3L
-+
-+#define SN_aes_128_cfb128		"AES-128-CFB"
-+#define LN_aes_128_cfb128		"aes-128-cfb"
-+#define NID_aes_128_cfb128		421
-+#define OBJ_aes_128_cfb128		OBJ_aes,4L
-+
-+#define SN_id_aes128_wrap		"id-aes128-wrap"
-+#define NID_id_aes128_wrap		788
-+#define OBJ_id_aes128_wrap		OBJ_aes,5L
-+
-+#define SN_aes_128_gcm		"id-aes128-GCM"
-+#define LN_aes_128_gcm		"aes-128-gcm"
-+#define NID_aes_128_gcm		895
-+#define OBJ_aes_128_gcm		OBJ_aes,6L
-+
-+#define SN_aes_128_ccm		"id-aes128-CCM"
-+#define LN_aes_128_ccm		"aes-128-ccm"
-+#define NID_aes_128_ccm		896
-+#define OBJ_aes_128_ccm		OBJ_aes,7L
-+
-+#define SN_id_aes128_wrap_pad		"id-aes128-wrap-pad"
-+#define NID_id_aes128_wrap_pad		897
-+#define OBJ_id_aes128_wrap_pad		OBJ_aes,8L
-+
-+#define SN_aes_192_ecb		"AES-192-ECB"
-+#define LN_aes_192_ecb		"aes-192-ecb"
-+#define NID_aes_192_ecb		422
-+#define OBJ_aes_192_ecb		OBJ_aes,21L
-+
-+#define SN_aes_192_cbc		"AES-192-CBC"
-+#define LN_aes_192_cbc		"aes-192-cbc"
-+#define NID_aes_192_cbc		423
-+#define OBJ_aes_192_cbc		OBJ_aes,22L
-+
-+#define SN_aes_192_ofb128		"AES-192-OFB"
-+#define LN_aes_192_ofb128		"aes-192-ofb"
-+#define NID_aes_192_ofb128		424
-+#define OBJ_aes_192_ofb128		OBJ_aes,23L
-+
-+#define SN_aes_192_cfb128		"AES-192-CFB"
-+#define LN_aes_192_cfb128		"aes-192-cfb"
-+#define NID_aes_192_cfb128		425
-+#define OBJ_aes_192_cfb128		OBJ_aes,24L
-+
-+#define SN_id_aes192_wrap		"id-aes192-wrap"
-+#define NID_id_aes192_wrap		789
-+#define OBJ_id_aes192_wrap		OBJ_aes,25L
-+
-+#define SN_aes_192_gcm		"id-aes192-GCM"
-+#define LN_aes_192_gcm		"aes-192-gcm"
-+#define NID_aes_192_gcm		898
-+#define OBJ_aes_192_gcm		OBJ_aes,26L
-+
-+#define SN_aes_192_ccm		"id-aes192-CCM"
-+#define LN_aes_192_ccm		"aes-192-ccm"
-+#define NID_aes_192_ccm		899
-+#define OBJ_aes_192_ccm		OBJ_aes,27L
-+
-+#define SN_id_aes192_wrap_pad		"id-aes192-wrap-pad"
-+#define NID_id_aes192_wrap_pad		900
-+#define OBJ_id_aes192_wrap_pad		OBJ_aes,28L
-+
-+#define SN_aes_256_ecb		"AES-256-ECB"
-+#define LN_aes_256_ecb		"aes-256-ecb"
-+#define NID_aes_256_ecb		426
-+#define OBJ_aes_256_ecb		OBJ_aes,41L
-+
-+#define SN_aes_256_cbc		"AES-256-CBC"
-+#define LN_aes_256_cbc		"aes-256-cbc"
-+#define NID_aes_256_cbc		427
-+#define OBJ_aes_256_cbc		OBJ_aes,42L
-+
-+#define SN_aes_256_ofb128		"AES-256-OFB"
-+#define LN_aes_256_ofb128		"aes-256-ofb"
-+#define NID_aes_256_ofb128		428
-+#define OBJ_aes_256_ofb128		OBJ_aes,43L
-+
-+#define SN_aes_256_cfb128		"AES-256-CFB"
-+#define LN_aes_256_cfb128		"aes-256-cfb"
-+#define NID_aes_256_cfb128		429
-+#define OBJ_aes_256_cfb128		OBJ_aes,44L
-+
-+#define SN_id_aes256_wrap		"id-aes256-wrap"
-+#define NID_id_aes256_wrap		790
-+#define OBJ_id_aes256_wrap		OBJ_aes,45L
-+
-+#define SN_aes_256_gcm		"id-aes256-GCM"
-+#define LN_aes_256_gcm		"aes-256-gcm"
-+#define NID_aes_256_gcm		901
-+#define OBJ_aes_256_gcm		OBJ_aes,46L
-+
-+#define SN_aes_256_ccm		"id-aes256-CCM"
-+#define LN_aes_256_ccm		"aes-256-ccm"
-+#define NID_aes_256_ccm		902
-+#define OBJ_aes_256_ccm		OBJ_aes,47L
-+
-+#define SN_id_aes256_wrap_pad		"id-aes256-wrap-pad"
-+#define NID_id_aes256_wrap_pad		903
-+#define OBJ_id_aes256_wrap_pad		OBJ_aes,48L
-+
-+#define SN_aes_128_cfb1		"AES-128-CFB1"
-+#define LN_aes_128_cfb1		"aes-128-cfb1"
-+#define NID_aes_128_cfb1		650
-+
-+#define SN_aes_192_cfb1		"AES-192-CFB1"
-+#define LN_aes_192_cfb1		"aes-192-cfb1"
-+#define NID_aes_192_cfb1		651
-+
-+#define SN_aes_256_cfb1		"AES-256-CFB1"
-+#define LN_aes_256_cfb1		"aes-256-cfb1"
-+#define NID_aes_256_cfb1		652
-+
-+#define SN_aes_128_cfb8		"AES-128-CFB8"
-+#define LN_aes_128_cfb8		"aes-128-cfb8"
-+#define NID_aes_128_cfb8		653
-+
-+#define SN_aes_192_cfb8		"AES-192-CFB8"
-+#define LN_aes_192_cfb8		"aes-192-cfb8"
-+#define NID_aes_192_cfb8		654
-+
-+#define SN_aes_256_cfb8		"AES-256-CFB8"
-+#define LN_aes_256_cfb8		"aes-256-cfb8"
-+#define NID_aes_256_cfb8		655
-+
-+#define SN_aes_128_ctr		"AES-128-CTR"
-+#define LN_aes_128_ctr		"aes-128-ctr"
-+#define NID_aes_128_ctr		904
-+
-+#define SN_aes_192_ctr		"AES-192-CTR"
-+#define LN_aes_192_ctr		"aes-192-ctr"
-+#define NID_aes_192_ctr		905
-+
-+#define SN_aes_256_ctr		"AES-256-CTR"
-+#define LN_aes_256_ctr		"aes-256-ctr"
-+#define NID_aes_256_ctr		906
-+
-+#define SN_aes_128_xts		"AES-128-XTS"
-+#define LN_aes_128_xts		"aes-128-xts"
-+#define NID_aes_128_xts		913
-+
-+#define SN_aes_256_xts		"AES-256-XTS"
-+#define LN_aes_256_xts		"aes-256-xts"
-+#define NID_aes_256_xts		914
-+
-+#define SN_des_cfb1		"DES-CFB1"
-+#define LN_des_cfb1		"des-cfb1"
-+#define NID_des_cfb1		656
-+
-+#define SN_des_cfb8		"DES-CFB8"
-+#define LN_des_cfb8		"des-cfb8"
-+#define NID_des_cfb8		657
-+
-+#define SN_des_ede3_cfb1		"DES-EDE3-CFB1"
-+#define LN_des_ede3_cfb1		"des-ede3-cfb1"
-+#define NID_des_ede3_cfb1		658
-+
-+#define SN_des_ede3_cfb8		"DES-EDE3-CFB8"
-+#define LN_des_ede3_cfb8		"des-ede3-cfb8"
-+#define NID_des_ede3_cfb8		659
-+
-+#define OBJ_nist_hashalgs		OBJ_nistAlgorithms,2L
-+
-+#define SN_sha256		"SHA256"
-+#define LN_sha256		"sha256"
-+#define NID_sha256		672
-+#define OBJ_sha256		OBJ_nist_hashalgs,1L
-+
-+#define SN_sha384		"SHA384"
-+#define LN_sha384		"sha384"
-+#define NID_sha384		673
-+#define OBJ_sha384		OBJ_nist_hashalgs,2L
-+
-+#define SN_sha512		"SHA512"
-+#define LN_sha512		"sha512"
-+#define NID_sha512		674
-+#define OBJ_sha512		OBJ_nist_hashalgs,3L
-+
-+#define SN_sha224		"SHA224"
-+#define LN_sha224		"sha224"
-+#define NID_sha224		675
-+#define OBJ_sha224		OBJ_nist_hashalgs,4L
-+
-+#define OBJ_dsa_with_sha2		OBJ_nistAlgorithms,3L
-+
-+#define SN_dsa_with_SHA224		"dsa_with_SHA224"
-+#define NID_dsa_with_SHA224		802
-+#define OBJ_dsa_with_SHA224		OBJ_dsa_with_sha2,1L
-+
-+#define SN_dsa_with_SHA256		"dsa_with_SHA256"
-+#define NID_dsa_with_SHA256		803
-+#define OBJ_dsa_with_SHA256		OBJ_dsa_with_sha2,2L
-+
-+#define SN_hold_instruction_code		"holdInstructionCode"
-+#define LN_hold_instruction_code		"Hold Instruction Code"
-+#define NID_hold_instruction_code		430
-+#define OBJ_hold_instruction_code		OBJ_id_ce,23L
-+
-+#define OBJ_holdInstruction		OBJ_X9_57,2L
-+
-+#define SN_hold_instruction_none		"holdInstructionNone"
-+#define LN_hold_instruction_none		"Hold Instruction None"
-+#define NID_hold_instruction_none		431
-+#define OBJ_hold_instruction_none		OBJ_holdInstruction,1L
-+
-+#define SN_hold_instruction_call_issuer		"holdInstructionCallIssuer"
-+#define LN_hold_instruction_call_issuer		"Hold Instruction Call Issuer"
-+#define NID_hold_instruction_call_issuer		432
-+#define OBJ_hold_instruction_call_issuer		OBJ_holdInstruction,2L
-+
-+#define SN_hold_instruction_reject		"holdInstructionReject"
-+#define LN_hold_instruction_reject		"Hold Instruction Reject"
-+#define NID_hold_instruction_reject		433
-+#define OBJ_hold_instruction_reject		OBJ_holdInstruction,3L
-+
-+#define SN_data		"data"
-+#define NID_data		434
-+#define OBJ_data		OBJ_itu_t,9L
-+
-+#define SN_pss		"pss"
-+#define NID_pss		435
-+#define OBJ_pss		OBJ_data,2342L
-+
-+#define SN_ucl		"ucl"
-+#define NID_ucl		436
-+#define OBJ_ucl		OBJ_pss,19200300L
-+
-+#define SN_pilot		"pilot"
-+#define NID_pilot		437
-+#define OBJ_pilot		OBJ_ucl,100L
-+
-+#define LN_pilotAttributeType		"pilotAttributeType"
-+#define NID_pilotAttributeType		438
-+#define OBJ_pilotAttributeType		OBJ_pilot,1L
-+
-+#define LN_pilotAttributeSyntax		"pilotAttributeSyntax"
-+#define NID_pilotAttributeSyntax		439
-+#define OBJ_pilotAttributeSyntax		OBJ_pilot,3L
-+
-+#define LN_pilotObjectClass		"pilotObjectClass"
-+#define NID_pilotObjectClass		440
-+#define OBJ_pilotObjectClass		OBJ_pilot,4L
-+
-+#define LN_pilotGroups		"pilotGroups"
-+#define NID_pilotGroups		441
-+#define OBJ_pilotGroups		OBJ_pilot,10L
-+
-+#define LN_iA5StringSyntax		"iA5StringSyntax"
-+#define NID_iA5StringSyntax		442
-+#define OBJ_iA5StringSyntax		OBJ_pilotAttributeSyntax,4L
-+
-+#define LN_caseIgnoreIA5StringSyntax		"caseIgnoreIA5StringSyntax"
-+#define NID_caseIgnoreIA5StringSyntax		443
-+#define OBJ_caseIgnoreIA5StringSyntax		OBJ_pilotAttributeSyntax,5L
-+
-+#define LN_pilotObject		"pilotObject"
-+#define NID_pilotObject		444
-+#define OBJ_pilotObject		OBJ_pilotObjectClass,3L
-+
-+#define LN_pilotPerson		"pilotPerson"
-+#define NID_pilotPerson		445
-+#define OBJ_pilotPerson		OBJ_pilotObjectClass,4L
-+
-+#define SN_account		"account"
-+#define NID_account		446
-+#define OBJ_account		OBJ_pilotObjectClass,5L
-+
-+#define SN_document		"document"
-+#define NID_document		447
-+#define OBJ_document		OBJ_pilotObjectClass,6L
-+
-+#define SN_room		"room"
-+#define NID_room		448
-+#define OBJ_room		OBJ_pilotObjectClass,7L
-+
-+#define LN_documentSeries		"documentSeries"
-+#define NID_documentSeries		449
-+#define OBJ_documentSeries		OBJ_pilotObjectClass,9L
-+
-+#define SN_Domain		"domain"
-+#define LN_Domain		"Domain"
-+#define NID_Domain		392
-+#define OBJ_Domain		OBJ_pilotObjectClass,13L
-+
-+#define LN_rFC822localPart		"rFC822localPart"
-+#define NID_rFC822localPart		450
-+#define OBJ_rFC822localPart		OBJ_pilotObjectClass,14L
-+
-+#define LN_dNSDomain		"dNSDomain"
-+#define NID_dNSDomain		451
-+#define OBJ_dNSDomain		OBJ_pilotObjectClass,15L
-+
-+#define LN_domainRelatedObject		"domainRelatedObject"
-+#define NID_domainRelatedObject		452
-+#define OBJ_domainRelatedObject		OBJ_pilotObjectClass,17L
-+
-+#define LN_friendlyCountry		"friendlyCountry"
-+#define NID_friendlyCountry		453
-+#define OBJ_friendlyCountry		OBJ_pilotObjectClass,18L
-+
-+#define LN_simpleSecurityObject		"simpleSecurityObject"
-+#define NID_simpleSecurityObject		454
-+#define OBJ_simpleSecurityObject		OBJ_pilotObjectClass,19L
-+
-+#define LN_pilotOrganization		"pilotOrganization"
-+#define NID_pilotOrganization		455
-+#define OBJ_pilotOrganization		OBJ_pilotObjectClass,20L
-+
-+#define LN_pilotDSA		"pilotDSA"
-+#define NID_pilotDSA		456
-+#define OBJ_pilotDSA		OBJ_pilotObjectClass,21L
-+
-+#define LN_qualityLabelledData		"qualityLabelledData"
-+#define NID_qualityLabelledData		457
-+#define OBJ_qualityLabelledData		OBJ_pilotObjectClass,22L
-+
-+#define SN_userId		"UID"
-+#define LN_userId		"userId"
-+#define NID_userId		458
-+#define OBJ_userId		OBJ_pilotAttributeType,1L
-+
-+#define LN_textEncodedORAddress		"textEncodedORAddress"
-+#define NID_textEncodedORAddress		459
-+#define OBJ_textEncodedORAddress		OBJ_pilotAttributeType,2L
-+
-+#define SN_rfc822Mailbox		"mail"
-+#define LN_rfc822Mailbox		"rfc822Mailbox"
-+#define NID_rfc822Mailbox		460
-+#define OBJ_rfc822Mailbox		OBJ_pilotAttributeType,3L
-+
-+#define SN_info		"info"
-+#define NID_info		461
-+#define OBJ_info		OBJ_pilotAttributeType,4L
-+
-+#define LN_favouriteDrink		"favouriteDrink"
-+#define NID_favouriteDrink		462
-+#define OBJ_favouriteDrink		OBJ_pilotAttributeType,5L
-+
-+#define LN_roomNumber		"roomNumber"
-+#define NID_roomNumber		463
-+#define OBJ_roomNumber		OBJ_pilotAttributeType,6L
-+
-+#define SN_photo		"photo"
-+#define NID_photo		464
-+#define OBJ_photo		OBJ_pilotAttributeType,7L
-+
-+#define LN_userClass		"userClass"
-+#define NID_userClass		465
-+#define OBJ_userClass		OBJ_pilotAttributeType,8L
-+
-+#define SN_host		"host"
-+#define NID_host		466
-+#define OBJ_host		OBJ_pilotAttributeType,9L
-+
-+#define SN_manager		"manager"
-+#define NID_manager		467
-+#define OBJ_manager		OBJ_pilotAttributeType,10L
-+
-+#define LN_documentIdentifier		"documentIdentifier"
-+#define NID_documentIdentifier		468
-+#define OBJ_documentIdentifier		OBJ_pilotAttributeType,11L
-+
-+#define LN_documentTitle		"documentTitle"
-+#define NID_documentTitle		469
-+#define OBJ_documentTitle		OBJ_pilotAttributeType,12L
-+
-+#define LN_documentVersion		"documentVersion"
-+#define NID_documentVersion		470
-+#define OBJ_documentVersion		OBJ_pilotAttributeType,13L
-+
-+#define LN_documentAuthor		"documentAuthor"
-+#define NID_documentAuthor		471
-+#define OBJ_documentAuthor		OBJ_pilotAttributeType,14L
-+
-+#define LN_documentLocation		"documentLocation"
-+#define NID_documentLocation		472
-+#define OBJ_documentLocation		OBJ_pilotAttributeType,15L
-+
-+#define LN_homeTelephoneNumber		"homeTelephoneNumber"
-+#define NID_homeTelephoneNumber		473
-+#define OBJ_homeTelephoneNumber		OBJ_pilotAttributeType,20L
-+
-+#define SN_secretary		"secretary"
-+#define NID_secretary		474
-+#define OBJ_secretary		OBJ_pilotAttributeType,21L
-+
-+#define LN_otherMailbox		"otherMailbox"
-+#define NID_otherMailbox		475
-+#define OBJ_otherMailbox		OBJ_pilotAttributeType,22L
-+
-+#define LN_lastModifiedTime		"lastModifiedTime"
-+#define NID_lastModifiedTime		476
-+#define OBJ_lastModifiedTime		OBJ_pilotAttributeType,23L
-+
-+#define LN_lastModifiedBy		"lastModifiedBy"
-+#define NID_lastModifiedBy		477
-+#define OBJ_lastModifiedBy		OBJ_pilotAttributeType,24L
-+
-+#define SN_domainComponent		"DC"
-+#define LN_domainComponent		"domainComponent"
-+#define NID_domainComponent		391
-+#define OBJ_domainComponent		OBJ_pilotAttributeType,25L
-+
-+#define LN_aRecord		"aRecord"
-+#define NID_aRecord		478
-+#define OBJ_aRecord		OBJ_pilotAttributeType,26L
-+
-+#define LN_pilotAttributeType27		"pilotAttributeType27"
-+#define NID_pilotAttributeType27		479
-+#define OBJ_pilotAttributeType27		OBJ_pilotAttributeType,27L
-+
-+#define LN_mXRecord		"mXRecord"
-+#define NID_mXRecord		480
-+#define OBJ_mXRecord		OBJ_pilotAttributeType,28L
-+
-+#define LN_nSRecord		"nSRecord"
-+#define NID_nSRecord		481
-+#define OBJ_nSRecord		OBJ_pilotAttributeType,29L
-+
-+#define LN_sOARecord		"sOARecord"
-+#define NID_sOARecord		482
-+#define OBJ_sOARecord		OBJ_pilotAttributeType,30L
-+
-+#define LN_cNAMERecord		"cNAMERecord"
-+#define NID_cNAMERecord		483
-+#define OBJ_cNAMERecord		OBJ_pilotAttributeType,31L
-+
-+#define LN_associatedDomain		"associatedDomain"
-+#define NID_associatedDomain		484
-+#define OBJ_associatedDomain		OBJ_pilotAttributeType,37L
-+
-+#define LN_associatedName		"associatedName"
-+#define NID_associatedName		485
-+#define OBJ_associatedName		OBJ_pilotAttributeType,38L
-+
-+#define LN_homePostalAddress		"homePostalAddress"
-+#define NID_homePostalAddress		486
-+#define OBJ_homePostalAddress		OBJ_pilotAttributeType,39L
-+
-+#define LN_personalTitle		"personalTitle"
-+#define NID_personalTitle		487
-+#define OBJ_personalTitle		OBJ_pilotAttributeType,40L
-+
-+#define LN_mobileTelephoneNumber		"mobileTelephoneNumber"
-+#define NID_mobileTelephoneNumber		488
-+#define OBJ_mobileTelephoneNumber		OBJ_pilotAttributeType,41L
-+
-+#define LN_pagerTelephoneNumber		"pagerTelephoneNumber"
-+#define NID_pagerTelephoneNumber		489
-+#define OBJ_pagerTelephoneNumber		OBJ_pilotAttributeType,42L
-+
-+#define LN_friendlyCountryName		"friendlyCountryName"
-+#define NID_friendlyCountryName		490
-+#define OBJ_friendlyCountryName		OBJ_pilotAttributeType,43L
-+
-+#define LN_organizationalStatus		"organizationalStatus"
-+#define NID_organizationalStatus		491
-+#define OBJ_organizationalStatus		OBJ_pilotAttributeType,45L
-+
-+#define LN_janetMailbox		"janetMailbox"
-+#define NID_janetMailbox		492
-+#define OBJ_janetMailbox		OBJ_pilotAttributeType,46L
-+
-+#define LN_mailPreferenceOption		"mailPreferenceOption"
-+#define NID_mailPreferenceOption		493
-+#define OBJ_mailPreferenceOption		OBJ_pilotAttributeType,47L
-+
-+#define LN_buildingName		"buildingName"
-+#define NID_buildingName		494
-+#define OBJ_buildingName		OBJ_pilotAttributeType,48L
-+
-+#define LN_dSAQuality		"dSAQuality"
-+#define NID_dSAQuality		495
-+#define OBJ_dSAQuality		OBJ_pilotAttributeType,49L
-+
-+#define LN_singleLevelQuality		"singleLevelQuality"
-+#define NID_singleLevelQuality		496
-+#define OBJ_singleLevelQuality		OBJ_pilotAttributeType,50L
-+
-+#define LN_subtreeMinimumQuality		"subtreeMinimumQuality"
-+#define NID_subtreeMinimumQuality		497
-+#define OBJ_subtreeMinimumQuality		OBJ_pilotAttributeType,51L
-+
-+#define LN_subtreeMaximumQuality		"subtreeMaximumQuality"
-+#define NID_subtreeMaximumQuality		498
-+#define OBJ_subtreeMaximumQuality		OBJ_pilotAttributeType,52L
-+
-+#define LN_personalSignature		"personalSignature"
-+#define NID_personalSignature		499
-+#define OBJ_personalSignature		OBJ_pilotAttributeType,53L
-+
-+#define LN_dITRedirect		"dITRedirect"
-+#define NID_dITRedirect		500
-+#define OBJ_dITRedirect		OBJ_pilotAttributeType,54L
-+
-+#define SN_audio		"audio"
-+#define NID_audio		501
-+#define OBJ_audio		OBJ_pilotAttributeType,55L
-+
-+#define LN_documentPublisher		"documentPublisher"
-+#define NID_documentPublisher		502
-+#define OBJ_documentPublisher		OBJ_pilotAttributeType,56L
-+
-+#define SN_id_set		"id-set"
-+#define LN_id_set		"Secure Electronic Transactions"
-+#define NID_id_set		512
-+#define OBJ_id_set		OBJ_international_organizations,42L
-+
-+#define SN_set_ctype		"set-ctype"
-+#define LN_set_ctype		"content types"
-+#define NID_set_ctype		513
-+#define OBJ_set_ctype		OBJ_id_set,0L
-+
-+#define SN_set_msgExt		"set-msgExt"
-+#define LN_set_msgExt		"message extensions"
-+#define NID_set_msgExt		514
-+#define OBJ_set_msgExt		OBJ_id_set,1L
-+
-+#define SN_set_attr		"set-attr"
-+#define NID_set_attr		515
-+#define OBJ_set_attr		OBJ_id_set,3L
-+
-+#define SN_set_policy		"set-policy"
-+#define NID_set_policy		516
-+#define OBJ_set_policy		OBJ_id_set,5L
-+
-+#define SN_set_certExt		"set-certExt"
-+#define LN_set_certExt		"certificate extensions"
-+#define NID_set_certExt		517
-+#define OBJ_set_certExt		OBJ_id_set,7L
-+
-+#define SN_set_brand		"set-brand"
-+#define NID_set_brand		518
-+#define OBJ_set_brand		OBJ_id_set,8L
-+
-+#define SN_setct_PANData		"setct-PANData"
-+#define NID_setct_PANData		519
-+#define OBJ_setct_PANData		OBJ_set_ctype,0L
-+
-+#define SN_setct_PANToken		"setct-PANToken"
-+#define NID_setct_PANToken		520
-+#define OBJ_setct_PANToken		OBJ_set_ctype,1L
-+
-+#define SN_setct_PANOnly		"setct-PANOnly"
-+#define NID_setct_PANOnly		521
-+#define OBJ_setct_PANOnly		OBJ_set_ctype,2L
-+
-+#define SN_setct_OIData		"setct-OIData"
-+#define NID_setct_OIData		522
-+#define OBJ_setct_OIData		OBJ_set_ctype,3L
-+
-+#define SN_setct_PI		"setct-PI"
-+#define NID_setct_PI		523
-+#define OBJ_setct_PI		OBJ_set_ctype,4L
-+
-+#define SN_setct_PIData		"setct-PIData"
-+#define NID_setct_PIData		524
-+#define OBJ_setct_PIData		OBJ_set_ctype,5L
-+
-+#define SN_setct_PIDataUnsigned		"setct-PIDataUnsigned"
-+#define NID_setct_PIDataUnsigned		525
-+#define OBJ_setct_PIDataUnsigned		OBJ_set_ctype,6L
-+
-+#define SN_setct_HODInput		"setct-HODInput"
-+#define NID_setct_HODInput		526
-+#define OBJ_setct_HODInput		OBJ_set_ctype,7L
-+
-+#define SN_setct_AuthResBaggage		"setct-AuthResBaggage"
-+#define NID_setct_AuthResBaggage		527
-+#define OBJ_setct_AuthResBaggage		OBJ_set_ctype,8L
-+
-+#define SN_setct_AuthRevReqBaggage		"setct-AuthRevReqBaggage"
-+#define NID_setct_AuthRevReqBaggage		528
-+#define OBJ_setct_AuthRevReqBaggage		OBJ_set_ctype,9L
-+
-+#define SN_setct_AuthRevResBaggage		"setct-AuthRevResBaggage"
-+#define NID_setct_AuthRevResBaggage		529
-+#define OBJ_setct_AuthRevResBaggage		OBJ_set_ctype,10L
-+
-+#define SN_setct_CapTokenSeq		"setct-CapTokenSeq"
-+#define NID_setct_CapTokenSeq		530
-+#define OBJ_setct_CapTokenSeq		OBJ_set_ctype,11L
-+
-+#define SN_setct_PInitResData		"setct-PInitResData"
-+#define NID_setct_PInitResData		531
-+#define OBJ_setct_PInitResData		OBJ_set_ctype,12L
-+
-+#define SN_setct_PI_TBS		"setct-PI-TBS"
-+#define NID_setct_PI_TBS		532
-+#define OBJ_setct_PI_TBS		OBJ_set_ctype,13L
-+
-+#define SN_setct_PResData		"setct-PResData"
-+#define NID_setct_PResData		533
-+#define OBJ_setct_PResData		OBJ_set_ctype,14L
-+
-+#define SN_setct_AuthReqTBS		"setct-AuthReqTBS"
-+#define NID_setct_AuthReqTBS		534
-+#define OBJ_setct_AuthReqTBS		OBJ_set_ctype,16L
-+
-+#define SN_setct_AuthResTBS		"setct-AuthResTBS"
-+#define NID_setct_AuthResTBS		535
-+#define OBJ_setct_AuthResTBS		OBJ_set_ctype,17L
-+
-+#define SN_setct_AuthResTBSX		"setct-AuthResTBSX"
-+#define NID_setct_AuthResTBSX		536
-+#define OBJ_setct_AuthResTBSX		OBJ_set_ctype,18L
-+
-+#define SN_setct_AuthTokenTBS		"setct-AuthTokenTBS"
-+#define NID_setct_AuthTokenTBS		537
-+#define OBJ_setct_AuthTokenTBS		OBJ_set_ctype,19L
-+
-+#define SN_setct_CapTokenData		"setct-CapTokenData"
-+#define NID_setct_CapTokenData		538
-+#define OBJ_setct_CapTokenData		OBJ_set_ctype,20L
-+
-+#define SN_setct_CapTokenTBS		"setct-CapTokenTBS"
-+#define NID_setct_CapTokenTBS		539
-+#define OBJ_setct_CapTokenTBS		OBJ_set_ctype,21L
-+
-+#define SN_setct_AcqCardCodeMsg		"setct-AcqCardCodeMsg"
-+#define NID_setct_AcqCardCodeMsg		540
-+#define OBJ_setct_AcqCardCodeMsg		OBJ_set_ctype,22L
-+
-+#define SN_setct_AuthRevReqTBS		"setct-AuthRevReqTBS"
-+#define NID_setct_AuthRevReqTBS		541
-+#define OBJ_setct_AuthRevReqTBS		OBJ_set_ctype,23L
-+
-+#define SN_setct_AuthRevResData		"setct-AuthRevResData"
-+#define NID_setct_AuthRevResData		542
-+#define OBJ_setct_AuthRevResData		OBJ_set_ctype,24L
-+
-+#define SN_setct_AuthRevResTBS		"setct-AuthRevResTBS"
-+#define NID_setct_AuthRevResTBS		543
-+#define OBJ_setct_AuthRevResTBS		OBJ_set_ctype,25L
-+
-+#define SN_setct_CapReqTBS		"setct-CapReqTBS"
-+#define NID_setct_CapReqTBS		544
-+#define OBJ_setct_CapReqTBS		OBJ_set_ctype,26L
-+
-+#define SN_setct_CapReqTBSX		"setct-CapReqTBSX"
-+#define NID_setct_CapReqTBSX		545
-+#define OBJ_setct_CapReqTBSX		OBJ_set_ctype,27L
-+
-+#define SN_setct_CapResData		"setct-CapResData"
-+#define NID_setct_CapResData		546
-+#define OBJ_setct_CapResData		OBJ_set_ctype,28L
-+
-+#define SN_setct_CapRevReqTBS		"setct-CapRevReqTBS"
-+#define NID_setct_CapRevReqTBS		547
-+#define OBJ_setct_CapRevReqTBS		OBJ_set_ctype,29L
-+
-+#define SN_setct_CapRevReqTBSX		"setct-CapRevReqTBSX"
-+#define NID_setct_CapRevReqTBSX		548
-+#define OBJ_setct_CapRevReqTBSX		OBJ_set_ctype,30L
-+
-+#define SN_setct_CapRevResData		"setct-CapRevResData"
-+#define NID_setct_CapRevResData		549
-+#define OBJ_setct_CapRevResData		OBJ_set_ctype,31L
-+
-+#define SN_setct_CredReqTBS		"setct-CredReqTBS"
-+#define NID_setct_CredReqTBS		550
-+#define OBJ_setct_CredReqTBS		OBJ_set_ctype,32L
-+
-+#define SN_setct_CredReqTBSX		"setct-CredReqTBSX"
-+#define NID_setct_CredReqTBSX		551
-+#define OBJ_setct_CredReqTBSX		OBJ_set_ctype,33L
-+
-+#define SN_setct_CredResData		"setct-CredResData"
-+#define NID_setct_CredResData		552
-+#define OBJ_setct_CredResData		OBJ_set_ctype,34L
-+
-+#define SN_setct_CredRevReqTBS		"setct-CredRevReqTBS"
-+#define NID_setct_CredRevReqTBS		553
-+#define OBJ_setct_CredRevReqTBS		OBJ_set_ctype,35L
-+
-+#define SN_setct_CredRevReqTBSX		"setct-CredRevReqTBSX"
-+#define NID_setct_CredRevReqTBSX		554
-+#define OBJ_setct_CredRevReqTBSX		OBJ_set_ctype,36L
-+
-+#define SN_setct_CredRevResData		"setct-CredRevResData"
-+#define NID_setct_CredRevResData		555
-+#define OBJ_setct_CredRevResData		OBJ_set_ctype,37L
-+
-+#define SN_setct_PCertReqData		"setct-PCertReqData"
-+#define NID_setct_PCertReqData		556
-+#define OBJ_setct_PCertReqData		OBJ_set_ctype,38L
-+
-+#define SN_setct_PCertResTBS		"setct-PCertResTBS"
-+#define NID_setct_PCertResTBS		557
-+#define OBJ_setct_PCertResTBS		OBJ_set_ctype,39L
-+
-+#define SN_setct_BatchAdminReqData		"setct-BatchAdminReqData"
-+#define NID_setct_BatchAdminReqData		558
-+#define OBJ_setct_BatchAdminReqData		OBJ_set_ctype,40L
-+
-+#define SN_setct_BatchAdminResData		"setct-BatchAdminResData"
-+#define NID_setct_BatchAdminResData		559
-+#define OBJ_setct_BatchAdminResData		OBJ_set_ctype,41L
-+
-+#define SN_setct_CardCInitResTBS		"setct-CardCInitResTBS"
-+#define NID_setct_CardCInitResTBS		560
-+#define OBJ_setct_CardCInitResTBS		OBJ_set_ctype,42L
-+
-+#define SN_setct_MeAqCInitResTBS		"setct-MeAqCInitResTBS"
-+#define NID_setct_MeAqCInitResTBS		561
-+#define OBJ_setct_MeAqCInitResTBS		OBJ_set_ctype,43L
-+
-+#define SN_setct_RegFormResTBS		"setct-RegFormResTBS"
-+#define NID_setct_RegFormResTBS		562
-+#define OBJ_setct_RegFormResTBS		OBJ_set_ctype,44L
-+
-+#define SN_setct_CertReqData		"setct-CertReqData"
-+#define NID_setct_CertReqData		563
-+#define OBJ_setct_CertReqData		OBJ_set_ctype,45L
-+
-+#define SN_setct_CertReqTBS		"setct-CertReqTBS"
-+#define NID_setct_CertReqTBS		564
-+#define OBJ_setct_CertReqTBS		OBJ_set_ctype,46L
-+
-+#define SN_setct_CertResData		"setct-CertResData"
-+#define NID_setct_CertResData		565
-+#define OBJ_setct_CertResData		OBJ_set_ctype,47L
-+
-+#define SN_setct_CertInqReqTBS		"setct-CertInqReqTBS"
-+#define NID_setct_CertInqReqTBS		566
-+#define OBJ_setct_CertInqReqTBS		OBJ_set_ctype,48L
-+
-+#define SN_setct_ErrorTBS		"setct-ErrorTBS"
-+#define NID_setct_ErrorTBS		567
-+#define OBJ_setct_ErrorTBS		OBJ_set_ctype,49L
-+
-+#define SN_setct_PIDualSignedTBE		"setct-PIDualSignedTBE"
-+#define NID_setct_PIDualSignedTBE		568
-+#define OBJ_setct_PIDualSignedTBE		OBJ_set_ctype,50L
-+
-+#define SN_setct_PIUnsignedTBE		"setct-PIUnsignedTBE"
-+#define NID_setct_PIUnsignedTBE		569
-+#define OBJ_setct_PIUnsignedTBE		OBJ_set_ctype,51L
-+
-+#define SN_setct_AuthReqTBE		"setct-AuthReqTBE"
-+#define NID_setct_AuthReqTBE		570
-+#define OBJ_setct_AuthReqTBE		OBJ_set_ctype,52L
-+
-+#define SN_setct_AuthResTBE		"setct-AuthResTBE"
-+#define NID_setct_AuthResTBE		571
-+#define OBJ_setct_AuthResTBE		OBJ_set_ctype,53L
-+
-+#define SN_setct_AuthResTBEX		"setct-AuthResTBEX"
-+#define NID_setct_AuthResTBEX		572
-+#define OBJ_setct_AuthResTBEX		OBJ_set_ctype,54L
-+
-+#define SN_setct_AuthTokenTBE		"setct-AuthTokenTBE"
-+#define NID_setct_AuthTokenTBE		573
-+#define OBJ_setct_AuthTokenTBE		OBJ_set_ctype,55L
-+
-+#define SN_setct_CapTokenTBE		"setct-CapTokenTBE"
-+#define NID_setct_CapTokenTBE		574
-+#define OBJ_setct_CapTokenTBE		OBJ_set_ctype,56L
-+
-+#define SN_setct_CapTokenTBEX		"setct-CapTokenTBEX"
-+#define NID_setct_CapTokenTBEX		575
-+#define OBJ_setct_CapTokenTBEX		OBJ_set_ctype,57L
-+
-+#define SN_setct_AcqCardCodeMsgTBE		"setct-AcqCardCodeMsgTBE"
-+#define NID_setct_AcqCardCodeMsgTBE		576
-+#define OBJ_setct_AcqCardCodeMsgTBE		OBJ_set_ctype,58L
-+
-+#define SN_setct_AuthRevReqTBE		"setct-AuthRevReqTBE"
-+#define NID_setct_AuthRevReqTBE		577
-+#define OBJ_setct_AuthRevReqTBE		OBJ_set_ctype,59L
-+
-+#define SN_setct_AuthRevResTBE		"setct-AuthRevResTBE"
-+#define NID_setct_AuthRevResTBE		578
-+#define OBJ_setct_AuthRevResTBE		OBJ_set_ctype,60L
-+
-+#define SN_setct_AuthRevResTBEB		"setct-AuthRevResTBEB"
-+#define NID_setct_AuthRevResTBEB		579
-+#define OBJ_setct_AuthRevResTBEB		OBJ_set_ctype,61L
-+
-+#define SN_setct_CapReqTBE		"setct-CapReqTBE"
-+#define NID_setct_CapReqTBE		580
-+#define OBJ_setct_CapReqTBE		OBJ_set_ctype,62L
-+
-+#define SN_setct_CapReqTBEX		"setct-CapReqTBEX"
-+#define NID_setct_CapReqTBEX		581
-+#define OBJ_setct_CapReqTBEX		OBJ_set_ctype,63L
-+
-+#define SN_setct_CapResTBE		"setct-CapResTBE"
-+#define NID_setct_CapResTBE		582
-+#define OBJ_setct_CapResTBE		OBJ_set_ctype,64L
-+
-+#define SN_setct_CapRevReqTBE		"setct-CapRevReqTBE"
-+#define NID_setct_CapRevReqTBE		583
-+#define OBJ_setct_CapRevReqTBE		OBJ_set_ctype,65L
-+
-+#define SN_setct_CapRevReqTBEX		"setct-CapRevReqTBEX"
-+#define NID_setct_CapRevReqTBEX		584
-+#define OBJ_setct_CapRevReqTBEX		OBJ_set_ctype,66L
-+
-+#define SN_setct_CapRevResTBE		"setct-CapRevResTBE"
-+#define NID_setct_CapRevResTBE		585
-+#define OBJ_setct_CapRevResTBE		OBJ_set_ctype,67L
-+
-+#define SN_setct_CredReqTBE		"setct-CredReqTBE"
-+#define NID_setct_CredReqTBE		586
-+#define OBJ_setct_CredReqTBE		OBJ_set_ctype,68L
-+
-+#define SN_setct_CredReqTBEX		"setct-CredReqTBEX"
-+#define NID_setct_CredReqTBEX		587
-+#define OBJ_setct_CredReqTBEX		OBJ_set_ctype,69L
-+
-+#define SN_setct_CredResTBE		"setct-CredResTBE"
-+#define NID_setct_CredResTBE		588
-+#define OBJ_setct_CredResTBE		OBJ_set_ctype,70L
-+
-+#define SN_setct_CredRevReqTBE		"setct-CredRevReqTBE"
-+#define NID_setct_CredRevReqTBE		589
-+#define OBJ_setct_CredRevReqTBE		OBJ_set_ctype,71L
-+
-+#define SN_setct_CredRevReqTBEX		"setct-CredRevReqTBEX"
-+#define NID_setct_CredRevReqTBEX		590
-+#define OBJ_setct_CredRevReqTBEX		OBJ_set_ctype,72L
-+
-+#define SN_setct_CredRevResTBE		"setct-CredRevResTBE"
-+#define NID_setct_CredRevResTBE		591
-+#define OBJ_setct_CredRevResTBE		OBJ_set_ctype,73L
-+
-+#define SN_setct_BatchAdminReqTBE		"setct-BatchAdminReqTBE"
-+#define NID_setct_BatchAdminReqTBE		592
-+#define OBJ_setct_BatchAdminReqTBE		OBJ_set_ctype,74L
-+
-+#define SN_setct_BatchAdminResTBE		"setct-BatchAdminResTBE"
-+#define NID_setct_BatchAdminResTBE		593
-+#define OBJ_setct_BatchAdminResTBE		OBJ_set_ctype,75L
-+
-+#define SN_setct_RegFormReqTBE		"setct-RegFormReqTBE"
-+#define NID_setct_RegFormReqTBE		594
-+#define OBJ_setct_RegFormReqTBE		OBJ_set_ctype,76L
-+
-+#define SN_setct_CertReqTBE		"setct-CertReqTBE"
-+#define NID_setct_CertReqTBE		595
-+#define OBJ_setct_CertReqTBE		OBJ_set_ctype,77L
-+
-+#define SN_setct_CertReqTBEX		"setct-CertReqTBEX"
-+#define NID_setct_CertReqTBEX		596
-+#define OBJ_setct_CertReqTBEX		OBJ_set_ctype,78L
-+
-+#define SN_setct_CertResTBE		"setct-CertResTBE"
-+#define NID_setct_CertResTBE		597
-+#define OBJ_setct_CertResTBE		OBJ_set_ctype,79L
-+
-+#define SN_setct_CRLNotificationTBS		"setct-CRLNotificationTBS"
-+#define NID_setct_CRLNotificationTBS		598
-+#define OBJ_setct_CRLNotificationTBS		OBJ_set_ctype,80L
-+
-+#define SN_setct_CRLNotificationResTBS		"setct-CRLNotificationResTBS"
-+#define NID_setct_CRLNotificationResTBS		599
-+#define OBJ_setct_CRLNotificationResTBS		OBJ_set_ctype,81L
-+
-+#define SN_setct_BCIDistributionTBS		"setct-BCIDistributionTBS"
-+#define NID_setct_BCIDistributionTBS		600
-+#define OBJ_setct_BCIDistributionTBS		OBJ_set_ctype,82L
-+
-+#define SN_setext_genCrypt		"setext-genCrypt"
-+#define LN_setext_genCrypt		"generic cryptogram"
-+#define NID_setext_genCrypt		601
-+#define OBJ_setext_genCrypt		OBJ_set_msgExt,1L
-+
-+#define SN_setext_miAuth		"setext-miAuth"
-+#define LN_setext_miAuth		"merchant initiated auth"
-+#define NID_setext_miAuth		602
-+#define OBJ_setext_miAuth		OBJ_set_msgExt,3L
-+
-+#define SN_setext_pinSecure		"setext-pinSecure"
-+#define NID_setext_pinSecure		603
-+#define OBJ_setext_pinSecure		OBJ_set_msgExt,4L
-+
-+#define SN_setext_pinAny		"setext-pinAny"
-+#define NID_setext_pinAny		604
-+#define OBJ_setext_pinAny		OBJ_set_msgExt,5L
-+
-+#define SN_setext_track2		"setext-track2"
-+#define NID_setext_track2		605
-+#define OBJ_setext_track2		OBJ_set_msgExt,7L
-+
-+#define SN_setext_cv		"setext-cv"
-+#define LN_setext_cv		"additional verification"
-+#define NID_setext_cv		606
-+#define OBJ_setext_cv		OBJ_set_msgExt,8L
-+
-+#define SN_set_policy_root		"set-policy-root"
-+#define NID_set_policy_root		607
-+#define OBJ_set_policy_root		OBJ_set_policy,0L
-+
-+#define SN_setCext_hashedRoot		"setCext-hashedRoot"
-+#define NID_setCext_hashedRoot		608
-+#define OBJ_setCext_hashedRoot		OBJ_set_certExt,0L
-+
-+#define SN_setCext_certType		"setCext-certType"
-+#define NID_setCext_certType		609
-+#define OBJ_setCext_certType		OBJ_set_certExt,1L
-+
-+#define SN_setCext_merchData		"setCext-merchData"
-+#define NID_setCext_merchData		610
-+#define OBJ_setCext_merchData		OBJ_set_certExt,2L
-+
-+#define SN_setCext_cCertRequired		"setCext-cCertRequired"
-+#define NID_setCext_cCertRequired		611
-+#define OBJ_setCext_cCertRequired		OBJ_set_certExt,3L
-+
-+#define SN_setCext_tunneling		"setCext-tunneling"
-+#define NID_setCext_tunneling		612
-+#define OBJ_setCext_tunneling		OBJ_set_certExt,4L
-+
-+#define SN_setCext_setExt		"setCext-setExt"
-+#define NID_setCext_setExt		613
-+#define OBJ_setCext_setExt		OBJ_set_certExt,5L
-+
-+#define SN_setCext_setQualf		"setCext-setQualf"
-+#define NID_setCext_setQualf		614
-+#define OBJ_setCext_setQualf		OBJ_set_certExt,6L
-+
-+#define SN_setCext_PGWYcapabilities		"setCext-PGWYcapabilities"
-+#define NID_setCext_PGWYcapabilities		615
-+#define OBJ_setCext_PGWYcapabilities		OBJ_set_certExt,7L
-+
-+#define SN_setCext_TokenIdentifier		"setCext-TokenIdentifier"
-+#define NID_setCext_TokenIdentifier		616
-+#define OBJ_setCext_TokenIdentifier		OBJ_set_certExt,8L
-+
-+#define SN_setCext_Track2Data		"setCext-Track2Data"
-+#define NID_setCext_Track2Data		617
-+#define OBJ_setCext_Track2Data		OBJ_set_certExt,9L
-+
-+#define SN_setCext_TokenType		"setCext-TokenType"
-+#define NID_setCext_TokenType		618
-+#define OBJ_setCext_TokenType		OBJ_set_certExt,10L
-+
-+#define SN_setCext_IssuerCapabilities		"setCext-IssuerCapabilities"
-+#define NID_setCext_IssuerCapabilities		619
-+#define OBJ_setCext_IssuerCapabilities		OBJ_set_certExt,11L
-+
-+#define SN_setAttr_Cert		"setAttr-Cert"
-+#define NID_setAttr_Cert		620
-+#define OBJ_setAttr_Cert		OBJ_set_attr,0L
-+
-+#define SN_setAttr_PGWYcap		"setAttr-PGWYcap"
-+#define LN_setAttr_PGWYcap		"payment gateway capabilities"
-+#define NID_setAttr_PGWYcap		621
-+#define OBJ_setAttr_PGWYcap		OBJ_set_attr,1L
-+
-+#define SN_setAttr_TokenType		"setAttr-TokenType"
-+#define NID_setAttr_TokenType		622
-+#define OBJ_setAttr_TokenType		OBJ_set_attr,2L
-+
-+#define SN_setAttr_IssCap		"setAttr-IssCap"
-+#define LN_setAttr_IssCap		"issuer capabilities"
-+#define NID_setAttr_IssCap		623
-+#define OBJ_setAttr_IssCap		OBJ_set_attr,3L
-+
-+#define SN_set_rootKeyThumb		"set-rootKeyThumb"
-+#define NID_set_rootKeyThumb		624
-+#define OBJ_set_rootKeyThumb		OBJ_setAttr_Cert,0L
-+
-+#define SN_set_addPolicy		"set-addPolicy"
-+#define NID_set_addPolicy		625
-+#define OBJ_set_addPolicy		OBJ_setAttr_Cert,1L
-+
-+#define SN_setAttr_Token_EMV		"setAttr-Token-EMV"
-+#define NID_setAttr_Token_EMV		626
-+#define OBJ_setAttr_Token_EMV		OBJ_setAttr_TokenType,1L
-+
-+#define SN_setAttr_Token_B0Prime		"setAttr-Token-B0Prime"
-+#define NID_setAttr_Token_B0Prime		627
-+#define OBJ_setAttr_Token_B0Prime		OBJ_setAttr_TokenType,2L
-+
-+#define SN_setAttr_IssCap_CVM		"setAttr-IssCap-CVM"
-+#define NID_setAttr_IssCap_CVM		628
-+#define OBJ_setAttr_IssCap_CVM		OBJ_setAttr_IssCap,3L
-+
-+#define SN_setAttr_IssCap_T2		"setAttr-IssCap-T2"
-+#define NID_setAttr_IssCap_T2		629
-+#define OBJ_setAttr_IssCap_T2		OBJ_setAttr_IssCap,4L
-+
-+#define SN_setAttr_IssCap_Sig		"setAttr-IssCap-Sig"
-+#define NID_setAttr_IssCap_Sig		630
-+#define OBJ_setAttr_IssCap_Sig		OBJ_setAttr_IssCap,5L
-+
-+#define SN_setAttr_GenCryptgrm		"setAttr-GenCryptgrm"
-+#define LN_setAttr_GenCryptgrm		"generate cryptogram"
-+#define NID_setAttr_GenCryptgrm		631
-+#define OBJ_setAttr_GenCryptgrm		OBJ_setAttr_IssCap_CVM,1L
-+
-+#define SN_setAttr_T2Enc		"setAttr-T2Enc"
-+#define LN_setAttr_T2Enc		"encrypted track 2"
-+#define NID_setAttr_T2Enc		632
-+#define OBJ_setAttr_T2Enc		OBJ_setAttr_IssCap_T2,1L
-+
-+#define SN_setAttr_T2cleartxt		"setAttr-T2cleartxt"
-+#define LN_setAttr_T2cleartxt		"cleartext track 2"
-+#define NID_setAttr_T2cleartxt		633
-+#define OBJ_setAttr_T2cleartxt		OBJ_setAttr_IssCap_T2,2L
-+
-+#define SN_setAttr_TokICCsig		"setAttr-TokICCsig"
-+#define LN_setAttr_TokICCsig		"ICC or token signature"
-+#define NID_setAttr_TokICCsig		634
-+#define OBJ_setAttr_TokICCsig		OBJ_setAttr_IssCap_Sig,1L
-+
-+#define SN_setAttr_SecDevSig		"setAttr-SecDevSig"
-+#define LN_setAttr_SecDevSig		"secure device signature"
-+#define NID_setAttr_SecDevSig		635
-+#define OBJ_setAttr_SecDevSig		OBJ_setAttr_IssCap_Sig,2L
-+
-+#define SN_set_brand_IATA_ATA		"set-brand-IATA-ATA"
-+#define NID_set_brand_IATA_ATA		636
-+#define OBJ_set_brand_IATA_ATA		OBJ_set_brand,1L
-+
-+#define SN_set_brand_Diners		"set-brand-Diners"
-+#define NID_set_brand_Diners		637
-+#define OBJ_set_brand_Diners		OBJ_set_brand,30L
-+
-+#define SN_set_brand_AmericanExpress		"set-brand-AmericanExpress"
-+#define NID_set_brand_AmericanExpress		638
-+#define OBJ_set_brand_AmericanExpress		OBJ_set_brand,34L
-+
-+#define SN_set_brand_JCB		"set-brand-JCB"
-+#define NID_set_brand_JCB		639
-+#define OBJ_set_brand_JCB		OBJ_set_brand,35L
-+
-+#define SN_set_brand_Visa		"set-brand-Visa"
-+#define NID_set_brand_Visa		640
-+#define OBJ_set_brand_Visa		OBJ_set_brand,4L
-+
-+#define SN_set_brand_MasterCard		"set-brand-MasterCard"
-+#define NID_set_brand_MasterCard		641
-+#define OBJ_set_brand_MasterCard		OBJ_set_brand,5L
-+
-+#define SN_set_brand_Novus		"set-brand-Novus"
-+#define NID_set_brand_Novus		642
-+#define OBJ_set_brand_Novus		OBJ_set_brand,6011L
-+
-+#define SN_des_cdmf		"DES-CDMF"
-+#define LN_des_cdmf		"des-cdmf"
-+#define NID_des_cdmf		643
-+#define OBJ_des_cdmf		OBJ_rsadsi,3L,10L
-+
-+#define SN_rsaOAEPEncryptionSET		"rsaOAEPEncryptionSET"
-+#define NID_rsaOAEPEncryptionSET		644
-+#define OBJ_rsaOAEPEncryptionSET		OBJ_rsadsi,1L,1L,6L
-+
-+#define SN_ipsec3		"Oakley-EC2N-3"
-+#define LN_ipsec3		"ipsec3"
-+#define NID_ipsec3		749
-+
-+#define SN_ipsec4		"Oakley-EC2N-4"
-+#define LN_ipsec4		"ipsec4"
-+#define NID_ipsec4		750
-+
-+#define SN_whirlpool		"whirlpool"
-+#define NID_whirlpool		804
-+#define OBJ_whirlpool		OBJ_iso,0L,10118L,3L,0L,55L
-+
-+#define SN_cryptopro		"cryptopro"
-+#define NID_cryptopro		805
-+#define OBJ_cryptopro		OBJ_member_body,643L,2L,2L
-+
-+#define SN_cryptocom		"cryptocom"
-+#define NID_cryptocom		806
-+#define OBJ_cryptocom		OBJ_member_body,643L,2L,9L
-+
-+#define SN_id_GostR3411_94_with_GostR3410_2001		"id-GostR3411-94-with-GostR3410-2001"
-+#define LN_id_GostR3411_94_with_GostR3410_2001		"GOST R 34.11-94 with GOST R 34.10-2001"
-+#define NID_id_GostR3411_94_with_GostR3410_2001		807
-+#define OBJ_id_GostR3411_94_with_GostR3410_2001		OBJ_cryptopro,3L
-+
-+#define SN_id_GostR3411_94_with_GostR3410_94		"id-GostR3411-94-with-GostR3410-94"
-+#define LN_id_GostR3411_94_with_GostR3410_94		"GOST R 34.11-94 with GOST R 34.10-94"
-+#define NID_id_GostR3411_94_with_GostR3410_94		808
-+#define OBJ_id_GostR3411_94_with_GostR3410_94		OBJ_cryptopro,4L
-+
-+#define SN_id_GostR3411_94		"md_gost94"
-+#define LN_id_GostR3411_94		"GOST R 34.11-94"
-+#define NID_id_GostR3411_94		809
-+#define OBJ_id_GostR3411_94		OBJ_cryptopro,9L
-+
-+#define SN_id_HMACGostR3411_94		"id-HMACGostR3411-94"
-+#define LN_id_HMACGostR3411_94		"HMAC GOST 34.11-94"
-+#define NID_id_HMACGostR3411_94		810
-+#define OBJ_id_HMACGostR3411_94		OBJ_cryptopro,10L
-+
-+#define SN_id_GostR3410_2001		"gost2001"
-+#define LN_id_GostR3410_2001		"GOST R 34.10-2001"
-+#define NID_id_GostR3410_2001		811
-+#define OBJ_id_GostR3410_2001		OBJ_cryptopro,19L
-+
-+#define SN_id_GostR3410_94		"gost94"
-+#define LN_id_GostR3410_94		"GOST R 34.10-94"
-+#define NID_id_GostR3410_94		812
-+#define OBJ_id_GostR3410_94		OBJ_cryptopro,20L
-+
-+#define SN_id_Gost28147_89		"gost89"
-+#define LN_id_Gost28147_89		"GOST 28147-89"
-+#define NID_id_Gost28147_89		813
-+#define OBJ_id_Gost28147_89		OBJ_cryptopro,21L
-+
-+#define SN_gost89_cnt		"gost89-cnt"
-+#define NID_gost89_cnt		814
-+
-+#define SN_id_Gost28147_89_MAC		"gost-mac"
-+#define LN_id_Gost28147_89_MAC		"GOST 28147-89 MAC"
-+#define NID_id_Gost28147_89_MAC		815
-+#define OBJ_id_Gost28147_89_MAC		OBJ_cryptopro,22L
-+
-+#define SN_id_GostR3411_94_prf		"prf-gostr3411-94"
-+#define LN_id_GostR3411_94_prf		"GOST R 34.11-94 PRF"
-+#define NID_id_GostR3411_94_prf		816
-+#define OBJ_id_GostR3411_94_prf		OBJ_cryptopro,23L
-+
-+#define SN_id_GostR3410_2001DH		"id-GostR3410-2001DH"
-+#define LN_id_GostR3410_2001DH		"GOST R 34.10-2001 DH"
-+#define NID_id_GostR3410_2001DH		817
-+#define OBJ_id_GostR3410_2001DH		OBJ_cryptopro,98L
-+
-+#define SN_id_GostR3410_94DH		"id-GostR3410-94DH"
-+#define LN_id_GostR3410_94DH		"GOST R 34.10-94 DH"
-+#define NID_id_GostR3410_94DH		818
-+#define OBJ_id_GostR3410_94DH		OBJ_cryptopro,99L
-+
-+#define SN_id_Gost28147_89_CryptoPro_KeyMeshing		"id-Gost28147-89-CryptoPro-KeyMeshing"
-+#define NID_id_Gost28147_89_CryptoPro_KeyMeshing		819
-+#define OBJ_id_Gost28147_89_CryptoPro_KeyMeshing		OBJ_cryptopro,14L,1L
-+
-+#define SN_id_Gost28147_89_None_KeyMeshing		"id-Gost28147-89-None-KeyMeshing"
-+#define NID_id_Gost28147_89_None_KeyMeshing		820
-+#define OBJ_id_Gost28147_89_None_KeyMeshing		OBJ_cryptopro,14L,0L
-+
-+#define SN_id_GostR3411_94_TestParamSet		"id-GostR3411-94-TestParamSet"
-+#define NID_id_GostR3411_94_TestParamSet		821
-+#define OBJ_id_GostR3411_94_TestParamSet		OBJ_cryptopro,30L,0L
-+
-+#define SN_id_GostR3411_94_CryptoProParamSet		"id-GostR3411-94-CryptoProParamSet"
-+#define NID_id_GostR3411_94_CryptoProParamSet		822
-+#define OBJ_id_GostR3411_94_CryptoProParamSet		OBJ_cryptopro,30L,1L
-+
-+#define SN_id_Gost28147_89_TestParamSet		"id-Gost28147-89-TestParamSet"
-+#define NID_id_Gost28147_89_TestParamSet		823
-+#define OBJ_id_Gost28147_89_TestParamSet		OBJ_cryptopro,31L,0L
-+
-+#define SN_id_Gost28147_89_CryptoPro_A_ParamSet		"id-Gost28147-89-CryptoPro-A-ParamSet"
-+#define NID_id_Gost28147_89_CryptoPro_A_ParamSet		824
-+#define OBJ_id_Gost28147_89_CryptoPro_A_ParamSet		OBJ_cryptopro,31L,1L
-+
-+#define SN_id_Gost28147_89_CryptoPro_B_ParamSet		"id-Gost28147-89-CryptoPro-B-ParamSet"
-+#define NID_id_Gost28147_89_CryptoPro_B_ParamSet		825
-+#define OBJ_id_Gost28147_89_CryptoPro_B_ParamSet		OBJ_cryptopro,31L,2L
-+
-+#define SN_id_Gost28147_89_CryptoPro_C_ParamSet		"id-Gost28147-89-CryptoPro-C-ParamSet"
-+#define NID_id_Gost28147_89_CryptoPro_C_ParamSet		826
-+#define OBJ_id_Gost28147_89_CryptoPro_C_ParamSet		OBJ_cryptopro,31L,3L
-+
-+#define SN_id_Gost28147_89_CryptoPro_D_ParamSet		"id-Gost28147-89-CryptoPro-D-ParamSet"
-+#define NID_id_Gost28147_89_CryptoPro_D_ParamSet		827
-+#define OBJ_id_Gost28147_89_CryptoPro_D_ParamSet		OBJ_cryptopro,31L,4L
-+
-+#define SN_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet"
-+#define NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		828
-+#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet		OBJ_cryptopro,31L,5L
-+
-+#define SN_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet"
-+#define NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		829
-+#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet		OBJ_cryptopro,31L,6L
-+
-+#define SN_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		"id-Gost28147-89-CryptoPro-RIC-1-ParamSet"
-+#define NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		830
-+#define OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet		OBJ_cryptopro,31L,7L
-+
-+#define SN_id_GostR3410_94_TestParamSet		"id-GostR3410-94-TestParamSet"
-+#define NID_id_GostR3410_94_TestParamSet		831
-+#define OBJ_id_GostR3410_94_TestParamSet		OBJ_cryptopro,32L,0L
-+
-+#define SN_id_GostR3410_94_CryptoPro_A_ParamSet		"id-GostR3410-94-CryptoPro-A-ParamSet"
-+#define NID_id_GostR3410_94_CryptoPro_A_ParamSet		832
-+#define OBJ_id_GostR3410_94_CryptoPro_A_ParamSet		OBJ_cryptopro,32L,2L
-+
-+#define SN_id_GostR3410_94_CryptoPro_B_ParamSet		"id-GostR3410-94-CryptoPro-B-ParamSet"
-+#define NID_id_GostR3410_94_CryptoPro_B_ParamSet		833
-+#define OBJ_id_GostR3410_94_CryptoPro_B_ParamSet		OBJ_cryptopro,32L,3L
-+
-+#define SN_id_GostR3410_94_CryptoPro_C_ParamSet		"id-GostR3410-94-CryptoPro-C-ParamSet"
-+#define NID_id_GostR3410_94_CryptoPro_C_ParamSet		834
-+#define OBJ_id_GostR3410_94_CryptoPro_C_ParamSet		OBJ_cryptopro,32L,4L
-+
-+#define SN_id_GostR3410_94_CryptoPro_D_ParamSet		"id-GostR3410-94-CryptoPro-D-ParamSet"
-+#define NID_id_GostR3410_94_CryptoPro_D_ParamSet		835
-+#define OBJ_id_GostR3410_94_CryptoPro_D_ParamSet		OBJ_cryptopro,32L,5L
-+
-+#define SN_id_GostR3410_94_CryptoPro_XchA_ParamSet		"id-GostR3410-94-CryptoPro-XchA-ParamSet"
-+#define NID_id_GostR3410_94_CryptoPro_XchA_ParamSet		836
-+#define OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet		OBJ_cryptopro,33L,1L
-+
-+#define SN_id_GostR3410_94_CryptoPro_XchB_ParamSet		"id-GostR3410-94-CryptoPro-XchB-ParamSet"
-+#define NID_id_GostR3410_94_CryptoPro_XchB_ParamSet		837
-+#define OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet		OBJ_cryptopro,33L,2L
-+
-+#define SN_id_GostR3410_94_CryptoPro_XchC_ParamSet		"id-GostR3410-94-CryptoPro-XchC-ParamSet"
-+#define NID_id_GostR3410_94_CryptoPro_XchC_ParamSet		838
-+#define OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet		OBJ_cryptopro,33L,3L
-+
-+#define SN_id_GostR3410_2001_TestParamSet		"id-GostR3410-2001-TestParamSet"
-+#define NID_id_GostR3410_2001_TestParamSet		839
-+#define OBJ_id_GostR3410_2001_TestParamSet		OBJ_cryptopro,35L,0L
-+
-+#define SN_id_GostR3410_2001_CryptoPro_A_ParamSet		"id-GostR3410-2001-CryptoPro-A-ParamSet"
-+#define NID_id_GostR3410_2001_CryptoPro_A_ParamSet		840
-+#define OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet		OBJ_cryptopro,35L,1L
-+
-+#define SN_id_GostR3410_2001_CryptoPro_B_ParamSet		"id-GostR3410-2001-CryptoPro-B-ParamSet"
-+#define NID_id_GostR3410_2001_CryptoPro_B_ParamSet		841
-+#define OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet		OBJ_cryptopro,35L,2L
-+
-+#define SN_id_GostR3410_2001_CryptoPro_C_ParamSet		"id-GostR3410-2001-CryptoPro-C-ParamSet"
-+#define NID_id_GostR3410_2001_CryptoPro_C_ParamSet		842
-+#define OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet		OBJ_cryptopro,35L,3L
-+
-+#define SN_id_GostR3410_2001_CryptoPro_XchA_ParamSet		"id-GostR3410-2001-CryptoPro-XchA-ParamSet"
-+#define NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet		843
-+#define OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet		OBJ_cryptopro,36L,0L
-+
-+#define SN_id_GostR3410_2001_CryptoPro_XchB_ParamSet		"id-GostR3410-2001-CryptoPro-XchB-ParamSet"
-+#define NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet		844
-+#define OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet		OBJ_cryptopro,36L,1L
-+
-+#define SN_id_GostR3410_94_a		"id-GostR3410-94-a"
-+#define NID_id_GostR3410_94_a		845
-+#define OBJ_id_GostR3410_94_a		OBJ_id_GostR3410_94,1L
-+
-+#define SN_id_GostR3410_94_aBis		"id-GostR3410-94-aBis"
-+#define NID_id_GostR3410_94_aBis		846
-+#define OBJ_id_GostR3410_94_aBis		OBJ_id_GostR3410_94,2L
-+
-+#define SN_id_GostR3410_94_b		"id-GostR3410-94-b"
-+#define NID_id_GostR3410_94_b		847
-+#define OBJ_id_GostR3410_94_b		OBJ_id_GostR3410_94,3L
-+
-+#define SN_id_GostR3410_94_bBis		"id-GostR3410-94-bBis"
-+#define NID_id_GostR3410_94_bBis		848
-+#define OBJ_id_GostR3410_94_bBis		OBJ_id_GostR3410_94,4L
-+
-+#define SN_id_Gost28147_89_cc		"id-Gost28147-89-cc"
-+#define LN_id_Gost28147_89_cc		"GOST 28147-89 Cryptocom ParamSet"
-+#define NID_id_Gost28147_89_cc		849
-+#define OBJ_id_Gost28147_89_cc		OBJ_cryptocom,1L,6L,1L
-+
-+#define SN_id_GostR3410_94_cc		"gost94cc"
-+#define LN_id_GostR3410_94_cc		"GOST 34.10-94 Cryptocom"
-+#define NID_id_GostR3410_94_cc		850
-+#define OBJ_id_GostR3410_94_cc		OBJ_cryptocom,1L,5L,3L
-+
-+#define SN_id_GostR3410_2001_cc		"gost2001cc"
-+#define LN_id_GostR3410_2001_cc		"GOST 34.10-2001 Cryptocom"
-+#define NID_id_GostR3410_2001_cc		851
-+#define OBJ_id_GostR3410_2001_cc		OBJ_cryptocom,1L,5L,4L
-+
-+#define SN_id_GostR3411_94_with_GostR3410_94_cc		"id-GostR3411-94-with-GostR3410-94-cc"
-+#define LN_id_GostR3411_94_with_GostR3410_94_cc		"GOST R 34.11-94 with GOST R 34.10-94 Cryptocom"
-+#define NID_id_GostR3411_94_with_GostR3410_94_cc		852
-+#define OBJ_id_GostR3411_94_with_GostR3410_94_cc		OBJ_cryptocom,1L,3L,3L
-+
-+#define SN_id_GostR3411_94_with_GostR3410_2001_cc		"id-GostR3411-94-with-GostR3410-2001-cc"
-+#define LN_id_GostR3411_94_with_GostR3410_2001_cc		"GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom"
-+#define NID_id_GostR3411_94_with_GostR3410_2001_cc		853
-+#define OBJ_id_GostR3411_94_with_GostR3410_2001_cc		OBJ_cryptocom,1L,3L,4L
-+
-+#define SN_id_GostR3410_2001_ParamSet_cc		"id-GostR3410-2001-ParamSet-cc"
-+#define LN_id_GostR3410_2001_ParamSet_cc		"GOST R 3410-2001 Parameter Set Cryptocom"
-+#define NID_id_GostR3410_2001_ParamSet_cc		854
-+#define OBJ_id_GostR3410_2001_ParamSet_cc		OBJ_cryptocom,1L,8L,1L
-+
-+#define SN_camellia_128_cbc		"CAMELLIA-128-CBC"
-+#define LN_camellia_128_cbc		"camellia-128-cbc"
-+#define NID_camellia_128_cbc		751
-+#define OBJ_camellia_128_cbc		1L,2L,392L,200011L,61L,1L,1L,1L,2L
-+
-+#define SN_camellia_192_cbc		"CAMELLIA-192-CBC"
-+#define LN_camellia_192_cbc		"camellia-192-cbc"
-+#define NID_camellia_192_cbc		752
-+#define OBJ_camellia_192_cbc		1L,2L,392L,200011L,61L,1L,1L,1L,3L
-+
-+#define SN_camellia_256_cbc		"CAMELLIA-256-CBC"
-+#define LN_camellia_256_cbc		"camellia-256-cbc"
-+#define NID_camellia_256_cbc		753
-+#define OBJ_camellia_256_cbc		1L,2L,392L,200011L,61L,1L,1L,1L,4L
-+
-+#define SN_id_camellia128_wrap		"id-camellia128-wrap"
-+#define NID_id_camellia128_wrap		907
-+#define OBJ_id_camellia128_wrap		1L,2L,392L,200011L,61L,1L,1L,3L,2L
-+
-+#define SN_id_camellia192_wrap		"id-camellia192-wrap"
-+#define NID_id_camellia192_wrap		908
-+#define OBJ_id_camellia192_wrap		1L,2L,392L,200011L,61L,1L,1L,3L,3L
-+
-+#define SN_id_camellia256_wrap		"id-camellia256-wrap"
-+#define NID_id_camellia256_wrap		909
-+#define OBJ_id_camellia256_wrap		1L,2L,392L,200011L,61L,1L,1L,3L,4L
-+
-+#define OBJ_ntt_ds		0L,3L,4401L,5L
-+
-+#define OBJ_camellia		OBJ_ntt_ds,3L,1L,9L
-+
-+#define SN_camellia_128_ecb		"CAMELLIA-128-ECB"
-+#define LN_camellia_128_ecb		"camellia-128-ecb"
-+#define NID_camellia_128_ecb		754
-+#define OBJ_camellia_128_ecb		OBJ_camellia,1L
-+
-+#define SN_camellia_128_ofb128		"CAMELLIA-128-OFB"
-+#define LN_camellia_128_ofb128		"camellia-128-ofb"
-+#define NID_camellia_128_ofb128		766
-+#define OBJ_camellia_128_ofb128		OBJ_camellia,3L
-+
-+#define SN_camellia_128_cfb128		"CAMELLIA-128-CFB"
-+#define LN_camellia_128_cfb128		"camellia-128-cfb"
-+#define NID_camellia_128_cfb128		757
-+#define OBJ_camellia_128_cfb128		OBJ_camellia,4L
-+
-+#define SN_camellia_192_ecb		"CAMELLIA-192-ECB"
-+#define LN_camellia_192_ecb		"camellia-192-ecb"
-+#define NID_camellia_192_ecb		755
-+#define OBJ_camellia_192_ecb		OBJ_camellia,21L
-+
-+#define SN_camellia_192_ofb128		"CAMELLIA-192-OFB"
-+#define LN_camellia_192_ofb128		"camellia-192-ofb"
-+#define NID_camellia_192_ofb128		767
-+#define OBJ_camellia_192_ofb128		OBJ_camellia,23L
-+
-+#define SN_camellia_192_cfb128		"CAMELLIA-192-CFB"
-+#define LN_camellia_192_cfb128		"camellia-192-cfb"
-+#define NID_camellia_192_cfb128		758
-+#define OBJ_camellia_192_cfb128		OBJ_camellia,24L
-+
-+#define SN_camellia_256_ecb		"CAMELLIA-256-ECB"
-+#define LN_camellia_256_ecb		"camellia-256-ecb"
-+#define NID_camellia_256_ecb		756
-+#define OBJ_camellia_256_ecb		OBJ_camellia,41L
-+
-+#define SN_camellia_256_ofb128		"CAMELLIA-256-OFB"
-+#define LN_camellia_256_ofb128		"camellia-256-ofb"
-+#define NID_camellia_256_ofb128		768
-+#define OBJ_camellia_256_ofb128		OBJ_camellia,43L
-+
-+#define SN_camellia_256_cfb128		"CAMELLIA-256-CFB"
-+#define LN_camellia_256_cfb128		"camellia-256-cfb"
-+#define NID_camellia_256_cfb128		759
-+#define OBJ_camellia_256_cfb128		OBJ_camellia,44L
-+
-+#define SN_camellia_128_cfb1		"CAMELLIA-128-CFB1"
-+#define LN_camellia_128_cfb1		"camellia-128-cfb1"
-+#define NID_camellia_128_cfb1		760
-+
-+#define SN_camellia_192_cfb1		"CAMELLIA-192-CFB1"
-+#define LN_camellia_192_cfb1		"camellia-192-cfb1"
-+#define NID_camellia_192_cfb1		761
-+
-+#define SN_camellia_256_cfb1		"CAMELLIA-256-CFB1"
-+#define LN_camellia_256_cfb1		"camellia-256-cfb1"
-+#define NID_camellia_256_cfb1		762
-+
-+#define SN_camellia_128_cfb8		"CAMELLIA-128-CFB8"
-+#define LN_camellia_128_cfb8		"camellia-128-cfb8"
-+#define NID_camellia_128_cfb8		763
-+
-+#define SN_camellia_192_cfb8		"CAMELLIA-192-CFB8"
-+#define LN_camellia_192_cfb8		"camellia-192-cfb8"
-+#define NID_camellia_192_cfb8		764
-+
-+#define SN_camellia_256_cfb8		"CAMELLIA-256-CFB8"
-+#define LN_camellia_256_cfb8		"camellia-256-cfb8"
-+#define NID_camellia_256_cfb8		765
-+
-+#define SN_kisa		"KISA"
-+#define LN_kisa		"kisa"
-+#define NID_kisa		773
-+#define OBJ_kisa		OBJ_member_body,410L,200004L
-+
-+#define SN_seed_ecb		"SEED-ECB"
-+#define LN_seed_ecb		"seed-ecb"
-+#define NID_seed_ecb		776
-+#define OBJ_seed_ecb		OBJ_kisa,1L,3L
-+
-+#define SN_seed_cbc		"SEED-CBC"
-+#define LN_seed_cbc		"seed-cbc"
-+#define NID_seed_cbc		777
-+#define OBJ_seed_cbc		OBJ_kisa,1L,4L
-+
-+#define SN_seed_cfb128		"SEED-CFB"
-+#define LN_seed_cfb128		"seed-cfb"
-+#define NID_seed_cfb128		779
-+#define OBJ_seed_cfb128		OBJ_kisa,1L,5L
-+
-+#define SN_seed_ofb128		"SEED-OFB"
-+#define LN_seed_ofb128		"seed-ofb"
-+#define NID_seed_ofb128		778
-+#define OBJ_seed_ofb128		OBJ_kisa,1L,6L
-+
-+#define SN_hmac		"HMAC"
-+#define LN_hmac		"hmac"
-+#define NID_hmac		855
-+
-+#define SN_cmac		"CMAC"
-+#define LN_cmac		"cmac"
-+#define NID_cmac		894
-+
-+#define SN_rc4_hmac_md5		"RC4-HMAC-MD5"
-+#define LN_rc4_hmac_md5		"rc4-hmac-md5"
-+#define NID_rc4_hmac_md5		915
-+
-+#define SN_aes_128_cbc_hmac_sha1		"AES-128-CBC-HMAC-SHA1"
-+#define LN_aes_128_cbc_hmac_sha1		"aes-128-cbc-hmac-sha1"
-+#define NID_aes_128_cbc_hmac_sha1		916
-+
-+#define SN_aes_192_cbc_hmac_sha1		"AES-192-CBC-HMAC-SHA1"
-+#define LN_aes_192_cbc_hmac_sha1		"aes-192-cbc-hmac-sha1"
-+#define NID_aes_192_cbc_hmac_sha1		917
-+
-+#define SN_aes_256_cbc_hmac_sha1		"AES-256-CBC-HMAC-SHA1"
-+#define LN_aes_256_cbc_hmac_sha1		"aes-256-cbc-hmac-sha1"
-+#define NID_aes_256_cbc_hmac_sha1		918
-+
-+#define SN_teletrust		"teletrust"
-+#define NID_teletrust		920
-+#define OBJ_teletrust		OBJ_identified_organization,36L
-+
-+#define SN_brainpool		"brainpool"
-+#define NID_brainpool		921
-+#define OBJ_brainpool		OBJ_teletrust,3L,3L,2L,8L,1L
-+
-+#define SN_brainpoolP160r1		"brainpoolP160r1"
-+#define NID_brainpoolP160r1		922
-+#define OBJ_brainpoolP160r1		OBJ_brainpool,1L,1L
-+
-+#define SN_brainpoolP160t1		"brainpoolP160t1"
-+#define NID_brainpoolP160t1		923
-+#define OBJ_brainpoolP160t1		OBJ_brainpool,1L,2L
-+
-+#define SN_brainpoolP192r1		"brainpoolP192r1"
-+#define NID_brainpoolP192r1		924
-+#define OBJ_brainpoolP192r1		OBJ_brainpool,1L,3L
-+
-+#define SN_brainpoolP192t1		"brainpoolP192t1"
-+#define NID_brainpoolP192t1		925
-+#define OBJ_brainpoolP192t1		OBJ_brainpool,1L,4L
-+
-+#define SN_brainpoolP224r1		"brainpoolP224r1"
-+#define NID_brainpoolP224r1		926
-+#define OBJ_brainpoolP224r1		OBJ_brainpool,1L,5L
-+
-+#define SN_brainpoolP224t1		"brainpoolP224t1"
-+#define NID_brainpoolP224t1		927
-+#define OBJ_brainpoolP224t1		OBJ_brainpool,1L,6L
-+
-+#define SN_brainpoolP256r1		"brainpoolP256r1"
-+#define NID_brainpoolP256r1		928
-+#define OBJ_brainpoolP256r1		OBJ_brainpool,1L,7L
-+
-+#define SN_brainpoolP256t1		"brainpoolP256t1"
-+#define NID_brainpoolP256t1		929
-+#define OBJ_brainpoolP256t1		OBJ_brainpool,1L,8L
-+
-+#define SN_brainpoolP320r1		"brainpoolP320r1"
-+#define NID_brainpoolP320r1		930
-+#define OBJ_brainpoolP320r1		OBJ_brainpool,1L,9L
-+
-+#define SN_brainpoolP320t1		"brainpoolP320t1"
-+#define NID_brainpoolP320t1		931
-+#define OBJ_brainpoolP320t1		OBJ_brainpool,1L,10L
-+
-+#define SN_brainpoolP384r1		"brainpoolP384r1"
-+#define NID_brainpoolP384r1		932
-+#define OBJ_brainpoolP384r1		OBJ_brainpool,1L,11L
-+
-+#define SN_brainpoolP384t1		"brainpoolP384t1"
-+#define NID_brainpoolP384t1		933
-+#define OBJ_brainpoolP384t1		OBJ_brainpool,1L,12L
-+
-+#define SN_brainpoolP512r1		"brainpoolP512r1"
-+#define NID_brainpoolP512r1		934
-+#define OBJ_brainpoolP512r1		OBJ_brainpool,1L,13L
-+
-+#define SN_brainpoolP512t1		"brainpoolP512t1"
-+#define NID_brainpoolP512t1		935
-+#define OBJ_brainpoolP512t1		OBJ_brainpool,1L,14L
-+
-+#define SN_FRP256v1		"FRP256v1"
-+#define NID_FRP256v1		936
-+#define OBJ_FRP256v1		1L,2L,250L,1L,223L,101L,256L,1L
-+
-+#define SN_chacha20		"ChaCha"
-+#define LN_chacha20		"chacha"
-+#define NID_chacha20		937
-+
-+#define SN_gost89_ecb		"gost89-ecb"
-+#define NID_gost89_ecb		938
-+
-+#define SN_gost89_cbc		"gost89-cbc"
-+#define NID_gost89_cbc		939
-+
-+#define SN_tc26		"tc26"
-+#define NID_tc26		940
-+#define OBJ_tc26		OBJ_member_body,643L,7L,1L
-+
-+#define SN_id_tc26_gost3411_2012_256		"streebog256"
-+#define LN_id_tc26_gost3411_2012_256		"GOST R 34.11-2012 (256 bit)"
-+#define NID_id_tc26_gost3411_2012_256		941
-+#define OBJ_id_tc26_gost3411_2012_256		OBJ_tc26,1L,2L,2L
-+
-+#define SN_id_tc26_gost3411_2012_512		"streebog512"
-+#define LN_id_tc26_gost3411_2012_512		"GOST R 34-11-2012 (512 bit)"
-+#define NID_id_tc26_gost3411_2012_512		942
-+#define OBJ_id_tc26_gost3411_2012_512		OBJ_tc26,1L,2L,3L
-+
-+#define SN_id_tc26_gost_3410_2012_512_paramSetA		"id-tc26-gost-3410-2012-512-paramSetA"
-+#define NID_id_tc26_gost_3410_2012_512_paramSetA		943
-+#define OBJ_id_tc26_gost_3410_2012_512_paramSetA		OBJ_tc26,2L,1L,2L,1L
-+
-+#define SN_id_tc26_gost_3410_2012_512_paramSetB		"id-tc26-gost-3410-2012-512-paramSetB"
-+#define NID_id_tc26_gost_3410_2012_512_paramSetB		944
-+#define OBJ_id_tc26_gost_3410_2012_512_paramSetB		OBJ_tc26,2L,1L,2L,2L
-+
-+#define SN_id_tc26_gost_28147_param_Z		"id-tc26-gost-28147-param-Z"
-+#define NID_id_tc26_gost_28147_param_Z		945
-+#define OBJ_id_tc26_gost_28147_param_Z		OBJ_tc26,2L,5L,1L,1L
-+
-+#define SN_id_tc26_gost3410_2012_256		"id-tc26-gost3410-2012-256"
-+#define LN_id_tc26_gost3410_2012_256		"GOST R 34.10-2012 (256 bit)"
-+#define NID_id_tc26_gost3410_2012_256		946
-+#define OBJ_id_tc26_gost3410_2012_256		OBJ_tc26,1L,1L,1L
-+
-+#define SN_id_tc26_gost3410_2012_512		"id-tc26-gost3410-2012-512"
-+#define LN_id_tc26_gost3410_2012_512		"GOST R 34.10-2012 (512 bit)"
-+#define NID_id_tc26_gost3410_2012_512		947
-+#define OBJ_id_tc26_gost3410_2012_512		OBJ_tc26,1L,1L,2L
-+
-+#define SN_id_tc26_signwithdigest_gost3410_2012_256		"id-tc26-signwithdigest-gost3410-2012-256"
-+#define LN_id_tc26_signwithdigest_gost3410_2012_256		"GOST R 34.11-2012 with GOST R 34.10-2012 (256 bit)"
-+#define NID_id_tc26_signwithdigest_gost3410_2012_256		948
-+#define OBJ_id_tc26_signwithdigest_gost3410_2012_256		OBJ_tc26,1L,3L,2L
-+
-+#define SN_id_tc26_signwithdigest_gost3410_2012_512		"id-tc26-signwithdigest-gost3410-2012-512"
-+#define LN_id_tc26_signwithdigest_gost3410_2012_512		"GOST R 34.11-2012 with GOST R 34.10-2012 (512 bit)"
-+#define NID_id_tc26_signwithdigest_gost3410_2012_512		949
-+#define OBJ_id_tc26_signwithdigest_gost3410_2012_512		OBJ_tc26,1L,3L,3L
-+
--- 
-2.9.3
-
diff --git a/core/libressl/rev b/core/libressl/rev
deleted file mode 100644
index 00750edc..00000000
--- a/core/libressl/rev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/core/libressl/src b/core/libressl/src
deleted file mode 160000
-Subproject 57212869395854dda193040c4f46c8f0d3bb5a0
diff --git a/core/loksh/gen.rc b/core/loksh/gen.rc
deleted file mode 100644
index 9f8ab699..00000000
--- a/core/loksh/gen.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-cflags\
-	-D _GNU_SOURCE\
-	-I include\
-	-idirafter core/openbsd/src/sys
-
-cc emacs.c '||' '$builddir'/core/openbsd/fetch.stamp
-exe ksh\
-	alloc.c\
-	c_ksh.c\
-	c_sh.c\
-	c_test.c\
-	c_ulimit.c\
-	edit.c\
-	emacs.c.o\
-	eval.c \
-	exec.c\
-	expr.c\
-	history.c\
-	io.c\
-	jobs.c\
-	lex.c\
-	mail.c\
-	main.c\
-	misc.c\
-	path.c\
-	shf.c\
-	syn.c\
-	table.c\
-	trap.c\
-	tree.c\
-	tty.c\
-	var.c\
-	version.c\
-	vi.c
-file bin/ksh '$outdir'/ksh 755
-sym bin/sh ksh
-for(name in ksh sh) file share/man/man1/$name.1 '$srcdir'/$name.1 644
-
-fetch git
diff --git a/core/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch b/core/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch
deleted file mode 100644
index 44f96f35..00000000
--- a/core/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 34a09675724c2d4f13f21b4f5663c098fe955090 Mon Sep 17 00:00:00 2001
-From: schwarze <schwarze@openbsd.org>
-Date: Tue, 9 Aug 2016 11:04:46 +0000
-Subject: [PATCH] In emacs incremental search mode (^R), make commands starting
- with the escape key (^[) work as documented. Long-standing bug, this time
- reported by Dave minus Cohen dot com. OK natano@ halex@
-
----
- emacs.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/emacs.c b/emacs.c
-index 51d1ab0..2f82b5b 100644
---- a/emacs.c
-+++ b/emacs.c
-@@ -1,4 +1,4 @@
--/*	$OpenBSD: emacs.c,v 1.65 2016/01/26 17:39:31 mmcc Exp $	*/
-+/*	$OpenBSD: emacs.c,v 1.66 2016/08/09 11:04:46 schwarze Exp $	*/
- 
- /*
-  *  Emacs-like command line editing and history
-@@ -893,9 +893,10 @@ x_search_hist(int c)
- 		if ((c = x_e_getc()) < 0)
- 			return KSTD;
- 		f = kb_find_hist_func(c);
--		if (c == CTRL('['))
-+		if (c == CTRL('[')) {
-+			x_e_ungetc(c);
- 			break;
--		else if (f == x_search_hist)
-+		} else if (f == x_search_hist)
- 			offset = x_search(pat, 0, offset);
- 		else if (f == x_del_back) {
- 			if (p == pat) {
--- 
-2.10.1
-
diff --git a/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch b/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch
deleted file mode 100644
index 9225f6fd..00000000
--- a/core/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From abdea742e220edf3b7ba8b44260e75ca95c5c9da Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 10 Dec 2016 19:30:09 -0800
-Subject: [PATCH] Add missing stdlib.h include for mkstemp
-
----
- io.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/io.c b/io.c
-index 16a0709..99fa0a8 100644
---- a/io.c
-+++ b/io.c
-@@ -9,6 +9,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- 
--- 
-2.11.0
-
diff --git a/core/loksh/rev b/core/loksh/rev
deleted file mode 100644
index b8626c4c..00000000
--- a/core/loksh/rev
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/core/loksh/src b/core/loksh/src
deleted file mode 160000
-Subproject 41570f1f0481eff704bd9ec6989a62053738489
diff --git a/core/mdocml/.gitignore b/core/mdocml/.gitignore
deleted file mode 100644
index 0da61be7..00000000
--- a/core/mdocml/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/mdocml-1.13.4.tar.gz
-/src
diff --git a/core/mdocml/config.h b/core/mdocml/config.h
deleted file mode 100644
index 86d08114..00000000
--- a/core/mdocml/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <config-posix.h>
-
-#define HAVE_DIRENT_NAMLEN 0
-#define HAVE_ERR 1
-#define HAVE_FTS 1
-#define HAVE_PLEDGE 0
-#define HAVE_PROGNAME 1
-#define HAVE_REALLOCARRAY 1
-#define HAVE_REWB_BSD 0
-#define HAVE_REWB_SYSV 1
-#define HAVE_SANDBOX_INIT 0
-#define HAVE_STRCASESTR 1
-#define HAVE_STRINGLIST 0
-#define HAVE_STRLCAT 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRSEP 1
-#define HAVE_STRTONUM 1
-#define HAVE_VASPRINTF 1
-#define HAVE_WCHAR 1
-#define HAVE_SQLITE3 0
-#define HAVE_SQLITE3_ERRSTR 0
-#define HAVE_OHASH 0
-#define HAVE_MANPATH 0
-
-/* binary names */
-#define BINM_APROPOS "apropos"
-#define BINM_MAKEWHATIS "makewhatis"
-#define BINM_MAN "man"
-#define BINM_SOELIM "soelim"
-#define BINM_WHATIS "whatis"
-
-/* paths */
-#define MAN_CONF_FILE "/etc/man.conf"
-#define MANPATH_DEFAULT "/share/man"
diff --git a/core/mdocml/gen.rc b/core/mdocml/gen.rc
deleted file mode 100644
index 887b7319..00000000
--- a/core/mdocml/gen.rc
+++ /dev/null
@@ -1,73 +0,0 @@
-cflags\
-	-isystem core/openbsd/include\
-	-isystem '$builddir'/core/zlib/include\
-	-I include\
-	-I '$dir'
-
-lib libmandoc.a -d core/zlib/headers\
-	man.c\
-	man_hash.c\
-	man_macro.c\
-	man_validate.c\
-	\
-	att.c\
-	lib.c\
-	mdoc.c\
-	mdoc_argv.c\
-	mdoc_hash.c\
-	mdoc_macro.c\
-	mdoc_state.c\
-	mdoc_validate.c\
-	st.c\
-	\
-	eqn.c\
-	roff.c\
-	tbl.c\
-	tbl_data.c\
-	tbl_layout.c\
-	tbl_opts.c\
-	\
-	chars.c\
-	mandoc.c\
-	mandoc_aux.c\
-	mandoc_ohash.c\
-	msec.c\
-	preconv.c\
-	read.c\
-	\
-	compat_ohash.c
-
-exe mandoc\
-	main.c\
-	manpath.c\
-	out.c\
-	tag.c\
-	tree.c\
-	\
-	eqn_html.c\
-	html.c\
-	man_html.c\
-	mdoc_html.c\
-	tbl_html.c\
-	\
-	mdoc_man.c\
-	\
-	eqn_term.c\
-	man_term.c\
-	mdoc_term.c\
-	term.c\
-	term_ascii.c\
-	term_ps.c\
-	tbl_term.c\
-	libmandoc.a\
-	'$builddir'/^(core/openbsd/libbsd.a core/zlib/libz.a)
-exe demandoc demandoc.c libmandoc.a '$builddir'/^(core/openbsd/libbsd.a core/zlib/libz.a)
-
-for(exe in mandoc demandoc) file bin/$exe '$outdir'/$exe 755
-sym bin/man mandoc
-for(man in mandoc.1 demandoc.1 man.1 mandoc.3 man.conf.5 man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7) {
-	sect=`{printf %s $man | tail -c 1}
-	file share/man/man$sect/$man '$srcdir'/$man 644
-}
-
-fetch curl
diff --git a/core/mdocml/rev b/core/mdocml/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/mdocml/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/mdocml/sha256 b/core/mdocml/sha256
deleted file mode 100644
index 13446bd9..00000000
--- a/core/mdocml/sha256
+++ /dev/null
@@ -1 +0,0 @@
-0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef  mdocml-1.13.4.tar.gz
diff --git a/core/mdocml/url b/core/mdocml/url
deleted file mode 100644
index 46ea2f7b..00000000
--- a/core/mdocml/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://mdocml.bsd.lv/snapshots/mdocml-1.13.4.tar.gz"
diff --git a/core/ninja/gen.rc b/core/ninja/gen.rc
deleted file mode 100644
index c4f2d321..00000000
--- a/core/ninja/gen.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-set cc '$cxx'
-set cflags '$cxxflags' \
-	-Wall -Wextra -Wno-deprecated -Wno-unused-parameter\
-	-fno-rtti -fno-exceptions '-fvisibility=hidden' \
-	-D USE_PPOLL
-
-exe ninja src/^(\
-	ninja.cc\
-	build.cc\
-	build_log.cc\
-	clean.cc\
-	clparser.cc\
-	debug_flags.cc\
-	depfile_parser.cc\
-	deps_log.cc\
-	disk_interface.cc\
-	edit_distance.cc\
-	eval_env.cc\
-	graph.cc\
-	graphviz.cc\
-	lexer.cc\
-	line_printer.cc\
-	manifest_parser.cc\
-	metrics.cc\
-	state.cc\
-	util.cc\
-	version.cc\
-	subprocess-posix.cc\
-)
-
-file bin/ninja '$outdir'/ninja 755
-
-fetch git
diff --git a/core/ninja/rev b/core/ninja/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/ninja/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/ninja/src b/core/ninja/src
deleted file mode 160000
-Subproject 717b7b4a31db6027207588c0fb89c3ead384747
diff --git a/core/openbsd/.gitignore b/core/openbsd/.gitignore
deleted file mode 100644
index 3abe5d25..00000000
--- a/core/openbsd/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/src
-/src.tar.gz
-/sys.tar.gz
diff --git a/core/openbsd/gen.rc b/core/openbsd/gen.rc
deleted file mode 100644
index 56b446f1..00000000
--- a/core/openbsd/gen.rc
+++ /dev/null
@@ -1,64 +0,0 @@
-cflags\
-	-D '''DEF_WEAK(n)=''' \
-	-isystem '$builddir'/core/libressl/include\
-	-I '$dir'/include\
-	-idirafter '$srcdir'/include\
-	-idirafter '$srcdir'/sys
-
-# Link arc4random.c to '$outdir' so that it doesn't include the local
-# arc4random.h
-build '$outdir'/lib/libc/crypt/arc4random.c copy '$srcdir'/lib/libc/crypt/arc4random.c
-build '$outdir'/lib/libc/crypt/arc4random.h copy '$srcdir'/lib/libcrypto/crypto/arc4random_linux.h
-build '$outdir'/lib/libc/crypt/chacha_private.h copy '$srcdir'/lib/libc/crypt/chacha_private.h
-cc '$outdir'/lib/libc/crypt/arc4random.c '||' '$outdir'/lib/libc/crypt/^(arc4random.h chacha_private.h)
-
-lib libbsd.a -d core/libressl/headers\
-	lib/libc/^(\
-		crypt/^(arc4random.c.o arc4random_uniform.c)\
-		gen/^(fts.c getprogname.c setprogname.c vis.c warnc.c vwarnc.c)\
-		stdlib/^(reallocarray.c strtonum.c)\
-		string/^(explicit_bzero.c strmode.c timingsafe_memcmp.c)\
-	)\
-	lib/libcrypto/crypto/getentropy_linux.c
-
-# diff
-exe diff usr.bin/diff/^(diff.c diffdir.c diffreg.c xmalloc.c) libbsd.a
-file bin/diff '$outdir'/diff 755
-file share/man/man1/diff.1 '$srcdir'/usr.bin/diff/diff.1 644
-
-# fmt
-exe fmt usr.bin/fmt/fmt.c
-file bin/fmt '$outdir'/fmt 755
-file share/man/man1/fmt.1 '$srcdir'/usr.bin/fmt/fmt.1 644
-
-# patch
-exe patch usr.bin/patch/^(patch.c pch.c inp.c util.c backupfile.c mkpath.c ed.c) libbsd.a
-file bin/patch '$outdir'/patch 755
-file share/man/man1/patch.1 '$srcdir'/usr.bin/patch/patch.1 644
-
-# pax
-exe pax bin/pax/^(\
-	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c\
-	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c tables.c\
-	tar.c tty_subs.c\
-) libbsd.a
-file bin/pax '$outdir'/pax 755
-for(alias in tar cpio) sym bin/$alias pax
-for(man in pax tar cpio) file share/man/man1/$man.1 '$srcdir'/bin/pax/$man.1 644
-
-# yacc
-exe yacc usr.bin/yacc/^(\
-	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c\
-	skeleton.c symtab.c verbose.c warshall.c\
-) libbsd.a
-file bin/yacc '$outdir'/yacc 755
-file share/man/man1/yacc.1 '$srcdir'/usr.bin/yacc/yacc.1 644
-
-srcpats=./^(\
-	bin/pax\
-	include\
-	lib/^(libc/^(crypt gen stdlib string) libcrypto/crypto)\
-	usr.bin/^(diff fmt patch yacc)\
-)^/'*'
-syspats='./sys/sys/*'
-fetch curl $srcpats ';' $syspats
diff --git a/core/openbsd/include/err.h b/core/openbsd/include/err.h
deleted file mode 100644
index c537811b..00000000
--- a/core/openbsd/include/err.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include_next <err.h>
-void warnc(int, const char *, ...) __attribute__((__format__ (printf, 2, 3)));
-void vwarnc(int, const char *, va_list) __attribute__((__format__ (printf, 2, 0)));
diff --git a/core/openbsd/include/grp.h b/core/openbsd/include/grp.h
deleted file mode 100644
index 49f4dfd4..00000000
--- a/core/openbsd/include/grp.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include_next <grp.h>
-#define setgroupent(n) setgrent()
diff --git a/core/openbsd/include/machine/endian.h b/core/openbsd/include/machine/endian.h
deleted file mode 100644
index 2dc4d830..00000000
--- a/core/openbsd/include/machine/endian.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <endian.h>
diff --git a/core/openbsd/include/pwd.h b/core/openbsd/include/pwd.h
deleted file mode 100644
index e859a8d1..00000000
--- a/core/openbsd/include/pwd.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include_next <pwd.h>
-#define setpassent(n) setpwent()
diff --git a/core/openbsd/include/stdlib.h b/core/openbsd/include/stdlib.h
deleted file mode 100644
index 0e1aa252..00000000
--- a/core/openbsd/include/stdlib.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include_next <stdlib.h>
-#include <stdint.h>
-void *reallocarray(void *, size_t, size_t);
-long long strtonum(const char *, long long, long long, const char **);
-uint32_t arc4random(void);
-uint32_t arc4random_uniform(uint32_t);
-void arc4random_buf(void *, size_t);
-void setprogname(const char *);
-const char *getprogname(void);
-extern char *__progname;
diff --git a/core/openbsd/include/string.h b/core/openbsd/include/string.h
deleted file mode 100644
index 17c8ad81..00000000
--- a/core/openbsd/include/string.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include_next <string.h>
-void explicit_bzero(void *, size_t);
-void strmode(int, char *);
-int timingsafe_memcmp(const void *, const void *, size_t);
diff --git a/core/openbsd/include/sys/cdefs.h b/core/openbsd/include/sys/cdefs.h
deleted file mode 100644
index 70258b8c..00000000
--- a/core/openbsd/include/sys/cdefs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* only needed for C++ */
-#define __BEGIN_DECLS
-#define __END_DECLS
-
-#define __dead __attribute__((__noreturn__))
diff --git a/core/openbsd/include/sys/param.h b/core/openbsd/include/sys/param.h
deleted file mode 100644
index 3167713c..00000000
--- a/core/openbsd/include/sys/param.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include_next <sys/param.h>
-#define ALIGNBYTES (sizeof(uintptr_t) - 1)
-#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
diff --git a/core/openbsd/include/sys/time.h b/core/openbsd/include/sys/time.h
deleted file mode 100644
index 98d5d3a7..00000000
--- a/core/openbsd/include/sys/time.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include_next <sys/time.h>
-#define	timespeccmp(tsp, usp, cmp)					\
-	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
-	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
-	    ((tsp)->tv_sec cmp (usp)->tv_sec))
diff --git a/core/openbsd/include/unistd.h b/core/openbsd/include/unistd.h
deleted file mode 100644
index 17e14240..00000000
--- a/core/openbsd/include/unistd.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include_next <unistd.h>
-#define pledge(request, paths) 0 /* linux doesn't have pledge */
-int getentropy(void *, size_t);
diff --git a/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch b/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch
deleted file mode 100644
index fb3e7cbd..00000000
--- a/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 03bc025e5ccfc5ba5524cd76a83a5682263fd3e4 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 17 Apr 2016 23:50:15 -0700
-Subject: [PATCH] fts: Avoid d_namlen
-
----
- lib/libc/gen/fts.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
-index 9a9b2a5..77e1e77 100644
---- a/lib/libc/gen/fts.c
-+++ b/lib/libc/gen/fts.c
-@@ -556,6 +556,7 @@ fts_build(FTS *sp, int type)
- 	int nitems, cderrno, descend, level, nlinks, nostat, doadjust;
- 	int saved_errno;
- 	char *cp;
-+	size_t namlen;
- 
- 	/* Set current node pointer. */
- 	cur = sp->fts_cur;
-@@ -654,11 +655,13 @@ fts_build(FTS *sp, int type)
- 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
- 			continue;
- 
--		if (!(p = fts_alloc(sp, dp->d_name, (size_t)dp->d_namlen)))
-+		namlen = strlen(dp->d_name);
-+
-+		if (!(p = fts_alloc(sp, dp->d_name, namlen)))
- 			goto mem1;
--		if (dp->d_namlen >= maxlen) {	/* include space for NUL */
-+		if (namlen >= maxlen) {	/* include space for NUL */
- 			oldaddr = sp->fts_path;
--			if (fts_palloc(sp, dp->d_namlen +len + 1)) {
-+			if (fts_palloc(sp, namlen +len + 1)) {
- 				/*
- 				 * No more memory for path or structures.  Save
- 				 * errno, free up the current structure and the
-@@ -684,7 +687,7 @@ mem1:				saved_errno = errno;
- 
- 		p->fts_level = level;
- 		p->fts_parent = sp->fts_cur;
--		p->fts_pathlen = len + dp->d_namlen;
-+		p->fts_pathlen = len + namlen;
- 		if (p->fts_pathlen < len) {
- 			/*
- 			 * If we wrap, free up the current structure and
--- 
-2.9.3
-
diff --git a/core/openbsd/patch/0002-fts-Add-some-includes.patch b/core/openbsd/patch/0002-fts-Add-some-includes.patch
deleted file mode 100644
index a6a16303..00000000
--- a/core/openbsd/patch/0002-fts-Add-some-includes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From de6a55b9392c80bb9be3dd8b9bb816d8d269ee5b Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 18 Apr 2016 01:25:29 -0700
-Subject: [PATCH] fts: Add some includes
-
----
- include/fts.h      | 2 ++
- lib/libc/gen/fts.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/include/fts.h b/include/fts.h
-index eaf6be0..a5b3aff 100644
---- a/include/fts.h
-+++ b/include/fts.h
-@@ -35,6 +35,8 @@
- #ifndef	_FTS_H_
- #define	_FTS_H_
- 
-+#include <sys/cdefs.h>
-+
- typedef struct {
- 	struct _ftsent *fts_cur;	/* current node */
- 	struct _ftsent *fts_child;	/* linked list of children */
-diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
-index 77e1e77..eff297c 100644
---- a/lib/libc/gen/fts.c
-+++ b/lib/libc/gen/fts.c
-@@ -31,6 +31,7 @@
- 
- #include <sys/param.h>	/* ALIGN */
- #include <sys/stat.h>
-+#include <sys/types.h>
- 
- #include <dirent.h>
- #include <errno.h>
-@@ -39,6 +40,7 @@
- #include <limits.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include <unistd.h>
- 
- #define MAXIMUM(a, b)	(((a) > (b)) ? (a) : (b))
--- 
-2.9.3
-
diff --git a/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch b/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
deleted file mode 100644
index 0ca88edf..00000000
--- a/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d5f85f2a77ee62751c4ec4193cc55207875a757 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 18 Apr 2016 00:13:51 -0700
-Subject: [PATCH] pax: Set listf to stderr in main
-
----
- bin/pax/pax.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/bin/pax/pax.c b/bin/pax/pax.c
-index 1b17b8c..7e62c51 100644
---- a/bin/pax/pax.c
-+++ b/bin/pax/pax.c
-@@ -91,7 +91,7 @@ int	docrc;			/* check/create file crc */
- char	*dirptr;		/* destination dir in a copy */
- char	*argv0;			/* root of argv[0] */
- sigset_t s_mask;		/* signal mask for cleanup critical sect */
--FILE	*listf = stderr;	/* file pointer to print file list to */
-+FILE	*listf;			/* file pointer to print file list to */
- int	listfd = STDERR_FILENO;	/* fd matching listf, for sighandler output */
- char	*tempfile;		/* tempfile to use for mkstemp(3) */
- char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
-@@ -222,6 +222,8 @@ main(int argc, char **argv)
- 	char *tmpdir;
- 	size_t tdlen;
- 
-+	listf = stderr;
-+
- 	/*
- 	 * Keep a reference to cwd, so we can always come back home.
- 	 */
--- 
-2.9.3
-
diff --git a/core/openbsd/patch/0004-pax-Add-some-includes.patch b/core/openbsd/patch/0004-pax-Add-some-includes.patch
deleted file mode 100644
index 4061d470..00000000
--- a/core/openbsd/patch/0004-pax-Add-some-includes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 140c41d57f7bef789f4a0ea0db0426c1b3f0f38f Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 18 Apr 2016 01:27:29 -0700
-Subject: [PATCH] pax: Add some includes
-
----
- bin/pax/ar_subs.c   | 1 +
- bin/pax/file_subs.c | 1 +
- bin/pax/gen_subs.c  | 1 +
- bin/pax/sel_subs.c  | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
-index b95b1c2..91b8436 100644
---- a/bin/pax/ar_subs.c
-+++ b/bin/pax/ar_subs.c
-@@ -44,6 +44,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <time.h>
- #include "pax.h"
- #include "extern.h"
- 
-diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
-index 1f27d28..b7239c8 100644
---- a/bin/pax/file_subs.c
-+++ b/bin/pax/file_subs.c
-@@ -36,6 +36,7 @@
- 
- #include <sys/time.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
- #include <err.h>
- #include <errno.h>
- #include <fcntl.h>
-diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
-index cd857dc..ae5843e 100644
---- a/bin/pax/gen_subs.c
-+++ b/bin/pax/gen_subs.c
-@@ -43,6 +43,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <vis.h>
-+#include <time.h>
- #include "pax.h"
- #include "extern.h"
- 
-diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
-index fc9194d..7bdbe46 100644
---- a/bin/pax/sel_subs.c
-+++ b/bin/pax/sel_subs.c
-@@ -44,6 +44,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <time.h>
- #include "pax.h"
- #include "sel_subs.h"
- #include "extern.h"
--- 
-2.8.1
-
diff --git a/core/openbsd/patch/0005-tar-Default-to-stdin.patch b/core/openbsd/patch/0005-tar-Default-to-stdin.patch
deleted file mode 100644
index f4c2e08c..00000000
--- a/core/openbsd/patch/0005-tar-Default-to-stdin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4e6eb43b544fff46d7ca4307b4c0e7699a261ed7 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 18 Apr 2016 01:16:12 -0700
-Subject: [PATCH] tar: Default to stdin
-
----
- bin/pax/options.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/bin/pax/options.c b/bin/pax/options.c
-index 8721eaa..51101c7 100644
---- a/bin/pax/options.c
-+++ b/bin/pax/options.c
-@@ -871,9 +871,7 @@ tar_options(int argc, char **argv)
- 
- 	if (!fstdin && ((arcname == NULL) || (*arcname == '\0'))) {
- 		arcname = getenv("TAPE");
--		if ((arcname == NULL) || (*arcname == '\0'))
--			arcname = _PATH_DEFTAPE;
--		else if ((arcname[0] == '-') && (arcname[1]== '\0')) {
-+		if ((arcname == NULL) || (*arcname == '\0') || (arcname[0] == '-') && (arcname[1]== '\0')) {
- 			arcname = NULL;
- 			fstdin = 1;
- 		}
--- 
-2.9.3
-
diff --git a/core/openbsd/patch/0006-yacc-Add-some-includes.patch b/core/openbsd/patch/0006-yacc-Add-some-includes.patch
deleted file mode 100644
index a4b0ed78..00000000
--- a/core/openbsd/patch/0006-yacc-Add-some-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 148c9835e6304a4247c7116156e8c5a97f153c0e Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 18 Apr 2016 17:34:01 -0700
-Subject: [PATCH] yacc: Add some includes
-
----
- usr.bin/yacc/defs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
-index 7300cae..fab6e12 100644
---- a/usr.bin/yacc/defs.h
-+++ b/usr.bin/yacc/defs.h
-@@ -35,6 +35,7 @@
-  *	@(#)defs.h	5.6 (Berkeley) 5/24/93
-  */
- 
-+#include <sys/cdefs.h>
- #include <assert.h>
- #include <ctype.h>
- #include <stdio.h>
--- 
-2.8.1
-
diff --git a/core/openbsd/patch/0007-diff-Add-missing-includes.patch b/core/openbsd/patch/0007-diff-Add-missing-includes.patch
deleted file mode 100644
index 2560b726..00000000
--- a/core/openbsd/patch/0007-diff-Add-missing-includes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cd4851a8e922a6bda085b6d345df2a291004ffb8 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Jun 2016 14:48:20 -0700
-Subject: [PATCH] diff: Add missing includes
-
----
- usr.bin/diff/diff.c    | 1 +
- usr.bin/diff/diffreg.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
-index 2b075f12c49..80c7f842ef6 100644
---- a/usr.bin/diff/diff.c
-+++ b/usr.bin/diff/diff.c
-@@ -20,6 +20,7 @@
-  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
-  */
- 
-+#include <sys/cdefs.h>
- #include <sys/stat.h>
- 
- #include <ctype.h>
-diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
-index 35d61c349cb..953018cf553 100644
---- a/usr.bin/diff/diffreg.c
-+++ b/usr.bin/diff/diffreg.c
-@@ -77,6 +77,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include <unistd.h>
- #include <limits.h>
- 
--- 
-2.11.0
-
diff --git a/core/openbsd/patch/0008-patch-Add-missing-includes.patch b/core/openbsd/patch/0008-patch-Add-missing-includes.patch
deleted file mode 100644
index 782880c4..00000000
--- a/core/openbsd/patch/0008-patch-Add-missing-includes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e47145b05bd63b51df6219855747a8247c0910fc Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Jun 2016 18:40:24 -0700
-Subject: [PATCH] patch: Add missing includes
-
----
- usr.bin/patch/inp.c   | 1 +
- usr.bin/patch/patch.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
-index 3f60861..80c4801 100644
---- a/usr.bin/patch/inp.c
-+++ b/usr.bin/patch/inp.c
-@@ -32,6 +32,7 @@
- #include <sys/mman.h>
- 
- #include <ctype.h>
-+#include <fcntl.h>
- #include <libgen.h>
- #include <stddef.h>
- #include <stdint.h>
-diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
-index 8f8f8cd..8087a21 100644
---- a/usr.bin/patch/patch.c
-+++ b/usr.bin/patch/patch.c
-@@ -26,6 +26,7 @@
-  * behaviour
-  */
- 
-+#include <sys/cdefs.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
--- 
-2.9.3
-
diff --git a/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch b/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch
deleted file mode 100644
index 0eb9f9d2..00000000
--- a/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0d285d78276b91b101391a4dab53b0585d2812f8 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Jun 2016 18:40:37 -0700
-Subject: [PATCH] patch: Avoid d_namlen
-
----
- usr.bin/patch/backupfile.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
-index d9e40bc..1d7858a 100644
---- a/usr.bin/patch/backupfile.c
-+++ b/usr.bin/patch/backupfile.c
-@@ -95,7 +95,7 @@ max_backup_version(const char *file, const char *dir)
- 	file_name_length = strlen(file);
- 
- 	while ((dp = readdir(dirp)) != NULL) {
--		if (dp->d_namlen <= file_name_length)
-+		if (strlen(dp->d_name) <= file_name_length)
- 			continue;
- 
- 		this_version = version_number(file, dp->d_name, file_name_length);
--- 
-2.8.1
-
diff --git a/core/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch b/core/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch
deleted file mode 100644
index 3956747e..00000000
--- a/core/openbsd/patch/0010-patch-Fix-with-musl-s-basename-dirname.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4eaf0cae80ad349f877a6c29d71d7dcdfa077481 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Jun 2016 20:13:35 -0700
-Subject: [PATCH] patch: Fix with musl's basename/dirname
-
----
- usr.bin/patch/backupfile.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
-index 1d7858a..243d00e 100644
---- a/usr.bin/patch/backupfile.c
-+++ b/usr.bin/patch/backupfile.c
-@@ -53,21 +53,22 @@ static void	invalid_arg(const char *, const char *, int);
- char *
- find_backup_file_name(const char *file)
- {
--	char	*dir, *base_versions;
-+	char	*path, *base_versions;
- 	int	highest_backup;
- 
- 	if (backup_type == simple)
- 		return concat(file, simple_backup_suffix);
--	base_versions = concat(basename(file), ".~");
--	if (base_versions == NULL)
-+	path = strdup(file);
-+	if (path == NULL)
- 		return NULL;
--	dir = dirname(file);
--	if (dir == NULL) {
--		free(base_versions);
-+	base_versions = concat(basename(path), ".~");
-+	if (base_versions == NULL) {
-+		free(path);
- 		return NULL;
- 	}
--	highest_backup = max_backup_version(base_versions, dir);
-+	highest_backup = max_backup_version(base_versions, dirname(path));
- 	free(base_versions);
-+	free(path);
- 	if (backup_type == numbered_existing && highest_backup == 0)
- 		return concat(file, simple_backup_suffix);
- 	return make_version_name(file, highest_backup + 1);
--- 
-2.8.1
-
diff --git a/core/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch b/core/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
deleted file mode 100644
index 6fa04409..00000000
--- a/core/openbsd/patch/0011-pax-Fix-GNU-long-name-handling-with-short-read.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 633eb1c50eb77216f4049c1ec983c5616fef13da Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 3 Dec 2016 20:49:24 -0800
-Subject: [PATCH] pax: Fix GNU long name handling with short read
-
----
- bin/pax/ar_subs.c   | 66 +++++++++++++++++++++++++++++++++++++++--------------
- bin/pax/buf_subs.c  |  4 +---
- bin/pax/file_subs.c | 25 +-------------------
- 3 files changed, 51 insertions(+), 44 deletions(-)
-
-diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
-index 91b843645af..4071b71e2e0 100644
---- a/bin/pax/ar_subs.c
-+++ b/bin/pax/ar_subs.c
-@@ -37,6 +37,7 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-+#include <err.h>
- #include <signal.h>
- #include <string.h>
- #include <stdio.h>
-@@ -51,6 +52,7 @@
- static void wr_archive(ARCHD *, int is_app);
- static int get_arc(void);
- static int next_head(ARCHD *);
-+static int rd_gnu_string(ARCHD *);
- extern sigset_t s_mask;
- 
- /*
-@@ -96,16 +98,8 @@ list(void)
- 	 * step through the archive until the format says it is done
- 	 */
- 	while (next_head(arcn) == 0) {
--		if (arcn->type == PAX_GLL || arcn->type == PAX_GLF) {
--			/*
--			 * we need to read, to get the real filename
--			 */
--			off_t cnt;
--			if (!rd_wrfile(arcn, arcn->type == PAX_GLF
--			    ? -1 : -2, &cnt))
--				(void)rd_skip(cnt + arcn->pad);
-+		if (rd_gnu_string(arcn))
- 			continue;
--		}
- 
- 		/*
- 		 * check for pattern, and user specified options match.
-@@ -211,15 +205,8 @@ extract(void)
- 	 * says it is done
- 	 */
- 	while (next_head(arcn) == 0) {
--		if (arcn->type == PAX_GLL || arcn->type == PAX_GLF) {
--			/*
--			 * we need to read, to get the real filename
--			 */
--			if (!rd_wrfile(arcn, arcn->type == PAX_GLF
--			    ? -1 : -2, &cnt))
--				(void)rd_skip(cnt + arcn->pad);
-+		if (rd_gnu_string(arcn))
- 			continue;
--		}
- 
- 		/*
- 		 * check for pattern, and user specified options match. When
-@@ -1246,3 +1233,48 @@ get_arc(void)
- 	paxwarn(1, "Sorry, unable to determine archive format.");
- 	return(-1);
- }
-+
-+/*
-+ * rd_gnu_string()
-+ * 	Read the file contents into an allocated string if it is a GNU tar
-+ * 	long link/file.
-+ * Return:
-+ * 	1 if gnu string read, 0 otherwise
-+ */
-+
-+static int
-+rd_gnu_string(ARCHD *arcn)
-+{
-+	char **strp;
-+
-+	switch (arcn->type) {
-+	case PAX_GLF:
-+		strp = &gnu_name_string;
-+		break;
-+	case PAX_GLL:
-+		strp = &gnu_link_string;
-+		break;
-+	default:
-+		strp = NULL;
-+		break;
-+	}
-+	if (!strp)
-+		return 0;
-+	/*
-+	 * we need to read, to get the real filename
-+	 */
-+	if (*strp)
-+		err(1, "WARNING! Major Internal Error! GNU hack Failing!");
-+	*strp = malloc(arcn->sb.st_size + 1);
-+	if (*strp == NULL) {
-+		paxwarn(1, "Out of memory");
-+		(void)rd_skip(arcn->skip + arcn->pad);
-+	} else if (rd_wrbuf(*strp, arcn->sb.st_size) < arcn->sb.st_size) {
-+		free(*strp);
-+		*strp = NULL;
-+	} else {
-+		(*strp)[arcn->sb.st_size] = '\0';
-+		(void)rd_skip(arcn->pad);
-+	}
-+	return 1;
-+}
-diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
-index cac45294436..31a05c300a6 100644
---- a/bin/pax/buf_subs.c
-+++ b/bin/pax/buf_subs.c
-@@ -673,9 +673,7 @@ rd_wrfile(ARCHD *arcn, int ofd, off_t *left)
- 	 * pass the blocksize of the file being written to the write routine,
- 	 * if the size is zero, use the default MINFBSZ
- 	 */
--	if (ofd < 0)
--		sz = PAXPATHLEN + 1;		/* GNU tar long link/file */
--	else if (fstat(ofd, &sb) == 0) {
-+	if (fstat(ofd, &sb) == 0) {
- 		if (sb.st_blksize > 0)
- 			sz = (int)sb.st_blksize;
- 	} else
-diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
-index b7239c87409..5b7f81b713b 100644
---- a/bin/pax/file_subs.c
-+++ b/bin/pax/file_subs.c
-@@ -920,7 +920,6 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
- 	char *end;
- 	int wcnt;
- 	char *st = str;
--	char **strp;
- 
- 	/*
- 	 * while we have data to process
-@@ -979,29 +978,7 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
- 		/*
- 		 * have non-zero data in this file system block, have to write
- 		 */
--		switch (fd) {
--		case -1:
--			strp = &gnu_name_string;
--			break;
--		case -2:
--			strp = &gnu_link_string;
--			break;
--		default:
--			strp = NULL;
--			break;
--		}
--		if (strp) {
--			if (*strp)
--				err(1, "WARNING! Major Internal Error! GNU hack Failing!");
--			*strp = malloc(wcnt + 1);
--			if (*strp == NULL) {
--				paxwarn(1, "Out of memory");
--				return(-1);
--			}
--			memcpy(*strp, st, wcnt);
--			(*strp)[wcnt] = '\0';
--			break;
--		} else if (write(fd, st, wcnt) != wcnt) {
-+		if (write(fd, st, wcnt) != wcnt) {
- 			syswarn(1, errno, "Failed write to file %s", name);
- 			return(-1);
- 		}
--- 
-2.11.0
-
diff --git a/core/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch b/core/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
deleted file mode 100644
index 61a4332e..00000000
--- a/core/openbsd/patch/0012-pax-Support-xz-compression-with-J-flag.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 5b372180bd0994a256be1a334c565d882f0db458 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 3 Dec 2016 23:50:27 -0800
-Subject: [PATCH] pax: Support xz compression with -J flag
-
----
- bin/pax/options.c | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/bin/pax/options.c b/bin/pax/options.c
-index 51101c7ad5a..a79a03b5bed 100644
---- a/bin/pax/options.c
-+++ b/bin/pax/options.c
-@@ -78,6 +78,7 @@ static int xz_id(char *_blk, int _size);
- #define GZIP_CMD	"gzip"		/* command to run as gzip */
- #define COMPRESS_CMD	"compress"	/* command to run as compress */
- #define BZIP2_CMD	"bzip2"		/* command to run as bzip2 */
-+#define XZ_CMD		"xz"		/* command to run as xz */
- 
- /*
-  *	Format specific routine table
-@@ -221,7 +222,7 @@ pax_options(int argc, char **argv)
- 	/*
- 	 * process option flags
- 	 */
--	while ((c=getopt(argc,argv,"ab:cdf:ijklno:p:rs:tuvwx:zB:DE:G:HLOPT:U:XYZ0"))
-+	while ((c=getopt(argc,argv,"ab:cdf:ijklno:p:rs:tuvwx:zB:DE:G:HJLOPT:U:XYZ0"))
- 	    != -1) {
- 		switch (c) {
- 		case 'a':
-@@ -481,6 +482,12 @@ pax_options(int argc, char **argv)
- 			Hflag = 1;
- 			flg |= CHF;
- 			break;
-+		case 'J':
-+			/*
-+			 * use xz.  Non standard option.
-+			 */
-+			gzip_program = XZ_CMD;
-+			break;
- 		case 'L':
- 			/*
- 			 * follow symlinks
-@@ -657,7 +664,7 @@ tar_options(int argc, char **argv)
- 	 * process option flags
- 	 */
- 	while ((c = getoldopt(argc, argv,
--	    "b:cef:hjmopqruts:vwxzBC:HI:LNOPXZ014578")) != -1) {
-+	    "b:cef:hjmopqruts:vwxzBC:HI:JLNOPXZ014578")) != -1) {
- 		switch (c) {
- 		case 'b':
- 			/*
-@@ -815,6 +822,12 @@ tar_options(int argc, char **argv)
- 			incfiles[nincfiles - 1].file = optarg;
- 			incfiles[nincfiles - 1].dir = chdname;
- 			break;
-+		case 'J':
-+			/*
-+			 * use xz.  Non standard option.
-+			 */
-+			gzip_program = XZ_CMD;
-+			break;
- 		case 'L':
- 			/*
- 			 * follow symlinks
-@@ -1098,7 +1111,7 @@ cpio_options(int argc, char **argv)
- 	dflag = 1;
- 	act = -1;
- 	nodirs = 1;
--	while ((c=getopt(argc,argv,"abcdfijklmoprstuvzABC:E:F:H:I:LO:SZ6")) != -1)
-+	while ((c=getopt(argc,argv,"abcdfijklmoprstuvzABC:E:F:H:I:JLO:SZ6")) != -1)
- 		switch (c) {
- 			case 'a':
- 				/*
-@@ -1282,6 +1295,12 @@ cpio_options(int argc, char **argv)
- 				(void)fputs("\n\n", stderr);
- 				cpio_usage();
- 				break;
-+			case 'J':
-+				/*
-+				 * use xz.  Non standard option.
-+				 */
-+				gzip_program = XZ_CMD;
-+				break;
- 			case 'L':
- 				/*
- 				 * follow symbolic links
--- 
-2.11.0
-
diff --git a/core/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch b/core/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch
deleted file mode 100644
index 121e10e8..00000000
--- a/core/openbsd/patch/0013-setprogname-Explicitly-discard-const-qualifier.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f976df1b8ad1ed79f25d04eb7285e582690ad965 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 11 Dec 2016 14:36:13 -0800
-Subject: [PATCH] setprogname: Explicitly discard const qualifier
-
----
- lib/libc/gen/setprogname.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/libc/gen/setprogname.c b/lib/libc/gen/setprogname.c
-index ec3189fa699..173148ba8cf 100644
---- a/lib/libc/gen/setprogname.c
-+++ b/lib/libc/gen/setprogname.c
-@@ -25,7 +25,7 @@ setprogname(const char *progname)
- 
- 	tmpn = strrchr(progname, '/');
- 	if (tmpn == NULL)
--		__progname = progname;
-+		__progname = (char *)progname;
- 	else
--		__progname = tmpn + 1;
-+		__progname = (char *)tmpn + 1;
- }
--- 
-2.11.0
-
diff --git a/core/openbsd/rev b/core/openbsd/rev
deleted file mode 100644
index 7f8f011e..00000000
--- a/core/openbsd/rev
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/core/openbsd/sha256 b/core/openbsd/sha256
deleted file mode 100644
index 4a497a70..00000000
--- a/core/openbsd/sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-bcb1cc9fafe2f03ce52455bf07d5cdc90b26ee2550fba1598e938a5fb077b959  src.tar.gz
-2e10bf43f5d649a7b58f95c70848ef792fff159affbac5b6c14838cbf4f8b7fa  sys.tar.gz
diff --git a/core/openbsd/url b/core/openbsd/url
deleted file mode 100644
index 2fac84b9..00000000
--- a/core/openbsd/url
+++ /dev/null
@@ -1,3 +0,0 @@
-url = "http://mirrors.sonic.net/pub/OpenBSD/6.0/src.tar.gz"
--O
-url = "http://mirrors.sonic.net/pub/OpenBSD/6.0/sys.tar.gz"
diff --git a/core/openssh/config.h b/core/openssh/config.h
deleted file mode 100644
index ef00fb14..00000000
--- a/core/openssh/config.h
+++ /dev/null
@@ -1,482 +0,0 @@
-#include <config-posix.h>
-
-#define ASKPASS_PROGRAM "/bin/ssh-askpass"
-#define LOGIN_PROGRAM "/bin/login"
-#define _PATH_BTMP "/var/log/btmp"
-#define _PATH_PASSWD_PROG "/bin/passwd"
-#define _PATH_SFTP_SERVER "/libexec/sftp-server"
-#define _PATH_SSH_ASKPASS_DEFAULT "/bin/ssh-askpass"
-#define _PATH_SSH_KEY_SIGN "/libexec/ssh-keysign"
-#define _PATH_SSH_PIDDIR "/run"
-#define _PATH_SSH_PKCS11_HELPER "/libexec/ssh-pkcs11-helper"
-#define _PATH_SSH_PROGRAM "/bin/ssh"
-#define _PATH_XAUTH "/dev/null/xauth"
-
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-/* #undef AIX_GETNAMEINFO_HACK */
-/* #undef AIX_LOGINFAILED_4ARG */
-/* #undef AU_IPv4 */
-/* #undef BIND_8_COMPAT */
-/* #undef BROKEN_BSM_API */
-/* #undef BROKEN_CMSG_TYPE */
-/* #undef BROKEN_GETADDRINFO */
-/* #undef BROKEN_GETGROUPS */
-/* #undef BROKEN_GLOB */
-/* #undef BROKEN_INET_NTOA */
-/* #undef BROKEN_LIBIAF */
-/* #undef BROKEN_MMAP */
-/* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */
-/* #undef BROKEN_READV_COMPARISON */
-/* #undef BROKEN_READ_COMPARISON */
-#define BROKEN_REALPATH 1
-/* #undef BROKEN_SAVED_UIDS */
-/* #undef BROKEN_SETREGID */
-/* #undef BROKEN_SETRESGID */
-/* #undef BROKEN_SETRESUID */
-/* #undef BROKEN_SETREUID */
-/* #undef BROKEN_SETVBUF */
-/* #undef BROKEN_SHADOW_EXPIRE */
-/* #undef BROKEN_SNPRINTF */
-/* #undef BROKEN_STRNVIS */
-/* #undef BROKEN_TCGETATTR_ICANON */
-/* #undef BROKEN_UPDWTMPX */
-/* #undef BSD_AUTH */
-/* #undef CONF_LASTLOG_FILE */
-/* #undef CONF_UTMP_FILE */
-/* #undef CONF_WTMPX_FILE */
-/* #undef CONF_WTMP_FILE */
-/* #undef DISABLE_FD_PASSING */
-/* #undef DISABLE_LASTLOG */
-/* #undef DISABLE_LOGIN */
-/* #undef DISABLE_PUTUTLINE */
-/* #undef DISABLE_PUTUTXLINE */
-/* #undef DISABLE_SHADOW */
-/* #undef DISABLE_UTMP */
-/* #undef DISABLE_UTMPX */
-#define DISABLE_WTMP 1
-#define DISABLE_WTMPX 1
-#define ENABLE_PKCS11 1
-/* #undef FILESYSTEM_NO_BACKSLASH */
-/* #undef FSID_HAS_VAL */
-/* #undef FSID_HAS___VAL */
-#define GETPGRP_VOID 1
-/* #undef GETSPNAM_CONFLICTING_DEFS */
-/* #undef GLOB_HAS_ALTDIRFUNC */
-/* #undef GLOB_HAS_GL_MATCHC */
-/* #undef GLOB_HAS_GL_STATV */
-/* #undef GSSAPI */
-#define HAS_SHADOW_EXPIRE 1
-/* #undef HAVE_ACCRIGHTS_IN_MSGHDR */
-#define HAVE_ADDR_IN_UTMP 1
-#define HAVE_ADDR_IN_UTMPX 1
-#define HAVE_ADDR_V6_IN_UTMP 1
-#define HAVE_ADDR_V6_IN_UTMPX 1
-#define HAVE_ARC4RANDOM 1
-#define HAVE_ARC4RANDOM_BUF 1
-/* #undef HAVE_ARC4RANDOM_STIR */
-#define HAVE_ARC4RANDOM_UNIFORM 1
-#define HAVE_ASPRINTF 1
-/* #undef HAVE_ATTRIBUTE__BOUNDED__ */
-#define HAVE_ATTRIBUTE__NONNULL__ 1
-/* #undef HAVE_ATTRIBUTE__SENTINEL__ */
-/* #undef HAVE_AUG_GET_MACHINE */
-/* #undef HAVE_B64_NTOP */
-/* #undef HAVE_B64_PTON */
-#define HAVE_BCOPY 1
-/* #undef HAVE_BCRYPT_PBKDF */
-/* #undef HAVE_BINDRESVPORT_SA */
-/* #undef HAVE_BLF_ENC */
-/* #undef HAVE_BLF_H */
-/* #undef HAVE_BLOWFISH_EXPAND0STATE */
-/* #undef HAVE_BLOWFISH_EXPANDSTATE */
-/* #undef HAVE_BLOWFISH_INITSTATE */
-/* #undef HAVE_BLOWFISH_STREAM2WORD */
-#define HAVE_BN_IS_PRIME_EX 1
-/* #undef HAVE_BSD_LIBUTIL_H */
-/* #undef HAVE_BSM_AUDIT_H */
-/* #undef HAVE_BSTRING_H */
-/* #undef HAVE_CAP_RIGHTS_LIMIT */
-/* #undef HAVE_CLOSEFROM */
-#define HAVE_CONST_GAI_STRERROR_PROTO 1
-#define HAVE_CONTROL_IN_MSGHDR 1
-/* #undef HAVE_CRYPTO_SHA2_H */
-#define HAVE_CRYPT_H 1
-/* #undef HAVE_CYGWIN */
-#define HAVE_DAEMON 1
-#define HAVE_DECL_AI_NUMERICSERV 1
-/* #undef HAVE_DECL_AUTHENTICATE */
-#define HAVE_DECL_GLOB_NOMATCH 1
-/* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */
-#define HAVE_DECL_HOWMANY 1
-#define HAVE_DECL_H_ERRNO 1
-/* #undef HAVE_DECL_LOGINFAILED */
-/* #undef HAVE_DECL_LOGINRESTRICTIONS */
-/* #undef HAVE_DECL_LOGINSUCCESS */
-#define HAVE_DECL_MAXSYMLINKS 1
-#define HAVE_DECL_NFDBITS 1
-#define HAVE_DECL_OFFSETOF 1
-#define HAVE_DECL_O_NONBLOCK 1
-/* #undef HAVE_DECL_PASSWDEXPIRED */
-/* #undef HAVE_DECL_SETAUTHDB */
-#define HAVE_DECL_SHUT_RD 1
-#define HAVE_DECL_WRITEV 1
-#define HAVE_DECL__GETLONG 0
-#define HAVE_DECL__GETSHORT 0
-#define HAVE_DES_CRYPT 1
-/* #undef HAVE_DEV_PTMX */
-/* #undef HAVE_DEV_PTS_AND_PTC */
-#define HAVE_DSA_GENERATE_PARAMETERS_EX 1
-#define HAVE_ELF_H 1
-#define HAVE_ENDIAN_H 1
-#define HAVE_ENDUTENT 1
-#define HAVE_ERR 1
-#define HAVE_ERRX 1
-#define HAVE_ERR_H 1
-/* #undef HAVE_ETC_DEFAULT_LOGIN */
-#define HAVE_EVP_CIPHER_CTX_CTRL 1
-#define HAVE_EVP_DIGESTFINAL_EX 1
-#define HAVE_EVP_DIGESTINIT_EX 1
-#define HAVE_EVP_MD_CTX_CLEANUP 1
-#define HAVE_EVP_MD_CTX_COPY_EX 1
-#define HAVE_EVP_MD_CTX_INIT 1
-#define HAVE_EVP_RIPEMD160 1
-#define HAVE_EVP_SHA256 1
-#define HAVE_EXIT_IN_UTMP 1
-#define HAVE_EXPLICIT_BZERO 1
-/* #undef HAVE_FCNTL_CLOSEM */
-#define HAVE_FD_MASK 1
-#define HAVE_FEATURES_H 1
-/* #undef HAVE_FLOATINGPOINT_H */
-/* #undef HAVE_FMT_SCALED */
-#define HAVE_FSTATFS 1
-#define HAVE_FUTIMES 1
-/* #undef HAVE_GETAUDIT */
-/* #undef HAVE_GETAUDIT_ADDR */
-#define HAVE_GETGROUPLIST 1
-/* #undef HAVE_GETGRSET */
-/* #undef HAVE_GETLASTLOGXBYNAME */
-/* #undef HAVE_GETLUID */
-#define HAVE_GETOPT_H 1
-#define HAVE_GETOPT_OPTRESET 1
-#define HAVE_GETPAGESIZE 1
-/* #undef HAVE_GETPEEREID */
-/* #undef HAVE_GETPEERUCRED */
-/* #undef HAVE_GETPWANAM */
-/* #undef HAVE_GETRRSETBYNAME */
-/* #undef HAVE_GETSEUSERBYNAME */
-/* #undef HAVE_GETTTYENT */
-#define HAVE_GETUTENT 1
-#define HAVE_GETUTID 1
-#define HAVE_GETUTLINE 1
-/* #undef HAVE_GETUTXUSER */
-/* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */
-/* #undef HAVE_GROUP_FROM_GID */
-/* #undef HAVE_GSSAPI_GENERIC_H */
-/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
-/* #undef HAVE_GSSAPI_GSSAPI_H */
-/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */
-/* #undef HAVE_GSSAPI_H */
-/* #undef HAVE_GSSAPI_KRB5_H */
-#define HAVE_HEADER_AD 1
-#define HAVE_HMAC_CTX_INIT 1
-#define HAVE_HOST_IN_UTMP 1
-#define HAVE_HOST_IN_UTMPX 1
-/* #undef HAVE_IAF_H */
-/* #undef HAVE_IA_H */
-#define HAVE_ID_IN_UTMP 1
-#define HAVE_ID_IN_UTMPX 1
-#define HAVE_INET_ATON 1
-/* #undef HAVE_INNETGR */
-#define HAVE_INT64_T 1
-#define HAVE_INTXX_T 1
-#define HAVE_IN_ADDR_T 1
-#define HAVE_IN_PORT_T 1
-/* #undef HAVE_KRB5_CC_NEW_UNIQUE */
-/* #undef HAVE_KRB5_FREE_ERROR_MESSAGE */
-/* #undef HAVE_KRB5_GET_ERROR_MESSAGE */
-#define HAVE_LASTLOG_H 1
-/* #undef HAVE_LDNS */
-/* #undef HAVE_LIBAUDIT_H */
-/* #undef HAVE_LIBBSM */
-/* #undef HAVE_LIBCRYPT */
-/* #undef HAVE_LIBDL */
-/* #undef HAVE_LIBIAF */
-/* #undef HAVE_LIBNETWORK */
-/* #undef HAVE_LIBPAM */
-/* #undef HAVE_LIBSOCKET */
-/* #undef HAVE_LIBUTIL_H */
-/* #undef HAVE_LIBXNET */
-#define HAVE_LIBZ 1
-#define HAVE_LINUX_AUDIT_H 1
-#define HAVE_LINUX_FILTER_H 1
-#define HAVE_LINUX_IF_TUN_H 1
-#define HAVE_LINUX_SECCOMP_H 1
-/* #undef HAVE_LOGIN */
-/* #undef HAVE_LOGIN_CAP_H */
-/* #undef HAVE_LOGIN_GETCAPBOOL */
-/* #undef HAVE_LOGIN_H */
-/* #undef HAVE_LOGOUT */
-/* #undef HAVE_LOGWTMP */
-#define HAVE_LONG_DOUBLE 1
-#define HAVE_LONG_LONG 1
-/* #undef HAVE_MAILLOCK_H */
-/* #undef HAVE_MD5_CRYPT */
-/* #undef HAVE_MD5_PASSWORDS */
-#define HAVE_MEMORY_H 1
-/* #undef HAVE_MEMSET_S */
-/* #undef HAVE_NDIR_H */
-/* #undef HAVE_NETGROUP_H */
-/* #undef HAVE_NET_IF_TUN_H */
-/* #undef HAVE_NEXT */
-/* #undef HAVE_NGETADDRINFO */
-/* #undef HAVE_NSLEEP */
-/* #undef HAVE_OGETADDRINFO */
-/* #undef HAVE_OLD_PAM */
-/* #undef HAVE_OPENLOG_R */
-#define HAVE_OPENPTY 1
-#define HAVE_OPENSSL 1
-/* #undef HAVE_OSF_SIA */
-/* #undef HAVE_PAM_GETENVLIST */
-/* #undef HAVE_PAM_PAM_APPL_H */
-/* #undef HAVE_PAM_PUTENV */
-#define HAVE_PATHS_H 1
-#define HAVE_PID_IN_UTMP 1
-#define HAVE_PLEDGE 1
-#define HAVE_PRCTL 1
-/* #undef HAVE_PRIV_BASICSET */
-/* #undef HAVE_PRIV_H */
-#define HAVE_PROC_PID 1
-/* #undef HAVE_PSTAT */
-#define HAVE_PTY_H 1
-#define HAVE_PUTUTLINE 1
-/* #undef HAVE_READPASSPHRASE */
-/* #undef HAVE_READPASSPHRASE_H */
-/* #undef HAVE_REALLOCARRAY */
-#define HAVE_RLIMIT_NPROC /**/
-/* #undef HAVE_RPC_TYPES_H */
-/* #undef HAVE_RRESVPORT_AF */
-#define HAVE_RSA_GENERATE_KEY_EX 1
-#define HAVE_RSA_GET_DEFAULT_METHOD 1
-/* #undef HAVE_SANDBOX_H */
-/* #undef HAVE_SANDBOX_INIT */
-/* #undef HAVE_SCAN_SCALED */
-/* #undef HAVE_SECUREWARE */
-/* #undef HAVE_SECURITY_PAM_APPL_H */
-/* #undef HAVE_SETAUTHDB */
-/* #undef HAVE_SETDTABLESIZE */
-/* #undef HAVE_SETGROUPENT */
-#define HAVE_SETGROUPS 1
-#define HAVE_SETLINEBUF 1
-/* #undef HAVE_SETLOGIN */
-/* #undef HAVE_SETLUID */
-/* #undef HAVE_SETPASSENT */
-/* #undef HAVE_SETPCRED */
-/* #undef HAVE_SETPFLAGS */
-/* #undef HAVE_SETPPRIV */
-/* #undef HAVE_SETPROCTITLE */
-#define HAVE_SETRESGID 1
-#define HAVE_SETRESUID 1
-#define HAVE_SETUTENT 1
-/* #undef HAVE_SETUTXDB */
-/* #undef HAVE_SET_ID */
-#define HAVE_SHA256_UPDATE 1
-/* #undef HAVE_SHA2_H */
-#define HAVE_SHADOW_H 1
-/* #undef HAVE_SIGVEC */
-#define HAVE_SO_PEERCRED 1
-#define HAVE_SS_FAMILY_IN_SS 1
-#define HAVE_STATFS 1
-#define HAVE_STRICT_MKSTEMP 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRMODE 1
-/* #undef HAVE_STRNVIS */
-#define HAVE_STRSEP 1
-#define HAVE_STRTONUM 1
-/* #undef HAVE_STRUCT_PASSWD_PW_CHANGE */
-/* #undef HAVE_STRUCT_PASSWD_PW_CLASS */
-/* #undef HAVE_STRUCT_PASSWD_PW_EXPIRE */
-#define HAVE_STRUCT_PASSWD_PW_GECOS 1
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-/* #undef HAVE_SWAP32 */
-/* #undef HAVE_SYSLEN_IN_UTMPX */
-/* #undef HAVE_SYS_AUDIT_H */
-/* #undef HAVE_SYS_BITYPES_H */
-/* #undef HAVE_SYS_BSDTTY_H */
-/* #undef HAVE_SYS_CAPABILITY_H */
-/* #undef HAVE_SYS_CDEFS_H */
-#define HAVE_SYS_DIR_H 1
-/* #undef HAVE_SYS_ERRLIST */
-#define HAVE_SYS_MOUNT_H 1
-/* #undef HAVE_SYS_NDIR_H */
-/* #undef HAVE_SYS_NERR */
-#define HAVE_SYS_POLL_H 1
-#define HAVE_SYS_PRCTL_H 1
-/* #undef HAVE_SYS_PSTAT_H */
-/* #undef HAVE_SYS_PTMS_H */
-/* #undef HAVE_SYS_STREAM_H */
-#define HAVE_SYS_STROPTS_H 1
-/* #undef HAVE_SYS_STRTIO_H */
-/* #undef HAVE_SYS_SYSLOG_H */
-#define HAVE_SYS_SYSMACROS_H 1
-/* #undef HAVE_SYS_TIMERS_H */
-/* #undef HAVE_TIME_IN_UTMP */
-/* #undef HAVE_TIME_IN_UTMPX */
-/* #undef HAVE_TIMINGSAFE_BCMP */
-/* #undef HAVE_TMPDIR_H */
-/* #undef HAVE_TTYENT_H */
-#define HAVE_TV_IN_UTMP 1
-#define HAVE_TV_IN_UTMPX 1
-#define HAVE_TYPE_IN_UTMP 1
-#define HAVE_TYPE_IN_UTMPX 1
-/* #undef HAVE_UCRED_H */
-#define HAVE_UINTXX_T 1
-#define HAVE_UNSIGNED_LONG_LONG 1
-#define HAVE_UPDWTMP 1
-#define HAVE_UPDWTMPX 1
-/* #undef HAVE_USERSEC_H */
-/* #undef HAVE_USER_FROM_UID */
-#define HAVE_USLEEP 1
-/* #undef HAVE_UTIL_H */
-#define HAVE_UTMPNAME 1
-#define HAVE_UTMPXNAME 1
-#define HAVE_UTMP_H 1
-#define HAVE_U_CHAR 1
-#define HAVE_U_INT 1
-#define HAVE_U_INT64_T 1
-#define HAVE_U_INTXX_T 1
-#define HAVE_VASPRINTF 1
-/* #undef HAVE_VIS_H */
-#define HAVE_WARN 1
-/* #undef HAVE__GETLONG */
-/* #undef HAVE__GETPTY */
-/* #undef HAVE__GETSHORT */
-#define HAVE__RES_EXTERN 1
-/* #undef HAVE___B64_NTOP */
-/* #undef HAVE___B64_PTON */
-#define HAVE___FUNCTION__ 1
-#define HAVE___PROGNAME 1
-/* #undef HAVE___SS_FAMILY_IN_SS */
-/* #undef HAVE___VA_COPY */
-#define HAVE___func__ 1
-/* #undef HEIMDAL */
-/* #undef IPADDR_IN_DISPLAY */
-#define IPV4_IN_IPV6 1
-/* #undef IP_TOS_IS_BROKEN */
-/* #undef KRB5 */
-/* #undef LASTLOG_WRITE_PUTUTXLINE */
-#define LINK_OPNOTSUPP_ERRNO EPERM
-#define LINUX_OOM_ADJUST 1
-/* #undef LLONG_MAX */
-/* #undef LLONG_MIN */
-#define LOCKED_PASSWD_PREFIX "!"
-/* #undef LOCKED_PASSWD_STRING */
-/* #undef LOCKED_PASSWD_SUBSTR */
-/* #undef LOGIN_NEEDS_TERM */
-/* #undef LOGIN_NEEDS_UTMPX */
-/* #undef LOGIN_NO_ENDOPT */
-#define LOGIN_PROGRAM_FALLBACK "/bin/login"
-/* #undef MAIL_DIRECTORY */
-/* #undef NEED_SETPGRP */
-/* #undef NO_ATTRIBUTE_ON_RETURN_TYPE */
-/* #undef NO_SSH_LASTLOG */
-/* #undef NO_UID_RESTORATION_TEST */
-/* #undef NO_X11_UNIX_SOCKETS */
-/* #undef OPENSSL_EVP_DIGESTUPDATE_VOID */
-#define OPENSSL_HAS_ECC 1
-#define OPENSSL_HAS_NISTP256 1
-#define OPENSSL_HAS_NISTP384 1
-#define OPENSSL_HAS_NISTP521 1
-#define OPENSSL_HAVE_EVPCTR 1
-#define OPENSSL_HAVE_EVPGCM 1
-/* #undef OPENSSL_LOBOTOMISED_AES */
-#define OPENSSL_PRNG_ONLY 1
-#define PACKAGE_BUGREPORT "openssh-unix-dev@mindrot.org"
-#define PACKAGE_NAME "OpenSSH"
-#define PACKAGE_STRING "OpenSSH Portable"
-#define PACKAGE_TARNAME "openssh"
-#define PACKAGE_URL ""
-#define PACKAGE_VERSION "Portable"
-/* #undef PAM_SUN_CODEBASE */
-#define PAM_TTY_KLUDGE 1
-/* #undef PASSWD_NEEDS_USERNAME */
-/* #undef PLATFORM_SYS_DIR_UID */
-/* #undef PRNGD_PORT */
-/* #undef PRNGD_SOCKET */
-/* #undef PTY_ZEROREAD */
-/* #undef SANDBOX_CAPSICUM */
-/* #undef SANDBOX_DARWIN */
-/* #undef SANDBOX_NULL */
-/* #undef SANDBOX_PLEDGE */
-/* #undef SANDBOX_RLIMIT */
-#define SANDBOX_SECCOMP_FILTER 1
-/* #undef SANDBOX_SKIP_RLIMIT_FSIZE */
-/* #undef SANDBOX_SKIP_RLIMIT_NOFILE */
-/* #undef SANDBOX_SOLARIS */
-/* #undef SANDBOX_SYSTRACE */
-#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64
-/* #undef SETEUID_BREAKS_SETUID */
-/* #undef SIZEOF_INT */
-/* #undef SIZEOF_LONG_INT */
-/* #undef SIZEOF_LONG_LONG_INT */
-/* #undef SIZEOF_SHORT_INT */
-/* #undef SKEY */
-/* #undef SKEYCHALLENGE_4ARG */
-#define SNPRINTF_CONST const
-#define SPT_TYPE SPT_REUSEARGV
-/* #undef SSHD_ACQUIRES_CTTY */
-/* #undef SSHPAM_CHAUTHTOK_NEEDS_RUID */
-/* #undef SSH_AUDIT_EVENTS */
-/* #undef SSH_IOBUFSZ */
-#define SSH_PRIVSEP_USER "sshd"
-#define SSH_TUN_COMPAT_AF 1
-/* #undef SSH_TUN_FREEBSD */
-#define SSH_TUN_LINUX 1
-/* #undef SSH_TUN_NO_L2 */
-/* #undef SSH_TUN_OPENBSD */
-#define SSH_TUN_PREPEND_AF 1
-/* #undef SUPERUSER_PATH */
-/* #undef SYSLOG_R_SAFE_IN_SIGHAND */
-/* #undef UNIXWARE_LONG_PASSWORDS */
-#define USER_PATH "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin"
-/* #undef USE_AFS */
-/* #undef USE_BSM_AUDIT */
-#define USE_BTMP 1
-/* #undef USE_LIBEDIT */
-/* #undef USE_LINUX_AUDIT */
-/* #undef USE_OPENSSL_ENGINE */
-/* #undef USE_PAM */
-/* #undef USE_PIPES */
-/* #undef USE_SOLARIS_PRIVS */
-/* #undef USE_SOLARIS_PROCESS_CONTRACTS */
-/* #undef USE_SOLARIS_PROJECTS */
-/* #undef WITH_ABBREV_NO_TTY */
-/* #undef WITH_AIXAUTHENTICATE */
-/* #undef WITH_IRIX_ARRAY */
-/* #undef WITH_IRIX_AUDIT */
-/* #undef WITH_IRIX_JOBS */
-/* #undef WITH_IRIX_PROJECT */
-#define WITH_OPENSSL 1
-/* #undef WITH_SELINUX */
-/* #undef WITH_SSH1 */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-/* #undef XAUTH_PATH */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGE_FILES */
-/* #undef __res_state */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-/* #undef socklen_t */
diff --git a/core/openssh/gen.rc b/core/openssh/gen.rc
deleted file mode 100644
index 6a9ea869..00000000
--- a/core/openssh/gen.rc
+++ /dev/null
@@ -1,121 +0,0 @@
-cflags\
-	-isystem core/openbsd/include\
-	-isystem '$builddir'/core/libressl/include\
-	-isystem '$builddir'/core/zlib/include\
-	-I include\
-	-I '$dir' \
-	-I '$srcdir' \
-	-I '$srcdir'/openbsd-compat\
-
-build '$outdir'/umac128.c.o cc '$srcdir'/umac.c ; defs=(\
-	'-DUMAC_OUTPUT_LEN=16' \
-	'-Dumac_new=umac128_new' \
-	'-Dumac_update=umac128_update' \
-	'-Dumac_final=umac128_final' \
-	'-Dumac_delete=umac128_delete' \
-	'-Dumac_ctx=umac128_ctx' \
-) with cflags '$cflags '$"defs
-
-lib libopenbsd-compat.a openbsd-compat/^(\
-	base64.c basename.c bcrypt_pbkdf.c bindresvport.c blowfish.c daemon.c\
-	dirname.c fmt_scaled.c getcwd.c getgrouplist.c getopt_long.c\
-	getrrsetbyname.c glob.c inet_aton.c inet_ntoa.c inet_ntop.c mktemp.c\
-	pwcache.c readpassphrase.c reallocarray.c realpath.c rresvport.c\
-	setenv.c setproctitle.c sha1.c sha2.c rmd160.c md5.c sigact.c strlcat.c\
-	strlcpy.c strmode.c strnlen.c strptime.c strsep.c strtonum.c strtoll.c\
-	strtoul.c strtoull.c timingsafe_bcmp.c vis.c explicit_bzero.c\
-	\
-	arc4random.c bsd-asprintf.c bsd-closefrom.c bsd-cray.c\
-	bsd-cygwin_util.c bsd-getpeereid.c getrrsetbyname-ldns.c bsd-misc.c\
-	bsd-nextstep.c bsd-openpty.c bsd-poll.c bsd-setres_id.c bsd-snprintf.c\
-	bsd-statvfs.c bsd-waitpid.c fake-rfc2553.c openssl-compat.c xmmap.c\
-	xcrypt.c kludge-fd_set.c\
-	\
-	port-aix.c port-irix.c port-linux.c port-solaris.c port-uw.c\
-)
-
-phony deps core/^(libressl zlib)^/headers
-
-# port-tun.c from openbsd-compat depends on sshbuf-getput-basic.c and ssherr.c
-# from libssh.a, so just include it in libssh.a.
-lib libssh.a -d '$dir'/deps\
-	ssh_api.c\
-	ssherr.c\
-	sshbuf.c\
-	sshkey.c\
-	sshbuf-getput-basic.c\
-	sshbuf-misc.c\
-	sshbuf-getput-crypto.c\
-	krl.c\
-	bitmap.c\
-	\
-	authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c\
-	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c\
-	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c\
-	compat.c crc32.c deattack.c fatal.c hostfile.c\
-	log.c match.c md-sha256.c moduli.c nchan.c packet.c opacket.c\
-	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c\
-	atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c utf8.c\
-	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c\
-	msg.c progressmeter.c dns.c entropy.c gss-genr.c umac.c umac128.c.o\
-	ssh-pkcs11.c smult_curve25519_ref.c\
-	poly1305.c chacha.c cipher-chachapoly.c\
-	ssh-ed25519.c digest-openssl.c digest-libc.c hmac.c\
-	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c\
-	kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c\
-	kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c\
-	kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c\
-	platform-pledge.c platform-tracing.c\
-	openbsd-compat/port-tun.c libopenbsd-compat.a\
-	'$builddir'/^(core/libressl/libcrypto.a.d core/zlib/libz.a)\
-
-exe ssh\
-	ssh.c readconf.c clientloop.c sshtty.c\
-	sshconnect.c sshconnect1.c sshconnect2.c mux.c\
-	libssh.a.d
-file bin/ssh '$outdir'/ssh 755
-file share/man/man1/ssh.1 '$srcdir'/ssh.1 644
-
-cc sftp-server.c
-cc sftp-common.c
-
-exe sshd -d '$dir'/deps\
-	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c\
-	audit.c audit-bsm.c audit-linux.c platform.c\
-	sshpty.c sshlogin.c servconf.c serverloop.c\
-	auth.c auth1.c auth2.c auth-options.c session.c\
-	auth-chall.c auth2-chall.c groupaccess.c\
-	auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c\
-	auth2-none.c auth2-passwd.c auth2-pubkey.c\
-	monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c\
-	auth2-gss.c gss-serv.c gss-serv-krb5.c\
-	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c\
-	sftp-server.c.o sftp-common.c.o\
-	sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c\
-	sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c\
-	sandbox-solaris.c\
-	libssh.a.d
-file bin/sshd '$outdir'/sshd 755
-file share/man/man8/sshd.8 '$srcdir'/sshd.8 644
-
-exe scp scp.c libssh.a.d
-file bin/scp '$outdir'/scp 755
-file share/man/man1/scp.1 '$srcdir'/scp.1 644
-
-exe ssh-add ssh-add.c libssh.a.d
-file bin/ssh-add '$outdir'/ssh-add 755
-file share/man/man1/ssh-add.1 '$srcdir'/ssh-add.1 644
-
-exe ssh-agent ssh-agent.c ssh-pkcs11-client.c libssh.a.d
-file bin/ssh-agent '$outdir'/ssh-agent 755
-file share/man/man1/ssh-agent.1 '$srcdir'/ssh-agent.1 644
-
-exe ssh-keygen ssh-keygen.c libssh.a.d
-file bin/ssh-keygen '$outdir'/ssh-keygen 755
-file share/man/man1/ssh-keygen.1 '$srcdir'/ssh-keygen.1 644
-
-exe sftp-server sftp-common.c.o sftp-server.c.o sftp-server-main.c libssh.a.d
-file libexec/sftp-server '$outdir'/sftp-server 755
-file share/man/man8/sftp-server.8 '$srcdir'/sftp-server.8 644
-
-fetch git
diff --git a/core/openssh/rev b/core/openssh/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/openssh/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/openssh/src b/core/openssh/src
deleted file mode 160000
-Subproject 99522ba7ec6963a05c04a156bf20e3ba3605987
diff --git a/core/perp/.gitignore b/core/perp/.gitignore
deleted file mode 100644
index d550babc..00000000
--- a/core/perp/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/perp-2.07.tar.gz
-/src
-/tools.ninja
diff --git a/core/perp/gen.rc b/core/perp/gen.rc
deleted file mode 100644
index 870d8432..00000000
--- a/core/perp/gen.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-cflags\
-	-I '$srcdir'/lasagna\
-	-I '$outdir'
-
-{
-	include 'toolchain/$host_toolchain.ninja'
-	exe mk_outvec lasagna/outvec/mk_outvec.c
-	exe mk_rlimit lasagna/rlimit/mk_rlimit.c
-	exe mksysstr lasagna/sysstr/mksysstr.c
-} >tools.ninja ; subninja tools.ninja
-
-rule outvec '$outdir/mk_outvec >$out.tmp && mv $out.tmp $out'
-build '$outdir'/outvec_STDOUT.h outvec '|' '$outdir'/mk_outvec
-
-rule rlimit '$outdir/mk_rlimit >$out.tmp && mv $out.tmp $out'
-build '$outdir'/rlimit_defs.c.in rlimit '|' '$outdir'/mk_rlimit
-
-rule sysstr '$outdir/mksysstr $type >$out.tmp && mv $out.tmp $out'
-build '$outdir'/sysstr_errno.c.in sysstr '|' '$outdir'/mksysstr ; with type errno
-build '$outdir'/sysstr_signo.c.in sysstr '|' '$outdir'/mksysstr ; with type signo
-
-phony deps '$outdir'/^(outvec_STDOUT.h rlimit_defs.c.in sysstr_^(errno signo)^.c.in)
-
-lib libasagna.a -d '$dir'/deps lasagna/^(\
-	buf/buf_^(cmp copy fill ndx rcopy rndx)^.c\
-	cstr/cstr_^(cat chop cmp cmpi contains copy dup lcat lcpy len ltrim match matchi ncmp pos rpos rtrim trim vcat_ vcopy_ vlen_)^.c\
-	cdb/^(cdb_^(find cc clear close distance dynget dynread get hashpart init open read seq) cdbmk_^(add addioq addrec clear finish init _update))^.c\
-	devout/devout.c\
-	domsock/domsock_^(accept close connect create)^.c\
-	dynbuf/^(dynbuf.c dynbuf_^(clear copy free freebuf grow need new pack put putb)^.c)\
-	dynstr/^(dynstr.c dynstr_^(chop clear copy copys free freestr grow need new put putc putn puts set vputs_)^.c)\
-	dynstuf/dynstuf_^(find free get grow init isempty items new peek pop push replace reverse set slots sort stuf visit)^.c\
-	execvx/execvx.c\
-	fd/fd_^(blocking cloexec dupe move nonblock)^.c\
-	hdb/hdb_^(find cc clear close distance dynget dynread get hashpart init open read seq)^.c\
-	hdb/hdbmk_^(add addioq addrec clear finish start _update)^.c\
-	hfunc/hfunc_^(djba djbm djbx elf1 fnva fnvm ghfa ghfm ghfx jsw1 kp37 kr31 kx17 murm oat1 p50a pjw1 rsuh rot1 rotm sax1 sdbm sfh1 postmix32)^.c\
-	ioq/ioq_^(get getln init put putfd putfile stderr stdin stdout vputs_)^.c\
-	newenv/newenv.c\
-	nextopt/^(nextopt nextopt_progname)^.c\
-	nfmt/nfmt_^(uint32 uint32_pad uint32_pad_ uint32_pad0 uint32_pad0_ uint32o uint32o_pad0 uint32o_pad0_ uint32x uint32x_pad uint32x_pad_ uint32x_pad0 uint32x_pad0_ uint64 uint64_pad uint64_pad_ uint64_pad0 uint64_pad0_)^.c\
-	nuscan/nuscan_^(uint32 uint32o)^.c\
-	outvec/outvec_^(STDERR STDOUT flush put puts vputs_)^.c\
-	packet/packet_^(read write)^.c\
-	padlock/padlock_^(exbyte exlock extest fcntl shbyte shlock shtest unbyte unlock)^.c\
-	pidlock/pidlock_^(check set)^.c\
-	pkt/pkt_^(load read write)^.c\
-	pollio/pollio.c\
-	rlimit/rlimit.c\
-	sig/sig_^(block catch catchr unblock)^.c\
-	sysstr/sysstr_^(errno signal)^.c\
-	tain/tain_^(assign iszero less load load_msecs load_utc minus now pack packhex pause plus tai_pack tai_unpack uptime to_float to_msecs to_utc unpack unpackhex)^.c\
-	tx64/^(base64_vec tx64_encode)^.c\
-	ufunc/ufunc_^(u32add u48add)^.c\
-	upak/upak_vpack.c\
-	upak/upak^('' 16 24 32 48 64)^_pack.c\
-	upak/upak^('' 16 24 32 48 64)^_unpack.c\
-)
-
-fn x {
-	subdir=$1
-	exe=$2
-	shift 2
-	exe $exe $subdir/$* libasagna.a
-	if(! ~ $exe cat*)
-		file share/man/man8/$exe.8 '$srcdir'/$subdir/man/$exe.8 644
-	file bin/$exe '$outdir'/$exe 755
-}
-
-x perp perpd perpd.c perpd_conn.c perpd_svdef.c
-
-cc perp/tinylog.c ; with\
-	cflags '$cflags -D ''TINYLOG_ZIP="/bin/gzip"'' -D ''ZIP_EXT=".gz"'''
-x perp tinylog tinylog.c.o
-
-for(exe in perp^(boot ctl hup ls ok stat)) x perp $exe $exe.c
-tools=(\
-	run^(args argv0 choom detach deux env file limit lock pause session tool trap uid)\
-	cat^(args env limits uid)\
-) for(exe in $tools) x runtools $exe $exe.c
-
-file share/man/man5/perpetrate.5 '$srcdir'/perp/man/perpetrate.5 644
-file share/man/man8/perp_intro.8 '$srcdir'/perp/man/perp_intro.8 644
-file share/man/man5/runtools_intro.8 '$srcdir'/runtools/man/runtools_intro.8 644
-
-fetch curl
diff --git a/core/perp/rev b/core/perp/rev
deleted file mode 100644
index d00491fd..00000000
--- a/core/perp/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/core/perp/sha256 b/core/perp/sha256
deleted file mode 100644
index 943750d5..00000000
--- a/core/perp/sha256
+++ /dev/null
@@ -1 +0,0 @@
-1222fe31c16014d8b2a78416f93ba9f8c31eddbc381adc9021fa5d9764475815  perp-2.07.tar.gz
diff --git a/core/perp/url b/core/perp/url
deleted file mode 100644
index 0eff1363..00000000
--- a/core/perp/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://b0llix.net/perp/distfiles/perp-2.07.tar.gz"
diff --git a/core/pigz/gen.rc b/core/pigz/gen.rc
deleted file mode 100644
index 015cd2cf..00000000
--- a/core/pigz/gen.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-cflags\
-	-Wall -Wextra\
-	-isystem '$builddir'/core/zlib/include
-
-exe pigz -d core/zlib/headers\
-	pigz.c yarn.c try.c\
-	zopfli/src/zopfli/^(deflate.c blocksplitter.c tree.c lz77.c cache.c hash.c util.c squeeze.c katajainen.c)\
-	'$builddir'/core/zlib/libz.a
-file bin/pigz '$outdir'/pigz 755
-for(alias in gzip gunzip zcat) sym bin/$alias pigz
-
-fetch git
diff --git a/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch b/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch
deleted file mode 100644
index 50ced245..00000000
--- a/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d9642e90c3ece95407627c005dee51d193305398 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 20 Nov 2016 18:41:36 -0800
-Subject: [PATCH] Handle -n option like gzip does
-
----
- pigz.1 | 2 +-
- pigz.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pigz.1 b/pigz.1
-index 9679e40..4e5d9f0 100644
---- a/pigz.1
-+++ b/pigz.1
-@@ -156,7 +156,7 @@ Display the
- license and quit.
- .TP
- .B -n --no-name
--Do not store or restore file name in/from header.
-+Do not store or restore file name and mod time in/from header.
- .TP
- .B -N --name
- Store/restore file name and mod time in/from header.
-diff --git a/pigz.c b/pigz.c
-index a35a645..cf53623 100644
---- a/pigz.c
-+++ b/pigz.c
-@@ -4028,7 +4028,7 @@ local int option(char *arg)
-             case 'i':  g.setdict = 0;  break;
-             case 'k':  g.keep = 1;  break;
-             case 'l':  g.list = 1;  break;
--            case 'n':  g.headis &= ~5;  break;
-+            case 'n':  g.headis &= ~0xf;  break;
-             case 'p':  get = 2;  break;
-             case 'q':  g.verbosity = 0;  break;
-             case 'r':  g.recurse = 1;  break;
--- 
-2.10.2
-
diff --git a/core/pigz/rev b/core/pigz/rev
deleted file mode 100644
index 00750edc..00000000
--- a/core/pigz/rev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/core/pigz/src b/core/pigz/src
deleted file mode 160000
-Subproject a6f3dab846fec23c3f0db8ba6aafcb6772afefd
diff --git a/core/plan9port/gen.rc b/core/plan9port/gen.rc
deleted file mode 100644
index 92415e0e..00000000
--- a/core/plan9port/gen.rc
+++ /dev/null
@@ -1,412 +0,0 @@
-arch=x86_64
-
-cflags\
-	-D __Linux26__\
-	-D PLAN9PORT\
-	-I '$srcdir'/include\
-	-I '$srcdir'/src/cmd/rc\
-	-I '$srcdir'/src/lib9/fmt\
-	-I '$outdir'/rc
-
-# src/src/lib9/mkfile:/^OFILES
-lib lib9.a src/lib9/^(\
-	fmt/^(\
-		dofmt.c\
-		fltfmt.c\
-		fmt.c\
-		fmtfd.c\
-		fmtfdflush.c\
-		fmtlocale.c\
-		fmtnull.c\
-		fmtprint.c\
-		fmtquote.c\
-		fmtrune.c\
-		fmtstr.c\
-		fmtvprint.c\
-		fprint.c\
-		nan64.c\
-		print.c\
-		runefmtstr.c\
-		runeseprint.c\
-		runesmprint.c\
-		runesnprint.c\
-		runesprint.c\
-		runevseprint.c\
-		runevsmprint.c\
-		runevsnprint.c\
-		seprint.c\
-		smprint.c\
-		snprint.c\
-		sprint.c\
-		strtod.c\
-		vfprint.c\
-		vseprint.c\
-		vsmprint.c\
-		vsnprint.c\
-		charstod.c\
-		pow10.c\
-	)\
-	fmtlock2.c\
-	\
-	utf/^(\
-		rune.c\
-		runestrcat.c\
-		runestrchr.c\
-		runestrcmp.c\
-		runestrcpy.c\
-		runestrdup.c\
-		runestrlen.c\
-		runestrecpy.c\
-		runestrncat.c\
-		runestrncmp.c\
-		runestrncpy.c\
-		runestrrchr.c\
-		runestrstr.c\
-		runetype.c\
-		utfecpy.c\
-		utflen.c\
-		utfnlen.c\
-		utfrrune.c\
-		utfrune.c\
-		utfutf.c\
-	)\
-	\
-	_exits.c\
-	_p9dialparse.c\
-	_p9dir.c\
-	announce.c\
-	argv0.c\
-	atexit.c\
-	atoi.c\
-	atol.c\
-	atoll.c\
-	atnotify.c\
-	await.c\
-	cistrcmp.c\
-	cistrncmp.c\
-	cistrstr.c\
-	cleanname.c\
-	convD2M.c\
-	convM2D.c\
-	convM2S.c\
-	convS2M.c\
-	create.c\
-	crypt.c\
-	ctime.c\
-	dial.c\
-	dirfstat.c\
-	dirfwstat.c\
-	dirmodefmt.c\
-	dirread.c\
-	dirstat.c\
-	dirwstat.c\
-	dup.c\
-	encodefmt.c\
-	errstr.c\
-	exec.c\
-	execl.c\
-	exitcode.c\
-	fcallfmt.c\
-	get9root.c\
-	getcallerpc-$arch.c\
-	getenv.c\
-	getfields.c\
-	getnetconn.c\
-	getns.c\
-	getuser.c\
-	getwd.c\
-	jmp.c\
-	lrand.c\
-	lnrand.c\
-	main.c\
-	malloc.c\
-	malloctag.c\
-	mallocz.c\
-	nan.c\
-	needsrcquote.c\
-	needstack.c\
-	netcrypt.c\
-	netmkaddr.c\
-	notify.c\
-	nrand.c\
-	nulldir.c\
-	open.c\
-	opentemp.c\
-	pin.c\
-	pipe.c\
-	post9p.c\
-	postnote.c\
-	qlock.c\
-	quote.c\
-	rand.c\
-	read9pmsg.c\
-	readcons.c\
-	readn.c\
-	rfork.c\
-	searchpath.c\
-	seek.c\
-	sendfd.c\
-	sleep.c\
-	strdup.c\
-	strecpy.c\
-	sysfatal.c\
-	syslog.c\
-	sysname.c\
-	time.c\
-	tm2sec.c\
-	tokenize.c\
-	truerand.c\
-	u16.c\
-	u32.c\
-	u64.c\
-	unsharp.c\
-	wait.c\
-	waitpid.c\
-	write.c\
-	zoneinfo.c\
-)
-
-# src/src/lib9p/mkfile:/^OFILES
-lib lib9p.a src/lib9p/^(\
-	_post.c\
-	dirread.c\
-	fid.c\
-	file.c\
-	intmap.c\
-	mem.c\
-	req.c\
-	parse.c\
-	srv.c\
-	tpost.c\
-	uid.c\
-	util.c\
-)
-
-# src/src/lib9pclient/mkfile:/^OFILES
-lib lib9pclient.a src/lib9pclient/^(\
-	access.c\
-	auth.c\
-	close.c\
-	create.c\
-	dirread.c\
-	fs.c\
-	ns.c\
-	open.c\
-	openfd.c\
-	print.c\
-	read.c\
-	remove.c\
-	seek.c\
-	stat.c\
-	walk.c\
-	write.c\
-	wstat.c\
-)
-
-# src/src/libbio/mkfile:/^OFILES
-lib libbio.a src/libbio/^(\
-	bbuffered.c\
-	bfildes.c\
-	bflush.c\
-	bgetc.c\
-	bgetrune.c\
-	bgetd.c\
-	binit.c\
-	boffset.c\
-	bprint.c\
-	bputc.c\
-	bputrune.c\
-	brdline.c\
-	brdstr.c\
-	bread.c\
-	bseek.c\
-	bvprint.c\
-	bwrite.c\
-)
-
-# src/src/libcomplete/mkfile:/^OFILES
-lib libcomplete.a src/libcomplete/complete.c
-
-# src/src/libdraw/mkfile:/^OFILES
-lib libdraw.a src/libdraw/^(\
-	alloc.c\
-	allocimagemix.c\
-	arith.c\
-	bezier.c\
-	border.c\
-	buildfont.c\
-	bytesperline.c\
-	chan.c\
-	cloadimage.c\
-	computil.c\
-	creadimage.c\
-	debug.c\
-	defont.c\
-	draw.c\
-	drawclient.c\
-	drawfcall.c\
-	drawrepl.c\
-	egetrect.c\
-	ellipse.c\
-	emenuhit.c\
-	event.c\
-	font.c\
-	freesubfont.c\
-	getdefont.c\
-	getrect.c\
-	getsubfont.c\
-	icossin.c\
-	icossin2.c\
-	init.c\
-	iprint.c\
-	keyboard.c\
-	line.c\
-	loadimage.c\
-	menuhit.c\
-	mkfont.c\
-	mouse.c\
-	openfont.c\
-	poly.c\
-	readimage.c\
-	readsubfont.c\
-	rectclip.c\
-	replclipr.c\
-	rgb.c\
-	scroll.c\
-	snarf.c\
-	string.c\
-	stringbg.c\
-	stringsubfont.c\
-	stringwidth.c\
-	subfont.c\
-	subfontcache.c\
-	subfontname.c\
-	unloadimage.c\
-	window.c\
-	writeimage.c\
-	writesubfont.c\
-	wsys.c\
-	unix.c\
-)
-
-# src/src/libframe/mkfile:/^OFILES
-lib libframe.a src/libframe/^(\
-	frbox.c\
-	frdelete.c\
-	frdraw.c\
-	frinit.c\
-	frinsert.c\
-	frptofchar.c\
-	frselect.c\
-	frstr.c\
-	frutil.c\
-)
-
-# src/src/libmemdraw/mkfile:/^OFILES
-lib libmemdraw.a src/libmemdraw/^(\
-	alloc.c\
-	alloc-stub.c\
-	arc.c\
-	cload.c\
-	cload-stub.c\
-	cmap.c\
-	cread.c\
-	defont.c\
-	draw.c\
-	draw-stub.c\
-	ellipse.c\
-	fillpoly.c\
-	hwdraw.c\
-	iprint.c\
-	line.c\
-	load.c\
-	load-stub.c\
-	openmemsubfont.c\
-	poly.c\
-	read.c\
-	string.c\
-	subfont.c\
-	unload.c\
-	unload-stub.c\
-	write.c\
-)
-
-# src/src/libmemlayer/mkfile:/^OFILES
-lib libmemlayer.a src/libmemlayer/^(\
-	draw.c\
-	lalloc.c\
-	layerop.c\
-	ldelete.c\
-	lhide.c\
-	line.c\
-	load.c\
-	lorigin.c\
-	lsetrefresh.c\
-	ltofront.c\
-	ltorear.c\
-	unload.c\
-)
-
-# src/src/libmux/mkfile:/^OFILES
-lib libmux.a src/libmux/^(io.c mux.c queue.c thread.c)
-
-# src/src/libplumb/mkfile:/^OFILES
-lib libplumb.a src/libplumb/^(event.c fid.c mesg.c)
-
-# src/src/cmd/rc/mkfile:/^OFILES
-yacc rc/x '$srcdir'/src/cmd/rc/syn.y
-# remove stdlib.h and string.h includes so that u.h comes first.
-build '$outdir'/rc/syn.c grep '$outdir'/rc/x.tab.c ; with\
-	expr '-F -x -v -e ''#include <stdlib.h>'' -e ''#include <string.h>'''
-exe bin/rc -d '$outdir'/rc/x.tab.h '$outdir'/rc/syn.c src/cmd/rc/^(\
-	code.c\
-	exec.c\
-	getflags.c\
-	glob.c\
-	havefork.c\
-	here.c\
-	io.c\
-	lex.c\
-	pcmd.c\
-	pfnc.c\
-	plan9ish.c\
-	simple.c\
-	subr.c\
-	trap.c\
-	tree.c\
-	unixcrap.c\
-	var.c\
-) lib9.a
-
-# src/src/cmd/sam/mkfile:/^OFILES
-exe bin/sam src/cmd/sam/^(\
-	sam.c\
-	address.c\
-	buff.c\
-	cmd.c\
-	disk.c\
-	error.c\
-	file.c\
-	io.c\
-	list.c\
-	mesg.c\
-	moveto.c\
-	multi.c\
-	rasp.c\
-	regexp.c\
-	shell.c\
-	string.c\
-	sys.c\
-	unix.c\
-	util.c\
-	xec.c\
-) libplumb.a lib9.a
-
-for(exe in rc sam) {
-	file bin/$exe '$outdir'/bin/$exe 755
-	file share/man/man1/$exe.1 '$srcdir'/man/man1/$exe.1 644
-}
-
-file lib/rcmain '$srcdir'/rcmain 644
-
-fetch git
diff --git a/core/plan9port/patch/0001-Fix-build-with-musl.patch b/core/plan9port/patch/0001-Fix-build-with-musl.patch
deleted file mode 100644
index 65507008..00000000
--- a/core/plan9port/patch/0001-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bc48772672bdb1436455e078b17df47a63813394 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 10 Apr 2016 02:50:03 -0700
-Subject: [PATCH] Fix build with musl
-
----
- src/lib9/dirread.c | 34 ----------------------------------
- 1 file changed, 34 deletions(-)
-
-diff --git a/src/lib9/dirread.c b/src/lib9/dirread.c
-index 40fbe3c..345f49c 100644
---- a/src/lib9/dirread.c
-+++ b/src/lib9/dirread.c
-@@ -6,45 +6,11 @@
- 
- extern int _p9dir(struct stat*, struct stat*, char*, Dir*, char**, char*);
- 
--#if defined(__linux__)
--static int
--mygetdents(int fd, struct dirent *buf, int n)
--{
--	off_t off;
--	int nn;
--
--	/* This doesn't match the man page, but it works in Debian with a 2.2 kernel */
--	off = p9seek(fd, 0, 1);
--	nn = getdirentries(fd, (void*)buf, n, &off);
--	return nn;
--}
--#elif defined(__APPLE__) 
--static int
--mygetdents(int fd, struct dirent *buf, int n)
--{
--	long off;
--	return getdirentries(fd, (void*)buf, n, &off);
--}
--#elif defined(__FreeBSD__) || defined(__DragonFly__)
--static int
--mygetdents(int fd, struct dirent *buf, int n)
--{
--	off_t off;
--	return getdirentries(fd, (void*)buf, n, &off);
--}
--#elif defined(__sun__) || defined(__NetBSD__) || defined(__OpenBSD__)
- static int
- mygetdents(int fd, struct dirent *buf, int n)
- {
- 	return getdents(fd, (void*)buf, n);
- }
--#elif defined(__AIX__)
--static int
--mygetdents(int fd, struct dirent *buf, int n)
--{
--	return getdirent(fd, (void*)buf, n);
--}
--#endif
- 
- #if defined(__DragonFly__)
- static inline int d_reclen(struct dirent *de) { return _DIRENT_DIRSIZ(de); }
--- 
-2.8.1
-
diff --git a/core/plan9port/patch/0002-rc-Look-for-lib-rcmain.patch b/core/plan9port/patch/0002-rc-Look-for-lib-rcmain.patch
deleted file mode 100644
index dbe342ee..00000000
--- a/core/plan9port/patch/0002-rc-Look-for-lib-rcmain.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 73124caea18f5d36417ec24b8e69b540daf97bc2 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 18 May 2016 22:58:17 -0700
-Subject: [PATCH] rc: Look for /lib/rcmain
-
----
- src/cmd/rc/exec.c     | 2 +-
- src/cmd/rc/plan9ish.c | 6 +-----
- src/cmd/rc/rc.h       | 2 +-
- 3 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/src/cmd/rc/exec.c b/src/cmd/rc/exec.c
-index 03c96d4..1fb9be5 100644
---- a/src/cmd/rc/exec.c
-+++ b/src/cmd/rc/exec.c
-@@ -147,7 +147,7 @@ main(int argc, char *argv[])
- 	if(flag['I'])
- 		flag['i'] = 0;
- 	else if(flag['i']==0 && argc==1 && Isatty(0)) flag['i'] = flagset;
--	rcmain = flag['m'] ? flag['m'][0] : Rcmain();
-+	rcmain = flag['m'] ? flag['m'][0] : Rcmain;
- 	err = openfd(2);
- 	kinit();
- 	Trapinit();
-diff --git a/src/cmd/rc/plan9ish.c b/src/cmd/rc/plan9ish.c
-index da9d867..60c0ee4 100644
---- a/src/cmd/rc/plan9ish.c
-+++ b/src/cmd/rc/plan9ish.c
-@@ -24,12 +24,8 @@ char *syssigname[]={
- 	"term",
- 	0
- };
--char*
--Rcmain(void)
--{
--	return unsharp("#9/rcmain");
--}
- 
-+char Rcmain[]="/lib/rcmain";
- char Fdprefix[]="/dev/fd/";
- long readnb(int, char *, long);
- void execfinit(void);
-diff --git a/src/cmd/rc/rc.h b/src/cmd/rc/rc.h
-index 7778ff4..986b8be 100644
---- a/src/cmd/rc/rc.h
-+++ b/src/cmd/rc/rc.h
-@@ -135,7 +135,7 @@ int doprompt;		/* is it time for a prompt? */
-  */
- #define	PRD	0
- #define	PWR	1
--extern char *Rcmain(), Fdprefix[];
-+extern char Rcmain[], Fdprefix[];
- #define	register
- /*
-  * How many dot commands have we executed?
--- 
-2.8.1
-
diff --git a/core/plan9port/patch/0003-rcmain-Don-t-use-PLAN9-bin-9.patch b/core/plan9port/patch/0003-rcmain-Don-t-use-PLAN9-bin-9.patch
deleted file mode 100644
index 04c884b0..00000000
--- a/core/plan9port/patch/0003-rcmain-Don-t-use-PLAN9-bin-9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4e822f477a9d1c71c5489e59bd30ee4b3e2f5058 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 18 May 2016 23:02:03 -0700
-Subject: [PATCH] rcmain: Don't use $PLAN9/bin/9
-
----
- rcmain | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rcmain b/rcmain
-index 461cb3e..a73014d 100644
---- a/rcmain
-+++ b/rcmain
-@@ -29,11 +29,11 @@ if(flag i){
- 			# is not sufficient when running in a subshell
- 			# that is rc -e (like mk uses!)
- 			if(builtin cd $1){
--				if(flag i) $PLAN9/bin/9 awd || status=''
-+				if(flag i) awd || status=''
- 				status=''
- 			}
- 		}
--		$PLAN9/bin/9 awd
-+		awd
- 	}
- 	if(flag l && test -r $home/lib/profile) . $home/lib/profile
- 	status=''
--- 
-2.8.1
-
diff --git a/core/plan9port/patch/0004-Fix-sys-termios.h-include-to-termios.h.patch b/core/plan9port/patch/0004-Fix-sys-termios.h-include-to-termios.h.patch
deleted file mode 100644
index 0de91323..00000000
--- a/core/plan9port/patch/0004-Fix-sys-termios.h-include-to-termios.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0af022a4cef553bf2b09bdc6079d22adef7164ad Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 10 Dec 2016 23:54:51 -0800
-Subject: [PATCH] Fix sys/termios.h include to termios.h
-
----
- src/lib9/readcons.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib9/readcons.c b/src/lib9/readcons.c
-index 8de44b8f..289f0f3b 100644
---- a/src/lib9/readcons.c
-+++ b/src/lib9/readcons.c
-@@ -2,7 +2,7 @@
- #define NOPLAN9DEFINES
- #include <libc.h>
- #include <termios.h>
--#include <sys/termios.h>
-+#include <termios.h>
- 
- static int
- rawx(int fd, int echoing)
--- 
-2.11.0
-
diff --git a/core/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch b/core/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch
deleted file mode 100644
index 0b022c64..00000000
--- a/core/plan9port/patch/0005-Include-u.h-before-any-other-system-headers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c35ccfd7b03be1770ba3894e2e97b7faf87b8634 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 11 Dec 2016 13:28:47 -0800
-Subject: [PATCH] Include <u.h> before any other system headers
-
-Otherwise, the system headers may provide different values for feature test
-macros than we do in u.h.
----
- src/cmd/rc/io.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cmd/rc/io.c b/src/cmd/rc/io.c
-index bb8af4ab..ac3b7585 100644
---- a/src/cmd/rc/io.c
-+++ b/src/cmd/rc/io.c
-@@ -1,3 +1,4 @@
-+#include <u.h>
- #include <limits.h>
- #include "rc.h"
- #include "exec.h"
--- 
-2.11.0
-
diff --git a/core/plan9port/rev b/core/plan9port/rev
deleted file mode 100644
index 00750edc..00000000
--- a/core/plan9port/rev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/core/plan9port/src b/core/plan9port/src
deleted file mode 160000
-Subproject 35d43924484b88b9816e40d2f6bff4547f3eec4
diff --git a/core/sbase/egrep b/core/sbase/egrep
deleted file mode 100755
index 23ba6e4e..00000000
--- a/core/sbase/egrep
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/rc
-exec grep -E $*
diff --git a/core/sbase/gen.rc b/core/sbase/gen.rc
deleted file mode 100644
index fb77593b..00000000
--- a/core/sbase/gen.rc
+++ /dev/null
@@ -1,195 +0,0 @@
-cflags\
-	'-std=c99' -pedantic\
-	-Wall -Wno-maybe-uninitialized\
-	-D _DEFAULT_SOURCE\
-	-D _BSD_SOURCE\
-	-D '_XOPEN_SOURCE=700' \
-	-D '_FILE_OFFSET_BITS=64' \
-	-I '$outdir'
-
-lib libutil.a libutil/^(\
-	concat.c\
-	cp.c\
-	crypt.c\
-	ealloc.c\
-	enmasse.c\
-	eprintf.c\
-	eregcomp.c\
-	estrtod.c\
-	fnck.c\
-	fshut.c\
-	getlines.c\
-	human.c\
-	linecmp.c\
-	md5.c\
-	memmem.c\
-	mkdirp.c\
-	mode.c\
-	parseoffset.c\
-	putword.c\
-	reallocarray.c\
-	recurse.c\
-	rm.c\
-	sha1.c\
-	sha224.c\
-	sha256.c\
-	sha384.c\
-	sha512.c\
-	sha512-224.c\
-	sha512-256.c\
-	strcasestr.c\
-	strlcat.c\
-	strlcpy.c\
-	strsep.c\
-	strtonum.c\
-	unescape.c\
-	writeall.c\
-)
-lib libutf.a libutf/^(\
-	rune.c\
-	runetype.c\
-	utf.c\
-	utftorunestr.c\
-	fgetrune.c\
-	fputrune.c\
-	isalnumrune.c\
-	isalpharune.c\
-	isblankrune.c\
-	iscntrlrune.c\
-	isdigitrune.c\
-	isgraphrune.c\
-	isprintrune.c\
-	ispunctrune.c\
-	isspacerune.c\
-	istitlerune.c\
-	isxdigitrune.c\
-	lowerrune.c\
-	upperrune.c\
-)
-
-rule getconf '$srcdir/getconf.sh >$out.tmp && mv $out.tmp $out'
-build '$outdir'/getconf.h getconf '|' '$srcdir/getconf.sh'
-
-fn x {
-	exe=$1
-	shift
-
-	src=$exe
-	deps=()
-	switch($exe) {
-	case install
-		src=xinstall
-	case getconf
-		deps=('||' '$outdir'/getconf.h)
-	}
-
-	cc $src.c $deps
-	link $exe $src.c.o libutil.a libutf.a
-
-	file bin/$exe '$outdir'/$exe 755
-	file share/man/man1/$exe.1 '$srcdir'/$src.1 644
-}
-
-x basename
-x cal
-x cat
-x chgrp
-x chmod
-x chown
-x chroot
-x cksum
-x cmp
-x cols
-x comm
-x cp
-x cron
-x cut
-x date
-x dirname
-x du
-x echo
-x ed
-x env
-x expand
-x expr
-x false
-x find
-x flock
-x fold
-x getconf
-x grep
-x head
-x hostname
-x install
-x join
-x kill
-x link
-x ln
-x logger
-x logname
-x ls
-x md5sum
-x mkdir
-x mkfifo
-x mktemp
-x mv
-x nice
-x nl
-x nohup
-x od
-x paste
-x pathchk
-x printenv
-x printf
-x pwd
-x readlink
-x renice
-x rm
-x rmdir
-x sed
-x seq
-x setsid
-x sha1sum
-x sha224sum
-x sha256sum
-x sha384sum
-x sha512-224sum
-x sha512-256sum
-x sha512sum
-x sleep
-x sort
-x split
-x sponge
-x strings
-x sync
-x tail
-# use tar from OpenBSD
-x tee
-x test
-x tftp
-x time
-x touch
-x tr
-x true
-x tsort
-x tty
-x uname
-x unexpand
-x uniq
-x unlink
-x uudecode
-x uuencode
-x wc
-x which
-x whoami
-x xargs
-x yes
-
-# TODO: Hard links?
-sym bin/[ test
-
-# TODO: binutils' config/lib-ld.m4 should use AC_REQUIRE([AC_PROG_EGREP]) and
-# $EGREP instead of egrep.
-file bin/egrep '$dir'/egrep 755
-
-fetch git
diff --git a/core/sbase/patch/0001-crypt-Add-some-missing-error-checks-for-cryptsum.patch b/core/sbase/patch/0001-crypt-Add-some-missing-error-checks-for-cryptsum.patch
deleted file mode 100644
index c2d87263..00000000
--- a/core/sbase/patch/0001-crypt-Add-some-missing-error-checks-for-cryptsum.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 51f007e97e71641b176fd2ecb6b818a351df2360 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 1 Dec 2016 00:14:32 -0800
-Subject: [PATCH] crypt: Add some missing error checks for cryptsum
-
-Previously, if a file failed to read in a checksum list, it would be
-reported as not matched rather than a read failure.
-
-Also, if reading from stdin failed, previously a bogus checksum would be
-printed anyway.
----
- libutil/crypt.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/libutil/crypt.c b/libutil/crypt.c
-index 3f849ba..6991c39 100644
---- a/libutil/crypt.c
-+++ b/libutil/crypt.c
-@@ -64,7 +64,10 @@ mdchecklist(FILE *listfp, struct crypt_ops *ops, uint8_t *md, size_t sz,
- 			(*noread)++;
- 			continue;
- 		}
--		cryptsum(ops, fp, file, md);
-+		if (cryptsum(ops, fp, file, md)) {
-+			(*noread)++;
-+			continue;
-+		}
- 		r = mdcheckline(line, md, sz);
- 		if (r == 1) {
- 			printf("%s: OK\n", file);
-@@ -125,8 +128,10 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
- 	int ret = 0;
- 
- 	if (argc == 0) {
--		cryptsum(ops, stdin, "<stdin>", md);
--		mdprint(md, "<stdin>", sz);
-+		if (cryptsum(ops, stdin, "<stdin>", md))
-+			ret = 1;
-+		else
-+			mdprint(md, "<stdin>", sz);
- 	} else {
- 		for (; *argv; argc--, argv++) {
- 			if ((*argv)[0] == '-' && !(*argv)[1]) {
-@@ -137,11 +142,10 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
- 				ret = 1;
- 				continue;
- 			}
--			if (cryptsum(ops, fp, *argv, md)) {
-+			if (cryptsum(ops, fp, *argv, md))
- 				ret = 1;
--			} else {
-+			else
- 				mdprint(md, *argv, sz);
--			}
- 			if (fp != stdin && fshut(fp, *argv))
- 				ret = 1;
- 		}
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0002-od-Fix-buffer-overflow-if-N-flag-is-larger-than-BUFS.patch b/core/sbase/patch/0002-od-Fix-buffer-overflow-if-N-flag-is-larger-than-BUFS.patch
deleted file mode 100644
index 0cbb6a81..00000000
--- a/core/sbase/patch/0002-od-Fix-buffer-overflow-if-N-flag-is-larger-than-BUFS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 798885ef6d44c3a6572c5e63a0ffe3471b397f3b Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 1 Dec 2016 00:59:12 -0800
-Subject: [PATCH] od: Fix buffer overflow if -N flag is larger than BUFSIZ
-
-Previously, if max was specified, od will call read with that size,
-potentially overflowing buf with data read from the file.
----
- od.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/od.c b/od.c
-index 9b83501..27a7104 100644
---- a/od.c
-+++ b/od.c
-@@ -129,23 +129,25 @@ od(FILE *fp, char *fname, int last)
- {
- 	static unsigned char *line;
- 	static size_t lineoff;
--	size_t i;
--	unsigned char buf[BUFSIZ];
- 	static off_t addr;
--	size_t buflen;
-+	unsigned char buf[BUFSIZ];
-+	size_t i, n, size = sizeof(buf);
- 
- 	while (skip - addr > 0) {
--		buflen = fread(buf, 1, MIN(skip - addr, BUFSIZ), fp);
--		addr += buflen;
-+		n = fread(buf, 1, MIN(skip - addr, sizeof(buf)), fp);
-+		addr += n;
- 		if (feof(fp) || ferror(fp))
- 			return;
- 	}
- 	if (!line)
- 		line = emalloc(linelen);
- 
--	while ((buflen = fread(buf, 1, max >= 0 ?
--	                       max - (addr - skip) : BUFSIZ, fp))) {
--		for (i = 0; i < buflen; i++, addr++) {
-+	for (;;) {
-+		if (max >= 0)
-+			size = MIN(max - (addr - skip), size);
-+		if (!(n = fread(buf, 1, size, fp)))
-+			break;
-+		for (i = 0; i < n; i++, addr++) {
- 			line[lineoff++] = buf[i];
- 			if (lineoff == linelen) {
- 				printline(line, lineoff, addr - lineoff + 1);
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0003-libutil-Add-writeall-utility-function.patch b/core/sbase/patch/0003-libutil-Add-writeall-utility-function.patch
deleted file mode 100644
index bb1d9f9d..00000000
--- a/core/sbase/patch/0003-libutil-Add-writeall-utility-function.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 21eed6939c15af59218f58a5ed858e56d62c3279 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 30 Nov 2016 00:03:40 -0800
-Subject: [PATCH] libutil: Add writeall utility function
-
-writeall makes successive write calls to write an entire buffer to the
-output file descriptor. It returns the number of bytes written, or -1 on
-the first error.
----
- Makefile           |  3 ++-
- libutil/writeall.c | 21 +++++++++++++++++++++
- util.h             |  3 +++
- 3 files changed, 26 insertions(+), 1 deletion(-)
- create mode 100644 libutil/writeall.c
-
-diff --git a/Makefile b/Makefile
-index 25bab70..a337ead 100644
---- a/Makefile
-+++ b/Makefile
-@@ -79,7 +79,8 @@ LIBUTILSRC =\
- 	libutil/strlcpy.c\
- 	libutil/strsep.c\
- 	libutil/strtonum.c\
--	libutil/unescape.c
-+	libutil/unescape.c\
-+	libutil/writeall.c
- 
- LIB = $(LIBUTF) $(LIBUTIL)
- 
-diff --git a/libutil/writeall.c b/libutil/writeall.c
-new file mode 100644
-index 0000000..4725ced
---- /dev/null
-+++ b/libutil/writeall.c
-@@ -0,0 +1,21 @@
-+/* See LICENSE file for copyright and license details. */
-+#include <unistd.h>
-+
-+#include "../util.h"
-+
-+ssize_t
-+writeall(int fd, const void *buf, size_t len)
-+{
-+	const char *p = buf;
-+	ssize_t n;
-+
-+	while (len) {
-+		n = write(fd, p, len);
-+		if (n <= 0)
-+			return n;
-+		p += n;
-+		len -= n;
-+	}
-+
-+	return p - (const char *)buf;
-+}
-diff --git a/util.h b/util.h
-index b5860dc..eaad3ce 100644
---- a/util.h
-+++ b/util.h
-@@ -62,6 +62,9 @@ char *strsep(char **, const char *);
- int enregcomp(int, regex_t *, const char *, int);
- int eregcomp(regex_t *, const char *, int);
- 
-+/* io */
-+ssize_t writeall(int, const void *, size_t);
-+
- /* misc */
- void enmasse(int, char **, int (*)(const char *, const char *, int));
- void fnck(const char *, const char *, int (*)(const char *, const char *, int), int);
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0004-Don-t-use-buffered-IO-fread-when-not-appropriate.patch b/core/sbase/patch/0004-Don-t-use-buffered-IO-fread-when-not-appropriate.patch
deleted file mode 100644
index 4719939b..00000000
--- a/core/sbase/patch/0004-Don-t-use-buffered-IO-fread-when-not-appropriate.patch
+++ /dev/null
@@ -1,411 +0,0 @@
-From dae208cd2dc1cf70967ce170eca06917de45eaee Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 30 Nov 2016 00:06:04 -0800
-Subject: [PATCH] Don't use buffered IO (fread) when not appropriate
-
-fread reads the entire requested size (BUFSIZ), which causes tools to
-block if only small amounts of data are available at a time. At best,
-this causes unnecessary copies and inefficiency, at worst, tools like
-tee and cat are almost unusable in some cases since they only display
-large chunks of data at a time.
----
- cksum.c         | 31 +++++++++++++++++--------------
- crypt.h         |  2 +-
- libutil/crypt.c | 37 +++++++++++++++++++------------------
- od.c            | 43 +++++++++++++++++++++++++++----------------
- tee.c           | 39 +++++++++++++++++++--------------------
- 5 files changed, 83 insertions(+), 69 deletions(-)
-
-diff --git a/cksum.c b/cksum.c
-index 570ca81..b53ec17 100644
---- a/cksum.c
-+++ b/cksum.c
-@@ -1,7 +1,9 @@
- /* See LICENSE file for copyright and license details. */
-+#include <fcntl.h>
- #include <inttypes.h>
- #include <stdio.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #include "util.h"
- 
-@@ -61,19 +63,20 @@ static const unsigned long crctab[] = {         0x00000000,
- };
- 
- static void
--cksum(FILE *fp, const char *s)
-+cksum(int fd, const char *s)
- {
--	size_t len = 0, i, n;
-+	ssize_t n;
-+	size_t len = 0, i;
- 	uint32_t ck = 0;
- 	unsigned char buf[BUFSIZ];
- 
--	while ((n = fread(buf, 1, sizeof(buf), fp))) {
-+	while ((n = read(fd, buf, sizeof(buf))) > 0) {
- 		for (i = 0; i < n; i++)
- 			ck = (ck << 8) ^ crctab[(ck >> 24) ^ buf[i]];
- 		len += n;
- 	}
--	if (ferror(fp)) {
--		weprintf("fread %s:", s ? s : "<stdin>");
-+	if (n < 0) {
-+		weprintf("read %s:", s ? s : "<stdin>");
- 		ret = 1;
- 		return;
- 	}
-@@ -92,29 +95,29 @@ cksum(FILE *fp, const char *s)
- int
- main(int argc, char *argv[])
- {
--	FILE *fp;
-+	int fd;
- 
- 	argv0 = argv[0], argc--, argv++;
- 
- 	if (!argc) {
--		cksum(stdin, NULL);
-+		cksum(0, NULL);
- 	} else {
- 		for (; *argv; argc--, argv++) {
- 			if (!strcmp(*argv, "-")) {
- 				*argv = "<stdin>";
--				fp = stdin;
--			} else if (!(fp = fopen(*argv, "r"))) {
--				weprintf("fopen %s:", *argv);
-+				fd = 0;
-+			} else if ((fd = open(*argv, O_RDONLY)) < 0) {
-+				weprintf("open %s:", *argv);
- 				ret = 1;
- 				continue;
- 			}
--			cksum(fp, *argv);
--			if (fp != stdin && fshut(fp, *argv))
--				ret = 1;
-+			cksum(fd, *argv);
-+			if (fd != 0)
-+				close(fd);
- 		}
- 	}
- 
--	ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
-+	ret |= fshut(stdout, "<stdout>");
- 
- 	return ret;
- }
-diff --git a/crypt.h b/crypt.h
-index e0cc08d..2fd2932 100644
---- a/crypt.h
-+++ b/crypt.h
-@@ -8,5 +8,5 @@ struct crypt_ops {
- 
- int cryptcheck(int, char **, struct crypt_ops *, uint8_t *, size_t);
- int cryptmain(int, char **, struct crypt_ops *, uint8_t *, size_t);
--int cryptsum(struct crypt_ops *, FILE *, const char *, uint8_t *);
-+int cryptsum(struct crypt_ops *, int, const char *, uint8_t *);
- void mdprint(const uint8_t *, const char *, size_t);
-diff --git a/libutil/crypt.c b/libutil/crypt.c
-index 6991c39..e285614 100644
---- a/libutil/crypt.c
-+++ b/libutil/crypt.c
-@@ -1,8 +1,10 @@
- /* See LICENSE file for copyright and license details. */
-+#include <fcntl.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #include "../crypt.h"
- #include "../text.h"
-@@ -41,7 +43,7 @@ static void
- mdchecklist(FILE *listfp, struct crypt_ops *ops, uint8_t *md, size_t sz,
-             int *formatsucks, int *noread, int *nonmatch)
- {
--	FILE *fp;
-+	int fd;
- 	size_t bufsiz = 0;
- 	int r;
- 	char *line = NULL, *file, *p;
-@@ -59,12 +61,12 @@ mdchecklist(FILE *listfp, struct crypt_ops *ops, uint8_t *md, size_t sz,
- 		file += 2;
- 		for (p = file; *p && *p != '\n' && *p != '\r'; p++); /* strip newline */
- 		*p = '\0';
--		if (!(fp = fopen(file, "r"))) {
--			weprintf("fopen %s:", file);
-+		if ((fd = open(file, O_RDONLY)) < 0) {
-+			weprintf("open %s:", file);
- 			(*noread)++;
- 			continue;
- 		}
--		if (cryptsum(ops, fp, file, md)) {
-+		if (cryptsum(ops, fd, file, md)) {
- 			(*noread)++;
- 			continue;
- 		}
-@@ -77,7 +79,7 @@ mdchecklist(FILE *listfp, struct crypt_ops *ops, uint8_t *md, size_t sz,
- 		} else {
- 			(*formatsucks)++;
- 		}
--		fclose(fp);
-+		close(fd);
- 	}
- 	free(line);
- }
-@@ -124,11 +126,11 @@ cryptcheck(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz
- int
- cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
- {
--	FILE *fp;
-+	int fd;
- 	int ret = 0;
- 
- 	if (argc == 0) {
--		if (cryptsum(ops, stdin, "<stdin>", md))
-+		if (cryptsum(ops, 0, "<stdin>", md))
- 			ret = 1;
- 		else
- 			mdprint(md, "<stdin>", sz);
-@@ -136,18 +138,18 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
- 		for (; *argv; argc--, argv++) {
- 			if ((*argv)[0] == '-' && !(*argv)[1]) {
- 				*argv = "<stdin>";
--				fp = stdin;
--			} else if (!(fp = fopen(*argv, "r"))) {
--				weprintf("fopen %s:", *argv);
-+				fd = 0;
-+			} else if ((fd = open(*argv, O_RDONLY)) < 0) {
-+				weprintf("open %s:", *argv);
- 				ret = 1;
- 				continue;
- 			}
--			if (cryptsum(ops, fp, *argv, md))
-+			if (cryptsum(ops, fd, *argv, md))
- 				ret = 1;
- 			else
- 				mdprint(md, *argv, sz);
--			if (fp != stdin && fshut(fp, *argv))
--				ret = 1;
-+			if (fd != 0)
-+				close(fd);
- 		}
- 	}
- 
-@@ -155,16 +157,15 @@ cryptmain(int argc, char *argv[], struct crypt_ops *ops, uint8_t *md, size_t sz)
- }
- 
- int
--cryptsum(struct crypt_ops *ops, FILE *fp, const char *f,
--	 uint8_t *md)
-+cryptsum(struct crypt_ops *ops, int fd, const char *f, uint8_t *md)
- {
- 	uint8_t buf[BUFSIZ];
--	size_t n;
-+	ssize_t n;
- 
- 	ops->init(ops->s);
--	while ((n = fread(buf, 1, sizeof(buf), fp)) > 0)
-+	while ((n = read(fd, buf, sizeof(buf))) > 0)
- 		ops->update(ops->s, buf, n);
--	if (ferror(fp)) {
-+	if (n < 0) {
- 		weprintf("%s: read error:", f);
- 		return 1;
- 	}
-diff --git a/od.c b/od.c
-index 27a7104..e5dde83 100644
---- a/od.c
-+++ b/od.c
-@@ -1,8 +1,10 @@
- /* See LICENSE file for copyright and license details. */
-+#include <fcntl.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #include "queue.h"
- #include "util.h"
-@@ -124,20 +126,23 @@ once:
- 	}
- }
- 
--static void
--od(FILE *fp, char *fname, int last)
-+static int
-+od(int fd, char *fname, int last)
- {
- 	static unsigned char *line;
- 	static size_t lineoff;
- 	static off_t addr;
- 	unsigned char buf[BUFSIZ];
--	size_t i, n, size = sizeof(buf);
-+	size_t i, size = sizeof(buf);
-+	ssize_t n;
- 
- 	while (skip - addr > 0) {
--		n = fread(buf, 1, MIN(skip - addr, sizeof(buf)), fp);
-+		n = read(fd, buf, MIN(skip - addr, sizeof(buf)));
-+		if (n < 0)
-+			weprintf("read %s:", fname);
-+		if (n <= 0)
-+			return n;
- 		addr += n;
--		if (feof(fp) || ferror(fp))
--			return;
- 	}
- 	if (!line)
- 		line = emalloc(linelen);
-@@ -145,7 +150,7 @@ od(FILE *fp, char *fname, int last)
- 	for (;;) {
- 		if (max >= 0)
- 			size = MIN(max - (addr - skip), size);
--		if (!(n = fread(buf, 1, size, fp)))
-+		if ((n = read(fd, buf, size)) <= 0)
- 			break;
- 		for (i = 0; i < n; i++, addr++) {
- 			line[lineoff++] = buf[i];
-@@ -155,10 +160,15 @@ od(FILE *fp, char *fname, int last)
- 			}
- 		}
- 	}
-+	if (n < 0) {
-+		weprintf("read %s:", fname);
-+		return n;
-+	}
- 	if (lineoff && last)
- 		printline(line, lineoff, addr - lineoff);
- 	if (last)
- 		printline((unsigned char *)"", 0, addr);
-+	return 0;
- }
- 
- static int
-@@ -196,7 +206,7 @@ usage(void)
- int
- main(int argc, char *argv[])
- {
--	FILE *fp;
-+	int fd;
- 	struct type *t;
- 	int ret = 0, len;
- 	char *s;
-@@ -293,25 +303,26 @@ main(int argc, char *argv[])
- 		linelen *= 2;
- 
- 	if (!argc) {
--		od(stdin, "<stdin>", 1);
-+		if (od(0, "<stdin>", 1) < 0)
-+			ret = 1;
- 	} else {
- 		for (; *argv; argc--, argv++) {
- 			if (!strcmp(*argv, "-")) {
- 				*argv = "<stdin>";
--				fp = stdin;
--			} else if (!(fp = fopen(*argv, "r"))) {
--				weprintf("fopen %s:", *argv);
-+				fd = 0;
-+			} else if ((fd = open(*argv, O_RDONLY)) < 0) {
-+				weprintf("open %s:", *argv);
- 				ret = 1;
- 				continue;
- 			}
--			od(fp, *argv, (!*(argv + 1)));
--			if (fp != stdin && fshut(fp, *argv))
-+			if (od(fd, *argv, (!*(argv + 1))) < 0)
- 				ret = 1;
-+			if (fd != 0)
-+				close(fd);
- 		}
- 	}
- 
--	ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>") |
--	       fshut(stderr, "<stderr>");
-+	ret |= fshut(stdout, "<stdout>") | fshut(stderr, "<stderr>");
- 
- 	return ret;
- }
-diff --git a/tee.c b/tee.c
-index 35e3db5..eac106c 100644
---- a/tee.c
-+++ b/tee.c
-@@ -1,6 +1,7 @@
- /* See LICENSE file for copyright and license details. */
-+#include <fcntl.h>
- #include <signal.h>
--#include <stdio.h>
-+#include <unistd.h>
- 
- #include "util.h"
- 
-@@ -13,14 +14,15 @@ usage(void)
- int
- main(int argc, char *argv[])
- {
--	FILE **fps = NULL;
--	size_t i, n, nfps;
--	int ret = 0, aflag = 0, iflag = 0;
-+	int *fds = NULL;
-+	size_t i, nfds;
-+	ssize_t n;
-+	int ret = 0, aflag = O_TRUNC, iflag = 0;
- 	char buf[BUFSIZ];
- 
- 	ARGBEGIN {
- 	case 'a':
--		aflag = 1;
-+		aflag = O_APPEND;
- 		break;
- 	case 'i':
- 		iflag = 1;
-@@ -31,31 +33,28 @@ main(int argc, char *argv[])
- 
- 	if (iflag && signal(SIGINT, SIG_IGN) == SIG_ERR)
- 		eprintf("signal:");
--	nfps = argc + 1;
--	fps = ecalloc(nfps, sizeof(*fps));
-+	nfds = argc + 1;
-+	fds = ecalloc(nfds, sizeof(*fds));
- 
- 	for (i = 0; i < argc; i++) {
--		if (!(fps[i] = fopen(argv[i], aflag ? "a" : "w"))) {
--			weprintf("fopen %s:", argv[i]);
-+		if ((fds[i] = open(argv[i], O_WRONLY|O_CREAT|aflag, 0666)) < 0) {
-+			weprintf("open %s:", argv[i]);
- 			ret = 1;
- 		}
- 	}
--	fps[i] = stdout;
-+	fds[i] = 1;
- 
--	while ((n = fread(buf, 1, sizeof(buf), stdin))) {
--		for (i = 0; i < nfps; i++) {
--			if (fps[i] && fwrite(buf, 1, n, fps[i]) != n) {
--				fshut(fps[i], (i != argc) ? argv[i] : "<stdout>");
--				fps[i] = NULL;
-+	while ((n = read(0, buf, sizeof(buf))) > 0) {
-+		for (i = 0; i < nfds; i++) {
-+			if (fds[i] >= 0 && writeall(fds[i], buf, n) < 0) {
-+				weprintf("write %s:", (i != argc) ? argv[i] : "<stdout>");
-+				fds[i] = -1;
- 				ret = 1;
- 			}
- 		}
- 	}
--
--	ret |= fshut(stdin, "<stdin>");
--	for (i = 0; i < nfps; i++)
--		if (fps[i])
--			ret |= fshut(fps[i], (i != argc) ? argv[i] : "<stdout>");
-+	if (n < 0)
-+		eprintf("read <stdin>:");
- 
- 	return ret;
- }
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0005-xinstall-Check-result-of-fchmod.patch b/core/sbase/patch/0005-xinstall-Check-result-of-fchmod.patch
deleted file mode 100644
index be4d8b9a..00000000
--- a/core/sbase/patch/0005-xinstall-Check-result-of-fchmod.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c01e384fc7e008f6946c4b530376805e9014e684 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 2 Dec 2016 21:09:37 -0800
-Subject: [PATCH] xinstall: Check result of fchmod
-
----
- xinstall.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/xinstall.c b/xinstall.c
-index bf921fb..5a0e390 100644
---- a/xinstall.c
-+++ b/xinstall.c
-@@ -119,7 +119,8 @@ install(const char *s1, const char *s2, int depth)
- 		}
- 		concat(f1, s1, f2, s2);
- 
--		fchmod(fileno(f2), mode);
-+		if (fchmod(fileno(f2), mode) < 0)
-+			eprintf("fchmod %s:", s2);
- 
- 		if (fclose(f2) == EOF)
- 			eprintf("fclose %s:", s2);
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0006-concat-Use-plain-read-write-instead-of-buffered-stdi.patch b/core/sbase/patch/0006-concat-Use-plain-read-write-instead-of-buffered-stdi.patch
deleted file mode 100644
index 5ef2e9cb..00000000
--- a/core/sbase/patch/0006-concat-Use-plain-read-write-instead-of-buffered-stdi.patch
+++ /dev/null
@@ -1,631 +0,0 @@
-From e1a14951ce6b83aa5116b9791ad64045a74af453 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 30 Nov 2016 01:20:00 -0800
-Subject: [PATCH] concat: Use plain read/write instead of buffered stdio
-
-If we are just copying data from one file to another, we don't need to
-fill a complete buffer, just read a chunk at a time, and write it to the
-output.
----
- cat.c            |  39 +++++------
- libutil/concat.c |  24 ++++---
- libutil/cp.c     |  42 +++++-------
- sponge.c         |  31 +++++----
- tail.c           | 199 +++++++++++++++++++++++++++++++++----------------------
- text.h           |   1 -
- util.h           |   1 +
- xinstall.c       |  25 ++++---
- 8 files changed, 196 insertions(+), 166 deletions(-)
-
-diff --git a/cat.c b/cat.c
-index e3741aa..211e8d1 100644
---- a/cat.c
-+++ b/cat.c
-@@ -1,22 +1,11 @@
- /* See LICENSE file for copyright and license details. */
--#include <stdio.h>
-+#include <fcntl.h>
- #include <string.h>
- #include <unistd.h>
- 
--#include "text.h"
- #include "util.h"
- 
- static void
--uconcat(FILE *fp1, const char *s1, FILE *fp2, const char *s2)
--{
--	int c;
--
--	setbuf(fp2, NULL);
--	while ((c = getc(fp1)) != EOF)
--		putc(c, fp2);
--}
--
--static void
- usage(void)
- {
- 	eprintf("usage: %s [-u] [file ...]\n", argv0);
-@@ -25,37 +14,39 @@ usage(void)
- int
- main(int argc, char *argv[])
- {
--	FILE *fp;
--	int ret = 0;
--	void (*cat)(FILE *, const char *, FILE *, const char *) = &concat;
-+	int fd, ret = 0;
- 
- 	ARGBEGIN {
- 	case 'u':
--		cat = &uconcat;
- 		break;
- 	default:
- 		usage();
- 	} ARGEND
- 
- 	if (!argc) {
--		cat(stdin, "<stdin>", stdout, "<stdout>");
-+		if (concat(0, "<stdin>", 1, "<stdout>") < 0)
-+			ret = 1;
- 	} else {
- 		for (; *argv; argc--, argv++) {
- 			if (!strcmp(*argv, "-")) {
- 				*argv = "<stdin>";
--				fp = stdin;
--			} else if (!(fp = fopen(*argv, "r"))) {
--				weprintf("fopen %s:", *argv);
-+				fd = 0;
-+			} else if ((fd = open(*argv, O_RDONLY)) < 0) {
-+				weprintf("open %s:", *argv);
- 				ret = 1;
- 				continue;
- 			}
--			cat(fp, *argv, stdout, "<stdout>");
--			if (fp != stdin && fshut(fp, *argv))
-+			switch (concat(fd, *argv, 1, "<stdout>")) {
-+			case -1:
- 				ret = 1;
-+				break;
-+			case -2:
-+				return 1;  /* exit on write error */
-+			}
-+			if (fd != 0)
-+				close(fd);
- 		}
- 	}
- 
--	ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
--
- 	return ret;
- }
-diff --git a/libutil/concat.c b/libutil/concat.c
-index fad9471..2e9aa52 100644
---- a/libutil/concat.c
-+++ b/libutil/concat.c
-@@ -1,19 +1,23 @@
- /* See LICENSE file for copyright and license details. */
--#include <stdio.h>
-+#include <unistd.h>
- 
--#include "../text.h"
- #include "../util.h"
- 
--void
--concat(FILE *fp1, const char *s1, FILE *fp2, const char *s2)
-+int
-+concat(int f1, const char *s1, int f2, const char *s2)
- {
- 	char buf[BUFSIZ];
--	size_t n;
-+	ssize_t n;
- 
--	while ((n = fread(buf, 1, sizeof(buf), fp1))) {
--		fwrite(buf, 1, n, fp2);
--
--		if (feof(fp1) || ferror(fp1) || ferror(fp2))
--			break;
-+	while ((n = read(f1, buf, sizeof(buf))) > 0) {
-+		if (writeall(f2, buf, n) < 0) {
-+			weprintf("write %s:", s2);
-+			return -2;
-+		}
-+	}
-+	if (n < 0) {
-+		weprintf("read %s:", s1);
-+		return -1;
- 	}
-+	return 0;
- }
-diff --git a/libutil/cp.c b/libutil/cp.c
-index c398962..8cd0a7d 100644
---- a/libutil/cp.c
-+++ b/libutil/cp.c
-@@ -12,7 +12,6 @@
- #include <utime.h>
- 
- #include "../fs.h"
--#include "../text.h"
- #include "../util.h"
- 
- int cp_aflag  = 0;
-@@ -27,7 +26,7 @@ int
- cp(const char *s1, const char *s2, int depth)
- {
- 	DIR *dp;
--	FILE *f1, *f2;
-+	int f1, f2;
- 	struct dirent *d;
- 	struct stat st;
- 	struct timespec times[2];
-@@ -112,43 +111,34 @@ cp(const char *s1, const char *s2, int depth)
- 			return 0;
- 		}
- 	} else {
--		if (!(f1 = fopen(s1, "r"))) {
--			weprintf("fopen %s:", s1);
-+		if ((f1 = open(s1, O_RDONLY)) < 0) {
-+			weprintf("open %s:", s1);
- 			cp_status = 1;
- 			return 0;
- 		}
--		if (!(f2 = fopen(s2, "w"))) {
--			if (cp_fflag) {
--				if (unlink(s2) < 0 && errno != ENOENT) {
--					weprintf("unlink %s:", s2);
--					cp_status = 1;
--					return 0;
--				} else if (!(f2 = fopen(s2, "w"))) {
--					weprintf("fopen %s:", s2);
--					cp_status = 1;
--					return 0;
--				}
--			} else {
--				weprintf("fopen %s:", s2);
-+		if ((f2 = creat(s2, st.st_mode)) < 0 && cp_fflag) {
-+			if (unlink(s2) < 0 && errno != ENOENT) {
-+				weprintf("unlink %s:", s2);
- 				cp_status = 1;
- 				return 0;
- 			}
-+			f2 = creat(s2, st.st_mode);
- 		}
--		concat(f1, s1, f2, s2);
--
--		/* preserve permissions by default */
--		fchmod(fileno(f2), st.st_mode);
--
--		if (fclose(f2) == EOF) {
--			weprintf("fclose %s:", s2);
-+		if (f2 < 0) {
-+			weprintf("creat %s:", s2);
- 			cp_status = 1;
- 			return 0;
- 		}
--		if (fclose(f1) == EOF) {
--			weprintf("fclose %s:", s1);
-+		if (concat(f1, s1, f2, s2) < 0) {
- 			cp_status = 1;
- 			return 0;
- 		}
-+
-+		/* preserve permissions by default */
-+		fchmod(f2, st.st_mode);
-+
-+		close(f1);
-+		close(f2);
- 	}
- 
- 	if (cp_aflag || cp_pflag) {
-diff --git a/sponge.c b/sponge.c
-index baeac7f..da8b28c 100644
---- a/sponge.c
-+++ b/sponge.c
-@@ -1,7 +1,8 @@
- /* See LICENSE file for copyright and license details. */
--#include <stdio.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <unistd.h>
- 
--#include "text.h"
- #include "util.h"
- 
- static void
-@@ -13,24 +14,26 @@ usage(void)
- int
- main(int argc, char *argv[])
- {
--	FILE *fp, *tmpfp;
--	int ret = 0;
-+	char tmp[] = "/tmp/sponge-XXXXXX";
-+	int fd, tmpfd;
- 
- 	argv0 = argv[0], argc--, argv++;
- 
- 	if (argc != 1)
- 		usage();
- 
--	if (!(tmpfp = tmpfile()))
--		eprintf("tmpfile:");
--	concat(stdin, "<stdin>", tmpfp, "<tmpfile>");
--	rewind(tmpfp);
-+	if ((tmpfd = mkstemp(tmp)) < 0)
-+		eprintf("mkstemp:");
-+	unlink(tmp);
-+	if (concat(0, "<stdin>", tmpfd, "<tmpfile>") < 0)
-+		return 1;
-+	if (lseek(tmpfd, 0, SEEK_SET) < 0)
-+		eprintf("lseek:");
- 
--	if (!(fp = fopen(argv[0], "w")))
--		eprintf("fopen %s:", argv[0]);
--	concat(tmpfp, "<tmpfile>", fp, argv[0]);
-+	if ((fd = creat(argv[0], 0666)) < 0)
-+		eprintf("creat %s:", argv[0]);
-+	if (concat(tmpfd, "<tmpfile>", fd, argv[0]) < 0)
-+		return 1;
- 
--	ret |= fshut(fp, argv[0]) | fshut(tmpfp, "<tmpfile>");
--
--	return ret;
-+	return 0;
- }
-diff --git a/tail.c b/tail.c
-index 711707f..1ab9d18 100644
---- a/tail.c
-+++ b/tail.c
-@@ -1,80 +1,125 @@
- /* See LICENSE file for copyright and license details. */
- #include <sys/stat.h>
- 
-+#include <fcntl.h>
-+#include <unistd.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- 
--#include "text.h"
- #include "utf.h"
- #include "util.h"
- 
- static char mode = 'n';
- 
--static void
--dropinit(FILE *fp, const char *str, size_t n)
-+static int
-+dropinit(int fd, const char *fname, size_t count)
- {
- 	Rune r;
--	char *buf = NULL;
--	size_t size = 0, i = 1;
--	ssize_t len;
-+	char buf[BUFSIZ], *p;
-+	ssize_t n;
-+	int nr;
-+
-+	if (count < 2)
-+		goto copy;
-+	count--;  /* numbering starts at 1 */
-+	while (count && (n = read(fd, buf, sizeof(buf))) > 0) {
-+		if (mode == 'n') {
-+			for (p = buf; count && n > 0; p++, n--) {
-+				if (*p == '\n')
-+					count--;
-+			}
-+		} else {
-+			for (p = buf; count && n > 0; p += nr, n -= nr, count--) {
-+				nr = charntorune(&r, p, n);
-+				if (!nr) {
-+					/* we don't have a full rune, move
-+					 * remaining data to beginning and read
-+					 * again */
-+					memmove(buf, p, n);
-+					break;
-+				}
-+			}
-+		}
-+	}
-+	if (count) {
-+		if (n < 0)
-+			weprintf("read %s:", fname);
-+		if (n <= 0)
-+			return n;
-+	}
- 
--	if (mode == 'n') {
--		while (i < n && (len = getline(&buf, &size, fp)) > 0)
--			if (len > 0 && buf[len - 1] == '\n')
--				i++;
--	} else {
--		while (i < n && efgetrune(&r, fp, str))
--			i++;
-+	/* write the rest of the buffer */
-+	if (writeall(1, p, n) < 0)
-+		eprintf("write:");
-+copy:
-+	switch (concat(fd, fname, 1, "<stdout>")) {
-+	case -1:  /* read error */
-+		return -1;
-+	case -2:  /* write error */
-+		exit(1);
-+	default:
-+		return 0;
- 	}
--	free(buf);
--	concat(fp, str, stdout, "<stdout>");
- }
- 
--static void
--taketail(FILE *fp, const char *str, size_t n)
-+static int
-+taketail(int fd, const char *fname, size_t count)
- {
--	Rune *r = NULL;
--	struct line *ring = NULL;
--	size_t i, j, *size = NULL;
--	ssize_t len;
--	int seenln = 0;
--
--	if (!n)
--		return;
--
--	if (mode == 'n') {
--		ring = ecalloc(n, sizeof(*ring));
--		size = ecalloc(n, sizeof(*size));
--
--		for (i = j = 0; (len = getline(&ring[i].data,
--		     &size[i], fp)) > 0; seenln = 1) {
--			ring[i].len = len;
--			i = j = (i + 1) % n;
-+	static char *buf = NULL;
-+	static size_t size = 0;
-+	char *p;
-+	size_t len = 0, left;
-+	ssize_t n;
-+
-+	if (!count)
-+		return 0;
-+	for (;;) {
-+		if (len + BUFSIZ > size) {
-+			/* make sure we have at least BUFSIZ to read */
-+			size += 2 * BUFSIZ;
-+			buf = erealloc(buf, size);
- 		}
--	} else {
--		r = ecalloc(n, sizeof(*r));
--
--		for (i = j = 0; efgetrune(&r[i], fp, str); )
--			i = j = (i + 1) % n;
--	}
--	if (ferror(fp))
--		eprintf("%s: read error:", str);
--
--	do {
--		if (seenln && ring && ring[j].data) {
--			fwrite(ring[j].data, 1, ring[j].len, stdout);
--			free(ring[j].data);
--		} else if (r) {
--			efputrune(&r[j], stdout, "<stdout>");
-+		n = read(fd, buf + len, size - len);
-+		if (n < 0) {
-+			weprintf("read %s:", fname);
-+			return -1;
- 		}
--	} while ((j = (j + 1) % n) != i);
--
--	free(ring);
--	free(size);
--	free(r);
-+		if (n == 0)
-+			break;
-+		len += n;
-+		if (mode == 'n') {
-+			/* ignore the last character; if it is a newline, it
-+			 * ends the last line */
-+			for (p = buf + len - 2, left = count; p >= buf; p--) {
-+				if (*p != '\n')
-+					continue;
-+				left--;
-+				if (!left) {
-+					p++;
-+					break;
-+				}
-+			}
-+		} else {
-+			for (p = buf + len - 1, left = count; p >= buf; p--) {
-+				/* skip utf-8 continuation bytes */
-+				if ((*p & 0xc0) == 0x80)
-+					continue;
-+				left--;
-+				if (!left)
-+					break;
-+			}
-+		}
-+		if (p > buf) {
-+			len -= p - buf;
-+			memmove(buf, p, len);
-+		}
-+	}
-+	if (writeall(1, buf, len) < 0)
-+		eprintf("write:");
-+	return 0;
- }
- 
- static void
-@@ -87,11 +132,11 @@ int
- main(int argc, char *argv[])
- {
- 	struct stat st1, st2;
--	FILE *fp;
--	size_t tmpsize, n = 10;
-+	int fd;
-+	size_t n = 10;
- 	int fflag = 0, ret = 0, newline = 0, many = 0;
--	char *numstr, *tmp;
--	void (*tail)(FILE *, const char *, size_t) = taketail;
-+	char *numstr;
-+	int (*tail)(int, const char *, size_t) = taketail;
- 
- 	ARGBEGIN {
- 	case 'f':
-@@ -113,17 +158,18 @@ main(int argc, char *argv[])
- 		usage();
- 	} ARGEND
- 
--	if (!argc)
--		tail(stdin, "<stdin>", n);
--	else {
-+	if (!argc) {
-+		if (tail(0, "<stdin>", n) < 0)
-+			ret = 1;
-+	} else {
- 		if ((many = argc > 1) && fflag)
- 			usage();
- 		for (newline = 0; *argv; argc--, argv++) {
- 			if (!strcmp(*argv, "-")) {
- 				*argv = "<stdin>";
--				fp = stdin;
--			} else if (!(fp = fopen(*argv, "r"))) {
--				weprintf("fopen %s:", *argv);
-+				fd = 0;
-+			} else if ((fd = open(*argv, O_RDONLY)) < 0) {
-+				weprintf("open %s:", *argv);
- 				ret = 1;
- 				continue;
- 			}
-@@ -134,27 +180,26 @@ main(int argc, char *argv[])
- 			if (!(S_ISFIFO(st1.st_mode) || S_ISREG(st1.st_mode)))
- 				fflag = 0;
- 			newline = 1;
--			tail(fp, *argv, n);
-+			if (tail(fd, *argv, n) < 0) {
-+				ret = 1;
-+				fflag = 0;
-+			}
- 
- 			if (!fflag) {
--				if (fp != stdin && fshut(fp, *argv))
--					ret = 1;
-+				if (fd != 0)
-+					close(fd);
- 				continue;
- 			}
--			for (tmp = NULL, tmpsize = 0;;) {
--				while (getline(&tmp, &tmpsize, fp) > 0) {
--					fputs(tmp, stdout);
--					fflush(stdout);
--				}
--				if (ferror(fp))
--					eprintf("readline %s:", *argv);
--				clearerr(fp);
-+			for (;;) {
-+				if (concat(fd, *argv, 1, "<stdout>") < 0)
-+					exit(1);
- 				/* ignore error in case file was removed, we continue
- 				 * tracking the existing open file descriptor */
- 				if (!stat(*argv, &st2)) {
- 					if (st2.st_size < st1.st_size) {
- 						fprintf(stderr, "%s: file truncated\n", *argv);
--						rewind(fp);
-+						if (lseek(fd, SEEK_SET, 0) < 0)
-+							eprintf("lseek:");
- 					}
- 					st1 = st2;
- 				}
-@@ -163,7 +208,5 @@ main(int argc, char *argv[])
- 		}
- 	}
- 
--	ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
--
- 	return ret;
- }
-diff --git a/text.h b/text.h
-index bceda52..9858592 100644
---- a/text.h
-+++ b/text.h
-@@ -13,5 +13,4 @@ struct linebuf {
- #define EMPTY_LINEBUF {NULL, 0, 0,}
- void getlines(FILE *, struct linebuf *);
- 
--void concat(FILE *, const char *, FILE *, const char *);
- int linecmp(struct line *, struct line *);
-diff --git a/util.h b/util.h
-index eaad3ce..968a3af 100644
---- a/util.h
-+++ b/util.h
-@@ -64,6 +64,7 @@ int eregcomp(regex_t *, const char *, int);
- 
- /* io */
- ssize_t writeall(int, const void *, size_t);
-+int concat(int, const char *, int, const char *);
- 
- /* misc */
- void enmasse(int, char **, int (*)(const char *, const char *, int));
-diff --git a/xinstall.c b/xinstall.c
-index 5a0e390..3d24a1a 100644
---- a/xinstall.c
-+++ b/xinstall.c
-@@ -2,6 +2,7 @@
- #include <grp.h>
- #include <pwd.h>
- #include <errno.h>
-+#include <fcntl.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -10,7 +11,6 @@
- #include <sys/wait.h>
- 
- #include "util.h"
--#include "text.h"
- 
- static int Dflag = 0;
- static int sflag = 0;
-@@ -61,7 +61,7 @@ static int
- install(const char *s1, const char *s2, int depth)
- {
- 	DIR *dp;
--	FILE *f1, *f2;
-+	int f1, f2;
- 	struct dirent *d;
- 	struct stat st;
- 	ssize_t r;
-@@ -109,23 +109,22 @@ install(const char *s1, const char *s2, int depth)
- 		else if (mknod(s2, (st.st_mode & ~07777) | mode, st.st_rdev) < 0)
- 			eprintf("mknod %s:", s2);
- 	} else {
--		if (!(f1 = fopen(s1, "r")))
--			eprintf("fopen %s:", s1);
--		if (!(f2 = fopen(s2, "w"))) {
-+		if ((f1 = open(s1, O_RDONLY)) < 0)
-+			eprintf("open %s:", s1);
-+		if ((f2 = creat(s2, 0600)) < 0) {
- 			if (unlink(s2) < 0 && errno != ENOENT)
- 				eprintf("unlink %s:", s2);
--			else if (!(f2 = fopen(s2, "w")))
--				eprintf("fopen %s:", s2);
-+			if ((f2 = creat(s2, 0600)) < 0)
-+				eprintf("creat %s:", s2);
- 		}
--		concat(f1, s1, f2, s2);
-+		if (concat(f1, s1, f2, s2) < 0)
-+			exit(1);
- 
--		if (fchmod(fileno(f2), mode) < 0)
-+		if (fchmod(f2, mode) < 0)
- 			eprintf("fchmod %s:", s2);
- 
--		if (fclose(f2) == EOF)
--			eprintf("fclose %s:", s2);
--		if (fclose(f1) == EOF)
--			eprintf("fclose %s:", s1);
-+		close(f1);
-+		close(f2);
- 
- 		if (sflag)
- 			strip(s2);
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0007-cp-Only-call-chmod-with-p-or-a.patch b/core/sbase/patch/0007-cp-Only-call-chmod-with-p-or-a.patch
deleted file mode 100644
index 0fb99426..00000000
--- a/core/sbase/patch/0007-cp-Only-call-chmod-with-p-or-a.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From fe67b456529ace8d45faab2eac8d3f3fe94fca05 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 2 Dec 2016 19:07:44 -0800
-Subject: [PATCH] cp: Only call chmod with -p or -a
-
-Previously, when the destination file was created with fopen, we needed
-to use fchmod to set its permissions.
-
-Now that we pass in the mode to creat, we already get the desired
-behavior of creating the file with the same mode as the source file
-modified by the user's file creation mask.
-
-This fixes the issue where a directory or special file created with
-mkdir/mknod does not end up with the appropriate mode with -p or -a
-(since it may have been narrowed by the umask).
-
-This also allows us to clear the SUID and SGID bits from the mode if the
-chown fails, as specified by POSIX.
----
- libutil/cp.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libutil/cp.c b/libutil/cp.c
-index 8cd0a7d..339c892 100644
---- a/libutil/cp.c
-+++ b/libutil/cp.c
-@@ -134,15 +134,11 @@ cp(const char *s1, const char *s2, int depth)
- 			return 0;
- 		}
- 
--		/* preserve permissions by default */
--		fchmod(f2, st.st_mode);
--
- 		close(f1);
- 		close(f2);
- 	}
- 
- 	if (cp_aflag || cp_pflag) {
--		/* timestamp and owner */
- 		if (!S_ISLNK(st.st_mode)) {
- 			times[0] = st.st_atim;
- 			times[1] = st.st_mtim;
-@@ -151,7 +147,11 @@ cp(const char *s1, const char *s2, int depth)
- 			if (chown(s2, st.st_uid, st.st_gid) < 0) {
- 				weprintf("chown %s:", s2);
- 				cp_status = 1;
--				return 0;
-+				st.st_mode &= ~(S_ISUID | S_ISGID);
-+			}
-+			if (chmod(s2, st.st_mode) < 0) {
-+				weprintf("chmod %s:", s2);
-+				cp_status = 1;
- 			}
- 		} else {
- 			if (lchown(s2, st.st_uid, st.st_gid) < 0) {
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0008-tail-Use-fstat-in-case-file-is-removed.patch b/core/sbase/patch/0008-tail-Use-fstat-in-case-file-is-removed.patch
deleted file mode 100644
index 4bae2d6f..00000000
--- a/core/sbase/patch/0008-tail-Use-fstat-in-case-file-is-removed.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f828ca22f0e81f9e1ce457a4bf609bde785e3c4c Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 30 Nov 2016 02:44:35 -0800
-Subject: [PATCH] tail: Use fstat in case file is removed
-
----
- tail.c | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/tail.c b/tail.c
-index 1ab9d18..ce65a01 100644
---- a/tail.c
-+++ b/tail.c
-@@ -175,8 +175,8 @@ main(int argc, char *argv[])
- 			}
- 			if (many)
- 				printf("%s==> %s <==\n", newline ? "\n" : "", *argv);
--			if (stat(*argv, &st1) < 0)
--				eprintf("stat %s:", *argv);
-+			if (fstat(fd, &st1) < 0)
-+				eprintf("fstat %s:", *argv);
- 			if (!(S_ISFIFO(st1.st_mode) || S_ISREG(st1.st_mode)))
- 				fflag = 0;
- 			newline = 1;
-@@ -193,16 +193,14 @@ main(int argc, char *argv[])
- 			for (;;) {
- 				if (concat(fd, *argv, 1, "<stdout>") < 0)
- 					exit(1);
--				/* ignore error in case file was removed, we continue
--				 * tracking the existing open file descriptor */
--				if (!stat(*argv, &st2)) {
--					if (st2.st_size < st1.st_size) {
--						fprintf(stderr, "%s: file truncated\n", *argv);
--						if (lseek(fd, SEEK_SET, 0) < 0)
--							eprintf("lseek:");
--					}
--					st1 = st2;
-+				if (fstat(fd, &st2) < 0)
-+					eprintf("fstat %s:", *argv);
-+				if (st2.st_size < st1.st_size) {
-+					fprintf(stderr, "%s: file truncated\n", *argv);
-+					if (lseek(fd, SEEK_SET, 0) < 0)
-+						eprintf("lseek:");
- 				}
-+				st1 = st2;
- 				sleep(1);
- 			}
- 		}
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0009-cp-Check-result-of-utimensat.patch b/core/sbase/patch/0009-cp-Check-result-of-utimensat.patch
deleted file mode 100644
index 2b910aa8..00000000
--- a/core/sbase/patch/0009-cp-Check-result-of-utimensat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0adb4dda2587dd82fd43c8e28444cf06464d2b56 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 2 Dec 2016 22:02:14 -0800
-Subject: [PATCH] cp: Check result of utimensat
-
-POSIX says that if duplicating the modification/access times fails, then
-an error should be written to stderr.
----
- libutil/cp.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libutil/cp.c b/libutil/cp.c
-index 339c892..15e4ce5 100644
---- a/libutil/cp.c
-+++ b/libutil/cp.c
-@@ -142,8 +142,10 @@ cp(const char *s1, const char *s2, int depth)
- 		if (!S_ISLNK(st.st_mode)) {
- 			times[0] = st.st_atim;
- 			times[1] = st.st_mtim;
--			utimensat(AT_FDCWD, s2, times, 0);
--
-+			if (utimensat(AT_FDCWD, s2, times, 0) < 0) {
-+				weprintf("utimensat %s:", s2);
-+				cp_status = 1;
-+			}
- 			if (chown(s2, st.st_uid, st.st_gid) < 0) {
- 				weprintf("chown %s:", s2);
- 				cp_status = 1;
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0010-cp-Also-preserve-atime-mtime-for-symlinks.patch b/core/sbase/patch/0010-cp-Also-preserve-atime-mtime-for-symlinks.patch
deleted file mode 100644
index 847f3fd1..00000000
--- a/core/sbase/patch/0010-cp-Also-preserve-atime-mtime-for-symlinks.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d8baa038d186b8ed30d77a23f2f9b42df5dc00bd Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 6 Dec 2016 00:25:42 -0800
-Subject: [PATCH] cp: Also preserve atime/mtime for symlinks
-
----
- libutil/cp.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libutil/cp.c b/libutil/cp.c
-index 15e4ce5..f89319d 100644
---- a/libutil/cp.c
-+++ b/libutil/cp.c
-@@ -139,13 +139,13 @@ cp(const char *s1, const char *s2, int depth)
- 	}
- 
- 	if (cp_aflag || cp_pflag) {
-+		times[0] = st.st_atim;
-+		times[1] = st.st_mtim;
-+		if (utimensat(AT_FDCWD, s2, times, AT_SYMLINK_NOFOLLOW) < 0) {
-+			weprintf("utimensat %s:", s2);
-+			cp_status = 1;
-+		}
- 		if (!S_ISLNK(st.st_mode)) {
--			times[0] = st.st_atim;
--			times[1] = st.st_mtim;
--			if (utimensat(AT_FDCWD, s2, times, 0) < 0) {
--				weprintf("utimensat %s:", s2);
--				cp_status = 1;
--			}
- 			if (chown(s2, st.st_uid, st.st_gid) < 0) {
- 				weprintf("chown %s:", s2);
- 				cp_status = 1;
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0011-tail-Process-bytes-with-c-option-and-add-m-option-fo.patch b/core/sbase/patch/0011-tail-Process-bytes-with-c-option-and-add-m-option-fo.patch
deleted file mode 100644
index d3d37993..00000000
--- a/core/sbase/patch/0011-tail-Process-bytes-with-c-option-and-add-m-option-fo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From f6e3de7b4a9cab4ff2f63a7217fb7d7cb3917657 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 6 Dec 2016 00:45:48 -0800
-Subject: [PATCH] tail: Process bytes with -c option, and add -m option for
- runes
-
-POSIX says that -c specifies a number of bytes, not characters. This
-flag is commonly used by scripts that operate on binary files to things
-like extract a header. Treating the offsets as character offsets will
-break things in mysterious ways.
-
-Instead, add a -m option (chosen to match `wc -m`, which also operates
-on characters) to handle character offsets.
----
- tail.1 |  6 +++---
- tail.c | 29 ++++++++++++++++++++++++-----
- 2 files changed, 27 insertions(+), 8 deletions(-)
-
-diff --git a/tail.1 b/tail.1
-index 433404d..281560d 100644
---- a/tail.1
-+++ b/tail.1
-@@ -7,7 +7,7 @@
- .Sh SYNOPSIS
- .Nm
- .Op Fl f
--.Op Fl c Ar num | Fl n Ar num | Fl Ns Ar num
-+.Op Fl c Ar num | Fl m Ar num | Fl n Ar num | Fl Ns Ar num
- .Op Ar file ...
- .Sh DESCRIPTION
- .Nm
-@@ -20,10 +20,10 @@ is given,
- reads from stdin.
- .Sh OPTIONS
- .Bl -tag -width Ds
--.It Fl c Ar num | Fl n Ar num | Fl Ns Ar num
-+.It Fl c Ar num | Fl m Ar num | Fl n Ar num | Fl Ns Ar num
- Display final
- .Ar num
--characters | lines |
-+bytes | characters | lines |
- lines. If
- .Ar num
- begins with '+'
-diff --git a/tail.c b/tail.c
-index ce65a01..ce3be9d 100644
---- a/tail.c
-+++ b/tail.c
-@@ -26,12 +26,23 @@ dropinit(int fd, const char *fname, size_t count)
- 		goto copy;
- 	count--;  /* numbering starts at 1 */
- 	while (count && (n = read(fd, buf, sizeof(buf))) > 0) {
--		if (mode == 'n') {
-+		switch (mode) {
-+		case 'n':  /* lines */
- 			for (p = buf; count && n > 0; p++, n--) {
- 				if (*p == '\n')
- 					count--;
- 			}
--		} else {
-+			break;
-+		case 'c':  /* bytes */
-+			if (count > n) {
-+				count -= n;
-+			} else {
-+				p = buf + count;
-+				n -= count;
-+				count = 0;
-+			}
-+			break;
-+		case 'm':  /* runes */
- 			for (p = buf; count && n > 0; p += nr, n -= nr, count--) {
- 				nr = charntorune(&r, p, n);
- 				if (!nr) {
-@@ -42,6 +53,7 @@ dropinit(int fd, const char *fname, size_t count)
- 					break;
- 				}
- 			}
-+			break;
- 		}
- 	}
- 	if (count) {
-@@ -90,7 +102,8 @@ taketail(int fd, const char *fname, size_t count)
- 		if (n == 0)
- 			break;
- 		len += n;
--		if (mode == 'n') {
-+		switch (mode) {
-+		case 'n':  /* lines */
- 			/* ignore the last character; if it is a newline, it
- 			 * ends the last line */
- 			for (p = buf + len - 2, left = count; p >= buf; p--) {
-@@ -102,7 +115,11 @@ taketail(int fd, const char *fname, size_t count)
- 					break;
- 				}
- 			}
--		} else {
-+			break;
-+		case 'c':  /* bytes */
-+			p = count < len ? buf + len - count : buf;
-+			break;
-+		case 'm':  /* runes */
- 			for (p = buf + len - 1, left = count; p >= buf; p--) {
- 				/* skip utf-8 continuation bytes */
- 				if ((*p & 0xc0) == 0x80)
-@@ -111,6 +128,7 @@ taketail(int fd, const char *fname, size_t count)
- 				if (!left)
- 					break;
- 			}
-+			break;
- 		}
- 		if (p > buf) {
- 			len -= p - buf;
-@@ -125,7 +143,7 @@ taketail(int fd, const char *fname, size_t count)
- static void
- usage(void)
- {
--	eprintf("usage: %s [-f] [-c num | -n num | -num] [file ...]\n", argv0);
-+	eprintf("usage: %s [-f] [-c num | -m num | -n num | -num] [file ...]\n", argv0);
- }
- 
- int
-@@ -143,6 +161,7 @@ main(int argc, char *argv[])
- 		fflag = 1;
- 		break;
- 	case 'c':
-+	case 'm':
- 	case 'n':
- 		mode = ARGC();
- 		numstr = EARGF(usage());
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0012-concat-Use-fixed-buffer-size-larger-than-BUFSIZ-on-m.patch b/core/sbase/patch/0012-concat-Use-fixed-buffer-size-larger-than-BUFSIZ-on-m.patch
deleted file mode 100644
index b31ecb23..00000000
--- a/core/sbase/patch/0012-concat-Use-fixed-buffer-size-larger-than-BUFSIZ-on-m.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2083459cade962e76d58a65e6c211e3aa9cf6d64 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 7 Dec 2016 23:41:29 -0800
-Subject: [PATCH] concat: Use fixed buffer size (larger than BUFSIZ on musl)
-
----
- libutil/concat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libutil/concat.c b/libutil/concat.c
-index 2e9aa52..461a4cc 100644
---- a/libutil/concat.c
-+++ b/libutil/concat.c
-@@ -6,7 +6,7 @@
- int
- concat(int f1, const char *s1, int f2, const char *s2)
- {
--	char buf[BUFSIZ];
-+	char buf[8192];
- 	ssize_t n;
- 
- 	while ((n = read(f1, buf, sizeof(buf))) > 0) {
--- 
-2.11.0
-
diff --git a/core/sbase/patch/0013-tail-Use-inotify-for-follow-mode.patch b/core/sbase/patch/0013-tail-Use-inotify-for-follow-mode.patch
deleted file mode 100644
index 0465f8bf..00000000
--- a/core/sbase/patch/0013-tail-Use-inotify-for-follow-mode.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d108384953d2bd1e3040ea3dd0bae3d2f68db7a7 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 30 Nov 2016 03:24:25 -0800
-Subject: [PATCH] tail: Use inotify for follow mode
-
----
- tail.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/tail.c b/tail.c
-index ce3be9d..8bc1fe6 100644
---- a/tail.c
-+++ b/tail.c
-@@ -1,4 +1,5 @@
- /* See LICENSE file for copyright and license details. */
-+#include <sys/inotify.h>
- #include <sys/stat.h>
- 
- #include <fcntl.h>
-@@ -152,9 +153,10 @@ main(int argc, char *argv[])
- 	struct stat st1, st2;
- 	int fd;
- 	size_t n = 10;
--	int fflag = 0, ret = 0, newline = 0, many = 0;
-+	int fflag = 0, ret = 0, newline = 0, many = 0, ifd;
- 	char *numstr;
- 	int (*tail)(int, const char *, size_t) = taketail;
-+	struct inotify_event ev;
- 
- 	ARGBEGIN {
- 	case 'f':
-@@ -209,9 +211,15 @@ main(int argc, char *argv[])
- 					close(fd);
- 				continue;
- 			}
-+			if ((ifd = inotify_init()) < 0)
-+				eprintf("inotify_init:");
-+			if (inotify_add_watch(ifd, *argv, IN_MODIFY) < 0)
-+				eprintf("inotify_add_watch:");
- 			for (;;) {
- 				if (concat(fd, *argv, 1, "<stdout>") < 0)
- 					exit(1);
-+				if (read(ifd, &ev, sizeof(ev)) < 0)
-+					eprintf("read <inotify>:");
- 				if (fstat(fd, &st2) < 0)
- 					eprintf("fstat %s:", *argv);
- 				if (st2.st_size < st1.st_size) {
-@@ -220,7 +228,6 @@ main(int argc, char *argv[])
- 						eprintf("lseek:");
- 				}
- 				st1 = st2;
--				sleep(1);
- 			}
- 		}
- 	}
--- 
-2.11.0
-
diff --git a/core/sbase/rev b/core/sbase/rev
deleted file mode 100644
index 45a4fb75..00000000
--- a/core/sbase/rev
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/core/sbase/src b/core/sbase/src
deleted file mode 160000
-Subproject fb11173926bc783bc70b8e848368eaa97915e54
diff --git a/core/sdhcp/gen.rc b/core/sdhcp/gen.rc
deleted file mode 100644
index ca1a180f..00000000
--- a/core/sdhcp/gen.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-cflags\
-	-Wall -Wextra -pedantic '-std=c99' \
-	-D _BSD_SOURCE
-
-exe sdhcp sdhcp.c util/eprintf.c
-file bin/sdhcp '$outdir'/sdhcp 755
-file share/man/man1/sdhcp.1 '$srcdir'/sdhcp.1 644
-
-fetch git
diff --git a/core/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch b/core/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch
deleted file mode 100644
index a26237db..00000000
--- a/core/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 627a4c7b6869a4ba2b15308355082f39d2263b40 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 11 Dec 2016 00:14:16 -0800
-Subject: [PATCH] Convert cid to char * for strlcpy
-
----
- sdhcp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sdhcp.c b/sdhcp.c
-index 5f829ad..c5f986a 100644
---- a/sdhcp.c
-+++ b/sdhcp.c
-@@ -466,7 +466,7 @@ main(int argc, char *argv[])
- 	if (argc)
- 		ifname = argv[0]; /* interface name */
- 	if (argc >= 2)
--		strlcpy(cid, argv[1], sizeof(cid)); /* client-id */
-+		strlcpy((char *)cid, argv[1], sizeof(cid)); /* client-id */
- 
- 	memset(&ifreq, 0, sizeof(ifreq));
- 	signal(SIGALRM, nop);
--- 
-2.11.0
-
diff --git a/core/sdhcp/rev b/core/sdhcp/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/sdhcp/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/sdhcp/src b/core/sdhcp/src
deleted file mode 160000
-Subproject 450beea4e88ab7f80206741f18f0d5539ae60b4
diff --git a/core/sinit/config.h b/core/sinit/config.h
deleted file mode 100644
index 3d2da6fc..00000000
--- a/core/sinit/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-static char *const rcinitcmd[]     = { "/etc/rc.init", NULL };
-static char *const rcrebootcmd[]   = { "/etc/rc.shutdown", "reboot", NULL };
-static char *const rcpoweroffcmd[] = { "/etc/rc.shutdown", "poweroff", NULL };
diff --git a/core/sinit/gen.rc b/core/sinit/gen.rc
deleted file mode 100644
index d45f6720..00000000
--- a/core/sinit/gen.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-cflags -Wall -Wextra -I '$dir'
-
-exe sinit sinit.c
-file bin/sinit '$outdir'/sinit 755
-file share/man/man8/sinit.8 '$srcdir'/sinit.8 644
-
-
-fetch git
diff --git a/core/sinit/rev b/core/sinit/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/sinit/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/sinit/src b/core/sinit/src
deleted file mode 160000
-Subproject 731f65fc82afcd474f4c682f9f0069e5c80c86d
diff --git a/core/skeleton/gen.rc b/core/skeleton/gen.rc
deleted file mode 100644
index 522d3228..00000000
--- a/core/skeleton/gen.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-dir bin 755
-dir boot 755
-dir dev 755
-dir etc 755
-dir home 755
-dir mnt 755
-dir proc 755
-dir root 700
-dir run 755
-dir sys 755
-dir tmp 755
-dir var 755
-dir var/empty 755
-dir var/log 755
-sym usr/bin ../bin
-
-file .gitignore '$dir'/gitignore 644
diff --git a/core/skeleton/gitignore b/core/skeleton/gitignore
deleted file mode 100644
index 90c5afa2..00000000
--- a/core/skeleton/gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/etc
-/home
-/mnt
-/proc
-/root
-/run
-/src
-/sys
-/tmp
-/var
diff --git a/core/tz/gen.rc b/core/tz/gen.rc
deleted file mode 100644
index b2a9377e..00000000
--- a/core/tz/gen.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-cflags -I '$dir'
-
-exe zic zic.c
-
-rule zic '$zic -d $outdir/zoneinfo $in'
-file bin/zic '$outdir'/zic 755
-
-tzdata=(\
-	africa\
-	antarctica\
-	asia\
-	australasia\
-	europe\
-	northamerica\
-	southamerica\
-	pacificnew\
-	etcetera\
-	backward\
-	systemv\
-	factory\
-)
-build '$outdir'/tzdata.index awk '$srcdir'/$tzdata '|' scripts/hash.rc '$dir/tzdata.awk' ; with\
-	expr '-f $dir/tzdata.awk out=$outdir/zoneinfo repo=$builddir/$repo.git'
-index_inputs=($index_inputs '$outdir'/tzdata.index)
-
-fetch git
diff --git a/core/tz/rev b/core/tz/rev
deleted file mode 100644
index 1e8b3149..00000000
--- a/core/tz/rev
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/core/tz/src b/core/tz/src
deleted file mode 160000
-Subproject eeff212d0f2b94a8c08d7ce2e1ff2278c027936
diff --git a/core/tz/tzdata.awk b/core/tz/tzdata.awk
deleted file mode 100644
index 6e24a588..00000000
--- a/core/tz/tzdata.awk
+++ /dev/null
@@ -1,26 +0,0 @@
-# usage: awk -f tzdata.awk repo=out/root.git out=out/core/tz/zoneinfo [file...]
-
-function run(cmd) {
-	status = system(cmd)
-	if (status != 0)
-		exit status
-}
-
-BEGIN {
-	cmdfmt = "rc ./scripts/hash.rc %s %s share/zoneinfo/%s %s"
-}
-
-FNR == 1 {
-	run(sprintf("zic -d %s %s", out, FILENAME))
-}
-
-$1 == "Link" {
-	s = $3
-	gsub(/[^\/]+/, "..", s)
-	s = substr(s, 1, length(s) - 2) $2
-	run(sprintf(cmdfmt, repo, 120000, $3, s))
-}
-
-$1 == "Zone" {
-	run(sprintf(cmdfmt, repo, 100644, $2, out "/" $2))
-}
diff --git a/core/tz/version.h b/core/tz/version.h
deleted file mode 100644
index 76f806c4..00000000
--- a/core/tz/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-static char const PKGVERSION[]="(tzcode) ";
-static char const TZVERSION[]="2016j";
-static char const REPORT_BUGS_TO[]="tz@iana.org";
diff --git a/core/ubase/config.h b/core/ubase/config.h
deleted file mode 100644
index c5d38cde..00000000
--- a/core/ubase/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#define ENV_SUPATH	"/bin"
-#define ENV_PATH	"/bin"
-#define PW_CIPHER	"$6$"	/* SHA-512 */
-#undef UTMP_PATH
-#define UTMP_PATH	"/run/utmp"
-#undef BTMP_PATH
-#define BTMP_PATH	"/var/log/btmp"
-#undef WTMP_PATH
-#define WTMP_PATH	"/var/log/wtmp"
diff --git a/core/ubase/gen.rc b/core/ubase/gen.rc
deleted file mode 100644
index 94c2b2e9..00000000
--- a/core/ubase/gen.rc
+++ /dev/null
@@ -1,96 +0,0 @@
-cflags\
-	'-std=c99' -pedantic\
-	-Wall -Wno-maybe-uninitialized -Wno-overflow\
-	-D _GNU_SOURCE\
-	-D '_XOPEN_SOURCE=700' \
-	-D '_FILE_OFFSET_BITS=64' \
-	-I '$dir'
-
-lib libutil.a libutil/^(\
-	agetcwd.c\
-	agetline.c\
-	apathmax.c\
-	concat.c\
-	ealloc.c\
-	eprintf.c\
-	estrtol.c\
-	estrtoul.c\
-	explicit_bzero.c\
-	passwd.c\
-	proc.c\
-	putword.c\
-	recurse.c\
-	strlcat.c\
-	strlcpy.c\
-	strtonum.c\
-	tty.c\
-)
-
-fn x {
-	if(~ $1 -m) {
-		mode=$2
-		shift 2
-	}
-	if not mode=755
-	exe=$1
-	shift
-	exe $exe $exe.c libutil.a
-	file bin/$exe '$outdir'/$exe $mode
-	if(~ $#* 1) file share/man/man$1/$exe.$1 '$srcdir'/$exe.$1 644
-	status=()
-}
-
-x chvt 1
-x clear 1
-x ctrlaltdel 8
-x dd 1
-x df 1
-x dmesg 1
-x eject 1
-x fallocate 1
-x free 1
-x freeramdisk 8
-x fsfreeze 8
-x getty 8
-x halt 8
-x hwclock 8
-x id 1
-x insmod 8
-x killall5 8
-x last
-x lastlog 8
-x login 1
-x lsmod 8
-x lsusb 8
-x mesg 1
-x mknod 1
-x mkswap 8
-x mount 8
-x mountpoint 1
-x nologin 8
-x pagesize 1
-x -m 4755 passwd 1
-x pidof 1
-x pivot_root 8
-x ps 1
-x pwdx 1
-x readahead 8
-x respawn 1
-x rmmod 8
-x stat 1
-x stty
-x -m 4755 su 1
-x swaplabel 8
-x swapoff 8
-x swapon 8
-x switch_root 8
-x sysctl 8
-x truncate 1
-x umount 8
-x unshare 1
-x uptime 1
-x vtallow 1
-x watch 1
-x who 1
-
-fetch git
diff --git a/core/ubase/patch/0001-passwd-Use-a-salt-when-encrypting-passwords.patch b/core/ubase/patch/0001-passwd-Use-a-salt-when-encrypting-passwords.patch
deleted file mode 100644
index 4c349432..00000000
--- a/core/ubase/patch/0001-passwd-Use-a-salt-when-encrypting-passwords.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 00b4ff3b70fd367c0f757943c3d557ffd42c477d Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 20 Oct 2015 20:23:50 -0700
-Subject: [PATCH] passwd: Use a salt when encrypting passwords
-
----
- passwd.c | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/passwd.c b/passwd.c
-index 3ea3dd1..d062482 100644
---- a/passwd.c
-+++ b/passwd.c
-@@ -2,12 +2,14 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/syscall.h>
- 
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
- #include <pwd.h>
- #include <shadow.h>
-+#include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -128,6 +130,25 @@ cleanup:
- }
- 
- static void
-+gensalt(char *s)
-+{
-+	static const char b64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-+	uint8_t buf[12];
-+	uint32_t n;
-+	int i;
-+
-+	if (syscall(SYS_getrandom, buf, sizeof(buf), 0) < 0)
-+		eprintf("getrandom:");
-+	for (i = 0; i < 12; i += 3) {
-+		n = buf[i] << 16 | buf[i+1] << 8 | buf[i+2];
-+		*s++ = b64[n%64]; n /= 64;
-+		*s++ = b64[n%64]; n /= 64;
-+		*s++ = b64[n%64]; n /= 64;
-+		*s++ = b64[n];
-+	}
-+}
-+
-+static void
- usage(void)
- {
- 	eprintf("usage: %s [username]\n", argv0);
-@@ -137,7 +158,8 @@ int
- main(int argc, char *argv[])
- {
- 	char *cryptpass1 = NULL, *cryptpass2 = NULL, *cryptpass3 = NULL;
--	char *inpass, *p, *salt = PW_CIPHER, *prevhash = NULL;
-+	char saltbuf[32] = PW_CIPHER;
-+	char *inpass, *p, *salt, *prevhash = NULL;
- 	struct passwd *pw;
- 	struct spwd *spw = NULL;
- 	FILE *fp = NULL;
-@@ -207,6 +229,9 @@ main(int argc, char *argv[])
- 		eprintf("incorrect password\n");
- 
- newpass:
-+	gensalt(saltbuf + strlen(saltbuf));
-+	salt = saltbuf;
-+
- 	inpass = getpass("Enter new password: ");
- 	if (!inpass)
- 		eprintf("getpass:");
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0002-mount-Don-t-pass-no-auto-to-kernel.patch b/core/ubase/patch/0002-mount-Don-t-pass-no-auto-to-kernel.patch
deleted file mode 100644
index bddcb0fb..00000000
--- a/core/ubase/patch/0002-mount-Don-t-pass-no-auto-to-kernel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8dee43a5ff31bbe2b463ca66b168202501a14a92 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 12 Jun 2016 20:51:43 -0700
-Subject: [PATCH] mount: Don't pass {,no}auto to kernel
-
----
- mount.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mount.c b/mount.c
-index 2eb175c..4ce6680 100644
---- a/mount.c
-+++ b/mount.c
-@@ -29,6 +29,7 @@ struct {
- 	{ "dirsync",    NULL,           MS_DIRSYNC     },
- 	{ "nodev",      "dev",          MS_NODEV       },
- 	{ "noatime",    "atime",        MS_NOATIME     },
-+	{ "noauto",     "auto",         0              },
- 	{ "nodiratime", "diratime",     MS_NODIRATIME  },
- 	{ "noexec",     "exec",         MS_NOEXEC      },
- 	{ "nosuid",     "suid",         MS_NOSUID      },
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0003-Add-stty-1.patch b/core/ubase/patch/0003-Add-stty-1.patch
deleted file mode 100644
index 7f9876a6..00000000
--- a/core/ubase/patch/0003-Add-stty-1.patch
+++ /dev/null
@@ -1,811 +0,0 @@
-From a5fa7dc291bf970a05e113434cd847e03d61e826 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@kth.se>
-Date: Mon, 28 Mar 2016 18:52:07 +0200
-Subject: [PATCH] Add stty(1)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mattias Andrée <maandree@kth.se>
----
- Makefile |   1 +
- TODO     |   1 +
- stty.c   | 762 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 764 insertions(+)
- create mode 100644 stty.c
-
-diff --git a/Makefile b/Makefile
-index 453607c..4b872ae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -75,6 +75,7 @@ BIN = \
- 	respawn           \
- 	rmmod             \
- 	stat              \
-+	stty              \
- 	su                \
- 	swaplabel         \
- 	swapoff           \
-diff --git a/TODO b/TODO
-index 21f5c20..5cdc351 100644
---- a/TODO
-+++ b/TODO
-@@ -23,6 +23,7 @@ rfkill
- rmgroup
- rmuser
- setcap
-+stty manpage
- tabs
- taskset
- top
-diff --git a/stty.c b/stty.c
-new file mode 100644
-index 0000000..c65748a
---- /dev/null
-+++ b/stty.c
-@@ -0,0 +1,762 @@
-+/* See LICENSE file for copyright and license details. */
-+#include <ctype.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include <stdarg.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <unistd.h>
-+
-+#include "util.h"
-+
-+/*
-+ * Petty POSIX violations:
-+ * 
-+ * -  XBD 12.2 is not honoured precisely. This is for
-+ *    convenience and compatibility with other implementations.
-+ */
-+
-+#define CC_MAX  255
-+
-+static int output_size_requested = 0;
-+static int output_speed_requested = 0;
-+static int drain_requested = 1;
-+
-+static void sane(int, struct termios *);
-+static void setwinsize(long, long);
-+static void ispeed(char *, struct termios *);
-+static void ospeed(char *, struct termios *);
-+
-+static void
-+raw(int unset, struct termios *m)
-+{
-+	if (!unset) {
-+		m->c_iflag = 0;
-+		m->c_lflag &= ~XCASE;
-+		m->c_cc[VMIN] = 1;
-+		m->c_cc[VTIME] = 0;
-+	} else {
-+		m->c_iflag |= BRKINT | IGNPAR | ISTRIP | ICRNL | IXON;
-+	}
-+}
-+
-+static void
-+evenp(int unset, struct termios *m)
-+{
-+	m->c_oflag &= ~CSIZE;
-+	m->c_oflag &= ~(unset ? PARENB : PARODD);
-+	m->c_oflag |= unset ? CS8 : (CS7 | PARENB);
-+}
-+
-+
-+static void
-+dec(int unset, struct termios *m)
-+{
-+	m->c_cc[VINTR] = CINTR;
-+	m->c_cc[VKILL] = CKILL;
-+	m->c_cc[VERASE] = CERASE;
-+	(void) unset;
-+}
-+
-+static void
-+ek(int unset, struct termios *m)
-+{
-+	m->c_cc[VKILL] = CKILL;
-+	m->c_cc[VERASE] = CERASE;
-+	(void) unset;
-+}
-+
-+static void
-+nl(int unset, struct termios *m)
-+{
-+	if (unset) {
-+		m->c_iflag &= ~(INLCR | IGNCR);
-+		m->c_oflag &= ~(OCRNL | ONLRET);
-+	}
-+}
-+
-+static void
-+oddp(int unset, struct termios *m)
-+{
-+	m->c_oflag &= ~CSIZE;
-+	m->c_oflag &= ~(unset ? PARENB : 0);
-+	m->c_oflag |= unset ? CS8 : (CS7 | PARODD | PARENB);
-+}
-+
-+static void drain(int unset, struct termios *m)  { drain_requested = !unset; (void) m; }
-+static void cooked(int unset, struct termios *m) { raw(!unset, m); }
-+static void pass8(int unset, struct termios *m)  { m->c_cflag &= ~CSIZE, m->c_cflag |= unset ? CS7 : CS8; }
-+static void size(int unset, struct termios *m)   { output_size_requested = 1; (void) m; (void) unset; }
-+static void speed(int unset, struct termios *m)  { output_speed_requested = 1; (void) m; (void) unset; }
-+static void tabs(int unset, struct termios *m)   { m->c_oflag &= ~TABDLY, m->c_oflag |= unset ? TAB3 : TAB0; }
-+static void cols(char *arg, struct termios *m)   { setwinsize(-1, estrtonum(arg, 0, USHRT_MAX)); (void) m; }
-+static void line(char *arg, struct termios *m)   { m->c_line = estrtonum(arg, 0, 255); }
-+static void min(char *arg, struct termios *m)    { m->c_cc[VMIN] = estrtonum(arg, 0, CC_MAX); }
-+static void rows(char *arg, struct termios *m)   { setwinsize(estrtonum(arg, 0, USHRT_MAX), -1); (void) m; }
-+static void stime(char *arg, struct termios *m)  { m->c_cc[VTIME] = estrtonum(arg, 0, CC_MAX); }
-+
-+enum type { CTRL, IN, OUT, LOCAL, COMB, SPEC };
-+enum {
-+	BOOL = 1,
-+	DUP = 2,
-+	SANE = 4,
-+	INSANE = 8,
-+	CBREAK = 16,
-+	DECCTLQ = 32,
-+	LCASE = 64,
-+	PASS8 = 128,
-+	LITOUT = 256,
-+	CRT = 1024,
-+	DEC = 2048,
-+	NL = 4096,
-+	COOKED = 8192
-+};
-+
-+struct mode {
-+	const char *op;
-+	enum type type;
-+	tcflag_t set;
-+	tcflag_t clear;
-+	void (*fun)(int, struct termios *);
-+	int flags;
-+};
-+
-+struct key {
-+	const char *op;
-+	size_t index;
-+	cc_t sanevalue;
-+};
-+
-+struct intvalued {
-+	const char *op;
-+	void (*fun)(char *, struct termios *);
-+};
-+
-+struct speed {
-+	const char *str;
-+	speed_t speed;
-+};
-+
-+static const struct mode modes[] = {
-+	{"clocal",   CTRL,  CLOCAL,  0,       0,      BOOL},
-+	{"cmspar",   CTRL,  CMSPAR,  0,       0,      BOOL},
-+	{"cread",    CTRL,  CREAD,   0,       0,      BOOL | SANE},
-+	{"crtscts",  CTRL,  CRTSCTS, 0,       0,      BOOL},
-+	{"cs5",      CTRL,  CS5,     CSIZE,   0,      0},
-+	{"cs6",      CTRL,  CS6,     CSIZE,   0,      0},
-+	{"cs7",      CTRL,  CS7,     CSIZE,   0,      0},
-+	{"cs8",      CTRL,  CS8,     CSIZE,   0,      0},
-+	{"cstopb",   CTRL,  CSTOPB,  0,       0,      BOOL},
-+	{"hup",      CTRL,  HUPCL,   0,       0,      BOOL | DUP},
-+	{"hupcl",    CTRL,  HUPCL,   0,       0,      BOOL},
-+	{"parenb",   CTRL,  PARENB,  0,       0,      BOOL | PASS8 | LITOUT},
-+	{"parodd",   CTRL,  PARODD,  0,       0,      BOOL},
-+
-+	{"brkint",   IN,    BRKINT,  0,       0,      BOOL | SANE},
-+	{"icrnl",    IN,    ICRNL,   0,       0,      BOOL | SANE | NL},
-+	{"ignbrk",   IN,    IGNBRK,  0,       0,      BOOL | INSANE},
-+	{"igncr",    IN,    IGNCR,   0,       0,      BOOL | INSANE},
-+	{"ignpar",   IN,    IGNPAR,  0,       0,      BOOL},
-+	{"imaxbel",  IN,    IMAXBEL, 0,       0,      BOOL | SANE},
-+	{"inlcr",    IN,    INLCR,   0,       0,      BOOL | INSANE},
-+	{"inpck",    IN,    INPCK,   0,       0,      BOOL},
-+	{"istrip",   IN,    ISTRIP,  0,       0,      BOOL | PASS8 | LITOUT},
-+	{"iuclc",    IN,    IUCLC,   0,       0,      BOOL | INSANE | LCASE},
-+	{"iutf8",    IN,    IUTF8,   0,       0,      BOOL | SANE},
-+	{"ixany",    IN,    IXANY,   0,       0,      BOOL | INSANE | DECCTLQ},
-+	{"ixoff",    IN,    IXOFF,   0,       0,      BOOL | INSANE},
-+	{"ixon",     IN,    IXON,    0,       0,      BOOL},
-+	{"parmrk",   IN,    PARMRK,  0,       0,      BOOL},
-+	{"tandem",   IN,    IXOFF,   0,       0,      BOOL | DUP},
-+
-+	{"bs0",      OUT,   BS0,     BSDLY,   0,      SANE},
-+	{"bs1",      OUT,   BS1,     BSDLY,   0,      INSANE},
-+	{"cr0",      OUT,   CR0,     CRDLY,   0,      SANE},
-+	{"cr1",      OUT,   CR1,     CRDLY,   0,      INSANE},
-+	{"cr2",      OUT,   CR2,     CRDLY,   0,      INSANE},
-+	{"cr3",      OUT,   CR3,     CRDLY,   0,      INSANE},
-+	{"ff0",      OUT,   FF0,     FFDLY,   0,      SANE},
-+	{"ff1",      OUT,   FF1,     FFDLY,   0,      INSANE},
-+	{"nl0",      OUT,   NL0,     NLDLY,   0,      SANE},
-+	{"nl1",      OUT,   NL1,     NLDLY,   0,      INSANE},
-+	{"ocrnl",    OUT,   OCRNL,   0,       0,      BOOL | INSANE},
-+	{"ofdel",    OUT,   OFDEL,   0,       0,      BOOL | INSANE},
-+	{"ofill",    OUT,   OFILL,   0,       0,      BOOL | INSANE},
-+	{"olcuc",    OUT,   OLCUC,   0,       0,      BOOL | INSANE | LCASE},
-+	{"onlcr",    OUT,   ONLCR,   0,       0,      BOOL | SANE | NL},
-+	{"onlret",   OUT,   ONLRET,  0,       0,      BOOL | INSANE},
-+	{"onocr",    OUT,   ONOCR,   0,       0,      BOOL | INSANE},
-+	{"opost",    OUT,   OPOST,   0,       0,      BOOL | SANE | LITOUT | COOKED},
-+	{"tab0",     OUT,   TAB0,    TABDLY,  0,      SANE},
-+	{"tab1",     OUT,   TAB1,    TABDLY,  0,      INSANE},
-+	{"tab2",     OUT,   TAB2,    TABDLY,  0,      INSANE},
-+	{"tab3",     OUT,   TAB3,    TABDLY,  0,      INSANE},
-+	{"vt0",      OUT,   VT0,     VTDLY,   0,      SANE},
-+	{"vt1",      OUT,   VT1,     VTDLY,   0,      INSANE},
-+
-+	{"crterase", LOCAL, ECHOE,   0,       0,      BOOL | DUP},
-+	{"crtkill",  LOCAL, ECHOKE,  0,       0,      BOOL | DUP},
-+	{"ctlecho",  LOCAL, ECHOCTL, 0,       0,      BOOL | DUP},
-+	{"echo",     LOCAL, ECHO,    0,       0,      BOOL | SANE},
-+	{"echoctl",  LOCAL, ECHOCTL, 0,       0,      BOOL | SANE | CRT | DEC},
-+	{"echoe",    LOCAL, ECHOE,   0,       0,      BOOL | SANE | CRT | DEC},
-+	{"echok",    LOCAL, ECHOK,   0,       0,      BOOL | SANE},
-+	{"echoke",   LOCAL, ECHOKE,  0,       0,      BOOL | SANE | CRT | DEC},
-+	{"echonl",   LOCAL, ECHONL,  0,       0,      BOOL | INSANE},
-+	{"echoprt",  LOCAL, ECHOPRT, 0,       0,      BOOL | INSANE},
-+	{"extproc",  LOCAL, EXTPROC, 0,       0,      BOOL | INSANE},
-+	{"flusho",   LOCAL, FLUSHO,  0,       0,      BOOL | INSANE},
-+	{"icanon",   LOCAL, ICANON,  0,       0,      BOOL | SANE | CBREAK | COOKED},
-+	{"iexten",   LOCAL, IEXTEN,  0,       0,      BOOL | SANE},
-+	{"isig",     LOCAL, ISIG,    0,       0,      BOOL | SANE | COOKED},
-+	{"noflsh",   LOCAL, NOFLSH,  0,       0,      BOOL | INSANE},
-+	{"prterase", LOCAL, ECHOPRT, 0,       0,      BOOL | DUP},
-+	{"tostop",   LOCAL, TOSTOP,  0,       0,      BOOL | INSANE},
-+	{"xcase",    LOCAL, XCASE,   0,       0,      BOOL | INSANE | LCASE},
-+
-+	{"cbreak",   COMB,  0,       CBREAK,  0,      BOOL | DUP},
-+	{"cooked",   COMB,  COOKED,  0,       cooked, BOOL | DUP},
-+	{"crt",      COMB,  CRT,     0,       0,      DUP},
-+	{"dec",      COMB,  DEC,     DECCTLQ, dec,    DUP},
-+	{"decctlq",  COMB,  0,       DECCTLQ, 0,      BOOL | DUP},
-+	{"ek",       COMB,  0,       0,       ek,     DUP},
-+	{"evenp",    COMB,  0,       0,       evenp,  BOOL | DUP},
-+	{"LCASE",    COMB,  LCASE,   0,       0,      BOOL | DUP},
-+	{"lcase",    COMB,  LCASE,   0,       0,      BOOL | DUP},
-+	{"litout",   COMB,  0,       LITOUT,  pass8,  BOOL | DUP},
-+	{"nl",       COMB,  0,       NL,      nl,     BOOL | DUP},
-+	{"oddp",     COMB,  0,       0,       oddp,   BOOL | DUP},
-+	{"parity",   COMB,  0,       0,       evenp,  BOOL | DUP},
-+	{"pass8",    COMB,  0,       PASS8,   pass8,  BOOL | DUP},
-+	{"raw",      COMB,  0,       COOKED,  raw,    BOOL | DUP},
-+	{"sane",     COMB,  SANE,    INSANE,  sane,   DUP},
-+	{"tabs",     COMB,  0,       0,       tabs,   BOOL | DUP},
-+
-+	{"size",     SPEC,  0,       0,       size,   DUP},
-+	{"speed",    SPEC,  0,       0,       speed,  DUP},
-+	{"drain",    SPEC,  0,       0,       drain,  BOOL | DUP},
-+
-+	{0, 0, 0, 0, 0, 0}
-+};
-+
-+static const struct key keys[] = {
-+	{"discard", VDISCARD, CDISCARD},
-+	{"eof",     VEOF,     CEOF},
-+	{"eol",     VEOL,     CEOL},
-+	{"eol2",    VEOL2,    _POSIX_VDISABLE},
-+	{"erase",   VERASE,   CERASE},
-+	{"intr",    VINTR,    CINTR},
-+	{"kill",    VKILL,    CKILL},
-+	{"lnext",   VLNEXT,   CLNEXT},
-+	{"quit",    VQUIT,    CQUIT},
-+	{"rprnt",   VREPRINT, CRPRNT},
-+	{"start",   VSTART,   CSTART},
-+	{"stop",    VSTOP,    CSTOP},
-+	{"susp",    VSUSP,    CSUSP},
-+	{"swtch",   VSWTC,    _POSIX_VDISABLE},
-+	{"werase",  VWERASE,  CWERASE},
-+	{0, 0, 0}
-+};
-+
-+static const struct intvalued ints[] = {
-+	{"cols",    cols},
-+	{"columns", cols},
-+	{"line",    line},
-+	{"min",     min},
-+	{"rows",    rows},
-+	{"time",    stime},
-+	{"ispeed",  ispeed},
-+	{"ospeed",  ospeed},
-+	{0, 0}
-+};
-+
-+#define B(baud) {#baud, B##baud}
-+static const struct speed speeds[] = {
-+	B(0),       B(50),      B(75),      B(110),     B(134),     B(150),     B(200),     B(300),
-+        B(600),     B(1200),    B(1800),    B(2400),    B(4800),    B(9600),    B(19200),   B(38400),
-+        B(57600),   B(115200),  B(230400),  B(460800),  B(500000),  B(576000),  B(921600),  B(1000000),
-+        B(1152000), B(1500000), B(2000000), B(2500000), B(3000000), B(3500000), B(4000000),
-+	{"134.5", B134},
-+	{"exta",  B19200},
-+	{"extb",  B38400},
-+	{0, 0}
-+};
-+#undef B
-+
-+static void
-+sane(int unset, struct termios *m)
-+{
-+	const struct key *op = keys;
-+	for (; op->op; op++)
-+		m->c_cc[op->index] = op->sanevalue;
-+	m->c_cc[VMIN] = 1;
-+	m->c_cc[VTIME] = 0;
-+	(void) unset;
-+}
-+
-+static int
-+isxnumber(char* str)
-+{
-+	if (!*str)
-+		return 0;
-+	for (; *str; str++)
-+		if (!isxdigit(*str))
-+			return 0;
-+	return 1;
-+}
-+
-+static void
-+decodehex(char *dest, char* src)
-+{
-+	while (*src) {
-+		char hi = *src++;
-+		char lo = *src++;
-+		hi = (hi & 15) + 9 * !isdigit(hi);
-+		lo = (lo & 15) + 9 * !isdigit(lo);
-+		*dest++ = (hi << 4) | lo;
-+	}
-+}
-+
-+static void
-+setwinsize(long y, long x)
-+{
-+	struct winsize winsize;
-+	if (ioctl(STDIN_FILENO, TIOCGWINSZ, &winsize))
-+		eprintf("TIOCGWINSZ <stdin>:");
-+	if (y >= 0)
-+		winsize.ws_row = y;
-+	if (x >= 0)
-+		winsize.ws_col = x;
-+	if (ioctl(STDIN_FILENO, TIOCSWINSZ, &winsize))
-+		eprintf("TIOCSWINSZ <stdin>:");
-+}
-+
-+static void
-+setoperand_mode(int unset, const struct mode *op, struct termios *mode)
-+{
-+	tcflag_t *bitsp = 0;
-+
-+	switch (op->type) {
-+	case CTRL:  bitsp = &mode->c_cflag; break;
-+	case IN:    bitsp = &mode->c_iflag; break;
-+	case OUT:   bitsp = &mode->c_oflag; break;
-+	case LOCAL: bitsp = &mode->c_lflag; break;
-+	case SPEC:  break;
-+	default:    abort();
-+	}
-+
-+	if (bitsp) {
-+		*bitsp &= ~op->clear;
-+		if (!unset)
-+			*bitsp |= op->set;
-+		else
-+			*bitsp &= ~op->set;
-+	}
-+
-+	if (op->fun)
-+		op->fun(unset, mode);
-+}
-+
-+static int
-+parseoperand_mode(char *arg, struct termios *mode)
-+{
-+	const struct mode *op = modes;
-+	const struct mode *op_proper;
-+	int unset = *arg == '-';
-+	int flags_set, flags_unset;
-+
-+	arg += unset;
-+	while (op->op && strcmp(arg, op->op))
-+		op++;
-+	if (!op->op)
-+		return -1;
-+	if (unset && !(op->flags & BOOL))
-+		return -1;
-+
-+	switch (op->type) {
-+        case CTRL:
-+        case IN:
-+        case OUT:
-+        case LOCAL:
-+        case SPEC:
-+		setoperand_mode(unset, op, mode);
-+		return 0;
-+        case COMB:
-+		break;
-+        default:
-+		abort();
-+	}
-+
-+	flags_set = (int)(op->set);
-+	flags_unset = (int)(op->clear);
-+	op_proper = op;
-+
-+	if (flags_unset || flags_set) {
-+		for (op = modes; op->op; op++) {
-+			if (op->type == COMB)
-+				continue;
-+			if (flags_unset && (op->flags & flags_unset))
-+				setoperand_mode(!unset, op, mode);
-+			if (flags_set && (op->flags & flags_set))
-+				setoperand_mode(unset, op, mode);
-+		}
-+	}
-+
-+	if (op_proper->fun)
-+		op_proper->fun(unset, mode);
-+
-+	return 0;
-+}
-+
-+static long long
-+estrtonum_radix(const char *numstr, long long minval, long long maxval, int radix)
-+{
-+	long long ll = 0;
-+	char *ep;
-+	errno = 0;
-+	ll = strtoll(numstr, &ep, radix);
-+	if (numstr == ep || *ep != '\0')
-+		eprintf("strtoll %s: invalid\n", numstr);
-+	else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
-+		eprintf("strtoll %s: too small\n", numstr);
-+	else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
-+		eprintf("strtoll %s: too large\n", numstr);
-+	return ll;
-+}
-+
-+static int
-+parseoperand_key(char *arg0, char *arg1, struct termios *mode)
-+{
-+	const struct key *op = keys;
-+	cc_t value;
-+
-+	while (op->op && strcmp(arg0, op->op))
-+		op++;
-+	if (!op->op)
-+		return -1;
-+
-+	if (!arg1)
-+		eprintf("missing argument for operand: %s\n", arg0);
-+
-+	if (!strcmp(arg1, "^-") || !strcmp(arg1, "undef"))
-+		value = _POSIX_VDISABLE;
-+	else if (!strcmp(arg1, "^?"))
-+		value = 127;
-+	else if (!arg1[0] || !arg1[1])
-+		value = arg1[0];
-+	else if (arg1[0] == '^')
-+		value = (cc_t)(arg1[1]) & ~0x60;
-+	else if (strstr(arg1, "0x") == arg1)
-+		value = estrtonum_radix(arg1 + 2, 0, CC_MAX, 16);
-+	else if (arg1[0] == '0' && arg1[1])
-+		value = estrtonum_radix(arg1 + 1, 0, CC_MAX, 8);
-+	else
-+		value = estrtonum_radix(arg1 + 0, 0, CC_MAX, 10);
-+
-+	mode->c_cc[op->index] = value;
-+	return 0;
-+}
-+
-+static int
-+parseoperand_int(char *arg0, char *arg1, struct termios *mode)
-+{
-+	const struct intvalued *op = ints;
-+
-+	while (op->op && strcmp(arg0, op->op))
-+		op++;
-+	if (!op->op)
-+		return -1;
-+
-+	if (!arg1)
-+		eprintf("missing argument for operand: %s\n", arg0);
-+
-+	op->fun(arg1, mode);
-+	return 0;
-+}
-+
-+static const char *
-+baudtostr(speed_t baud)
-+{
-+	const struct speed *speed = speeds;
-+	while (speed->str && speed->speed != baud)
-+		speed++;
-+	return speed->str ? speed->str : "0";
-+}
-+
-+static int
-+parsespeed(char *arg, struct speed *ret)
-+{
-+	const struct speed *speed = speeds;
-+	while (speed->str && strcmp(arg, speed->str))
-+		speed++;
-+	if (!speed->str)
-+		return -1;
-+	*ret = *speed;
-+	return 0;
-+}
-+
-+static void
-+eparsespeed(char *arg, struct speed *ret)
-+{
-+	if (parsespeed(arg, ret))
-+		eprintf("invalid speed parameter: %s\n", arg);
-+}
-+
-+static void
-+ispeed(char *arg, struct termios *m)
-+{
-+	struct speed speed;
-+	eparsespeed(arg, &speed);
-+	if (cfsetispeed(m, speed.speed))
-+		eprintf("cfsetispeed %s:", speed.str);
-+}
-+
-+static void
-+ospeed(char *arg, struct termios *m)
-+{
-+	struct speed speed;
-+	eparsespeed(arg, &speed);
-+	if (cfsetospeed(m, speed.speed))
-+		eprintf("cfsetospeed %s:", speed.str);
-+}
-+
-+static void
-+printtoken(const char *fmt, ...)
-+{
-+	static size_t width = 0;
-+	static size_t pos = 0;
-+	static char buf[BUFSIZ];
-+	va_list ap;
-+	int len;
-+
-+	if (!width) {
-+		struct winsize winsize;
-+		if (!ioctl(STDOUT_FILENO, TIOCGWINSZ, &winsize))
-+			if (winsize.ws_col > 40)
-+				width = winsize.ws_col;
-+		if (!width)
-+			width = SIZE_MAX;
-+	}
-+
-+	if (!strcmp(fmt, "\n")) {
-+		if (pos)
-+			printf("\n");
-+		pos = 0;
-+		return;
-+	}
-+
-+	va_start(ap, fmt);
-+	len = vsnprintf(buf, sizeof(buf), fmt, ap);
-+	va_end(ap);
-+	if (len < 0 || (size_t)len >= sizeof(buf))
-+		eprintf("vsnprintf:");
-+
-+	if (pos + !!pos + len > width) {
-+		printf("\n");
-+		pos = 0;
-+	} else if (pos) {
-+		printf(" ");
-+		pos++;
-+	}
-+
-+	printf("%s", buf);
-+	pos += len;
-+}
-+
-+static const char*
-+keytostr(cc_t key)
-+{
-+	static char buf[5];
-+	int r;
-+	if (key == _POSIX_VDISABLE)
-+		return "undef";
-+	else if (key < (cc_t)' ')
-+		r = snprintf(buf, sizeof(buf), "^%c", key + '@');
-+	else if (key < 127)
-+		r = snprintf(buf, sizeof(buf), "%c", key);
-+	else if (key == 127)
-+		r = snprintf(buf, sizeof(buf), "^?");
-+	else if (key < 128 + ' ')
-+		r = snprintf(buf, sizeof(buf), "M-^%c", key - 128 + '@');
-+	else if (key == 128 + 127)
-+		r = snprintf(buf, sizeof(buf), "M-^?");
-+	else
-+		r = snprintf(buf, sizeof(buf), "M-%c", key - 128);
-+	if (r < 0 || (size_t)r >= sizeof(buf))
-+		eprintf("snprintf:");
-+	return buf;
-+}
-+
-+static void
-+displaysettings(struct termios *m, int all)
-+{
-+	const struct key *kbd = keys;
-+	const struct mode *mod = modes;
-+	struct winsize winsize;
-+	speed_t in, out;
-+	tcflag_t *bitsp, mask;
-+
-+	in = cfgetispeed(m);
-+	out = cfgetospeed(m);
-+	if (!in || in == out) {
-+		if (all || out != B38400)
-+			printtoken("speed %s baud;", baudtostr(out));
-+	} else {
-+		printtoken("ispeed %s baud;", baudtostr(in));
-+		printtoken("ospeed %s baud;", baudtostr(out));
-+	}
-+
-+	if (all) {
-+		if (ioctl(STDIN_FILENO, TIOCGWINSZ, &winsize))
-+			eprintf("TIOCGWINSZ <stdin>:");
-+		printtoken("rows %u;", winsize.ws_row);
-+		printtoken("columns %u;", winsize.ws_col);
-+	}
-+	printtoken("\n");
-+
-+	if (all || m->c_line != 0)
-+		printtoken("line = %u;", (unsigned long)(m->c_line));
-+	if (all || (m->c_cc[VMIN] != 1 && !(m->c_lflag & ICANON)))
-+		printtoken("min = %u;", (unsigned long)(m->c_cc[VMIN]));
-+	if (all || (m->c_cc[VTIME] != 0 && !(m->c_lflag & ICANON)))
-+		printtoken("time = %u;", (unsigned long)(m->c_cc[VTIME]));
-+	printtoken("\n");
-+
-+	for (; kbd->op; kbd++)
-+		if (all || m->c_cc[kbd->index] != kbd->sanevalue)
-+			printtoken("%s = %s;", kbd->op, keytostr(m->c_cc[kbd->index]));
-+	printtoken("\n");
-+
-+	for (; mod->op; mod++) {
-+		switch (mod->type) {
-+	        case CTRL:  bitsp = &m->c_cflag; break;
-+        	case IN:    bitsp = &m->c_iflag; break;
-+        	case OUT:   bitsp = &m->c_oflag; break;
-+        	case LOCAL: bitsp = &m->c_lflag; break;
-+        	default:    bitsp = 0;           break;
-+		}
-+		if (!bitsp || (mod->flags & DUP))
-+			continue;
-+		mask = mod->clear ? mod->clear : mod->set;
-+		if ((*bitsp & mask) == mod->set) {
-+			if (all || (mod->flags & INSANE) || !(mod->flags & SANE))
-+				printtoken("%s", mod->op);
-+		}
-+		else if (mod->flags & BOOL) {
-+			if (all || (mod->flags & SANE) || !(mod->flags & INSANE))
-+				printtoken("-%s", mod->op);
-+		}
-+	}
-+	printtoken("\n");
-+}
-+
-+static void
-+usage(void)
-+{
-+	eprintf("usage: %s [-a | -g] [operand ...]\n", argv0);
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+	struct termios mode;
-+	struct termios mode2;
-+	struct winsize winsize;
-+	struct speed speed;
-+	int aflag = 0;
-+	int gflag = 0;
-+	size_t n;
-+	unsigned char *buf;
-+	char *p;
-+	speed_t in, out;
-+
-+	for (argv0 = *argv++, argc--; argc; argv++, argc--) {
-+		if (!strcmp(*argv, "-ag") || !strcmp(*argv, "-ga")) {
-+			aflag = gflag = 1;
-+		} else if (!strcmp(*argv, "-g")) {
-+			gflag = 1;
-+		} else if (!strcmp(*argv, "-a")) {
-+			aflag = 1;
-+		} else if (!strcmp(*argv, "--")) {
-+			argv++, argc--;
-+			break;
-+		} else {
-+			break;
-+		}
-+	}
-+
-+	if (aflag && gflag)
-+		usage();
-+
-+	memset(&mode, 0, sizeof(mode));
-+	if (tcgetattr(STDIN_FILENO, &mode))
-+		eprintf("tcgetattr <stdin>:");
-+	memcpy(&mode2, &mode, sizeof(mode));
-+
-+	for (; *argv; argv++) {
-+		if (**argv == '=') {
-+			p = *argv + 1;
-+			if (strlen(p) != sizeof(mode) * 2 || !isxnumber(p))
-+				goto invalid;
-+			decodehex((char *)&mode, p);
-+		} else if (!parseoperand_mode(*argv, &mode)) {
-+			/* do nothing. */
-+		} else if (!parseoperand_key(argv[0], argv[1], &mode)) {
-+			argv++;
-+		} else if (!parseoperand_int(argv[0], argv[1], &mode)) {
-+			argv++;
-+		} else if (!parsespeed(*argv, &speed)) {
-+			if (cfsetispeed(&mode, speed.speed))
-+				eprintf("cfsetispeed %s:", speed.str);
-+			if (cfsetospeed(&mode, speed.speed))
-+				eprintf("cfsetospeed %s:", speed.str);
-+		} else {
-+			goto invalid;
-+		}
-+	}
-+
-+	if (memcmp(&mode, &mode2, sizeof(mode))) {
-+		memset(&mode2, 0, sizeof(mode2));
-+		if (tcsetattr(STDIN_FILENO, drain_requested ? TCSADRAIN : TCSANOW, &mode))
-+			eprintf("tcsetattr <stdin>:");
-+		if (tcgetattr(STDIN_FILENO, &mode2))
-+			eprintf("tcgetattr <stdin>:");
-+		if (memcmp(&mode, &mode2, sizeof(mode)))
-+			eprintf("tcsetattr <stdin>: unable to apply all operands\n");
-+	}
-+
-+	if (gflag) {
-+		buf = (unsigned char *)&mode;
-+		printf("=");
-+		for (n = sizeof(mode); n--; buf++)
-+			printf("%02x", *buf);
-+		printf("\n");
-+	}
-+
-+	if (output_size_requested) {
-+		if (ioctl(STDIN_FILENO, TIOCGWINSZ, &winsize))
-+			eprintf("TIOCGWINSZ <stdin>:");
-+		printf("%u %u\n", winsize.ws_row, winsize.ws_col);
-+	}
-+
-+	if (output_speed_requested) {
-+		in = cfgetispeed(&mode);
-+		out = cfgetospeed(&mode);
-+		if (!in || in == out)
-+			printf("%s\n", baudtostr(out));
-+		else
-+			printf("%s %s\n", baudtostr(in), baudtostr(out));
-+	}
-+
-+	if ((aflag || !argc) && !gflag)
-+		displaysettings(&mode, aflag);
-+
-+	return 0;
-+
-+invalid:
-+	eprintf("invalid operand: %s\n", *argv);
-+}
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0004-stty-cleaner-output-when-no-arguments-are-used.patch b/core/ubase/patch/0004-stty-cleaner-output-when-no-arguments-are-used.patch
deleted file mode 100644
index ebe8e0a3..00000000
--- a/core/ubase/patch/0004-stty-cleaner-output-when-no-arguments-are-used.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 9f00ed516b949f735d4e0a4422a0e23e4df72211 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@kth.se>
-Date: Wed, 30 Mar 2016 16:46:07 +0200
-Subject: [PATCH] stty: cleaner output when no arguments are used
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mattias Andrée <maandree@kth.se>
----
- stty.c | 24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/stty.c b/stty.c
-index c65748a..3e90b8f 100644
---- a/stty.c
-+++ b/stty.c
-@@ -1,4 +1,6 @@
- /* See LICENSE file for copyright and license details. */
-+#include <sys/ioctl.h>
-+
- #include <ctype.h>
- #include <errno.h>
- #include <limits.h>
-@@ -7,7 +9,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/ioctl.h>
- #include <termios.h>
- #include <unistd.h>
- 
-@@ -113,7 +114,8 @@ enum {
- 	CRT = 1024,
- 	DEC = 2048,
- 	NL = 4096,
--	COOKED = 8192
-+	COOKED = 8192,
-+	DEF = 16384
- };
- 
- struct mode {
-@@ -149,10 +151,10 @@ static const struct mode modes[] = {
- 	{"cs5",      CTRL,  CS5,     CSIZE,   0,      0},
- 	{"cs6",      CTRL,  CS6,     CSIZE,   0,      0},
- 	{"cs7",      CTRL,  CS7,     CSIZE,   0,      0},
--	{"cs8",      CTRL,  CS8,     CSIZE,   0,      0},
-+	{"cs8",      CTRL,  CS8,     CSIZE,   0,      DEF},
- 	{"cstopb",   CTRL,  CSTOPB,  0,       0,      BOOL},
- 	{"hup",      CTRL,  HUPCL,   0,       0,      BOOL | DUP},
--	{"hupcl",    CTRL,  HUPCL,   0,       0,      BOOL},
-+	{"hupcl",    CTRL,  HUPCL,   0,       0,      BOOL | DEF},
- 	{"parenb",   CTRL,  PARENB,  0,       0,      BOOL | PASS8 | LITOUT},
- 	{"parodd",   CTRL,  PARODD,  0,       0,      BOOL},
- 
-@@ -169,7 +171,7 @@ static const struct mode modes[] = {
- 	{"iutf8",    IN,    IUTF8,   0,       0,      BOOL | SANE},
- 	{"ixany",    IN,    IXANY,   0,       0,      BOOL | INSANE | DECCTLQ},
- 	{"ixoff",    IN,    IXOFF,   0,       0,      BOOL | INSANE},
--	{"ixon",     IN,    IXON,    0,       0,      BOOL},
-+	{"ixon",     IN,    IXON,    0,       0,      BOOL | DEF},
- 	{"parmrk",   IN,    PARMRK,  0,       0,      BOOL},
- 	{"tandem",   IN,    IXOFF,   0,       0,      BOOL | DUP},
- 
-@@ -591,6 +593,14 @@ keytostr(cc_t key)
- 	return buf;
- }
- 
-+static int
-+isdefault(int flags)
-+{
-+	if (flags & (SANE | INSANE))
-+		return (flags & SANE) || !(flags & INSANE);
-+	return flags & DEF;
-+}
-+
- static void
- displaysettings(struct termios *m, int all)
- {
-@@ -643,11 +653,11 @@ displaysettings(struct termios *m, int all)
- 			continue;
- 		mask = mod->clear ? mod->clear : mod->set;
- 		if ((*bitsp & mask) == mod->set) {
--			if (all || (mod->flags & INSANE) || !(mod->flags & SANE))
-+			if (all || !isdefault(mod->flags))
- 				printtoken("%s", mod->op);
- 		}
- 		else if (mod->flags & BOOL) {
--			if (all || (mod->flags & SANE) || !(mod->flags & INSANE))
-+			if (all || isdefault(mod->flags))
- 				printtoken("-%s", mod->op);
- 		}
- 	}
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0005-stty-fix-casting-bug.patch b/core/ubase/patch/0005-stty-fix-casting-bug.patch
deleted file mode 100644
index 26faab07..00000000
--- a/core/ubase/patch/0005-stty-fix-casting-bug.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 70b734d269da4a0c92381f4e892e3c42f959e298 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@kth.se>
-Date: Wed, 30 Mar 2016 16:46:08 +0200
-Subject: [PATCH] stty: fix casting bug
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mattias Andrée <maandree@kth.se>
----
- stty.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/stty.c b/stty.c
-index 3e90b8f..9f4307b 100644
---- a/stty.c
-+++ b/stty.c
-@@ -629,11 +629,11 @@ displaysettings(struct termios *m, int all)
- 	printtoken("\n");
- 
- 	if (all || m->c_line != 0)
--		printtoken("line = %u;", (unsigned long)(m->c_line));
-+		printtoken("line = %u;", (unsigned)(m->c_line));
- 	if (all || (m->c_cc[VMIN] != 1 && !(m->c_lflag & ICANON)))
--		printtoken("min = %u;", (unsigned long)(m->c_cc[VMIN]));
-+		printtoken("min = %u;", (unsigned)(m->c_cc[VMIN]));
- 	if (all || (m->c_cc[VTIME] != 0 && !(m->c_lflag & ICANON)))
--		printtoken("time = %u;", (unsigned long)(m->c_cc[VTIME]));
-+		printtoken("time = %u;", (unsigned)(m->c_cc[VTIME]));
- 	printtoken("\n");
- 
- 	for (; kbd->op; kbd++)
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0006-stty-add-symbolic-values-for-line-disciplines.patch b/core/ubase/patch/0006-stty-add-symbolic-values-for-line-disciplines.patch
deleted file mode 100644
index 822ddf1d..00000000
--- a/core/ubase/patch/0006-stty-add-symbolic-values-for-line-disciplines.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From d2bc7a470249707740e001b5c996aa906181553f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@kth.se>
-Date: Wed, 30 Mar 2016 16:46:09 +0200
-Subject: [PATCH] stty: add symbolic values for line disciplines
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mattias Andrée <maandree@kth.se>
----
- stty.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 59 insertions(+), 4 deletions(-)
-
-diff --git a/stty.c b/stty.c
-index 9f4307b..e21ab24 100644
---- a/stty.c
-+++ b/stty.c
-@@ -95,7 +95,6 @@ static void size(int unset, struct termios *m)   { output_size_requested = 1; (v
- static void speed(int unset, struct termios *m)  { output_speed_requested = 1; (void) m; (void) unset; }
- static void tabs(int unset, struct termios *m)   { m->c_oflag &= ~TABDLY, m->c_oflag |= unset ? TAB3 : TAB0; }
- static void cols(char *arg, struct termios *m)   { setwinsize(-1, estrtonum(arg, 0, USHRT_MAX)); (void) m; }
--static void line(char *arg, struct termios *m)   { m->c_line = estrtonum(arg, 0, 255); }
- static void min(char *arg, struct termios *m)    { m->c_cc[VMIN] = estrtonum(arg, 0, CC_MAX); }
- static void rows(char *arg, struct termios *m)   { setwinsize(estrtonum(arg, 0, USHRT_MAX), -1); (void) m; }
- static void stime(char *arg, struct termios *m)  { m->c_cc[VTIME] = estrtonum(arg, 0, CC_MAX); }
-@@ -143,6 +142,11 @@ struct speed {
- 	speed_t speed;
- };
- 
-+struct line {
-+	const char *str;
-+	unsigned char value;
-+};
-+
- static const struct mode modes[] = {
- 	{"clocal",   CTRL,  CLOCAL,  0,       0,      BOOL},
- 	{"cmspar",   CTRL,  CMSPAR,  0,       0,      BOOL},
-@@ -267,7 +271,6 @@ static const struct key keys[] = {
- static const struct intvalued ints[] = {
- 	{"cols",    cols},
- 	{"columns", cols},
--	{"line",    line},
- 	{"min",     min},
- 	{"rows",    rows},
- 	{"time",    stime},
-@@ -289,6 +292,26 @@ static const struct speed speeds[] = {
- };
- #undef B
- 
-+static const struct line lines[] = {
-+	{"tty",      N_TTY},
-+	{"slip",     N_SLIP},
-+	{"mouse",    N_MOUSE},
-+	{"ppp",      N_PPP},
-+	{"strip",    N_STRIP},
-+	{"ax25",     N_AX25},
-+	{"x25",      N_X25},
-+	{"6pack",    N_6PACK},
-+	{"masc",     N_MASC},
-+	{"r3964",    N_R3964},
-+	{"profibus", N_PROFIBUS_FDL},
-+	{"irda",     N_IRDA},
-+	{"smsblock", N_SMSBLOCK},
-+	{"hdlc",     N_HDLC},
-+	{"syncppp",  N_SYNC_PPP},
-+	{"hci",      N_HCI},
-+	{0, 0}
-+};
-+
- static void
- sane(int unset, struct termios *m)
- {
-@@ -489,6 +512,27 @@ baudtostr(speed_t baud)
- 	return speed->str ? speed->str : "0";
- }
- 
-+static const char*
-+linetostr(unsigned value)
-+{
-+	const struct line *ln = lines;
-+	while (ln->str && ln->value != value)
-+		ln++;
-+	return ln->str;
-+}
-+
-+static void
-+line(char *arg, struct termios *m)
-+{
-+	const struct line *ln = lines;
-+	while (ln->str && strcmp(ln->str, arg))
-+		ln++;
-+	if (ln->str)
-+		m->c_line = ln->value;
-+	else
-+		m->c_line = estrtonum(arg, 0, 255);
-+}
-+
- static int
- parsespeed(char *arg, struct speed *ret)
- {
-@@ -609,6 +653,7 @@ displaysettings(struct termios *m, int all)
- 	struct winsize winsize;
- 	speed_t in, out;
- 	tcflag_t *bitsp, mask;
-+	const char *linestr;
- 
- 	in = cfgetispeed(m);
- 	out = cfgetospeed(m);
-@@ -628,8 +673,13 @@ displaysettings(struct termios *m, int all)
- 	}
- 	printtoken("\n");
- 
--	if (all || m->c_line != 0)
--		printtoken("line = %u;", (unsigned)(m->c_line));
-+	if (all || m->c_line != 0) {
-+		linestr = linetostr(m->c_line);
-+		if (linestr)
-+			printtoken("line = %s;", linestr);
-+		else
-+			printtoken("line = %u;", (unsigned)(m->c_line));
-+	}
- 	if (all || (m->c_cc[VMIN] != 1 && !(m->c_lflag & ICANON)))
- 		printtoken("min = %u;", (unsigned)(m->c_cc[VMIN]));
- 	if (all || (m->c_cc[VTIME] != 0 && !(m->c_lflag & ICANON)))
-@@ -719,6 +769,11 @@ main(int argc, char *argv[])
- 			argv++;
- 		} else if (!parseoperand_int(argv[0], argv[1], &mode)) {
- 			argv++;
-+		} else if (!strcmp(argv[0], "line")) {
-+			if (!argv[1])
-+				eprintf("missing argument for operand: %s\n", argv[0]);
-+			line(argv[1], &mode);
-+			argv++;
- 		} else if (!parsespeed(*argv, &speed)) {
- 			if (cfsetispeed(&mode, speed.speed))
- 				eprintf("cfsetispeed %s:", speed.str);
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0007-stty-simplify.patch b/core/ubase/patch/0007-stty-simplify.patch
deleted file mode 100644
index e4039231..00000000
--- a/core/ubase/patch/0007-stty-simplify.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 450963b1b1167b6b38dd0d78612015d79a9381bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@kth.se>
-Date: Sat, 2 Apr 2016 02:39:15 +0200
-Subject: [PATCH] stty: simplify
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Mattias Andrée <maandree@kth.se>
----
- stty.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/stty.c b/stty.c
-index e21ab24..9da517c 100644
---- a/stty.c
-+++ b/stty.c
-@@ -438,12 +438,12 @@ parseoperand_mode(char *arg, struct termios *mode)
- }
- 
- static long long
--estrtonum_radix(const char *numstr, long long minval, long long maxval, int radix)
-+estrtonum_anyradix(const char *numstr, long long minval, long long maxval)
- {
- 	long long ll = 0;
- 	char *ep;
- 	errno = 0;
--	ll = strtoll(numstr, &ep, radix);
-+	ll = strtoll(numstr, &ep, 0);
- 	if (numstr == ep || *ep != '\0')
- 		eprintf("strtoll %s: invalid\n", numstr);
- 	else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
-@@ -475,12 +475,8 @@ parseoperand_key(char *arg0, char *arg1, struct termios *mode)
- 		value = arg1[0];
- 	else if (arg1[0] == '^')
- 		value = (cc_t)(arg1[1]) & ~0x60;
--	else if (strstr(arg1, "0x") == arg1)
--		value = estrtonum_radix(arg1 + 2, 0, CC_MAX, 16);
--	else if (arg1[0] == '0' && arg1[1])
--		value = estrtonum_radix(arg1 + 1, 0, CC_MAX, 8);
- 	else
--		value = estrtonum_radix(arg1 + 0, 0, CC_MAX, 10);
-+		value = estrtonum_anyradix(arg1, 0, CC_MAX);
- 
- 	mode->c_cc[op->index] = value;
- 	return 0;
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0008-stty-Fix-indentation.patch b/core/ubase/patch/0008-stty-Fix-indentation.patch
deleted file mode 100644
index f2e5847f..00000000
--- a/core/ubase/patch/0008-stty-Fix-indentation.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From bfa40d29da6608660ed453ccc2b679831eeb0e1b Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 14 Jun 2016 22:04:15 -0700
-Subject: [PATCH] stty: Fix indentation
-
----
- stty.c | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/stty.c b/stty.c
-index 9da517c..9aa52b5 100644
---- a/stty.c
-+++ b/stty.c
-@@ -21,7 +21,7 @@
-  *    convenience and compatibility with other implementations.
-  */
- 
--#define CC_MAX  255
-+#define CC_MAX 255
- 
- static int output_size_requested = 0;
- static int output_speed_requested = 0;
-@@ -282,9 +282,9 @@ static const struct intvalued ints[] = {
- #define B(baud) {#baud, B##baud}
- static const struct speed speeds[] = {
- 	B(0),       B(50),      B(75),      B(110),     B(134),     B(150),     B(200),     B(300),
--        B(600),     B(1200),    B(1800),    B(2400),    B(4800),    B(9600),    B(19200),   B(38400),
--        B(57600),   B(115200),  B(230400),  B(460800),  B(500000),  B(576000),  B(921600),  B(1000000),
--        B(1152000), B(1500000), B(2000000), B(2500000), B(3000000), B(3500000), B(4000000),
-+	B(600),     B(1200),    B(1800),    B(2400),    B(4800),    B(9600),    B(19200),   B(38400),
-+	B(57600),   B(115200),  B(230400),  B(460800),  B(500000),  B(576000),  B(921600),  B(1000000),
-+	B(1152000), B(1500000), B(2000000), B(2500000), B(3000000), B(3500000), B(4000000),
- 	{"134.5", B134},
- 	{"exta",  B19200},
- 	{"extb",  B38400},
-@@ -403,16 +403,16 @@ parseoperand_mode(char *arg, struct termios *mode)
- 		return -1;
- 
- 	switch (op->type) {
--        case CTRL:
--        case IN:
--        case OUT:
--        case LOCAL:
--        case SPEC:
-+	case CTRL:
-+	case IN:
-+	case OUT:
-+	case LOCAL:
-+	case SPEC:
- 		setoperand_mode(unset, op, mode);
- 		return 0;
--        case COMB:
-+	case COMB:
- 		break;
--        default:
-+	default:
- 		abort();
- 	}
- 
-@@ -689,11 +689,11 @@ displaysettings(struct termios *m, int all)
- 
- 	for (; mod->op; mod++) {
- 		switch (mod->type) {
--	        case CTRL:  bitsp = &m->c_cflag; break;
--        	case IN:    bitsp = &m->c_iflag; break;
--        	case OUT:   bitsp = &m->c_oflag; break;
--        	case LOCAL: bitsp = &m->c_lflag; break;
--        	default:    bitsp = 0;           break;
-+		case CTRL:  bitsp = &m->c_cflag; break;
-+		case IN:    bitsp = &m->c_iflag; break;
-+		case OUT:   bitsp = &m->c_oflag; break;
-+		case LOCAL: bitsp = &m->c_lflag; break;
-+		default:    bitsp = 0;           break;
- 		}
- 		if (!bitsp || (mod->flags & DUP))
- 			continue;
--- 
-2.8.1
-
diff --git a/core/ubase/patch/0009-stty-Fix-build-with-musl-libc.patch b/core/ubase/patch/0009-stty-Fix-build-with-musl-libc.patch
deleted file mode 100644
index ae1373f5..00000000
--- a/core/ubase/patch/0009-stty-Fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7bf3cab74f99163de9aced05a424e359fbeecb82 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 14 Jun 2016 22:19:18 -0700
-Subject: [PATCH] stty: Fix build with musl libc
-
----
- stty.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/stty.c b/stty.c
-index 9aa52b5..3fc5844 100644
---- a/stty.c
-+++ b/stty.c
-@@ -1,5 +1,6 @@
- /* See LICENSE file for copyright and license details. */
- #include <sys/ioctl.h>
-+#include <sys/ttydefaults.h>
- 
- #include <ctype.h>
- #include <errno.h>
-@@ -37,7 +38,9 @@ raw(int unset, struct termios *m)
- {
- 	if (!unset) {
- 		m->c_iflag = 0;
-+#ifdef XCASE
- 		m->c_lflag &= ~XCASE;
-+#endif
- 		m->c_cc[VMIN] = 1;
- 		m->c_cc[VTIME] = 0;
- 	} else {
-@@ -149,7 +152,9 @@ struct line {
- 
- static const struct mode modes[] = {
- 	{"clocal",   CTRL,  CLOCAL,  0,       0,      BOOL},
-+#ifdef CMSPAR
- 	{"cmspar",   CTRL,  CMSPAR,  0,       0,      BOOL},
-+#endif
- 	{"cread",    CTRL,  CREAD,   0,       0,      BOOL | SANE},
- 	{"crtscts",  CTRL,  CRTSCTS, 0,       0,      BOOL},
- 	{"cs5",      CTRL,  CS5,     CSIZE,   0,      0},
-@@ -222,7 +227,9 @@ static const struct mode modes[] = {
- 	{"noflsh",   LOCAL, NOFLSH,  0,       0,      BOOL | INSANE},
- 	{"prterase", LOCAL, ECHOPRT, 0,       0,      BOOL | DUP},
- 	{"tostop",   LOCAL, TOSTOP,  0,       0,      BOOL | INSANE},
-+#ifdef XCASE
- 	{"xcase",    LOCAL, XCASE,   0,       0,      BOOL | INSANE | LCASE},
-+#endif
- 
- 	{"cbreak",   COMB,  0,       CBREAK,  0,      BOOL | DUP},
- 	{"cooked",   COMB,  COOKED,  0,       cooked, BOOL | DUP},
--- 
-2.8.1
-
diff --git a/core/ubase/rev b/core/ubase/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/ubase/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/ubase/src b/core/ubase/src
deleted file mode 160000
-Subproject e3dacbb542daeda7797855b01b3afbf7c433ad5
diff --git a/core/util-linux/config.h b/core/util-linux/config.h
deleted file mode 100644
index 9f5c2ab6..00000000
--- a/core/util-linux/config.h
+++ /dev/null
@@ -1,222 +0,0 @@
-#include <config-posix.h>
-
-#define _PATH_LOCALSTATEDIR "/run"
-#define LOCALEDIR "/share/locale"
-
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-#define AGETTY_RELOAD 1
-#define CHFN_CHSH_PASSWORD 1
-#define CONFIG_ADJTIME_PATH "/etc/adjtime"
-/* #undef ENABLE_NLS */
-#define FS_SEARCH_PATH "/bin"
-/* #undef HAVE_ASM_IO_H */
-#define HAVE_BTRFS_SUPPORT 1
-#define HAVE_BYTESWAP_H 1
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-#define HAVE_CPU_SET_T 1
-#define HAVE_CRYPT_H 1
-/* #undef HAVE_DCGETTEXT */
-#define HAVE_DECL_CPU_ALLOC 1
-/* #undef HAVE_DECL_DIRFD */
-#define HAVE_DECL__NL_TIME_WEEK_1STDAY 0
-/* #undef HAVE_DIR_DD_FD */
-#define HAVE_ENDIAN_H 1
-#define HAVE_ENVIRON_DECL 1
-#define HAVE_ERR 1
-#define HAVE_ERRX 1
-#define HAVE_ERR_H 1
-#define HAVE_FALLOCATE 1
-#define HAVE_GETDOMAINNAME 1
-#define HAVE_GETDTABLESIZE 1
-/* #undef HAVE_GETEXECNAME */
-/* #undef HAVE_GETMNTINFO */
-#define HAVE_GETOPT_H 1
-/* #undef HAVE_GETSGNAM */
-/* #undef HAVE_GETTEXT */
-#define HAVE_INOTIFY_INIT 1
-#define HAVE_INOTIFY_INIT1 1
-#define HAVE_IOPERM 1
-#define HAVE_IOPL 1
-/* #undef HAVE_LIBAUDIT */
-/* #undef HAVE_LIBBLKID */
-/* #undef HAVE_LIBCAP_NG */
-/* #undef HAVE_LIBCRYPT */
-/* #undef HAVE_LIBMOUNT */
-/* #undef HAVE_LIBNCURSES */
-/* #undef HAVE_LIBNCURSESW */
-/* #undef HAVE_LIBREADLINE */
-/* #undef HAVE_LIBRTAS */
-/* #undef HAVE_LIBSELINUX */
-/* #undef HAVE_LIBSYSTEMD */
-/* #undef HAVE_LIBTINFO */
-/* #undef HAVE_LIBUDEV */
-/* #undef HAVE_LIBUSER */
-/* #undef HAVE_LIBUTEMPTER */
-#define HAVE_LIBUTIL 1
-#define HAVE_LIBUUID 1
-#define HAVE_LINUX_BLKPG_H 1
-#define HAVE_LINUX_BTRFS_H 1
-#define HAVE_LINUX_CDROM_H 1
-/* #undef HAVE_LINUX_COMPILER_H */
-#define HAVE_LINUX_FALLOC_H 1
-#define HAVE_LINUX_FD_H 1
-/* #undef HAVE_LINUX_GSMMUX_H */
-#define HAVE_LINUX_MAJOR_H 1
-#define HAVE_LINUX_RAW_H 1
-#define HAVE_LINUX_SECUREBITS_H 1
-#define HAVE_LINUX_TIOCL_H 1
-#define HAVE_LINUX_VERSION_H 1
-#define HAVE_LINUX_WATCHDOG_H 1
-/* #undef HAVE_LLSEEK */
-/* #undef HAVE_LLSEEK_PROTOTYPE */
-/* #undef HAVE_LOFF_T */
-#define HAVE_LSEEK64 1
-#define HAVE_LSEEK64_PROTOTYPE 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MEMPCPY 1
-#define HAVE_MKOSTEMP 1
-#define HAVE_MNTENT_H 1
-/* #undef HAVE_NCURSESW_NCURSES_H */
-/* #undef HAVE_NCURSES_H */
-/* #undef HAVE_NCURSES_NCURSES_H */
-/* #undef HAVE_NET_IF_DL_H */
-/* #undef HAVE_NTP_GETTIME */
-#define HAVE_PATHS_H 1
-#define HAVE_PERSONALITY 1
-#define HAVE_PRCTL 1
-/* #undef HAVE_PRLIMIT */
-#define HAVE_PROGRAM_INVOCATION_SHORT_NAME 1
-#define HAVE_PTY_H 1
-/* #undef HAVE_QSORT_R */
-#define HAVE_REBOOT 1
-/* #undef HAVE_RESIZETERM */
-/* #undef HAVE_RPMATCH */
-/* #undef HAVE_SA_LEN */
-/* #undef HAVE_SCANDIRAT */
-/* #undef HAVE_SCANF_AS_MODIFIER */
-#define HAVE_SCANF_MS_MODIFIER 1
-/* #undef HAVE_SCHED_SETATTR */
-/* #undef HAVE_SECURE_GETENV */
-/* #undef HAVE_SECURITY_GET_INITIAL_CONTEXT */
-/* #undef HAVE_SECURITY_OPENPAM_H */
-/* #undef HAVE_SECURITY_PAM_APPL_H */
-/* #undef HAVE_SECURITY_PAM_MISC_H */
-#define HAVE_SETNS 1
-/* #undef HAVE_SETPROGNAME */
-#define HAVE_SETRESGID 1
-#define HAVE_SETRESUID 1
-#define HAVE_SHADOW_H 1
-#define HAVE_SIGHANDLER_T 1
-/* #undef HAVE_SLANG_H */
-/* #undef HAVE_SLANG_SLANG_H */
-/* #undef HAVE_SLANG_SLCURSES_H */
-/* #undef HAVE_SLCURSES_H */
-/* #undef HAVE_SMACK */
-#define HAVE_STDIO_EXT_H 1
-/* #undef HAVE_STRNCHR */
-#define HAVE_STRSIGNAL_DECL 1
-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-#define HAVE_STRUCT_TERMIOS_C_LINE 1
-#define HAVE_SYSINFO 1
-/* #undef HAVE_SYS_DISKLABEL_H */
-/* #undef HAVE_SYS_DISK_H */
-/* #undef HAVE_SYS_ENDIAN_H */
-#define HAVE_SYS_FILE_H 1
-/* #undef HAVE_SYS_IOCCOM_H */
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_IO_H 1
-/* #undef HAVE_SYS_MKDEV_H */
-#define HAVE_SYS_MOUNT_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_PRCTL_H 1
-#define HAVE_SYS_SIGNALFD_H 1
-/* #undef HAVE_SYS_SOCKIO_H */
-#define HAVE_SYS_SWAP_H 1
-#define HAVE_SYS_SYSCALL_H 1
-#define HAVE_SYS_SYSMACROS_H 1
-#define HAVE_SYS_TIMEX_H 1
-#define HAVE_SYS_TTYDEFAULTS_H 1
-/* #undef HAVE_SYS_UCRED_H */
-#define HAVE_TLS 1
-#define HAVE_TM_GMTOFF 1
-/* #undef HAVE_UNION_SEMUN */
-#define HAVE_UNSHARE 1
-#define HAVE_UPDWTMP 1
-/* #undef HAVE_USE_DEFAULT_COLORS */
-#define HAVE_USLEEP 1
-#define HAVE_UTMP_H 1
-/* #undef HAVE_UUIDD */
-#define HAVE_WARN 1
-#define HAVE_WARNX 1
-#define HAVE_WIDECHAR 1
-#define HAVE___FPENDING 1
-#define HAVE___PROGNAME 1
-/* #undef HAVE___SECURE_GETENV */
-#define LIBBLKID_DATE "08-Nov-2016"
-/* #undef LOGIN_CHOWN_VCS */
-/* #undef LOGIN_STAT_MAIL */
-#define LT_OBJDIR ".libs/"
-/* #undef NDEBUG */
-#define ONLY_LISTED_SHELLS 1
-#define PACKAGE "util-linux"
-#define PACKAGE_BUGREPORT "kzak@redhat.com"
-#define PACKAGE_NAME "util-linux"
-#define PACKAGE_STRING "util-linux 2.29"
-#define PACKAGE_TARNAME "util-linux"
-#define PACKAGE_URL "http://www.kernel.org/pub/linux/utils/util-linux/"
-#define PACKAGE_VERSION "2.29"
-#define PG_BELL 1
-#define SWAPON_HAS_TWO_ARGS 1
-/* #undef SYS_fallocate */
-/* #undef SYS_ioprio_get */
-/* #undef SYS_ioprio_set */
-/* #undef SYS_pivot_root */
-/* #undef SYS_prlimit64 */
-/* #undef SYS_sched_getaffinity */
-/* #undef SYS_sched_setattr */
-/* #undef SYS_setns */
-/* #undef SYS_unshare */
-#define USE_COLORS_BY_DEFAULT 1
-/* #undef USE_LIBMOUNT_SUPPORT_MTAB */
-#define USE_PLYMOUTH_SUPPORT 1
-/* #undef USE_SULOGIN_EMERGENCY_MOUNT */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#define USE_TTY_GROUP 1
-/* #undef USE_USRDIR_PATHS_ONLY */
-#define VERSION "2.29"
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-/* #undef _DARWIN_C_SOURCE */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGEFILE_SOURCE */
-/* #undef _LARGE_FILES */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-/* #undef const */
-/* #undef volatile */
diff --git a/core/util-linux/gen.rc b/core/util-linux/gen.rc
deleted file mode 100644
index 98f29302..00000000
--- a/core/util-linux/gen.rc
+++ /dev/null
@@ -1,107 +0,0 @@
-cflags\
-	-include '$dir'/config.h\
-	-I include\
-	-I '$dir' \
-	-I '$outdir' \
-	-I '$srcdir'/include\
-	-I '$srcdir'/libuuid/src
-
-build '$outdir'/libsmartcols.h sed '$srcdir'/libsmartcols/src/libsmartcols.h.in ; with\
-	expr '''s,"@LIBSMARTCOLS_VERSION@",PACKAGE_VERSION,'''
-build '$outdir'/libfdisk.h sed '$srcdir'/libfdisk/src/libfdisk.h.in ; expr=(\
-	-e '''s,"@LIBFDISK_VERSION@",PACKAGE_VERSION,''' \
-	-e /@LIBFDISK_MAJOR_VERSION@/d\
-	-e /@LIBFDISK_MINOR_VERSION@/d\
-	-e /@LIBFDISK_PATCH_VERSION@/d\
-) with expr $"expr
-
-phony deps '$outdir'/^(libsmartcols.h libfdisk.h)
-
-lib libcommon.a lib/^(\
-	blkdev.c\
-	canonicalize.c\
-	crc32.c\
-	env.c\
-	idcache.c\
-	fileutils.c\
-	ismounted.c\
-	mangle.c\
-	match.c\
-	mbsalign.c\
-	md5.c\
-	pager.c\
-	path.c\
-	randutils.c\
-	setproctitle.c\
-	strutils.c\
-	timeutils.c\
-	ttyutils.c\
-	exec_shell.c\
-	strv.c\
-	\
-	linux_version.c\
-	loopdev.c\
-	\
-	procutils.c\
-	sysfs.c\
-)
-
-lib libfdisk.a -d '$dir'/deps libfdisk/src/^(\
-	init.c\
-	field.c\
-	item.c\
-	test.c\
-	ask.c\
-	alignment.c\
-	label.c\
-	utils.c\
-	context.c\
-	parttype.c\
-	partition.c\
-	table.c\
-	iter.c\
-	script.c\
-	version.c\
-	wipe.c\
-	\
-	sun.c\
-	sgi.c\
-	dos.c\
-	bsd.c\
-	gpt.c\
-) libuuid.a libcommon.a
-
-lib libsmartcols.a -d '$dir'/deps libsmartcols/src/^(\
-	iter.c\
-	symbols.c\
-	cell.c\
-	column.c\
-	line.c\
-	table.c\
-	table_print.c\
-	version.c\
-	init.c\
-)
-
-lib libtcolors.a lib/^(colors.c color-names.c)
-
-lib libuuid.a libuuid/src/^(\
-	clear.c\
-	compare.c\
-	copy.c\
-	gen_uuid.c\
-	isnull.c\
-	pack.c\
-	parse.c\
-	unpack.c\
-	unparse.c\
-	uuid_time.c\
-)
-
-exe fdisk -d '$dir'/deps\
-	disk-utils/^(fdisk.c fdisk-menu.c fdisk-list.c)\
-	libfdisk.a.d libsmartcols.a libtcolors.a
-file bin/fdisk '$outdir'/fdisk 755
-file share/man/man8/fdisk.8 '$srcdir'/disk-utils/fdisk.8 644
-
-fetch git
diff --git a/core/util-linux/rev b/core/util-linux/rev
deleted file mode 100644
index d00491fd..00000000
--- a/core/util-linux/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/core/util-linux/src b/core/util-linux/src
deleted file mode 160000
-Subproject 5bd2b14de42bd81abfee1a3f3265b2ecb92f79b
diff --git a/core/xz/config.h b/core/xz/config.h
deleted file mode 100644
index fcd66734..00000000
--- a/core/xz/config.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#include <config-posix.h>
-
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-#define ASSUME_RAM 128
-/* #undef ENABLE_NLS */
-#define HAVE_BSWAP_16 1
-#define HAVE_BSWAP_32 1
-#define HAVE_BSWAP_64 1
-#define HAVE_BYTESWAP_H 1
-/* #undef HAVE_CC_SHA256_CTX */
-/* #undef HAVE_CC_SHA256_INIT */
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-#define HAVE_CHECK_CRC32 1
-#define HAVE_CHECK_CRC64 1
-#define HAVE_CHECK_SHA256 1
-/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
-/* #undef HAVE_DCGETTEXT */
-#define HAVE_DECL_CLOCK_MONOTONIC 1
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
-#define HAVE_DECODER_ARM 1
-#define HAVE_DECODER_ARMTHUMB 1
-#define HAVE_DECODER_DELTA 1
-#define HAVE_DECODER_IA64 1
-#define HAVE_DECODER_LZMA1 1
-#define HAVE_DECODER_LZMA2 1
-#define HAVE_DECODER_POWERPC 1
-#define HAVE_DECODER_SPARC 1
-#define HAVE_DECODER_X86 1
-#define HAVE_ENCODER_ARM 1
-#define HAVE_ENCODER_ARMTHUMB 1
-#define HAVE_ENCODER_DELTA 1
-#define HAVE_ENCODER_IA64 1
-#define HAVE_ENCODER_LZMA1 1
-#define HAVE_ENCODER_LZMA2 1
-#define HAVE_ENCODER_POWERPC 1
-#define HAVE_ENCODER_SPARC 1
-#define HAVE_ENCODER_X86 1
-/* #undef HAVE_FUTIMES */
-/* #undef HAVE_FUTIMESAT */
-#define HAVE_GETOPT_H 1
-#define HAVE_GETOPT_LONG 1
-/* #undef HAVE_GETTEXT */
-#define HAVE_IMMINTRIN_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MF_BT2 1
-#define HAVE_MF_BT3 1
-#define HAVE_MF_BT4 1
-#define HAVE_MF_HC3 1
-#define HAVE_MF_HC4 1
-/* #undef HAVE_MINIX_SHA2_H */
-#define HAVE_OPTRESET 1
-#define HAVE_PTHREAD_PRIO_INHERIT 1
-/* #undef HAVE_SHA256INIT */
-/* #undef HAVE_SHA256_CTX */
-/* #undef HAVE_SHA256_H */
-/* #undef HAVE_SHA256_INIT */
-/* #undef HAVE_SHA2_CTX */
-/* #undef HAVE_SHA2_H */
-/* #undef HAVE_SMALL */
-/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
-/* #undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC */
-/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */
-#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
-/* #undef HAVE_STRUCT_STAT_ST_UATIME */
-/* #undef HAVE_SYS_BYTEORDER_H */
-/* #undef HAVE_SYS_ENDIAN_H */
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_VISIBILITY 1
-#define HAVE__BOOL 1
-#define HAVE__MM_MOVEMASK_EPI8 1
-#define LT_OBJDIR ".libs/"
-#define MYTHREAD_POSIX 1
-/* #undef MYTHREAD_VISTA */
-/* #undef MYTHREAD_WIN95 */
-#define NDEBUG 1
-#define PACKAGE "xz"
-#define PACKAGE_BUGREPORT "lasse.collin@tukaani.org"
-#define PACKAGE_NAME "XZ Utils"
-#define PACKAGE_STRING "XZ Utils 5.2.2"
-#define PACKAGE_TARNAME "xz"
-#define PACKAGE_URL "http://tukaani.org/xz/"
-#define PACKAGE_VERSION "5.2.2"
-/* #undef PTHREAD_CREATE_JOINABLE */
-#define SIZEOF_SIZE_T 8
-/* #undef TUKLIB_CPUCORES_CPUSET */
-/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */
-#define TUKLIB_CPUCORES_SYSCONF 1
-/* #undef TUKLIB_CPUCORES_SYSCTL */
-#define TUKLIB_FAST_UNALIGNED_ACCESS 1
-/* #undef TUKLIB_PHYSMEM_AIX */
-/* #undef TUKLIB_PHYSMEM_GETINVENT_R */
-/* #undef TUKLIB_PHYSMEM_GETSYSINFO */
-/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */
-#define TUKLIB_PHYSMEM_SYSCONF 1
-/* #undef TUKLIB_PHYSMEM_SYSCTL */
-/* #undef TUKLIB_PHYSMEM_SYSINFO */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#define VERSION "5.2.2"
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-/* #undef _FILE_OFFSET_BITS */
-/* #undef _LARGE_FILES */
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-/* #undef _UINT32_T */
-/* #undef _UINT64_T */
-/* #undef _UINT8_T */
-/* #undef __GETOPT_PREFIX */
-/* #undef int32_t */
-/* #undef int64_t */
-/* #undef uint16_t */
-/* #undef uint32_t */
-/* #undef uint64_t */
-/* #undef uint8_t */
-/* #undef uintptr_t */
diff --git a/core/xz/gen.rc b/core/xz/gen.rc
deleted file mode 100644
index 1bf8f5c5..00000000
--- a/core/xz/gen.rc
+++ /dev/null
@@ -1,140 +0,0 @@
-cflags\
-	-D HAVE_CONFIG_H\
-	-I '$dir' \
-	-I '$srcdir'/src/common\
-	-I '$srcdir'/src/liblzma/api\
-	-I '$srcdir'/src/liblzma/check\
-	-I '$srcdir'/src/liblzma/common\
-	-I '$srcdir'/src/liblzma/delta\
-	-I '$srcdir'/src/liblzma/lz\
-	-I '$srcdir'/src/liblzma/lzma\
-	-I '$srcdir'/src/liblzma/rangecoder\
-	-I '$srcdir'/src/liblzma/simple\
-	-I include
-
-lib liblzma.a src/^(\
-	common/^(\
-		tuklib_physmem.c\
-		tuklib_cpucores.c\
-	)\
-	liblzma/^(\
-		check/^(\
-			crc32_tablegen.c\
-			crc64_tablegen.c\
-			check.c\
-			crc32_table.c\
-			crc32_fast.c\
-			crc64_table.c\
-			crc64_fast.c\
-			sha256.c\
-		)\
-		common/^(\
-			common.c\
-			block_util.c\
-			easy_preset.c\
-			filter_common.c\
-			hardware_physmem.c\
-			index.c\
-			stream_flags_common.c\
-			vli_size.c\
-			\
-			alone_encoder.c\
-			block_buffer_encoder.c\
-			block_encoder.c\
-			block_header_encoder.c\
-			easy_buffer_encoder.c\
-			easy_encoder.c\
-			easy_encoder_memusage.c\
-			filter_buffer_encoder.c\
-			filter_encoder.c\
-			filter_flags_encoder.c\
-			index_encoder.c\
-			stream_buffer_encoder.c\
-			stream_encoder.c\
-			stream_flags_encoder.c\
-			vli_encoder.c\
-			\
-			hardware_cputhreads.c\
-			outqueue.c\
-			stream_encoder_mt.c\
-			\
-			alone_decoder.c\
-			auto_decoder.c\
-			block_buffer_decoder.c\
-			block_decoder.c\
-			block_header_decoder.c\
-			easy_decoder_memusage.c\
-			filter_buffer_decoder.c\
-			filter_decoder.c\
-			filter_flags_decoder.c\
-			index_decoder.c\
-			index_hash.c\
-			stream_buffer_decoder.c\
-			stream_decoder.c\
-			stream_flags_decoder.c\
-			vli_decoder.c\
-		)\
-		delta/^(\
-			delta_common.c\
-			delta_encoder.c\
-			delta_decoder.c\
-		)\
-		lz/^(\
-			lz_encoder.c\
-			lz_encoder_mf.c\
-			lz_decoder.c\
-		)\
-		lzma/^(\
-			lzma_encoder.c\
-			lzma_encoder_presets.c\
-			lzma_encoder_optimum_fast.c\
-			lzma_encoder_optimum_normal.c\
-			fastpos_table.c\
-			lzma_decoder.c\
-			lzma2_encoder.c\
-			lzma2_decoder.c\
-		)\
-		rangecoder/price_table.c\
-		simple/^(\
-			simple_coder.c\
-			simple_encoder.c\
-			simple_decoder.c\
-			x86.c\
-			powerpc.c\
-			ia64.c\
-			arm.c\
-			armthumb.c\
-			sparc.c\
-		)\
-	)\
-)
-
-exe xz src/^(\
-	xz/^(\
-		args.c\
-		coder.c\
-		file_io.c\
-		hardware.c\
-		list.c\
-		main.c\
-		message.c\
-		mytime.c\
-		options.c\
-		signals.c\
-		suffix.c\
-		util.c\
-	)\
-	common/^(\
-		tuklib_open_stdxxx.c\
-		tuklib_progname.c\
-		tuklib_exit.c\
-		tuklib_mbstr_width.c\
-		tuklib_mbstr_fw.c\
-	)\
-) liblzma.a
-
-file bin/xz '$outdir'/xz 755
-file share/man/man1/xz.1 '$srcdir'/src/xz/xz.1 644
-for(alias in unxz xzcat) sym bin/$alias xz
-
-fetch git
diff --git a/core/xz/rev b/core/xz/rev
deleted file mode 100644
index d00491fd..00000000
--- a/core/xz/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/core/xz/src b/core/xz/src
deleted file mode 160000
-Subproject 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0
diff --git a/core/zlib/gen.rc b/core/zlib/gen.rc
deleted file mode 100644
index 56ac0a0a..00000000
--- a/core/zlib/gen.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-cflags\
-	-D HAVE_HIDDEN\
-	-D HAVE_STDARG_H\
-	-D HAVE_UNISTD_H\
-	-D _LARGEFILE64_SOURCE
-
-lib libz.a\
-	adler32.c\
-	crc32.c\
-	deflate.c\
-	infback.c\
-	inffast.c\
-	inflate.c\
-	inftrees.c\
-	trees.c\
-	zutil.c\
-	\
-	compress.c\
-	uncompr.c\
-	gzclose.c\
-	gzlib.c\
-	gzread.c\
-	gzwrite.c
-file lib/libz.a '$outdir'/libz.a 644
-
-hdrs=(zlib.h zconf.h)
-for(hdr in $hdrs) {
-	build '$outdir'/include/$hdr copy '$srcdir'/$hdr
-	file include/$hdr '$srcdir'/$hdr 644
-}
-phony headers '$outdir'/include/$hdrs
-
-fetch git
diff --git a/core/zlib/rev b/core/zlib/rev
deleted file mode 100644
index d00491fd..00000000
--- a/core/zlib/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/core/zlib/src b/core/zlib/src
deleted file mode 160000
-Subproject 50893291621658f355bc5b4d450a8d06a563053
author	Michael Forney <mforney@mforney.org>	2016-12-11 16:04:20 -0800
committer	Michael Forney <mforney@mforney.org>	2016-12-13 23:10:30 -0800
commit	293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch)
tree	6ecd1170e3dd793862dd852814dc1b4cd5e44260 /core
parent	9a506a6834df01a26795cea222b410f206efa9fa (diff)